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

Improved calorimeter reconstruction

parent 0e730905
No related branches found
No related tags found
1 merge request!128Improved calorimeter reconstruction
Show whitespace changes
Inline Side-by-side
options/reconstruction.ecal.py
+ 51
− 23
View file @ 18de40c9
...@@ -60,6 +60,8 @@ from Configurables import Jug__Reco__CalorimeterHitReco as CalHitReco ...@@ -60,6 +60,8 @@ from Configurables import Jug__Reco__CalorimeterHitReco as CalHitReco
from Configurables import Jug__Reco__CalorimeterHitsMerger as CalHitsMerger from Configurables import Jug__Reco__CalorimeterHitsMerger as CalHitsMerger
from Configurables import Jug__Reco__CalorimeterIslandCluster as IslandCluster from Configurables import Jug__Reco__CalorimeterIslandCluster as IslandCluster
from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG
from Configurables import Jug__Fast__TruthClustering as TruthClustering
from Configurables import Jug__Fast__ClusterMerger as ClusterMerger
# branches needed from simulation root file # branches needed from simulation root file
sim_coll = [ sim_coll = [
...@@ -77,7 +79,6 @@ algorithms.append(podin) ...@@ -77,7 +79,6 @@ algorithms.append(podin)
# Crystal Endcap Ecal # Crystal Endcap Ecal
ce_ecal_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",
...@@ -89,36 +90,50 @@ ce_ecal_reco = CalHitReco("ce_ecal_reco", ...@@ -89,36 +90,50 @@ ce_ecal_reco = CalHitReco("ce_ecal_reco",
inputHitCollection=ce_ecal_digi.outputHitCollection, inputHitCollection=ce_ecal_digi.outputHitCollection,
outputHitCollection="EcalEndcapNRecHits", outputHitCollection="EcalEndcapNRecHits",
thresholdFactor=4, # 4 sigma cut on pedestal sigma thresholdFactor=4, # 4 sigma cut on pedestal sigma
samplingFraction=0.998, # this accounts for a small fraction of leakage
readoutClass="EcalEndcapNHits", readoutClass="EcalEndcapNHits",
sectorField="sector", sectorField="sector",
**ce_ecal_daq) **ce_ecal_daq)
algorithms.append(ce_ecal_reco) algorithms.append(ce_ecal_reco)
ce_ecal_cl = IslandCluster("ce_ecal_cl", ce_ecal_cl = TruthClustering("ce_ecal_cl",
inputHitCollection=ce_ecal_reco.outputHitCollection, inputHits=ce_ecal_reco.outputHitCollection,
outputProtoClusterCollection="EcalEndcapNProtoClusters", mcHits="EcalEndcapNHits",
splitCluster=False, outputProtoClusters="EcalEndcapNProtoClusters")
minClusterHitEdep=1.0*units.MeV, # discard low energy hits #ce_ecal_cl = IslandCluster("ce_ecal_cl",
minClusterCenterEdep=30*units.MeV, # inputHitCollection=ce_ecal_reco.outputHitCollection,
sectorDist=5.0*units.cm, # outputProtoClusterCollection="EcalEndcapNProtoClusters",
dimScaledLocalDistXY=[1.8, 1.8]) # dimension scaled dist is good for hybrid sectors with different module size # splitCluster=False,
# minClusterHitEdep=1.0*units.MeV, # discard low energy hits
# minClusterCenterEdep=30*units.MeV,
# sectorDist=5.0*units.cm,
# dimScaledLocalDistXY=[1.8, 1.8]) # dimension scaled dist is good for hybrid sectors with different module size
algorithms.append(ce_ecal_cl) algorithms.append(ce_ecal_cl)
ce_ecal_clreco = RecoCoG("ce_ecal_clreco", ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
inputHitCollection=ce_ecal_cl.inputHitCollection, #inputHitCollection=ce_ecal_cl.inputHitCollection,
inputProtoClusterCollection=ce_ecal_cl.outputProtoClusterCollection, inputHitCollection=ce_ecal_cl.inputHits,
#inputProtoClusterCollection=ce_ecal_cl.outputProtoClusterCollection,
inputProtoClusterCollection=ce_ecal_cl.outputProtoClusters,
outputClusterCollection="EcalEndcapNClusters", outputClusterCollection="EcalEndcapNClusters",
mcHits="EcalEndcapNHits", mcHits="EcalEndcapNHits",
samplingFraction=0.998, # this accounts for a small fraction of leakage
logWeightBase=4.6) logWeightBase=4.6)
algorithms.append(ce_ecal_clreco) algorithms.append(ce_ecal_clreco)
# Endcap Sampling Ecal ce_ecal_clmerger = ClusterMerger("ce_ecal_clmerger",
inputClusters = ce_ecal_clreco.outputClusterCollection,
outputClusters = "EcalEndcapNMergedClusters",
outputRelations = "EcalEndcapNMergedClusterRelations")
algorithms.append(ce_ecal_clmerger)
# Endcap ScFi Ecal
ci_ecal_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",
scaleResponse=ci_ecal_sf,
energyResolutions=[.1, .0015, 0.],
**ci_ecal_daq) **ci_ecal_daq)
algorithms.append(ci_ecal_digi) algorithms.append(ci_ecal_digi)
...@@ -126,6 +141,7 @@ ci_ecal_reco = CalHitReco("ci_ecal_reco", ...@@ -126,6 +141,7 @@ 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,
samplingFraction=ci_ecal_sf,
**ci_ecal_daq) **ci_ecal_daq)
algorithms.append(ci_ecal_reco) algorithms.append(ci_ecal_reco)
...@@ -140,23 +156,35 @@ ci_ecal_merger = CalHitsMerger("ci_ecal_merger", ...@@ -140,23 +156,35 @@ ci_ecal_merger = CalHitsMerger("ci_ecal_merger",
readoutClass="EcalEndcapPHits") readoutClass="EcalEndcapPHits")
algorithms.append(ci_ecal_merger) algorithms.append(ci_ecal_merger)
ci_ecal_cl = IslandCluster("ci_ecal_cl", ci_ecal_cl = TruthClustering("ci_ecal_cl",
inputHitCollection=ci_ecal_merger.outputHitCollection, inputHits=ci_ecal_reco.outputHitCollection,
outputProtoClusterCollection="EcalEndcapPProtoClusters", mcHits="EcalEndcapPHits",
splitCluster=False, outputProtoClusters="EcalEndcapPProtoClusters")
minClusterCenterEdep=10.*units.MeV, #ci_ecal_cl = IslandCluster("ci_ecal_cl",
localDistXY=[10*units.mm, 10*units.mm]) #inputHitCollection=ci_ecal_merger.outputHitCollection,
#outputProtoClusterCollection="EcalEndcapPProtoClusters",
#splitCluster=False,
#minClusterCenterEdep=10.*units.MeV,
#localDistXY=[10*units.mm, 10*units.mm])
algorithms.append(ci_ecal_cl) algorithms.append(ci_ecal_cl)
ci_ecal_clreco = RecoCoG("ci_ecal_clreco", ci_ecal_clreco = RecoCoG("ci_ecal_clreco",
inputHitCollection=ci_ecal_cl.inputHitCollection, #inputHitCollection=ci_ecal_cl.inputHitCollection,
inputProtoClusterCollection=ci_ecal_cl.outputProtoClusterCollection, inputHitCollection=ci_ecal_cl.inputHits,
#inputProtoClusterCollection=ci_ecal_cl.outputProtoClusterCollection,
inputProtoClusterCollection=ci_ecal_cl.outputProtoClusters,
outputClusterCollection="EcalEndcapPClusters", outputClusterCollection="EcalEndcapPClusters",
enableEtaBounds=True,
mcHits="EcalEndcapPHits", mcHits="EcalEndcapPHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction=ci_ecal_sf)
algorithms.append(ci_ecal_clreco) algorithms.append(ci_ecal_clreco)
ci_ecal_clmerger = ClusterMerger("ci_ecal_clmerger",
inputClusters = ci_ecal_clreco.outputClusterCollection,
outputClusters = "EcalEndcapPMergedClusters",
outputRelations = "EcalEndcapPMergedClusterRelations")
algorithms.append(ci_ecal_clmerger)
# Output # Output
podout = PodioOutput("out", filename=output_rec) podout = PodioOutput("out", filename=output_rec)
podout.outputCommands = [ podout.outputCommands = [
......
options/reconstruction.hcal.py
+ 4
− 4
View file @ 18de40c9
...@@ -90,6 +90,7 @@ ci_hcal_reco = CalHitReco("ci_hcal_reco", ...@@ -90,6 +90,7 @@ ci_hcal_reco = CalHitReco("ci_hcal_reco",
inputHitCollection=ci_hcal_digi.outputHitCollection, inputHitCollection=ci_hcal_digi.outputHitCollection,
outputHitCollection="HcalEndcapPRecHits", outputHitCollection="HcalEndcapPRecHits",
thresholdFactor=5.0, thresholdFactor=5.0,
samplingFraction=ci_hcal_sf,
**ci_hcal_daq) **ci_hcal_daq)
algorithms.append(ci_hcal_reco) algorithms.append(ci_hcal_reco)
...@@ -114,8 +115,7 @@ ci_hcal_clreco = RecoCoG("ci_hcal_clreco", ...@@ -114,8 +115,7 @@ ci_hcal_clreco = RecoCoG("ci_hcal_clreco",
inputProtoClusterCollection=ci_hcal_cl.outputProtoClusterCollection, inputProtoClusterCollection=ci_hcal_cl.outputProtoClusterCollection,
outputClusterCollection="HcalEndcapPClusters", outputClusterCollection="HcalEndcapPClusters",
mcHits="HcalEndcapPHits", mcHits="HcalEndcapPHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction=ci_hcal_sf)
algorithms.append(ci_hcal_clreco) algorithms.append(ci_hcal_clreco)
# Hcal Electron Endcap # Hcal Electron Endcap
...@@ -131,6 +131,7 @@ ce_hcal_reco = CalHitReco("ce_hcal_reco", ...@@ -131,6 +131,7 @@ ce_hcal_reco = CalHitReco("ce_hcal_reco",
inputHitCollection=ce_hcal_digi.outputHitCollection, inputHitCollection=ce_hcal_digi.outputHitCollection,
outputHitCollection="HcalEndcapNRecHits", outputHitCollection="HcalEndcapNRecHits",
thresholdFactor=5.0, thresholdFactor=5.0,
samplingFraction=ce_hcal_sf,
**ce_hcal_daq) **ce_hcal_daq)
algorithms.append(ce_hcal_reco) algorithms.append(ce_hcal_reco)
...@@ -155,8 +156,7 @@ ce_hcal_clreco = RecoCoG("ce_hcal_clreco", ...@@ -155,8 +156,7 @@ ce_hcal_clreco = RecoCoG("ce_hcal_clreco",
inputProtoClusterCollection=ce_hcal_cl.outputProtoClusterCollection, inputProtoClusterCollection=ce_hcal_cl.outputProtoClusterCollection,
outputClusterCollection="HcalEndcapNClusters", outputClusterCollection="HcalEndcapNClusters",
mcHits="HcalEndcapNHits", mcHits="HcalEndcapNHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction=ce_hcal_sf)
algorithms.append(ce_hcal_clreco) algorithms.append(ce_hcal_clreco)
# Output # Output
......
options/reconstruction.py
+ 49
− 32
View file @ 18de40c9
...@@ -5,6 +5,7 @@ from GaudiKernel import SystemOfUnits as units ...@@ -5,6 +5,7 @@ from GaudiKernel import SystemOfUnits as units
from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
import json import json
from math import sqrt
detector_name = "athena" detector_name = "athena"
if "JUGGLER_DETECTOR" in os.environ : if "JUGGLER_DETECTOR" in os.environ :
...@@ -27,7 +28,7 @@ qe_data = [(1.0, 0.25), (7.5, 0.25),] ...@@ -27,7 +28,7 @@ qe_data = [(1.0, 0.25), (7.5, 0.25),]
# CAL reconstruction # CAL reconstruction
# get sampling fractions from system environment variable # get sampling fractions from system environment variable
ci_ecal_sf = float(os.environ.get("CI_ECAL_SAMP_FRAC", 0.253)) ci_ecal_sf = float(os.environ.get("CI_ECAL_SAMP_FRAC", 0.03))
cb_hcal_sf = float(os.environ.get("CB_HCAL_SAMP_FRAC", 0.038)) cb_hcal_sf = float(os.environ.get("CB_HCAL_SAMP_FRAC", 0.038))
ci_hcal_sf = float(os.environ.get("CI_HCAL_SAMP_FRAC", 0.025)) ci_hcal_sf = float(os.environ.get("CI_HCAL_SAMP_FRAC", 0.025))
ce_hcal_sf = float(os.environ.get("CE_HCAL_SAMP_FRAC", 0.025)) ce_hcal_sf = float(os.environ.get("CE_HCAL_SAMP_FRAC", 0.025))
...@@ -96,6 +97,7 @@ from Configurables import Jug__Fast__MatchClusters as MatchClusters ...@@ -96,6 +97,7 @@ from Configurables import Jug__Fast__MatchClusters as MatchClusters
from Configurables import Jug__Fast__ClusterMerger as ClusterMerger from Configurables import Jug__Fast__ClusterMerger as ClusterMerger
from Configurables import Jug__Fast__TruthEnergyPositionClusterMerger as EnergyPositionClusterMerger from Configurables import Jug__Fast__TruthEnergyPositionClusterMerger as EnergyPositionClusterMerger
from Configurables import Jug__Fast__InclusiveKinematicsTruth as InclusiveKinematicsTruth from Configurables import Jug__Fast__InclusiveKinematicsTruth as InclusiveKinematicsTruth
from Configurables import Jug__Fast__TruthClustering as TruthClustering
from Configurables import Jug__Digi__PhotoMultiplierDigi as PhotoMultiplierDigi from Configurables import Jug__Digi__PhotoMultiplierDigi as PhotoMultiplierDigi
from Configurables import Jug__Digi__CalorimeterHitDigi as CalHitDigi from Configurables import Jug__Digi__CalorimeterHitDigi as CalHitDigi
...@@ -240,27 +242,33 @@ ce_ecal_reco = CalHitReco("ce_ecal_reco", ...@@ -240,27 +242,33 @@ ce_ecal_reco = CalHitReco("ce_ecal_reco",
inputHitCollection=ce_ecal_digi.outputHitCollection, inputHitCollection=ce_ecal_digi.outputHitCollection,
outputHitCollection="EcalEndcapNRecHits", outputHitCollection="EcalEndcapNRecHits",
thresholdFactor=4, # 4 sigma cut on pedestal sigma thresholdFactor=4, # 4 sigma cut on pedestal sigma
samplingFraction=0.998, # this accounts for a small fraction of leakage
readoutClass="EcalEndcapNHits", readoutClass="EcalEndcapNHits",
sectorField="sector", sectorField="sector",
**ce_ecal_daq) **ce_ecal_daq)
algorithms.append(ce_ecal_reco) algorithms.append(ce_ecal_reco)
ce_ecal_cl = IslandCluster("ce_ecal_cl", ce_ecal_cl = TruthClustering("ce_ecal_cl",
inputHitCollection=ce_ecal_reco.outputHitCollection, inputHits=ce_ecal_reco.outputHitCollection,
outputProtoClusterCollection="EcalEndcapNProtoClusters", mcHits="EcalEndcapNHits",
splitCluster=False, outputProtoClusters="EcalEndcapNProtoClusters")
minClusterHitEdep=1.0*units.MeV, # discard low energy hits #ce_ecal_cl = IslandCluster("ce_ecal_cl",
minClusterCenterEdep=30*units.MeV, # inputHitCollection=ce_ecal_reco.outputHitCollection,
sectorDist=5.0*units.cm, # outputProtoClusterCollection="EcalEndcapNProtoClusters",
dimScaledLocalDistXY=[1.8, 1.8]) # dimension scaled dist is good for hybrid sectors with different module size # splitCluster=False,
# minClusterHitEdep=1.0*units.MeV, # discard low energy hits
# minClusterCenterEdep=30*units.MeV,
# sectorDist=5.0*units.cm,
# dimScaledLocalDistXY=[1.8, 1.8]) # dimension scaled dist is good for hybrid sectors with different module size
algorithms.append(ce_ecal_cl) algorithms.append(ce_ecal_cl)
ce_ecal_clreco = RecoCoG("ce_ecal_clreco", ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
inputHitCollection=ce_ecal_cl.inputHitCollection, #inputHitCollection=ce_ecal_cl.inputHitCollection,
inputProtoClusterCollection=ce_ecal_cl.outputProtoClusterCollection, inputHitCollection=ce_ecal_cl.inputHits,
#inputProtoClusterCollection=ce_ecal_cl.outputProtoClusterCollection,
inputProtoClusterCollection=ce_ecal_cl.outputProtoClusters,
outputClusterCollection="EcalEndcapNClusters", outputClusterCollection="EcalEndcapNClusters",
mcHits="EcalEndcapNHits", mcHits="EcalEndcapNHits",
samplingFraction=0.998, # this accounts for a small fraction of leakage
logWeightBase=4.6) logWeightBase=4.6)
algorithms.append(ce_ecal_clreco) algorithms.append(ce_ecal_clreco)
...@@ -270,12 +278,14 @@ ce_ecal_clmerger = ClusterMerger("ce_ecal_clmerger", ...@@ -270,12 +278,14 @@ ce_ecal_clmerger = ClusterMerger("ce_ecal_clmerger",
outputRelations = "EcalEndcapNMergedClusterRelations") outputRelations = "EcalEndcapNMergedClusterRelations")
algorithms.append(ce_ecal_clmerger) algorithms.append(ce_ecal_clmerger)
# Endcap Sampling Ecal # Endcap ScFi Ecal
ci_ecal_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",
scaleResponse=ci_ecal_sf,
energyResolutions=[.1, .0015, 0.],
**ci_ecal_daq) **ci_ecal_daq)
algorithms.append(ci_ecal_digi) algorithms.append(ci_ecal_digi)
...@@ -283,6 +293,7 @@ ci_ecal_reco = CalHitReco("ci_ecal_reco", ...@@ -283,6 +293,7 @@ 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,
samplingFraction=ci_ecal_sf,
**ci_ecal_daq) **ci_ecal_daq)
algorithms.append(ci_ecal_reco) algorithms.append(ci_ecal_reco)
...@@ -297,21 +308,27 @@ ci_ecal_merger = CalHitsMerger("ci_ecal_merger", ...@@ -297,21 +308,27 @@ ci_ecal_merger = CalHitsMerger("ci_ecal_merger",
readoutClass="EcalEndcapPHits") readoutClass="EcalEndcapPHits")
algorithms.append(ci_ecal_merger) algorithms.append(ci_ecal_merger)
ci_ecal_cl = IslandCluster("ci_ecal_cl", ci_ecal_cl = TruthClustering("ci_ecal_cl",
inputHitCollection=ci_ecal_merger.outputHitCollection, inputHits=ci_ecal_reco.outputHitCollection,
outputProtoClusterCollection="EcalEndcapPProtoClusters", mcHits="EcalEndcapPHits",
splitCluster=False, outputProtoClusters="EcalEndcapPProtoClusters")
minClusterCenterEdep=10.*units.MeV, #ci_ecal_cl = IslandCluster("ci_ecal_cl",
localDistXY=[10*units.mm, 10*units.mm]) #inputHitCollection=ci_ecal_merger.outputHitCollection,
#outputProtoClusterCollection="EcalEndcapPProtoClusters",
#splitCluster=False,
#minClusterCenterEdep=10.*units.MeV,
#localDistXY=[10*units.mm, 10*units.mm])
algorithms.append(ci_ecal_cl) algorithms.append(ci_ecal_cl)
ci_ecal_clreco = RecoCoG("ci_ecal_clreco", ci_ecal_clreco = RecoCoG("ci_ecal_clreco",
inputHitCollection=ci_ecal_cl.inputHitCollection, #inputHitCollection=ci_ecal_cl.inputHitCollection,
inputProtoClusterCollection=ci_ecal_cl.outputProtoClusterCollection, inputHitCollection=ci_ecal_cl.inputHits,
#inputProtoClusterCollection=ci_ecal_cl.outputProtoClusterCollection,
inputProtoClusterCollection=ci_ecal_cl.outputProtoClusters,
outputClusterCollection="EcalEndcapPClusters", outputClusterCollection="EcalEndcapPClusters",
enableEtaBounds=True,
mcHits="EcalEndcapPHits", mcHits="EcalEndcapPHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction=ci_ecal_sf)
algorithms.append(ci_ecal_clreco) algorithms.append(ci_ecal_clreco)
ci_ecal_clmerger = ClusterMerger("ci_ecal_clmerger", ci_ecal_clmerger = ClusterMerger("ci_ecal_clmerger",
...@@ -334,6 +351,7 @@ img_barrel_reco = ImCalPixelReco("img_barrel_reco", ...@@ -334,6 +351,7 @@ img_barrel_reco = ImCalPixelReco("img_barrel_reco",
inputHitCollection=img_barrel_digi.outputHitCollection, inputHitCollection=img_barrel_digi.outputHitCollection,
outputHitCollection="EcalBarrelImagingRecHits", outputHitCollection="EcalBarrelImagingRecHits",
thresholdFactor=3, # about 20 keV thresholdFactor=3, # about 20 keV
samplingFraction=img_barrel_sf,
readoutClass="EcalBarrelHits", # readout class readoutClass="EcalBarrelHits", # readout class
layerField="layer", # field to get layer id layerField="layer", # field to get layer id
sectorField="module", # field to get sector id sectorField="module", # field to get sector id
...@@ -350,7 +368,6 @@ img_barrel_cl = ImagingCluster("img_barrel_cl", ...@@ -350,7 +368,6 @@ img_barrel_cl = ImagingCluster("img_barrel_cl",
algorithms.append(img_barrel_cl) algorithms.append(img_barrel_cl)
img_barrel_clreco = ImagingClusterReco("img_barrel_clreco", img_barrel_clreco = ImagingClusterReco("img_barrel_clreco",
samplingFraction=img_barrel_sf,
inputHitCollection=img_barrel_cl.inputHitCollection, inputHitCollection=img_barrel_cl.inputHitCollection,
inputProtoClusterCollection=img_barrel_cl.outputProtoClusterCollection, inputProtoClusterCollection=img_barrel_cl.outputProtoClusterCollection,
outputClusterCollection="EcalBarrelImagingClusters", outputClusterCollection="EcalBarrelImagingClusters",
...@@ -371,6 +388,7 @@ scfi_barrel_reco = CalHitReco("scfi_barrel_reco", ...@@ -371,6 +388,7 @@ scfi_barrel_reco = CalHitReco("scfi_barrel_reco",
inputHitCollection=scfi_barrel_digi.outputHitCollection, inputHitCollection=scfi_barrel_digi.outputHitCollection,
outputHitCollection="EcalBarrelScFiRecHits", outputHitCollection="EcalBarrelScFiRecHits",
thresholdFactor=5.0, thresholdFactor=5.0,
samplingFraction= scifi_barrel_sf,
readoutClass="EcalBarrelScFiHits", readoutClass="EcalBarrelScFiHits",
layerField="layer", layerField="layer",
sectorField="module", sectorField="module",
...@@ -400,8 +418,7 @@ scfi_barrel_clreco = RecoCoG("scfi_barrel_clreco", ...@@ -400,8 +418,7 @@ scfi_barrel_clreco = RecoCoG("scfi_barrel_clreco",
inputProtoClusterCollection=scfi_barrel_cl.outputProtoClusterCollection, inputProtoClusterCollection=scfi_barrel_cl.outputProtoClusterCollection,
outputClusterCollection="EcalBarrelScFiClusters", outputClusterCollection="EcalBarrelScFiClusters",
mcHits="EcalBarrelScFiHits", mcHits="EcalBarrelScFiHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction= scifi_barrel_sf)
algorithms.append(scfi_barrel_clreco) algorithms.append(scfi_barrel_clreco)
## barrel cluster merger ## barrel cluster merger
...@@ -427,6 +444,7 @@ cb_hcal_reco = CalHitReco("cb_hcal_reco", ...@@ -427,6 +444,7 @@ cb_hcal_reco = CalHitReco("cb_hcal_reco",
inputHitCollection=cb_hcal_digi.outputHitCollection, inputHitCollection=cb_hcal_digi.outputHitCollection,
outputHitCollection="HcalBarrelRecHits", outputHitCollection="HcalBarrelRecHits",
thresholdFactor=5.0, thresholdFactor=5.0,
samplingFraction=cb_hcal_sf,
readoutClass="HcalBarrelHits", readoutClass="HcalBarrelHits",
layerField="layer", layerField="layer",
sectorField="module", sectorField="module",
...@@ -454,8 +472,7 @@ cb_hcal_clreco = RecoCoG("cb_hcal_clreco", ...@@ -454,8 +472,7 @@ cb_hcal_clreco = RecoCoG("cb_hcal_clreco",
inputProtoClusterCollection=cb_hcal_cl.outputProtoClusterCollection, inputProtoClusterCollection=cb_hcal_cl.outputProtoClusterCollection,
outputClusterCollection="HcalBarrelClusters", outputClusterCollection="HcalBarrelClusters",
mcHits="HcalBarrelHits", mcHits="HcalBarrelHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction=cb_hcal_sf)
algorithms.append(cb_hcal_clreco) algorithms.append(cb_hcal_clreco)
# Hcal Hadron Endcap # Hcal Hadron Endcap
...@@ -471,6 +488,7 @@ ci_hcal_reco = CalHitReco("ci_hcal_reco", ...@@ -471,6 +488,7 @@ ci_hcal_reco = CalHitReco("ci_hcal_reco",
inputHitCollection=ci_hcal_digi.outputHitCollection, inputHitCollection=ci_hcal_digi.outputHitCollection,
outputHitCollection="HcalEndcapPRecHits", outputHitCollection="HcalEndcapPRecHits",
thresholdFactor=5.0, thresholdFactor=5.0,
samplingFraction=ci_hcal_sf,
**ci_hcal_daq) **ci_hcal_daq)
algorithms.append(ci_hcal_reco) algorithms.append(ci_hcal_reco)
...@@ -495,8 +513,7 @@ ci_hcal_clreco = RecoCoG("ci_hcal_clreco", ...@@ -495,8 +513,7 @@ ci_hcal_clreco = RecoCoG("ci_hcal_clreco",
inputProtoClusterCollection=ci_hcal_cl.outputProtoClusterCollection, inputProtoClusterCollection=ci_hcal_cl.outputProtoClusterCollection,
outputClusterCollection="HcalEndcapPClusters", outputClusterCollection="HcalEndcapPClusters",
mcHits="HcalEndcapPHits", mcHits="HcalEndcapPHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction=ci_hcal_sf)
algorithms.append(ci_hcal_clreco) algorithms.append(ci_hcal_clreco)
# Hcal Electron Endcap # Hcal Electron Endcap
...@@ -512,6 +529,7 @@ ce_hcal_reco = CalHitReco("ce_hcal_reco", ...@@ -512,6 +529,7 @@ ce_hcal_reco = CalHitReco("ce_hcal_reco",
inputHitCollection=ce_hcal_digi.outputHitCollection, inputHitCollection=ce_hcal_digi.outputHitCollection,
outputHitCollection="HcalEndcapNRecHits", outputHitCollection="HcalEndcapNRecHits",
thresholdFactor=5.0, thresholdFactor=5.0,
samplingFraction=ce_hcal_sf,
**ce_hcal_daq) **ce_hcal_daq)
algorithms.append(ce_hcal_reco) algorithms.append(ce_hcal_reco)
...@@ -536,8 +554,7 @@ ce_hcal_clreco = RecoCoG("ce_hcal_clreco", ...@@ -536,8 +554,7 @@ ce_hcal_clreco = RecoCoG("ce_hcal_clreco",
inputProtoClusterCollection=ce_hcal_cl.outputProtoClusterCollection, inputProtoClusterCollection=ce_hcal_cl.outputProtoClusterCollection,
outputClusterCollection="HcalEndcapNClusters", outputClusterCollection="HcalEndcapNClusters",
mcHits="HcalEndcapNHits", mcHits="HcalEndcapNHits",
logWeightBase=6.2, logWeightBase=6.2)
samplingFraction=ce_hcal_sf)
algorithms.append(ce_hcal_clreco) algorithms.append(ce_hcal_clreco)
# Tracking # Tracking
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment