Skip to content

Commit

Permalink
Merge pull request #1286 from gianipez/nameSpaceDev
Browse files Browse the repository at this point in the history
introduced namespaces in: TrkPatRec, CosmicReco, CaloMC, CaloCluster, CaloReco, TrkHitReco prolog files
  • Loading branch information
kutschke authored Jun 18, 2024
2 parents 2df22a8 + babafd5 commit f397c4a
Show file tree
Hide file tree
Showing 8 changed files with 1,218 additions and 1,232 deletions.
4 changes: 2 additions & 2 deletions CalPatRec/fcl/prolog.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ CalPatRec : { @table::CalPatRec
caloHitError : 15.0 # mm

DivergeFlt : 1000. # default: 1000.
T0Calculator : @local::TimeCalculator
T0Calculator : { @table::TrkPatRec.TimeCalculator}
#------------------------------------------------------------------------------
# parameters of KalContext
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -215,7 +215,7 @@ CalPatRec : { @table::CalPatRec
updateT0 : [ false, true, true, true, true, true, true, true, true ]
updateT0Mode : 1 # 0: always use cluster time, if available; 1: use cluster time just once
DivergeFlt : 1000.
T0Calculator : @local::TimeCalculator
T0Calculator : {@table::TrkPatRec.TimeCalculator}
#------------------------------------------------------------------------------
# KalContext parameters (there are more to define ! )
#------------------------------------------------------------------------------
Expand Down
16 changes: 8 additions & 8 deletions CalPatRec/fcl/prolog_common.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,26 @@ CommonTrk : {
#------------------------------------------------------------------------------
# BTRK track fit, downstream electron hypothesis
#------------------------------------------------------------------------------
KSFDeMH : { @table::KSFDeM SeedCollection : MHFinderDe CheckHelicity:false }
KFFDeMHPar : { @table::KFFDeM SeedCollection : KSFDeMH }
KSFDeMH : { @table::TrkPatRec.producers.KSFDeM SeedCollection : MHFinderDe CheckHelicity:false }
KFFDeMHPar : { @table::TrkPatRec.producers.KFFDeM SeedCollection : KSFDeMH }
KFFDeMHDar : { @table::CalPatRec.producers.CalTrkFitDem SeedCollection : KSFDeMH }
#------------------------------------------------------------------------------
# BTRK track fit, upstream electron hypothesis
#------------------------------------------------------------------------------
KSFUeMH : { @table::KSFUeM SeedCollection : MHFinderUe CheckHelicity:false }
KFFUeMHPar : { @table::KFFUeM SeedCollection : KSFUeMH }
KSFUeMH : { @table::TrkPatRec.producers.KSFUeM SeedCollection : MHFinderUe CheckHelicity:false }
KFFUeMHPar : { @table::TrkPatRec.producers.KFFUeM SeedCollection : KSFUeMH }
KFFUeMHDar : { @table::CalPatRec.producers.CalTrkFitUem SeedCollection : KSFUeMH }
#------------------------------------------------------------------------------
# BTRK track fit, downstream muon hypothesis
#------------------------------------------------------------------------------
KSFDmuMH : { @table::KSFDmuM SeedCollection : MHFinderDmu CheckHelicity:false}
KFFDmuMHPar : { @table::KFFDmuM SeedCollection : KSFDmuMH }
KSFDmuMH : { @table::TrkPatRec.producers.KSFDmuM SeedCollection : MHFinderDmu CheckHelicity:false}
KFFDmuMHPar : { @table::TrkPatRec.producers.KFFDmuM SeedCollection : KSFDmuMH }
KFFDmuMHDar : { @table::CalPatRec.producers.CalTrkFitDmm SeedCollection : KSFDmuMH }
#------------------------------------------------------------------------------
# BTRK track fit, upstream muon hypothesis
#------------------------------------------------------------------------------
KSFUmuMH : { @table::KSFUmuM SeedCollection : MHFinderUmu CheckHelicity:false }
KFFUmuMHPar : { @table::KFFUmuM SeedCollection : KSFUmuMH }
KSFUmuMH : { @table::TrkPatRec.producers.KSFUmuM SeedCollection : MHFinderUmu CheckHelicity:false }
KFFUmuMHPar : { @table::TrkPatRec.producers.KFFUmuM SeedCollection : KSFUmuMH }
KFFUmuMHDar : { @table::CalPatRec.producers.CalTrkFitUmm SeedCollection : KSFUmuMH }
#------------------------------------------------------------------------------
# assume KinKal doesn't check the helicity, using that of the helix
Expand Down
52 changes: 26 additions & 26 deletions CaloCluster/fcl/prolog.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,36 @@

BEGIN_PROLOG

CaloProtoClusterMaker :
{
module_type : CaloProtoClusterMaker
caloHitCollection : CaloHitMaker
EminSeed : 10
ExpandCut : 1.0
EnoiseCut : 1.0
addSecondRing : false
deltaTime : 2
diagLevel : 0
}
CaloCluster : {
CaloProtoClusterMaker :
{
module_type : CaloProtoClusterMaker
caloHitCollection : CaloHitMaker
EminSeed : 10
ExpandCut : 1.0
EnoiseCut : 1.0
addSecondRing : false
deltaTime : 2
diagLevel : 0
}

CaloClusterMaker :
{
module_type : CaloClusterMaker
caloClusterMainCollection : "CaloProtoClusterMaker:main"
caloClusterSplitCollection : "CaloProtoClusterMaker:split"
deltaTime : 2
maxDistSplit : 150
maxDistMain : 150
strategy : 0
diagLevel : 0
CaloClusterMaker :
{
module_type : CaloClusterMaker
caloClusterMainCollection : "CaloProtoClusterMaker:main"
caloClusterSplitCollection : "CaloProtoClusterMaker:split"
deltaTime : 2
maxDistSplit : 150
maxDistMain : 150
strategy : 0
diagLevel : 0
}
}


CaloCluster :
{
CaloCluster : { @table::CaloCluster
producers : {
CaloProtoClusterMaker : @local::CaloProtoClusterMaker
CaloClusterMaker : @local::CaloClusterMaker
CaloProtoClusterMaker : { @table::CaloCluster.CaloProtoClusterMaker }
CaloClusterMaker : { @table::CaloCluster.CaloClusterMaker }
}

Reco : [ CaloProtoClusterMaker, CaloClusterMaker ]
Expand Down
192 changes: 88 additions & 104 deletions CaloMC/fcl/prolog.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -5,125 +5,109 @@
#include "Offline/CaloReco/fcl/common.fcl"
#include "Offline/CommonMC/fcl/prolog.fcl"



BEGIN_PROLOG

CaloShowerStepMaker :
{
module_type : CaloShowerStepMaker
numZSlices : 20
deltaTime : 0.2
caloStepPointCollection : ["g4run:calorimeter"]
usePhysVolInfo : false
physVolInfoInput : "g4run"
caloMaterial : ["G4_CESIUM_IODIDE", "Polyethylene092","CarbonFiber"]
compressData : true
eDepThreshold : 0
diagLevel : 0
}


CaloShowerROMaker :
{
module_type : CaloShowerROMaker
caloShowerStepCollection : ["CaloShowerStepMaker"]
eventWindowMarker : EWMProducer
protonBunchTimeMC : EWMProducer
digitizationStart : @local::HitMakerDigitizationStart
digitizationEnd : @local::HitMakerDigitizationEnd
digitizationBuffer : 10
LRUCorrection : true
BirksCorrection : true
PEStatCorrection : true
addTravelTime : true
diagLevel : 0
}

#See doc-db 35519 for noise level discussion
NoiseGenerator :
{
noiseWFSize : 10000
elecNphotPerNs : 0.18
rinNphotPerNs : 0.36
darkNphotPerNs : 0.60
digiSampling : @local::HitMakerDigiSampling
nMaxFragment : 1000
minPeakADC : @local::HitMakerMinPeakADC
diagLevel : 0
}

CaloDigiMaker :
{
module_type : CaloDigiMaker
caloShowerROCollection : CaloShowerROMaker
eventWindowMarker : EWMProducer
protonBunchTimeMC : EWMProducer
digitizationStart : @local::HitMakerDigitizationStart
digitizationEnd : @local::HitMakerDigitizationEnd
addNoise : true
addRandomNoise : false
NoiseGenerator : { @table::NoiseGenerator }
digiSampling : @local::HitMakerDigiSampling
nBits : 12
minPeakADC : @local::HitMakerMinPeakADC
nBinsPeak : 2
bufferDigi : 16
diagLevel : 0
}

CaloHitTruthMatch:
{
module_type : CaloHitTruthMatch
caloShowerSimCollection : CaloShowerROMaker
caloHitCollection : CaloHitMaker
primaryParticle : FindMCPrimary
digiSampling : @local::HitMakerDigiSampling
minAmplitude : 32
fillDetailedMC : false
diagLevel : 0
CaloMC : {

#See doc-db 35519 for noise level discussion
NoiseGenerator :
{
noiseWFSize : 10000
elecNphotPerNs : 0.18
rinNphotPerNs : 0.36
darkNphotPerNs : 0.60
digiSampling : @local::HitMakerDigiSampling
nMaxFragment : 1000
minPeakADC : @local::HitMakerMinPeakADC
diagLevel : 0
}
}

CaloClusterTruthMatch:
{
module_type : CaloClusterTruthMatch
caloClusterCollection : CaloClusterMaker
caloHitMCTruthAssn : CaloHitTruthMatch
diagLevel : 0
}
CaloMC : { @table::CaloMC
CaloShowerStepMaker :
{
module_type : CaloShowerStepMaker
numZSlices : 20
deltaTime : 0.2
caloStepPointCollection : ["g4run:calorimeter"]
usePhysVolInfo : false
physVolInfoInput : "g4run"
caloMaterial : ["G4_CESIUM_IODIDE", "Polyethylene092","CarbonFiber"]
compressData : true
eDepThreshold : 0
diagLevel : 0
}


CaloShowerROMaker :
{
module_type : CaloShowerROMaker
caloShowerStepCollection : ["CaloShowerStepMaker"]
eventWindowMarker : EWMProducer
protonBunchTimeMC : EWMProducer
digitizationStart : @local::HitMakerDigitizationStart
digitizationEnd : @local::HitMakerDigitizationEnd
digitizationBuffer : 10
LRUCorrection : true
BirksCorrection : true
PEStatCorrection : true
addTravelTime : true
diagLevel : 0
}

CaloMC :
{
StepProducers : {
CaloShowerStepMaker : @local::CaloShowerStepMaker
CaloDigiMaker :
{
module_type : CaloDigiMaker
caloShowerROCollection : CaloShowerROMaker
eventWindowMarker : EWMProducer
protonBunchTimeMC : EWMProducer
digitizationStart : @local::HitMakerDigitizationStart
digitizationEnd : @local::HitMakerDigitizationEnd
addNoise : true
addRandomNoise : false
NoiseGenerator : { @table::CaloMC.NoiseGenerator }
digiSampling : @local::HitMakerDigiSampling
nBits : 12
minPeakADC : @local::HitMakerMinPeakADC
nBinsPeak : 2
bufferDigi : 16
diagLevel : 0
}
StepSim : [ CaloShowerStepMaker]

DigiProducers : {
CaloShowerROMaker : @local::CaloShowerROMaker
CaloDigiMaker : @local::CaloDigiMaker
CaloHitTruthMatch:
{
module_type : CaloHitTruthMatch
caloShowerSimCollection : CaloShowerROMaker
caloHitCollection : CaloHitMaker
primaryParticle : FindMCPrimary
digiSampling : @local::HitMakerDigiSampling
minAmplitude : 32
fillDetailedMC : false
diagLevel : 0
}
DigiSim : [ CaloShowerROMaker, CaloDigiMaker]

TruthProducers : {
CaloHitTruthMatch : @local::CaloHitTruthMatch
CaloClusterTruthMatch : @local::CaloClusterTruthMatch
CaloClusterTruthMatch:
{
module_type : CaloClusterTruthMatch
caloClusterCollection : CaloClusterMaker
caloHitMCTruthAssn : CaloHitTruthMatch
diagLevel : 0
}
TruthMatch : [ CaloHitTruthMatch, CaloClusterTruthMatch ]
}

CaloClusterMC :
{
producers : { CaloClusterTruthMatch : @local::CaloClusterTruthMatch }
TruthMatch : [ CaloClusterTruthMatch ]
}

# legacy
CaloMC.producers : {
@table::CaloMC.StepProducers
@table::CaloMC.DigiProducers
CaloMC : { @table::CaloMC
producers : {
CaloShowerStepMaker : { @table::CaloMC.CaloShowerStepMaker }
CaloShowerROMaker : { @table::CaloMC.CaloShowerROMaker }
CaloDigiMaker : { @table::CaloMC.CaloDigiMaker }
CaloHitTruthMatch : { @table::CaloMC.CaloHitTruthMatch }
CaloClusterTruthMatch : { @table::CaloMC.CaloClusterTruthMatch }
}

DigiSim : [ CaloShowerROMaker, CaloDigiMaker]
StepSim : [ CaloShowerStepMaker]
TruthMatch : [ CaloHitTruthMatch, CaloClusterTruthMatch ]
}

CaloMC.StepAndDigiSim : [@sequence::CaloMC.StepSim, @sequence::CaloMC.DigiSim]
Expand Down
Loading

0 comments on commit f397c4a

Please # to comment.