diff --git a/JobConfig/reco/Extracted.fcl b/JobConfig/reco/Extracted.fcl index 6f184c29..c2ee60b2 100644 --- a/JobConfig/reco/Extracted.fcl +++ b/JobConfig/reco/Extracted.fcl @@ -6,6 +6,8 @@ services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.t # save the passive-material crossings found during extrapolation (CRV strongbacks) in the KalSeed intersections physics.producers.KKLine.KKFitSettings.SaveMaterialXings : true #include "Offline/CRVReco/fcl/epilog_extracted.fcl" +# extracted geometry: the Offline SigmaV list per CRV sector type (EX, T1, T2, muon taggers) +physics.producers.TrkCrvMatchLine.SigmaV : @local::TrkCrvMatcher.SigmaV # Disable KL filtering so track-less events are kept (needed for CRV # efficiency / tag-and-probe; matches OnSpill LHFilter disable). diff --git a/JobConfig/reco/prolog.fcl b/JobConfig/reco/prolog.fcl index 878edcd5..b476e541 100644 --- a/JobConfig/reco/prolog.fcl +++ b/JobConfig/reco/prolog.fcl @@ -14,6 +14,8 @@ #include "Offline/Filters/fcl/prolog.fcl" # BEGIN_PROLOG +# reco's SelectReco writes the CRV clusters with no instance name; recoMC/prolog.fcl sets the SelectRecoMC one +TrkCrvMatcherReco : { @table::TrkCrvMatcher CrvCoincidenceClusterCollection : "SelectReco" } Reconstruction : { # define the helix finders HelixFinders : [ "AgnosticHelixFinder", "CalHelixFinderDe" ] @@ -30,6 +32,14 @@ Reconstruction : { @table::CrvRecoPackage.producers @table::CosmicReco.producers + # track-CRV association after SelectReco, on its clusters (the layer probe still sees all CrvRecoPulses). + # Only KKLine and KKCHmu: LoopHelix tracks do not intersect the CRV (brownd1978 on Production#595). + # DtRefCenter: median dtRef of the track's own cluster from MC truth (KKLine: Offline default from extracted + # MDC2025bb; KKCHmu 27 ns from MDC2025au CosmicSignalOffSpill CH reco). + # SigmaV for the Run1 geometries, whose T1 and T2 are both CRV sector type 1: provisional, the extracted T1 value + TrkCrvMatchLine : { @table::TrkCrvMatcherReco KalSeedCollection : "KKLine" SigmaV : [ 13 ] } + TrkCrvMatchCHmu : { @table::TrkCrvMatcherReco KalSeedCollection : "KKCHmu" DtRefCenter : 27 SigmaV : [ 13 ] } + # choose the hit flagger flagPH : @local::CalPatRec.producers.DeltaFinder # flagPH : @local::TrkHitReco.producers.FlagBkgHits @@ -294,6 +304,9 @@ Reconstruction : { CaloReco : [ @sequence::CaloReco.Reco, @sequence::CaloCluster.Reco ] # CRV reco CrvReco : [ @sequence::CrvRecoPackage.CrvRecoSequence ] + # track-CRV association, after SelectReco (KKLine, KKCHmu only) + TrkCrvMatchNoField : [ TrkCrvMatchLine ] + TrkCrvMatchOffSpill : [ TrkCrvMatchCHmu ] # define products to keep # First, high-level reco products, and associated sub-products @@ -309,7 +322,8 @@ Reconstruction : { "keep mu2e::CaloDigis_SelectReco_*_*", "keep mu2e::CrvDigis_SelectReco_*_*", "keep mu2e::CrvCoincidenceClusters_SelectReco_*_*", - "keep mu2e::CrvRecoPulses_SelectReco_*_*" + "keep mu2e::CrvRecoPulses_SelectReco_*_*", + "keep mu2e::TrkCrvMatchs_*_*_*" ] # Middle reco products, pat rec intermediate results MidRecoProducts : [ @@ -353,7 +367,8 @@ Reconstruction.NoFieldPath : [ @sequence::Reconstruction.PreTrk, @sequence::Reconstruction.LineReco, KLFilter, - SelectReco + SelectReco, + @sequence::Reconstruction.TrkCrvMatchNoField ] # OnSpill paths; only LoopHelix @@ -368,14 +383,16 @@ Reconstruction.CentralHelixPath : [ @sequence::Reconstruction.PreTrk, @sequence::Reconstruction.OffSpillTrk, CHFilter, - SelectReco + SelectReco, + @sequence::Reconstruction.TrkCrvMatchOffSpill ] Reconstruction.LoopHelixPath : [ @sequence::Reconstruction.PreTrk, @sequence::Reconstruction.OffSpillTrk, LHFilter, - SelectReco + SelectReco, + @sequence::Reconstruction.TrkCrvMatchOffSpill ] # default output diff --git a/JobConfig/recoMC/Extracted.fcl b/JobConfig/recoMC/Extracted.fcl index cddfc789..ceb8c3c9 100644 --- a/JobConfig/recoMC/Extracted.fcl +++ b/JobConfig/recoMC/Extracted.fcl @@ -6,6 +6,8 @@ services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.t # save the passive-material crossings found during extrapolation (CRV strongbacks) in the KalSeed intersections physics.producers.KKLine.KKFitSettings.SaveMaterialXings : true #include "Offline/CRVReco/fcl/epilog_extracted.fcl" +# extracted geometry: the Offline SigmaV list per CRV sector type (EX, T1, T2, muon taggers) +physics.producers.TrkCrvMatchLine.SigmaV : @local::TrkCrvMatcher.SigmaV # Disable KL filtering so track-less events are kept (needed for CRV # efficiency / tag-and-probe; matches OnSpill LHFilter disable). diff --git a/JobConfig/recoMC/NoFieldRun1B.fcl b/JobConfig/recoMC/NoFieldRun1B.fcl index 1caf55d3..790e78bb 100644 --- a/JobConfig/recoMC/NoFieldRun1B.fcl +++ b/JobConfig/recoMC/NoFieldRun1B.fcl @@ -124,10 +124,12 @@ physics.RecoPath: [ "CosmicLineFinder", "CosmicKKLine", "SelectReco", + "TrkCrvMatchLine", "CaloHitTruthMatch", "CaloClusterTruthMatch", "CrvCoincidenceClusterMatchMC", "compressRecoMCs", - "CrvCoincidenceClusterMCAssns" + "CrvCoincidenceClusterMCAssns", + "TrkCrvMatchLineMC" ] diff --git a/JobConfig/recoMC/prolog.fcl b/JobConfig/recoMC/prolog.fcl index 7f35600f..4f3a6448 100644 --- a/JobConfig/recoMC/prolog.fcl +++ b/JobConfig/recoMC/prolog.fcl @@ -12,6 +12,9 @@ Reconstruction.producers : { @table::Reconstruction.producers @table::CaloMC.producers @table::CrvRecoMCPackage.producers + # truth of the track-CRV association, one per TrkCrvMatcher instance, after compression + TrkCrvMatchLineMC : { @table::TrkCrvMatchMC TrkCrvMatchCollection : "TrkCrvMatchLine" } + TrkCrvMatchCHmuMC : { @table::TrkCrvMatchMC TrkCrvMatchCollection : "TrkCrvMatchCHmu" } # MC specific output pruning SelectReco : { @@ -56,6 +59,9 @@ Reconstruction.producers : { crvStepsToKeep : [ ] } } +# SelectRecoMC writes the CRV clusters under the CrvCoincidenceClusterFinder instance +Reconstruction.producers.TrkCrvMatchLine.CrvCoincidenceClusterCollection : "SelectReco:CrvCoincidenceClusterFinder" +Reconstruction.producers.TrkCrvMatchCHmu.CrvCoincidenceClusterCollection : "SelectReco:CrvCoincidenceClusterFinder" # analyzers specific to MC Reconstruction.analyzers : { @table::Reconstruction.analyzers @@ -69,11 +75,15 @@ RecoMC : { # full MC sequence; form the Calo and CRV matching, and compress based on reco content # temporary build surface steps from StepPointMCs; this is a patch MCReco : [@sequence::CaloMC.TruthMatch, CrvCoincidenceClusterMatchMC, compressRecoMCs, CrvCoincidenceClusterMCAssns ] + # track-CRV association truth, after MCReco (needs compressRecoMCs and CrvCoincidenceClusterMCAssns) + TrkCrvMatchMCNoField : [ TrkCrvMatchLineMC ] + TrkCrvMatchMCOffSpill : [ TrkCrvMatchCHmuMC ] # MC truth matched to reco HighRecoMCProducts : [ "keep *_compressRecoMCs_*_*", "keep *_CrvCoincidenceClusterMCAssns_*_*", + "keep mu2e::TrkCrvMatchMCs_*_*_*", "keep *_SelectReco_*_*" ] GeneralMCProducts : [ @@ -91,7 +101,8 @@ Reconstruction : { # Override paths to inclulde MC sequences Reconstruction.NoFieldPath : [ @sequence::Reconstruction.NoFieldPath, - @sequence::RecoMC.MCReco + @sequence::RecoMC.MCReco, + @sequence::RecoMC.TrkCrvMatchMCNoField ] Reconstruction.OnSpillPath : [ @@ -101,12 +112,14 @@ Reconstruction.OnSpillPath : [ Reconstruction.CentralHelixPath : [ @sequence::Reconstruction.CentralHelixPath, - @sequence::RecoMC.MCReco + @sequence::RecoMC.MCReco, + @sequence::RecoMC.TrkCrvMatchMCOffSpill ] Reconstruction.LoopHelixPath : [ @sequence::Reconstruction.LoopHelixPath, - @sequence::RecoMC.MCReco + @sequence::RecoMC.MCReco, + @sequence::RecoMC.TrkCrvMatchMCOffSpill ] # add MC-specific payload diff --git a/Validation/offSpill.fcl b/Validation/offSpill.fcl index e6ae8129..75406d00 100644 --- a/Validation/offSpill.fcl +++ b/Validation/offSpill.fcl @@ -30,6 +30,8 @@ outputs.CentralHelixOutput.outputCommands : [ "keep mu2e::TimeClusters_SimpleTimeCluster_*_*", "keep mu2e::CaloClusters_CaloClusterMaker_*_*", "keep mu2e::CrvCoincidenceClusters_*_*_*", + "keep mu2e::TrkCrvMatchs_*_*_*", + "keep mu2e::TrkCrvMatchMCs_*_*_*", "keep mu2e::EventWindowMarker_*_*_*", "keep mu2e::ProtonBunchTime_*_*_*", "keep *_SelectReco*_*_*",