diff --git a/options/reconstruction.ecal.py b/options/reconstruction.ecal.py index 3229614d874d061e645d1130034c9a2665b891f8..f80282aede8f039765df2937649c4d8cd0d5271d 100644 --- a/options/reconstruction.ecal.py +++ b/options/reconstruction.ecal.py @@ -76,7 +76,7 @@ podin = PodioInput("PodioReader", collections=sim_coll) algorithms.append(podin) # Crystal Endcap Ecal -ce_calo_daq = calo_daq['ecal_neg_endcap'] +ce_ecal_daq = calo_daq['ecal_neg_endcap'] ce_ecal_digi = CalHitDigi("ce_ecal_digi", inputHitCollection="EcalEndcapNHits", @@ -114,7 +114,7 @@ ce_ecal_clreco = RecoCoG("ce_ecal_clreco", algorithms.append(ce_ecal_clreco) # Endcap Sampling Ecal -ci_calo_daq = calo_daq['ecal_pos_endcap'] +ci_ecal_daq = calo_daq['ecal_pos_endcap'] ci_ecal_digi = CalHitDigi("ci_ecal_digi", inputHitCollection="EcalEndcapPHits", diff --git a/options/reconstruction.py b/options/reconstruction.py index a48e74ce49e82c741b1384b45a8bb9a767608409..d26e800ed657ff301e25c4d37bd67e6b5904ca46 100644 --- a/options/reconstruction.py +++ b/options/reconstruction.py @@ -228,12 +228,12 @@ trk_b0_reco = TrackerHitReconstruction("trk_b0_reco", algorithms.append(trk_b0_reco) # Crystal Endcap Ecal -ce_calo_daq = calo_daq['ecal_neg_endcap'] +ce_ecal_daq = calo_daq['ecal_neg_endcap'] ce_ecal_digi = CalHitDigi("ce_ecal_digi", inputHitCollection="EcalEndcapNHits", outputHitCollection="EcalEndcapNRawHits", energyResolutions=[0., 0.02, 0.], - **ce_calo_daq) + **ce_ecal_daq) algorithms.append(ce_ecal_digi) ce_ecal_reco = CalHitReco("ce_ecal_reco", @@ -242,7 +242,7 @@ ce_ecal_reco = CalHitReco("ce_ecal_reco", thresholdFactor=4, # 4 sigma cut on pedestal sigma readoutClass="EcalEndcapNHits", sectorField="sector", - **ce_calo_daq) + **ce_ecal_daq) algorithms.append(ce_ecal_reco) ce_ecal_cl = IslandCluster("ce_ecal_cl", @@ -271,19 +271,19 @@ ce_ecal_clmerger = ClusterMerger("ce_ecal_clmerger", algorithms.append(ce_ecal_clmerger) # Endcap Sampling Ecal -ci_calo_daq = calo_daq['ecal_pos_endcap'] +ci_ecal_daq = calo_daq['ecal_pos_endcap'] ci_ecal_digi = CalHitDigi("ci_ecal_digi", inputHitCollection="EcalEndcapPHits", outputHitCollection="EcalEndcapPRawHits", - **ci_calo_daq) + **ci_ecal_daq) algorithms.append(ci_ecal_digi) ci_ecal_reco = CalHitReco("ci_ecal_reco", inputHitCollection=ci_ecal_digi.outputHitCollection, outputHitCollection="EcalEndcapPRecHits", thresholdFactor=5.0, - **ci_calo_daq) + **ci_ecal_daq) algorithms.append(ci_ecal_reco) # merge hits in different layer (projection to local x-y plane) diff --git a/options/reconstruction.raw.py b/options/reconstruction.raw.py index a655501d7e5dd8940797387fc2a26cd6f10bf7fc..62665bcdae7a7a80e85e5ee52d72e8a2ff233634 100644 --- a/options/reconstruction.raw.py +++ b/options/reconstruction.raw.py @@ -115,7 +115,7 @@ trk_b0_digi = TrackerDigi("trk_b0_digi", algorithms.append(trk_b0_digi) # Crystal Endcap Ecal -ce_calo_daq = calo_daq['ecal_neg_endcap'] +ce_ecal_daq = calo_daq['ecal_neg_endcap'] ce_ecal_digi = CalHitDigi("ce_ecal_digi", inputHitCollection="EcalEndcapNHits", @@ -125,7 +125,7 @@ ce_ecal_digi = CalHitDigi("ce_ecal_digi", algorithms.append(ce_ecal_digi) # Endcap Sampling Ecal -ci_calo_daq = calo_daq['ecal_pos_endcap'] +ci_ecal_daq = calo_daq['ecal_pos_endcap'] ci_ecal_digi = CalHitDigi("ci_ecal_digi", inputHitCollection="EcalEndcapPHits",