From ebdb2fee23a0eb1e3e2cae0cc5d8ae88d1ed4bae Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Sat, 7 Dec 2024 13:24:57 -0600 Subject: [PATCH 1/4] setting DeltaFinder as the new deafult for Compton-hits flagging --- CalPatRec/fcl/prolog.fcl | 16 ++++++++++++---- TrkHitReco/fcl/prolog.fcl | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CalPatRec/fcl/prolog.fcl b/CalPatRec/fcl/prolog.fcl index d0fad28823..30b25cc498 100644 --- a/CalPatRec/fcl/prolog.fcl +++ b/CalPatRec/fcl/prolog.fcl @@ -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 @@ -612,7 +612,7 @@ CalPatRec : { @table::CalPatRec runDisplay : 0 useCCs : 1 recoverCCs : 1 - chCollLabel : "FlagBkgHits" + chCollLabel : "DeltaFinder" chCollLabel2 : "makeSH" tcCollLabel : "TimeClusterFinderDe" ccCollLabel : "CaloClusterMaker" @@ -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 @@ -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 @@ -749,6 +749,10 @@ CalPatRec : { @table::CalPatRec CalPatRec: { @table::CalPatRec producers : { @table::CalPatRec.producers CalTimePeakFinderUe : { @table::CalPatRec.producers.CalTimePeakFinder PitchAngle: -0.67 } + CalTimePeakFinderUmu : { @table::CalPatRec.producers.CalTimePeakFinder + PitchAngle: -0.67 + Beta : 0.7 + } CalTimePeakFinderMu : { @table::CalPatRec.producers.CalTimePeakFinder Beta: 0.7 } CalHelixFinderDe : { @table::CalPatRec.producers.CalHelixFinder fitparticle: @local::Particle.eminus } CalHelixFinderUe : { @table::CalPatRec.producers.CalHelixFinder @@ -759,6 +763,10 @@ CalPatRec: { @table::CalPatRec fitparticle : @local::Particle.muminus TimeClusterCollectionLabel : CalTimePeakFinderMu } + CalHelixFinderUmu : { @table::CalPatRec.producers.CalHelixFinder + fitparticle : @local::Particle.muminus + TimeClusterCollectionLabel : CalTimePeakFinderUmu + } DeltaFinderUe : { @table::CalPatRec.producers.DeltaFinder timePeakCollectionTag : CalTimePeakFinderUe diff --git a/TrkHitReco/fcl/prolog.fcl b/TrkHitReco/fcl/prolog.fcl index 42cec4865c..22093ca6d7 100644 --- a/TrkHitReco/fcl/prolog.fcl +++ b/TrkHitReco/fcl/prolog.fcl @@ -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 From ca0af38491984a2273f6606ee8c95b122976c3c9 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Sat, 7 Dec 2024 13:30:43 -0600 Subject: [PATCH 2/4] Mu -> Dmu --- CalPatRec/fcl/prolog.fcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CalPatRec/fcl/prolog.fcl b/CalPatRec/fcl/prolog.fcl index 30b25cc498..b55e3330e2 100644 --- a/CalPatRec/fcl/prolog.fcl +++ b/CalPatRec/fcl/prolog.fcl @@ -748,12 +748,13 @@ CalPatRec : { @table::CalPatRec #------------------------------------------------------------------------------ CalPatRec: { @table::CalPatRec producers : { @table::CalPatRec.producers + CalTimePeakFinderDe : { @table::CalPatRec.producers.CalTimePeakFinder } CalTimePeakFinderUe : { @table::CalPatRec.producers.CalTimePeakFinder PitchAngle: -0.67 } CalTimePeakFinderUmu : { @table::CalPatRec.producers.CalTimePeakFinder PitchAngle: -0.67 Beta : 0.7 } - CalTimePeakFinderMu : { @table::CalPatRec.producers.CalTimePeakFinder Beta: 0.7 } + CalTimePeakFinderDmu : { @table::CalPatRec.producers.CalTimePeakFinder Beta: 0.7 } CalHelixFinderDe : { @table::CalPatRec.producers.CalHelixFinder fitparticle: @local::Particle.eminus } CalHelixFinderUe : { @table::CalPatRec.producers.CalHelixFinder fitparticle : @local::Particle.eminus From c21e2eaea4aac3ebd130d0b4085d052ef5ba6fb9 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Sat, 7 Dec 2024 13:42:40 -0600 Subject: [PATCH 3/4] fixed labels in CalHeixFinderDe and CalHelixFinderDmu --- CalPatRec/fcl/prolog.fcl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CalPatRec/fcl/prolog.fcl b/CalPatRec/fcl/prolog.fcl index b55e3330e2..f31a080a76 100644 --- a/CalPatRec/fcl/prolog.fcl +++ b/CalPatRec/fcl/prolog.fcl @@ -755,14 +755,17 @@ CalPatRec: { @table::CalPatRec Beta : 0.7 } CalTimePeakFinderDmu : { @table::CalPatRec.producers.CalTimePeakFinder Beta: 0.7 } - CalHelixFinderDe : { @table::CalPatRec.producers.CalHelixFinder fitparticle: @local::Particle.eminus } + 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 } CalHelixFinderUmu : { @table::CalPatRec.producers.CalHelixFinder fitparticle : @local::Particle.muminus From 43f26128ddc084c269e22f987c352df57455bb59 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Sat, 7 Dec 2024 14:35:59 -0600 Subject: [PATCH 4/4] cleanup --- CalPatRec/fcl/prolog.fcl | 15 +++------------ CalPatRec/fcl/prolog_common.fcl | 26 ++++++++++++++------------ 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/CalPatRec/fcl/prolog.fcl b/CalPatRec/fcl/prolog.fcl index f31a080a76..e85f6e42c5 100644 --- a/CalPatRec/fcl/prolog.fcl +++ b/CalPatRec/fcl/prolog.fcl @@ -771,15 +771,6 @@ CalPatRec: { @table::CalPatRec fitparticle : @local::Particle.muminus TimeClusterCollectionLabel : CalTimePeakFinderUmu } - - DeltaFinderUe : { @table::CalPatRec.producers.DeltaFinder - timePeakCollectionTag : CalTimePeakFinderUe - - } - - DeltaFinderMu : { @table::CalPatRec.producers.DeltaFinder - timePeakCollectionTag : CalTimePeakFinderMu - } CalSeedFitDe : { @table::CalPatRec.producers.CalSeedFit SeedCollection : "CalHelixFinderDe" } @@ -832,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 diff --git a/CalPatRec/fcl/prolog_common.fcl b/CalPatRec/fcl/prolog_common.fcl index ea936be671..269ce2dae5 100644 --- a/CalPatRec/fcl/prolog_common.fcl +++ b/CalPatRec/fcl/prolog_common.fcl @@ -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 @@ -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