adding electron endcaps, updating name for hit collections

benchmarks/clustering/options/full_cal_clustering.py

@@ -15,7 +15,7 @@ ce_ecal_sf = float(os.environ.get("CE_ECAL_SAMP_FRAC", 0.253))
 cb_ecal_sf = float(os.environ.get("CB_ECAL_SAMP_FRAC", 0.01324))
 cb_hcal_sf = float(os.environ.get("CB_HCAL_SAMP_FRAC", 0.038))
 hcal_hadronendcap_sf = float(os.environ.get("CE_HCAL_HADRONENDCAP_SAMP_FRAC", 0.025))
-
+hcal_electronendcap_sf = float(os.environ.get("CE_HCAL_ELECTRONENDCAP_SAMP_FRAC", 0.025))
 
 # input and output
 input_sims = [f.strip() for f in str.split(os.environ["FULL_CAL_SIM_FILE"], ",") if f.strip()]
@@ -48,7 +48,8 @@ sim_coll = [
     "EcalEndcapHits",
     "EcalBarrelHits",
     "HcalBarrelHits",
-    "HcalEndcapHits",
+    "HcalHadronEndcapHits",
+    "HcalElectronEndcapHits",
 ]
 
 # input and output
@@ -208,7 +209,7 @@ cb_hcal_clreco = RecoCoG("cb_hcal_clreco",
 
 ##Hadron Endcap HCal                                                                                       
 hcal_hadronendcap_digi = CalHitDigi("hcal_hadronendcap_digi",
-         inputHitCollection="HcalEndcapHits",
+         inputHitCollection="HcalHadronEndcapHits",
          outputHitCollection="HcalHadronEndcapHitsDigi",
          dynamicRangeADC=50.*MeV,
 	 capacityADC=32768,
@@ -227,7 +228,7 @@ hcal_hadronendcap_reco = CalHitReco("hcal_hadronendcap_reco",
 hcal_hadronendcap_merger = CalHitsMerger("hcal_hadronendcap_merger",
         inputHitCollection="HcalHadronEndcapHitsReco",
 	outputHitCollection="HcalHadronEndcapHitsRecoXY",
-	readoutClass="HcalEndcapHits",
+	readoutClass="HcalHadronEndcapHits",
         fields=["layer", "slice"],
 	fieldRefNumbers=[1, 0])
 
@@ -244,6 +245,42 @@ hcal_hadronendcap_clreco = RecoCoG("hcal_hadronendcap_clreco",
 	logWeightBase=6.2,
 	samplingFraction=hcal_hadronendcap_sf)
 
+#Hcal Electron Endcap
+hcal_electronendcap_digi = CalHitDigi("hcal_electronendcap_digi",
+	 inputHitCollection="HcalElectronEndcapHits",
+         outputHitCollection="HcalElectronEndcapHitsDigi",
+         dynamicRangeADC=50.*MeV,
+         capacityADC=32768,
+         pedestalMean=400,
+         pedestalSigma=10)
+
+hcal_electronendcap_reco = CalHitReco("hcal_electronendcap_reco",#
+	inputHitCollection="HcalElectronEndcapHitsDigi",
+        outputHitCollection="HcalElectronEndcapHitsReco",#
+	dynamicRangeADC=50.*MeV,#
+	capacityADC=32768,
+	pedestalMean=400,
+        pedestalSigma=10,
+	thresholdFactor=5.0)
+hcal_electronendcap_merger = CalHitsMerger("hcal_electronendcap_merger",
+        inputHitCollection="HcalElectronEndcapHitsReco",
+        outputHitCollection="HcalElectronEndcapHitsRecoXY",
+        readoutClass="HcalElectronEndcapHits",
+        fields=["layer", "slice"],
+        fieldRefNumbers=[1, 0])
+
+hcal_electronendcap_cl = IslandCluster("hcal_electronendcap_cl",
+        inputHitCollection="HcalElectronEndcapHitsRecoXY",
+        outputClusterCollection="HcalElectronEndcapClusters",
+        splitHitCollection="HcalElectronEndcapHitsSplit",
+        splitCluster=False,
+        minClusterCenterEdep=30.*MeV,
+	groupRanges=[15.*cm, 15.*cm])
+
+hcal_electronendcap_clreco = RecoCoG("hcal_electronendcap_clreco",
+        clusterCollection="HcalElectronEndcapClusters",
+	logWeightBase=6.2,
+        samplingFraction=hcal_electronendcap_sf)
 
 
 podout.outputCommands = ["keep *"]
@@ -256,6 +293,11 @@ ApplicationMgr(
               cb_hcal_digi, cb_hcal_reco, cb_hcal_merger, cb_hcal_cl, cb_hcal_clreco,
               hcal_hadronendcap_digi, hcal_hadronendcap_reco, hcal_hadronendcap_merger,
               hcal_hadronendcap_cl, hcal_hadronendcap_clreco,
+              hcal_electronendcap_digi,
+              hcal_electronendcap_reco,
+              hcal_electronendcap_merger,
+              hcal_electronendcap_cl,
+              #hcal_electronendcap_clreco,
               podout],
     EvtSel = 'NONE',
     EvtMax   = n_events,