Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setting DeltaFinder as the new default for Compton-hits flagging #1384

Merged
merged 4 commits into from
Dec 31, 2024
Merged

setting DeltaFinder as the new default for Compton-hits flagging #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebdb2fe
setting DeltaFinder as the new deafult for Compton-hits flagging
gianipez Dec 7, 2024
ca0af38
Mu -> Dmu
gianipez Dec 7, 2024
c21e2ea
fixed labels in CalHeixFinderDe and CalHelixFinderDmu
gianipez Dec 7, 2024
43f2612
cleanup
gianipez Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions CalPatRec/fcl/prolog.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ CalPatRec : { @table::CalPatRec
#------------------------------------------------------------------------------
ComboHitFilter : { module_type : ComboHitFilter
chCollTag : "makePH"
chfCollTag : "FlagBkgHits:ComboHits"
chfCollTag : "DeltaFinder:ComboHits"
sdmcCollTag : "compressDigiMCs"
simID : -1 ##
debugLevel : 0
Expand Down Expand Up @@ -612,7 +612,7 @@ CalPatRec : { @table::CalPatRec
runDisplay : 0
useCCs : 1
recoverCCs : 1
chCollLabel : "FlagBkgHits"
chCollLabel : "DeltaFinder"
chCollLabel2 : "makeSH"
tcCollLabel : "TimeClusterFinderDe"
ccCollLabel : "CaloClusterMaker"
Expand Down Expand Up @@ -642,7 +642,7 @@ CalPatRec : { @table::CalPatRec
AgnosticHelixFinder : {
module_type : AgnosticHelixFinder
diagLevel : 0
chCollLabel : "FlagBkgHits"
chCollLabel : "DeltaFinder"
tcCollLabel : "TZClusterFinder"
ccCollLabel : "CaloClusterMaker"
findMultipleHelices : true # whether or not to allow more than 1 helix per tc
Expand Down Expand Up @@ -727,7 +727,7 @@ CalPatRec : { @table::CalPatRec
module_type : TZClusterFilter
diagLevel : 0
runDisplay : 0
chCollLabel : "FlagBkgHits" # same as TZClusterFinder
chCollLabel : "DeltaFinder" # same as TZClusterFinder
tcCollLabel : "TZClusterFinder"
minSHsInCluster : 15
minCHsInCluster : 10
Expand All @@ -748,25 +748,28 @@ CalPatRec : { @table::CalPatRec
#------------------------------------------------------------------------------
CalPatRec: { @table::CalPatRec
producers : { @table::CalPatRec.producers
CalTimePeakFinderDe : { @table::CalPatRec.producers.CalTimePeakFinder }
CalTimePeakFinderUe : { @table::CalPatRec.producers.CalTimePeakFinder PitchAngle: -0.67 }
CalTimePeakFinderMu : { @table::CalPatRec.producers.CalTimePeakFinder Beta: 0.7 }
CalHelixFinderDe : { @table::CalPatRec.producers.CalHelixFinder fitparticle: @local::Particle.eminus }
CalTimePeakFinderUmu : { @table::CalPatRec.producers.CalTimePeakFinder
PitchAngle: -0.67
Beta : 0.7
}
CalTimePeakFinderDmu : { @table::CalPatRec.producers.CalTimePeakFinder Beta: 0.7 }
CalHelixFinderDe : { @table::CalPatRec.producers.CalHelixFinder
fitparticle: @local::Particle.eminus
TimeClusterCollectionLabel : CalTimePeakFinderDe
}
CalHelixFinderUe : { @table::CalPatRec.producers.CalHelixFinder
fitparticle : @local::Particle.eminus
TimeClusterCollectionLabel : CalTimePeakFinderUe
}
CalHelixFinderDmu : { @table::CalPatRec.producers.CalHelixFinder
fitparticle : @local::Particle.muminus
TimeClusterCollectionLabel : CalTimePeakFinderMu
TimeClusterCollectionLabel : CalTimePeakFinderDmu
}

DeltaFinderUe : { @table::CalPatRec.producers.DeltaFinder
timePeakCollectionTag : CalTimePeakFinderUe

}

DeltaFinderMu : { @table::CalPatRec.producers.DeltaFinder
timePeakCollectionTag : CalTimePeakFinderMu
CalHelixFinderUmu : { @table::CalPatRec.producers.CalHelixFinder
fitparticle : @local::Particle.muminus
TimeClusterCollectionLabel : CalTimePeakFinderUmu
}
CalSeedFitDe : { @table::CalPatRec.producers.CalSeedFit
SeedCollection : "CalHelixFinderDe"
Expand Down Expand Up @@ -820,8 +823,8 @@ CalPatRec: { @table::CalPatRec
}
}

CalPatRec.reco : [ CalTimePeakFinder , DeltaFinder , CalHelixFinder , CalSeedFit , CalTrkFit ]
CalPatRec.de_reco : [ CalTimePeakFinder , DeltaFinder , CalHelixFinderDe , CalSeedFitDe, CalTrkFitDe ]
CalPatRec.dm_reco : [ CalTimePeakFinderMu, DeltaFinderMu, CalHelixFinderDmu, CalSeedFitDm, CalTrkFitDm ]
CalPatRec.reco : [ CalTimePeakFinder , CalHelixFinder , CalSeedFit , CalTrkFit ]
CalPatRec.de_reco : [ CalTimePeakFinderDe, CalHelixFinderDe , CalSeedFitDe, CalTrkFitDe ]
CalPatRec.dm_reco : [ CalTimePeakFinderMu, CalHelixFinderDmu, CalSeedFitDm, CalTrkFitDm ]

END_PROLOG
26 changes: 14 additions & 12 deletions CalPatRec/fcl/prolog_common.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ CommonTrk : {
# into one collection
#------------------------------------------------------------------------------
MHFinderDe : { @table::TrkReco.producers.MergeHelices
HelixFinders : [ "HelixFinderDe" , "CalHelixFinderDe" ]
HelixFinders : [ "AgnosticHelixFinder" , "CalHelixFinderDe" ]
}
MHFinderDmu : { @table::TrkReco.producers.MergeHelices
HelixFinders : [ "HelixFinderDmu", "CalHelixFinderDmu"]
HelixFinders : [ "AgnosticHelixFinder", "CalHelixFinderDmu"]
}
MHFinderUe : { @table::TrkReco.producers.MergeHelices
HelixFinders : [ "HelixFinderUe" , "CalHelixFinderUe" ]
HelixFinders : [ "AgnosticHelixFinder" , "CalHelixFinderUe" ]
}
MHFinderUmu : { @table::TrkReco.producers.MergeHelices
HelixFinders : [ "HelixFinderUmu", "CalHelixFinderUmu"]
HelixFinders : [ "AgnosticHelixFinder", "CalHelixFinderUmu"]
}
#------------------------------------------------------------------------------
# BTRK track fit, downstream electron hypothesis
Expand Down Expand Up @@ -90,20 +90,22 @@ CommonTrk : {
#------------------------------------------------------------------------------
# helix reconstruction: put downstream electron and positron helices together
#------------------------------------------------------------------------------
CommonTrk.helix_reco_De : [ CalTimePeakFinder, DeltaFinder, CalHelixFinderDe, MHFinderCprDe,
TimeClusterFinderDe, HelixFinderDe, MHFinderTprDe ,
CommonTrk.helix_reco_De : [ CalTimePeakFinderDe, CalHelixFinderDe, MHFinderCprDe,
TZClusterFinder, AgnosticHelixFinder,MHFinderTprDe ,
MHFinderDe ]

CommonTrk.helix_reco_Ue : [ CalTimePeakFinder, DeltaFinder, CalHelixFinderUe,
TimeClusterFinderUe, HelixFinderUe,
CommonTrk.helix_reco_Ue : [ CalTimePeakFinderUe, CalHelixFinderUe,
TZClusterFinder, AgnosticHelixFinder,
MHFinderUe ]

CommonTrk.helix_reco_Dmu : [ CalTimePeakFinderMu, DeltaFinderMu, CalHelixFinderDmu, MHFinderCprDmu,
TimeClusterFinderDmu, HelixFinderDmu, MHFinderTprDmu ,
CommonTrk.helix_reco_Dmu : [ CalTimePeakFinderDmu, CalHelixFinderDmu, MHFinderCprDmu,
TZClusterFinder, AgnosticHelixFinder,
MHFinderTprDmu ,
MHFinderDmu ]

CommonTrk.helix_reco_Umu : [ CalTimePeakFinderMu, DeltaFinderMu, CalHelixFinderUmu, MHFinderCprUmu,
TimeClusterFinderUmu, HelixFinderUmu, MHFinderTprUmu ,
CommonTrk.helix_reco_Umu : [ CalTimePeakFinderUmu, CalHelixFinderUmu, MHFinderCprUmu,
TZClusterFinder, AgnosticHelixFinder,
MHFinderTprUmu ,
MHFinderUmu ]
#------------------------------------------------------------------------------
# by default, write out two lists of tracks corresponding to two different
Expand Down
2 changes: 1 addition & 1 deletion TrkHitReco/fcl/prolog.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ TrkHitReco : { @table::TrkHitReco

# SEQUENCES
# production sequence to prepare hits for tracking
PrepareHits : [ PBTFSD, makeSH, makePH, makeSTH, FlagBkgHits ]
PrepareHits : [ PBTFSD, makeSH, makePH, DeltaFinder ]
}

END_PROLOG