adjust scripts for crystal-glass endcap ecal

benchmarks/clustering/options/full_cal_clusters.py

@@ -48,8 +48,8 @@ from Configurables import Jug__Reco__ImagingClusterReco as ImagingClusterReco
 # branches needed from simulation root file
 digi_coll = [
 #    "mcparticles2",
-    "CrystalEcalHitsReco",
-    "EcalEndcapHitsReco",
+    "EcalEndcapNHitsReco",
+    "EcalEndcapPHitsReco",
     "EcalBarrelHitsReco",
     "HcalBarrelHitsReco",
     "HcalHadronEndcapHitsReco",
@@ -66,38 +66,38 @@ podout = PodioOutput("out", filename=output_rec)
 # Crystal Endcap Ecal
 ce_ecal_cl = IslandCluster("ce_ecal_cl",
         # OutputLevel=DEBUG,
-        inputHitCollection="CrystalEcalHitsReco",
-        outputClusterCollection="CrystalEcalClusters",
-        splitHitCollection="CrystalEcalHitsSplit",
+        inputHitCollection="EcalEndcapNHitsReco",
+        outputClusterCollection="EcalEndcapNClusters",
+        splitHitCollection="EcalEndcapNHitsSplit",
         splitCluster=False,
         minClusterCenterEdep=30*MeV,
         groupRanges=[2.2*cm, 2.2*cm])
 
 ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
-        clusterCollection="CrystalEcalClusters",
+        clusterCollection="EcalEndcapNClusters",
         samplingFraction=0.998,      # this accounts for a small fraction of leakage
         logWeightBase=4.6)
 
 
 # Endcap Sampling Ecal
 # merge hits in different layer (projection to local x-y plane)
-ce_ecal2_merger = CalHitsMerger("ce_ecal2_merger",
-        inputHitCollection="EcalEndcapHitsReco",
-        outputHitCollection="EcalEndcapHitsRecoXY",
+ci_ecal_merger = CalHitsMerger("ci_ecal_merger",
+        inputHitCollection="EcalEndcapPHitsReco",
+        outputHitCollection="EcalEndcapPHitsRecoXY",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0],
-        readoutClass="EcalEndcapHits")
+        readoutClass="EcalEndcapPHits")
 
-ce_ecal2_cl = IslandCluster("ce_ecal2_cl",
-        inputHitCollection="EcalEndcapHitsRecoXY",
-        outputClusterCollection="EcalEndcapClusters",
-        splitHitCollection="EcalEndcapHitsSplit",
+ci_ecal_cl = IslandCluster("ci_ecal_cl",
+        inputHitCollection="EcalEndcapPHitsRecoXY",
+        outputClusterCollection="EcalEndcapPClusters",
+        splitHitCollection="EcalEndcapPHitsSplit",
         splitCluster=False,
         minClusterCenterEdep=30.*MeV,
         groupRanges=[5*mm, 5*mm])
 
-ce_ecal2_clreco = RecoCoG("ce_ecal2_clreco",
-        clusterCollection="EcalEndcapClusters",
+ci_ecal_clreco = RecoCoG("ci_ecal_clreco",
+        clusterCollection="EcalEndcapPClusters",
         logWeightBase=6.2,
         samplingFraction=ce_ecal_sf)
 
@@ -187,7 +187,7 @@ podout.outputCommands = ["drop *", "keep mcparticles", "keep *Clusters", "keep *
 ApplicationMgr(
     TopAlg = [podin, # copier,
               ce_ecal_cl, ce_ecal_clreco,
-              ce_ecal2_merger, ce_ecal2_cl, ce_ecal2_clreco,
+              ci_ecal_merger, ci_ecal_cl, ci_ecal_clreco,
               cb_ecal_cl, cb_ecal_clreco,
               cb_hcal_merger, cb_hcal_cl, cb_hcal_clreco,
               ce_hcal_merger, ce_hcal_cl, ce_hcal_clreco,