Merge pull request #30248 from mmusich/moveCDCRecoToAlCaReco

Move Cosmics During Collisions Reconstruction to ALCARECO
cms-sw · Jun 24, 2020 · d3f6abb · d3f6abb
2 parents 70d7189 + c885a6e
commit d3f6abb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 14 deletions.
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlCosmicsInCollisions_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlCosmicsInCollisions_cff.py
@@ -24,8 +24,11 @@
     DebugOn      = cms.untracked.bool(False)
 )
 
+#_________________________ Cosmic During Collisions__________________________________
+from RecoTracker.SpecialSeedGenerators.cosmicDC_cff import *
+
 #________________________________Track selection____________________________________
-# AlCaReco for track based alignment using Cosmic muons reconstructed by Combinatorial Track Finder
+# AlCaReco for track based alignment using Cosmic muons reconstructed by Cosmics during collisions
 import Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi
 ALCARECOTkAlCosmicsInCollisions = Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi.AlignmentTrackSelector.clone(
     src = 'cosmicDCTracks',
@@ -49,4 +52,4 @@
     )
 
 #________________________________Sequences____________________________________
-seqALCARECOTkAlCosmicsInCollisions = cms.Sequence(ALCARECOTkAlCosmicsInCollisionsHLT+ALCARECOTkAlCosmicsInCollisionsDCSFilter+ALCARECOTkAlCosmicsInCollisions)
+seqALCARECOTkAlCosmicsInCollisions = cms.Sequence(cosmicDCTracksSeq*ALCARECOTkAlCosmicsInCollisionsHLT+ALCARECOTkAlCosmicsInCollisionsDCSFilter+ALCARECOTkAlCosmicsInCollisions)
diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py
@@ -49,9 +49,6 @@
 
 from RecoLocalCalo.CastorReco.CastorSimpleReconstructor_cfi import *
 
-# Cosmic During Collisions
-from RecoTracker.SpecialSeedGenerators.cosmicDC_cff import *
-
 # Low pT electrons
 from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronSequence_cff import *
 
@@ -176,7 +173,6 @@
                              recoPFMETTask,
                              PFTauTask,
                              reducedRecHitsTask,
-                             cosmicDCTracksSeqTask,
                              lowPtGsfElectronTask,
                              conversionOpenTrackTask,
                              gsfTracksOpenConversions
@@ -197,7 +193,7 @@
 pp_on_AA_2018.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask]))
 
 # not commisoned and not relevant in FastSim (?):
-_fastSim_highlevelrecoTask = highlevelrecoTask.copyAndExclude([cosmicDCTracksSeqTask,muoncosmichighlevelrecoTask])
+_fastSim_highlevelrecoTask = highlevelrecoTask.copyAndExclude([muoncosmichighlevelrecoTask])
 fastSim.toReplaceWith(highlevelrecoTask,_fastSim_highlevelrecoTask)
 
 

diff --git a/RecoTracker/Configuration/python/RecoTracker_EventContent_cff.py b/RecoTracker/Configuration/python/RecoTracker_EventContent_cff.py
@@ -34,10 +34,7 @@
         'keep recoTrackExtras_conversionStepTracks_*_*', 
         'keep TrackingRecHitsOwned_conversionStepTracks_*_*',
         'keep *_ctfPixelLess_*_*', 
-        'keep *_dedxTruncated40_*_*',
-        'keep recoTracks_cosmicDCTracks_*_*',
-        'keep recoTrackExtras_cosmicDCTracks_*_*',
-        'keep TrackingRecHitsOwned_cosmicDCTracks_*_*'
+        'keep *_dedxTruncated40_*_*'
     )
 )
 RecoTrackerRECO.outputCommands.extend(RecoTrackerAOD.outputCommands)

diff --git a/RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py b/RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py
@@ -14,17 +14,39 @@
 )
 cosmicDCSeeds = RecoTracker.SpecialSeedGenerators.outInSeedsFromStandaloneMuons_cfi.outInSeedsFromStandaloneMuons.clone(
     src = cms.InputTag("muonsFromCosmics"),
-    cut = cms.string("pt > 2 && abs(eta)<1.2 && phi<0"),
+    cut = cms.string("p > 3 && abs(eta)<1.6 && phi<0"),
     hitCollector = cms.string('hitCollectorForCosmicDCSeeds'),
     fromVertex = cms.bool(False),
-    maxEtaForTOB = cms.double(1.5),
-    minEtaForTEC = cms.double(0.7),
+    maxEtaForTOB = cms.double(2.5),
+    minEtaForTEC = cms.double(0.0),
 )
 
 # Ckf pattern
+import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilderP5_cff
+Chi2MeasurementEstimatorForCDC = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilderP5_cff.Chi2MeasurementEstimatorForP5.clone(
+    ComponentName = cms.string('Chi2MeasurementEstimatorForCDC'),
+    MaxDisplacement = 500
+)
+
+ckfBaseTrajectoryFilterCDC = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilderP5_cff.ckfBaseTrajectoryFilterP5.clone(
+    maxLostHits = 10,
+    maxConsecLostHits = 10
+)
+
+GroupedCkfTrajectoryBuilderCDC = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilderP5_cff.GroupedCkfTrajectoryBuilderP5.clone(
+    maxCand = 3,
+    estimator = 'Chi2MeasurementEstimatorForCDC',
+    trajectoryFilter = cms.PSet(
+        refToPSet_ = cms.string('ckfBaseTrajectoryFilterCDC')
+    )
+)
+
 import RecoTracker.CkfPattern.CkfTrackCandidatesP5_cff
 cosmicDCCkfTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidatesP5_cff.ckfTrackCandidatesP5.clone(
     src = cms.InputTag( "cosmicDCSeeds" ),
+    TrajectoryBuilderPSet = cms.PSet(
+        refToPSet_ = cms.string('GroupedCkfTrajectoryBuilderCDC')
+    )
 )
 
 # Track producer