No ecal endcap p insert (#151)

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:

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:

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:

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:

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:

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

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:

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']