Merge pull request #979 from brownd1978/kknames

Simplify KK fit instance names, for downstream compatibility

Mu2eKinKal/fcl/prolog.fcl

@@ -228,7 +228,7 @@ Mu2eKinKal : {
     ModuleSettings : @local::Mu2eKinKal.LOOPHELIX
   }
 
-  KKDriftFit : {
+  KK : {
     module_type : LoopHelixFit
     MaterialSettings : @local::Mu2eKinKal.MAT
     KKFitSettings: @local::Mu2eKinKal.KKFIT
@@ -246,7 +246,7 @@ Mu2eKinKal : {
     ModuleSettings : @local::Mu2eKinKal.KINEMATICLINE
   }
 
-  KKLineDriftFit : {
+  KKLine : {
     module_type : KinematicLineFit
     MaterialSettings : @local::Mu2eKinKal.MAT
     KKFitSettings: @local::Mu2eKinKal.KKFIT
@@ -283,15 +283,15 @@ Mu2eKinKal : {
     KKDeMSeedFit: @local::Mu2eKinKal.KKSeedFit
     KKLineSeedFit: @local::Mu2eKinKal.KKLineSeedFit
     # drift fits, with BField corrections
-    KKLineDriftFit: @local::Mu2eKinKal.KKLineDriftFit
-    KKDePDriftFit: @local::Mu2eKinKal.KKDriftFit
-    KKDeMDriftFit: @local::Mu2eKinKal.KKDriftFit
-    KKUePDriftFit: @local::Mu2eKinKal.KKDriftFit
-    KKUeMDriftFit: @local::Mu2eKinKal.KKDriftFit
-    KKDmuPDriftFit: @local::Mu2eKinKal.KKDriftFit
-    KKDmuMDriftFit: @local::Mu2eKinKal.KKDriftFit
-    KKUmuPDriftFit: @local::Mu2eKinKal.KKDriftFit
-    KKUmuMDriftFit: @local::Mu2eKinKal.KKDriftFit
+    KKLine: @local::Mu2eKinKal.KKLine
+    KKDeP: @local::Mu2eKinKal.KK
+    KKDeM: @local::Mu2eKinKal.KK
+    KKUeP: @local::Mu2eKinKal.KK
+    KKUeM: @local::Mu2eKinKal.KK
+    KKDmuP: @local::Mu2eKinKal.KK
+    KKDmuM: @local::Mu2eKinKal.KK
+    KKUmuP: @local::Mu2eKinKal.KK
+    KKUmuM: @local::Mu2eKinKal.KK
 
   }
   filters : {
@@ -302,29 +302,29 @@ Mu2eKinKal : {
 Mu2eKinKal.producers.KKLineSeedFit.ExtensionSettings.BFieldCorrection : false
 Mu2eKinKal.producers.KKLineSeedFit.KKFitSettings.FitParticle : 13
 Mu2eKinKal.producers.KKLineSeedFit.KKFitSettings.FitDirection : 1
-Mu2eKinKal.producers.KKLineDriftFit.KKFitSettings.FitParticle : 13
-Mu2eKinKal.producers.KKLineDriftFit.KKFitSettings.FitDirection : 1
+Mu2eKinKal.producers.KKLine.KKFitSettings.FitParticle : 13
+Mu2eKinKal.producers.KKLine.KKFitSettings.FitDirection : 1
 
 Mu2eKinKal.producers.KKDeMSeedFit.KKFitSettings.FitParticle : 11
 Mu2eKinKal.producers.KKDeMSeedFit.KKFitSettings.FitDirection : 0
 Mu2eKinKal.producers.KKDePSeedFit.KKFitSettings.FitParticle : -11
 Mu2eKinKal.producers.KKDePSeedFit.KKFitSettings.FitDirection : 0
 
-Mu2eKinKal.producers.KKDeMDriftFit.KKFitSettings.FitParticle : 11
-Mu2eKinKal.producers.KKDeMDriftFit.KKFitSettings.FitDirection : 0
-Mu2eKinKal.producers.KKDePDriftFit.KKFitSettings.FitParticle : -11
-Mu2eKinKal.producers.KKDePDriftFit.KKFitSettings.FitDirection : 0
-Mu2eKinKal.producers.KKUeMDriftFit.KKFitSettings.FitParticle : 11
-Mu2eKinKal.producers.KKUeMDriftFit.KKFitSettings.FitDirection : 1
-Mu2eKinKal.producers.KKUePDriftFit.KKFitSettings.FitParticle : -11
-Mu2eKinKal.producers.KKUePDriftFit.KKFitSettings.FitDirection : 1
-Mu2eKinKal.producers.KKDmuMDriftFit.KKFitSettings.FitParticle : 13
-Mu2eKinKal.producers.KKDmuMDriftFit.KKFitSettings.FitDirection : 0
-Mu2eKinKal.producers.KKDmuPDriftFit.KKFitSettings.FitParticle : -13
-Mu2eKinKal.producers.KKDmuPDriftFit.KKFitSettings.FitDirection : 0
-Mu2eKinKal.producers.KKUmuMDriftFit.KKFitSettings.FitParticle : 13
-Mu2eKinKal.producers.KKUmuMDriftFit.KKFitSettings.FitDirection : 1
-Mu2eKinKal.producers.KKUmuPDriftFit.KKFitSettings.FitParticle : -13
-Mu2eKinKal.producers.KKUmuPDriftFit.KKFitSettings.FitDirection : 1
+Mu2eKinKal.producers.KKDeM.KKFitSettings.FitParticle : 11
+Mu2eKinKal.producers.KKDeM.KKFitSettings.FitDirection : 0
+Mu2eKinKal.producers.KKDeP.KKFitSettings.FitParticle : -11
+Mu2eKinKal.producers.KKDeP.KKFitSettings.FitDirection : 0
+Mu2eKinKal.producers.KKUeM.KKFitSettings.FitParticle : 11
+Mu2eKinKal.producers.KKUeM.KKFitSettings.FitDirection : 1
+Mu2eKinKal.producers.KKUeP.KKFitSettings.FitParticle : -11
+Mu2eKinKal.producers.KKUeP.KKFitSettings.FitDirection : 1
+Mu2eKinKal.producers.KKDmuM.KKFitSettings.FitParticle : 13
+Mu2eKinKal.producers.KKDmuM.KKFitSettings.FitDirection : 0
+Mu2eKinKal.producers.KKDmuP.KKFitSettings.FitParticle : -13
+Mu2eKinKal.producers.KKDmuP.KKFitSettings.FitDirection : 0
+Mu2eKinKal.producers.KKUmuM.KKFitSettings.FitParticle : 13
+Mu2eKinKal.producers.KKUmuM.KKFitSettings.FitDirection : 1
+Mu2eKinKal.producers.KKUmuP.KKFitSettings.FitParticle : -13
+Mu2eKinKal.producers.KKUmuP.KKFitSettings.FitDirection : 1
 
 END_PROLOG

Mu2eKinKal/test/KKDrift.fcl

@@ -5,7 +5,7 @@
 # services.DbService.version: v1_0
 #
 # To convert the fit to use CentralHelix instead of LoopHelix, add the following line to the stub:
-# physics.producers.KKDeMDriftFit.module_type : CentralHelixFit
+# physics.producers.KKDeM.module_type : CentralHelixFit
 
 #include "Offline/fcl/minimalMessageService.fcl"
 #include "Offline/fcl/standardServices.fcl"
@@ -38,9 +38,16 @@ physics :
     @sequence::Reconstruction.TrkReco,
     @sequence::Reconstruction.CrvReco,
     TimeClusterFinderDe, HelixFinderDe,
+    TimeClusterFinderUe, HelixFinderUe,
+    TimeClusterFinderDmu, HelixFinderDmu,
     CalTimePeakFinder, CalHelixFinderDe,
+    CalTimePeakFinderMu, CalHelixFinderDmu,
     MHDeM,
-    KKDeMDriftFit,
+    MHUeP,
+    MHDmuM,
+    KKDeM,
+    KKUeP,
+    KKDmuM,
     @sequence::Reconstruction.MCReco
   ]
   analyzers : {
@@ -67,17 +74,34 @@ outputs : {
 physics.producers.CaloHitTruthMatch.primaryParticle : "compressDigiMCs"
 physics.producers.CaloHitTruthMatch.caloShowerSimCollection : "compressDigiMCs"
 physics.filters.CalHelixFinderDe.StrawHitFlagCollectionLabel                 : "FlagBkgHits:ComboHits"
-physics.producers.SelectRecoMC.KalSeedCollections  : ["KKDeMDriftFit"]
+physics.filters.CalHelixFinderDmu.StrawHitFlagCollectionLabel                 : "FlagBkgHits:ComboHits"
+physics.producers.SelectRecoMC.KalSeedCollections  : ["KKDeM", "KKDmuM", "KKUeP"]
 physics.producers.SelectRecoMC.HelixSeedCollections  : ["MHDeM"]
 physics.producers.SelectRecoMC.debugLevel : 0
 
-physics.producers.KKDeMDriftFit.ModuleSettings.HelixSeedCollections : [ "MHDeM" ]
-physics.producers.KKDeMDriftFit.ModuleSettings.ComboHitCollection : "makeSH"
-physics.producers.KKDeMDriftFit.ModuleSettings.CaloClusterCollection : "CaloClusterMaker"
-physics.producers.KKDeMDriftFit.ModuleSettings.StrawHitFlagCollection : "FlagBkgHits:StrawHits"
-physics.producers.KKDeMDriftFit.ModuleSettings.PrintLevel : 0
-physics.producers.KKDeMDriftFit.ModuleSettings.SaveAllFits : true
-physics.producers.KKDeMDriftFit.FitSettings.PrintLevel : 0
+physics.producers.KKDeM.ModuleSettings.HelixSeedCollections : [ "MHDeM" ]
+physics.producers.KKDeM.ModuleSettings.ComboHitCollection : "makeSH"
+physics.producers.KKDeM.ModuleSettings.CaloClusterCollection : "CaloClusterMaker"
+physics.producers.KKDeM.ModuleSettings.StrawHitFlagCollection : "FlagBkgHits:StrawHits"
+physics.producers.KKDeM.ModuleSettings.PrintLevel : 0
+physics.producers.KKDeM.ModuleSettings.SaveAllFits : true
+physics.producers.KKDeM.FitSettings.PrintLevel : 0
+
+physics.producers.KKUeP.ModuleSettings.HelixSeedCollections : [ "MHDeM" ]
+physics.producers.KKUeP.ModuleSettings.ComboHitCollection : "makeSH"
+physics.producers.KKUeP.ModuleSettings.CaloClusterCollection : "CaloClusterMaker"
+physics.producers.KKUeP.ModuleSettings.StrawHitFlagCollection : "FlagBkgHits:StrawHits"
+physics.producers.KKUeP.ModuleSettings.PrintLevel : 0
+physics.producers.KKUeP.ModuleSettings.SaveAllFits : true
+physics.producers.KKUeP.FitSettings.PrintLevel : 0
+
+physics.producers.KKDmuM.ModuleSettings.HelixSeedCollections : [ "MHDeM" ]
+physics.producers.KKDmuM.ModuleSettings.ComboHitCollection : "makeSH"
+physics.producers.KKDmuM.ModuleSettings.CaloClusterCollection : "CaloClusterMaker"
+physics.producers.KKDmuM.ModuleSettings.StrawHitFlagCollection : "FlagBkgHits:StrawHits"
+physics.producers.KKDmuM.ModuleSettings.PrintLevel : 0
+physics.producers.KKDmuM.ModuleSettings.SaveAllFits : true
+physics.producers.KKDmuM.FitSettings.PrintLevel : 0
 
 physics.analyzers.TAKK.candidate.options : @local::AllOpt
 physics.analyzers.TAKK.candidate.options.fillBestCrv : false
@@ -89,9 +113,9 @@ physics.analyzers.TAKK.FillTrkPIDInfo : false
 physics.analyzers.TAKK.FillHitInfo : true
 physics.analyzers.TAKK.FillTriggerInfo : false
 physics.analyzers.TAKK.candidate.input : "KK"
-physics.analyzers.TAKK.candidate.suffix : "DeMDriftFit"
+physics.analyzers.TAKK.candidate.suffix : "DeM"
 physics.analyzers.TAKK.candidate.options.fillHits : true
-physics.analyzers.TAKK.supplements : []
+physics.analyzers.TAKK.supplements : [@local::UeP, @local::DmuM]
 physics.analyzers.TAKK.ExtraMCStepCollectionTags : [ "compressDigiMCs:protonabsorber", "compressDigiMCs:stoppingtarget" ]
 
 physics.end_paths : [ EndPath ] # needed for generate_fcl

RecoDataProducts/src/KalSeed.cc

@@ -174,7 +174,7 @@ namespace mu2e {
         }
       }
     }
-    return iseg->t0();
+    return HitT0(iseg->t0Val(),1.0); //FIXME
   }
 }