Skip to content
Snippets Groups Projects
Commit 29b70515 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

naming consistency

parent 6b5dac04
No related branches found
No related tags found
1 merge request!127properly use DAQ as defined in athena/calibrations
This commit is part of merge request !127. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
options/reconstruction.ecal.py
+ 2
− 2
View file @ 29b70515
...@@ -76,7 +76,7 @@ podin = PodioInput("PodioReader", collections=sim_coll) ...@@ -76,7 +76,7 @@ podin = PodioInput("PodioReader", collections=sim_coll)
algorithms.append(podin) algorithms.append(podin)
# Crystal Endcap Ecal # 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", ce_ecal_digi = CalHitDigi("ce_ecal_digi",
inputHitCollection="EcalEndcapNHits", inputHitCollection="EcalEndcapNHits",
...@@ -114,7 +114,7 @@ ce_ecal_clreco = RecoCoG("ce_ecal_clreco", ...@@ -114,7 +114,7 @@ ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
algorithms.append(ce_ecal_clreco) algorithms.append(ce_ecal_clreco)
# Endcap Sampling Ecal # 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", ci_ecal_digi = CalHitDigi("ci_ecal_digi",
inputHitCollection="EcalEndcapPHits", inputHitCollection="EcalEndcapPHits",
......
options/reconstruction.py
+ 6
− 6
View file @ 29b70515
...@@ -228,12 +228,12 @@ trk_b0_reco = TrackerHitReconstruction("trk_b0_reco", ...@@ -228,12 +228,12 @@ trk_b0_reco = TrackerHitReconstruction("trk_b0_reco",
algorithms.append(trk_b0_reco) algorithms.append(trk_b0_reco)
# Crystal Endcap Ecal # 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", ce_ecal_digi = CalHitDigi("ce_ecal_digi",
inputHitCollection="EcalEndcapNHits", inputHitCollection="EcalEndcapNHits",
outputHitCollection="EcalEndcapNRawHits", outputHitCollection="EcalEndcapNRawHits",
energyResolutions=[0., 0.02, 0.], energyResolutions=[0., 0.02, 0.],
**ce_calo_daq) **ce_ecal_daq)
algorithms.append(ce_ecal_digi) algorithms.append(ce_ecal_digi)
ce_ecal_reco = CalHitReco("ce_ecal_reco", ce_ecal_reco = CalHitReco("ce_ecal_reco",
...@@ -242,7 +242,7 @@ 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 thresholdFactor=4, # 4 sigma cut on pedestal sigma
readoutClass="EcalEndcapNHits", readoutClass="EcalEndcapNHits",
sectorField="sector", sectorField="sector",
**ce_calo_daq) **ce_ecal_daq)
algorithms.append(ce_ecal_reco) algorithms.append(ce_ecal_reco)
ce_ecal_cl = IslandCluster("ce_ecal_cl", ce_ecal_cl = IslandCluster("ce_ecal_cl",
...@@ -271,19 +271,19 @@ ce_ecal_clmerger = ClusterMerger("ce_ecal_clmerger", ...@@ -271,19 +271,19 @@ ce_ecal_clmerger = ClusterMerger("ce_ecal_clmerger",
algorithms.append(ce_ecal_clmerger) algorithms.append(ce_ecal_clmerger)
# Endcap Sampling Ecal # 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", ci_ecal_digi = CalHitDigi("ci_ecal_digi",
inputHitCollection="EcalEndcapPHits", inputHitCollection="EcalEndcapPHits",
outputHitCollection="EcalEndcapPRawHits", outputHitCollection="EcalEndcapPRawHits",
**ci_calo_daq) **ci_ecal_daq)
algorithms.append(ci_ecal_digi) algorithms.append(ci_ecal_digi)
ci_ecal_reco = CalHitReco("ci_ecal_reco", ci_ecal_reco = CalHitReco("ci_ecal_reco",
inputHitCollection=ci_ecal_digi.outputHitCollection, inputHitCollection=ci_ecal_digi.outputHitCollection,
outputHitCollection="EcalEndcapPRecHits", outputHitCollection="EcalEndcapPRecHits",
thresholdFactor=5.0, thresholdFactor=5.0,
**ci_calo_daq) **ci_ecal_daq)
algorithms.append(ci_ecal_reco) algorithms.append(ci_ecal_reco)
# merge hits in different layer (projection to local x-y plane) # merge hits in different layer (projection to local x-y plane)
......
options/reconstruction.raw.py
+ 2
− 2
View file @ 29b70515
...@@ -115,7 +115,7 @@ trk_b0_digi = TrackerDigi("trk_b0_digi", ...@@ -115,7 +115,7 @@ trk_b0_digi = TrackerDigi("trk_b0_digi",
algorithms.append(trk_b0_digi) algorithms.append(trk_b0_digi)
# Crystal Endcap Ecal # 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", ce_ecal_digi = CalHitDigi("ce_ecal_digi",
inputHitCollection="EcalEndcapNHits", inputHitCollection="EcalEndcapNHits",
...@@ -125,7 +125,7 @@ ce_ecal_digi = CalHitDigi("ce_ecal_digi", ...@@ -125,7 +125,7 @@ ce_ecal_digi = CalHitDigi("ce_ecal_digi",
algorithms.append(ce_ecal_digi) algorithms.append(ce_ecal_digi)
# Endcap Sampling Ecal # 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", ci_ecal_digi = CalHitDigi("ci_ecal_digi",
inputHitCollection="EcalEndcapPHits", inputHitCollection="EcalEndcapPHits",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment