From d68e5d29f2c3ad06a3e7dd2874507c71dd86772f Mon Sep 17 00:00:00 2001 From: Sebouh Paul <sebouh.paul@gmail.com> Date: Fri, 6 Jun 2025 10:49:02 -0400 Subject: [PATCH] No ecal endcap p insert (#151) --- benchmarks/femc_electron/Snakefile | 2 +- benchmarks/femc_photon/Snakefile | 2 +- benchmarks/femc_pi0/Snakefile | 2 +- benchmarks/insert_muon/Snakefile | 2 +- benchmarks/insert_neutron/Snakefile | 2 +- benchmarks/insert_neutron/analysis/neutron_plots.py | 4 ++-- benchmarks/insert_tau/Snakefile | 2 +- benchmarks/insert_tau/analysis/tau_plots.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benchmarks/femc_electron/Snakefile b/benchmarks/femc_electron/Snakefile index d1e77db8..015a6350 100644 --- a/benchmarks/femc_electron/Snakefile +++ b/benchmarks/femc_electron/Snakefile @@ -60,7 +60,7 @@ rule femc_electron_recon: shell: """ env DETECTOR_CONFIG={params.DETECTOR_CONFIG} \ - eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPInsertRecHits,EcalEndcapPInsertClusters,EcalEndcapPInsertRecHits,EcalEndcapPClusters -Pjana:nevents={params.N_EVENTS} + eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,EcalEndcapPClusters -Pjana:nevents={params.N_EVENTS} """ rule femc_electron_analysis: diff --git a/benchmarks/femc_photon/Snakefile b/benchmarks/femc_photon/Snakefile index 5cfecca5..a3793d49 100644 --- a/benchmarks/femc_photon/Snakefile +++ b/benchmarks/femc_photon/Snakefile @@ -60,7 +60,7 @@ rule femc_photon_recon: shell: """ env DETECTOR_CONFIG={params.DETECTOR_CONFIG} \ - eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPInsertRecHits,EcalEndcapPInsertClusters,EcalEndcapPInsertRecHits,EcalEndcapPClusters -Pjana:nevents={params.N_EVENTS} + eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,EcalEndcapPClusters -Pjana:nevents={params.N_EVENTS} """ rule femc_photon_analysis: diff --git a/benchmarks/femc_pi0/Snakefile b/benchmarks/femc_pi0/Snakefile index 9d753f33..a838c356 100644 --- a/benchmarks/femc_pi0/Snakefile +++ b/benchmarks/femc_pi0/Snakefile @@ -60,7 +60,7 @@ rule femc_pi0_recon: shell: """ env DETECTOR_CONFIG={params.DETECTOR_CONFIG} \ - eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPInsertRecHits,EcalEndcapPInsertClusters,EcalEndcapPInsertRecHits,EcalEndcapPClusters -Pjana:nevents={params.N_EVENTS} + eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,EcalEndcapPClusters -Pjana:nevents={params.N_EVENTS} """ rule femc_pi0_analysis: diff --git a/benchmarks/insert_muon/Snakefile b/benchmarks/insert_muon/Snakefile index 85e3e27b..323bf432 100644 --- a/benchmarks/insert_muon/Snakefile +++ b/benchmarks/insert_muon/Snakefile @@ -54,7 +54,7 @@ rule insert_muon_recon: """ NEVENTS_REC=1000 env DETECTOR_CONFIG={params.DETECTOR_CONFIG} \ - eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPInsertRecHits,EcalEndcapPInsertClusters -Pjana:nevents=$NEVENTS_REC + eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits -Pjana:nevents=$NEVENTS_REC """ rule insert_muon_analysis: diff --git a/benchmarks/insert_neutron/Snakefile b/benchmarks/insert_neutron/Snakefile index 940abc6e..5cb2e44f 100644 --- a/benchmarks/insert_neutron/Snakefile +++ b/benchmarks/insert_neutron/Snakefile @@ -55,7 +55,7 @@ rule insert_neutron_recon: """ NEVENTS_REC=200 env DETECTOR_CONFIG={params.DETECTOR_CONFIG} \ - eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPInsertRecHits,EcalEndcapPInsertClusters -Pjana:nevents=$NEVENTS_REC + eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPClusters -Pjana:nevents=$NEVENTS_REC """ rule insert_neutron_analysis: diff --git a/benchmarks/insert_neutron/analysis/neutron_plots.py b/benchmarks/insert_neutron/analysis/neutron_plots.py index 451b6cf1..c5f3e928 100644 --- a/benchmarks/insert_neutron/analysis/neutron_plots.py +++ b/benchmarks/insert_neutron/analysis/neutron_plots.py @@ -141,7 +141,7 @@ for p in 20, 30,40,50,60,70, 80: wbest=0 a=arrays_sim[p] h=np.sum(a[f'HcalEndcapPInsertClusters.energy'], axis=-1) - e=np.sum(a[f'EcalEndcapPInsertClusters.energy'], axis=-1) + e=np.sum(a[f'EcalEndcapPClusters.energy'], axis=-1) for w in wrange: r=(e/w+h)[(h>0)&(a['eta_truth']>eta_min)&(a['eta_truth']<eta_max)] @@ -222,7 +222,7 @@ for eta_min, eta_max in zip(partitions[:-1],partitions[1:]): w=w_avg a=arrays_sim[p] h=np.sum(a[f'HcalEndcapPInsertClusters.energy'], axis=-1) - e=np.sum(a[f'EcalEndcapPInsertClusters.energy'], axis=-1) + e=np.sum(a[f'EcalEndcapPClusters.energy'], axis=-1) #phi=a['phi_truth'] uncorr=(e/w+h) s=-0.0064*uncorr+1.80 diff --git a/benchmarks/insert_tau/Snakefile b/benchmarks/insert_tau/Snakefile index d3843439..bbc5038b 100644 --- a/benchmarks/insert_tau/Snakefile +++ b/benchmarks/insert_tau/Snakefile @@ -60,7 +60,7 @@ rule insert_tau_recon: shell: """ env DETECTOR_CONFIG={params.DETECTOR_CONFIG} \ - eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPInsertRecHits,EcalEndcapPInsertClusters,EcalEndcapPClusters,LFHCALClusters -Pjana:nevents={params.N_EVENTS} + eicrecon {input.SIM_FILE} -Ppodio:output_file={output.REC_FILE} -Ppodio:output_collections=MCParticles,HcalEndcapPInsertRecHits,HcalEndcapPInsertClusters,HcalEndcapPInsertSubcellHits,EcalEndcapPClusters,LFHCALClusters -Pjana:nevents={params.N_EVENTS} """ rule insert_tau_analysis: diff --git a/benchmarks/insert_tau/analysis/tau_plots.py b/benchmarks/insert_tau/analysis/tau_plots.py index 77c2dd32..b520cc2a 100644 --- a/benchmarks/insert_tau/analysis/tau_plots.py +++ b/benchmarks/insert_tau/analysis/tau_plots.py @@ -32,7 +32,7 @@ for a in arrays_sim.values(): px=0 py=0 pz=0 - for det in "HcalEndcapPInsert", "EcalEndcapPInsert", "EcalEndcapP", "LFHCAL": + for det in "HcalEndcapPInsert", "EcalEndcapP", "LFHCAL": E=a[f'{det}Clusters.energy'] -- GitLab