Merge pull request #1 from echapon/pr_73X_v02_echapon_local

First working version of myregit
nclopezo · Nov 4, 2014 · 581b41d · 581b41d
2 parents 266cdf5 + 8eb5359
commit 581b41d
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 20 deletions.
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py
@@ -20,9 +20,9 @@
 
 # NEW CLUSTERS (remove previously used clusters)
 hiRegitMuDetachedTripletStepClusters = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepClusters.clone(
-    oldClusterRemovalInfo = cms.InputTag("hiRegitMuPixelPairStepClusters"),
-    trajectories          = cms.InputTag("hiRegitMuPixelPairStepTracks"),
-    overrideTrkQuals      = cms.InputTag('hiRegitMuPixelPairStepSelector','hiRegitMuPixelPairStep'),
+    # oldClusterRemovalInfo = cms.InputTag("hiRegitMuInitialStepClusters"),
+    trajectories          = cms.InputTag("hiRegitMuInitialStepTracks"),
+    overrideTrkQuals      = cms.InputTag('hiRegitMuInitialStepSelector','hiRegitMuInitialStep'),
     TrackQuality          = cms.string('tight')
 )
 
@@ -59,7 +59,8 @@
 
 hiRegitMuDetachedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuDetachedTripletStepSeeds'),
-    TrajectoryBuilder = 'hiRegitMuDetachedTripletStepTrajectoryBuilder'
+    TrajectoryBuilder = 'hiRegitMuDetachedTripletStepTrajectoryBuilder',
+    clustersToSkip = cms.InputTag("hiRegitMuDetachedTripletStepClusters")
     )
 
 # fitting: feed new-names
@@ -93,6 +94,7 @@
 
 
 hiRegitMuonDetachedTripletStep = cms.Sequence(hiRegitMuDetachedTripletStepClusters*
+                                              hiRegitMuDetachedTripletStepSeedLayers*
                                               hiRegitMuDetachedTripletStepSeeds*
                                               hiRegitMuDetachedTripletStepTrackCandidates*
                                               hiRegitMuDetachedTripletStepTracks*

diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py
@@ -15,9 +15,13 @@
 ###################################  
 from RecoTracker.IterativeTracking.InitialStep_cff import *
 
+# SEEDING LAYERS
+hiRegitMuInitialStepSeedLayers =  RecoTracker.IterativeTracking.InitialStep_cff.initialStepSeedLayers.clone()
+
 # seeding
 hiRegitMuInitialStepSeeds     = RecoTracker.IterativeTracking.InitialStep_cff.initialStepSeeds.clone()
 hiRegitMuInitialStepSeeds.RegionFactoryPSet                                           = HiTrackingRegionFactoryFromSTAMuonsBlock.clone()
+hiRegitMuInitialStepSeeds.OrderedHitsFactoryPSet.SeedingLayers                        = cms.InputTag("hiRegitMuInitialStepSeedLayers")
 hiRegitMuInitialStepSeeds.ClusterCheckPSet.doClusterCheck                             = False # do not check for max number of clusters pixel or strips
 hiRegitMuInitialStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.EscapePt        = 3.0
 hiRegitMuInitialStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.DeltaR          = 1 # default = 0.2
@@ -77,7 +81,8 @@
         ) #end of vpset
     )
 
-hiRegitMuonInitialStep = cms.Sequence(hiRegitMuInitialStepSeeds*
+hiRegitMuonInitialStep = cms.Sequence(hiRegitMuInitialStepSeedLayers*
+                                      hiRegitMuInitialStepSeeds*
                                       hiRegitMuInitialStepTrackCandidates*
                                       hiRegitMuInitialStepTracks*
                                       hiRegitMuInitialStepSelector)

diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py
@@ -17,8 +17,9 @@
 
 # remove previously used clusters
 hiRegitMuLowPtTripletStepClusters = RecoTracker.IterativeTracking.LowPtTripletStep_cff.lowPtTripletStepClusters.clone(
-    trajectories          = cms.InputTag("hiRegitMuInitialStepTracks"),
-    overrideTrkQuals      = cms.InputTag('hiRegitMuInitialStepSelector','hiRegitMuInitialStep'),
+    trajectories          = cms.InputTag("hiRegitMuDetachedTripletStepTracks"),
+    overrideTrkQuals      = cms.InputTag('hiRegitMuDetachedTripletStepSelector','hiRegitMuDetachedTripletStep'),
+    oldClusterRemovalInfo = cms.InputTag("hiRegitMuDetachedTripletStepClusters"),
     TrackQuality          = cms.string('tight')
 )
 
@@ -105,6 +106,7 @@
 )
 
 hiRegitMuonLowPtTripletStep = cms.Sequence(hiRegitMuLowPtTripletStepClusters*
+                                           hiRegitMuLowPtTripletStepSeedLayers*
                                            hiRegitMuLowPtTripletStepSeeds*
                                            hiRegitMuLowPtTripletStepTrackCandidates*
                                            hiRegitMuLowPtTripletStepTracks*

diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py
@@ -19,9 +19,9 @@
 
 # NEW CLUSTERS (remove previously used clusters)
 hiRegitMuMixedTripletStepClusters = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepClusters.clone(
-    oldClusterRemovalInfo = cms.InputTag("hiRegitMuDetachedTripletStepClusters"),
-    trajectories          = cms.InputTag("hiRegitMuDetachedTripletStepTracks"),
-    overrideTrkQuals      = cms.InputTag('hiRegitMuDetachedTripletStepSelector','hiRegitMuDetachedTripletStep'),
+    oldClusterRemovalInfo = cms.InputTag("hiRegitMuPixelPairStepClusters"),
+    trajectories          = cms.InputTag("hiRegitMuPixelPairStepTracks"),
+    overrideTrkQuals      = cms.InputTag('hiRegitMuPixelPairStepSelector','hiRegitMuPixelPairStep'),
     TrackQuality          = cms.string('tight')
 )
 
@@ -132,7 +132,9 @@
     ) #end of clone
 
 hiRegitMuonMixedTripletStep = cms.Sequence(hiRegitMuMixedTripletStepClusters*
+                                         hiRegitMuMixedTripletStepSeedLayersA*
                                          hiRegitMuMixedTripletStepSeedsA*
+                                         hiRegitMuMixedTripletStepSeedLayersB*
                                          hiRegitMuMixedTripletStepSeedsB*
                                          hiRegitMuMixedTripletStepSeeds*
                                          hiRegitMuMixedTripletStepTrackCandidates*

diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py
@@ -102,6 +102,7 @@
 )
 
 hiRegitMuonPixelLessStep = cms.Sequence(hiRegitMuPixelLessStepClusters*
+                                        hiRegitMuPixelLessStepSeedLayers*
                                         hiRegitMuPixelLessStepSeeds*
                                         hiRegitMuPixelLessStepTrackCandidates*
                                         hiRegitMuPixelLessStepTracks*

diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py
@@ -69,6 +69,7 @@
 hiRegitMuPixelPairStepTrackCandidates        =  RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuPixelPairStepSeeds'),
     TrajectoryBuilder = 'hiRegitMuPixelPairStepTrajectoryBuilder',
+    clustersToSkip = cms.InputTag("hiRegitMuPixelPairStepClusters"),
     maxNSeeds         = cms.uint32(1000000)
     )
 
@@ -103,6 +104,7 @@
 )
 
 hiRegitMuonPixelPairStep = cms.Sequence(hiRegitMuPixelPairStepClusters*
+                                        hiRegitMuPixelPairStepSeedLayers*
                                         hiRegitMuPixelPairStepSeeds*
                                         hiRegitMuPixelPairStepTrackCandidates*
                                         hiRegitMuPixelPairStepTracks*

diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py
@@ -129,6 +129,10 @@
 )
 
 hiRegitMuonTobTecStep = cms.Sequence(hiRegitMuTobTecStepClusters*
+                                     hiRegitMuTobTecStepSeedLayersTripl*
+                                     hiRegitMuTobTecStepSeedsTripl*
+                                     hiRegitMuTobTecStepSeedLayersPair*
+                                     hiRegitMuTobTecStepSeedsPair*
                                      hiRegitMuTobTecStepSeeds*
                                      hiRegitMuTobTecStepTrackCandidates*
                                      hiRegitMuTobTecStepTracks*

diff --git a/RecoHI/HiMuonAlgos/python/hiMuonIterativeTk_cff.py b/RecoHI/HiMuonAlgos/python/hiMuonIterativeTk_cff.py
@@ -35,13 +35,13 @@
     )
 
 hiRegitMuTracking = cms.Sequence(hiRegitMuonInitialStep
+                                 *hiRegitMuonDetachedTripletStep
                                  *hiRegitMuonLowPtTripletStep
                                  *hiRegitMuonPixelPairStep
-                                 *hiRegitMuonDetachedTripletStep
                                  *hiRegitMuonMixedTripletStep
                                  *hiRegitMuonPixelLessStep
                                  *hiRegitMuonTobTecStep
-                                 *hiGeneralAndRegitMuTracks
+                                 # *hiGeneralAndRegitMuTracks
                                  )
 
 # Emilien

diff --git a/RecoHI/HiTracking/python/HiTracking_cff.py b/RecoHI/HiTracking/python/HiTracking_cff.py
@@ -12,7 +12,7 @@
     hiBasicTracking
     *hiSecondPixelTripletStep
     *hiPixelPairStep
-    *hiGeneralTracksNoRegitMu
+    # *hiGeneralTracksNoRegitMu
     )
 
 hiTracking = cms.Sequence(

diff --git a/RecoHI/HiTracking/python/MergeTrackCollectionsHI_cff.py b/RecoHI/HiTracking/python/MergeTrackCollectionsHI_cff.py
@@ -19,15 +19,46 @@
     )
 
 #Emilien
+# hiGeneralTracks = RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone(
+#     ShareFrac = cms.double(0.99),
+#     TrackProducers = (cms.InputTag('hiGeneralTracksNoRegitMu'),
+#                       cms.InputTag('hiGeneralAndRegitMuTracks')
+#                      ),
+#     hasSelector=cms.vint32(0,0),
+#     selectedTrackQuals = cms.VInputTag(cms.InputTag(""),cms.InputTag("")),
+#     setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1), pQual=cms.bool(True)),  # should this be False?
+#                              ),
+#     copyExtras = True,
+#     # makeReKeyedSeeds = cms.untracked.bool(False)
+#     )
+
 hiGeneralTracks = RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone(
-    ShareFrac = cms.double(0.99),
-    TrackProducers = (cms.InputTag('hiGeneralTracksNoRegitMu'),
-                      cms.InputTag('hiGeneralAndRegitMuTracks')
+    TrackProducers = (cms.InputTag('hiGlobalPrimTracks'),
+                      cms.InputTag('hiSecondPixelTripletGlobalPrimTracks'),
+                      cms.InputTag('hiPixelPairGlobalPrimTracks'),
+                      cms.InputTag('hiRegitMuInitialStepTracks'),
+                      cms.InputTag('hiRegitMuLowPtTripletStepTracks'),
+                      cms.InputTag('hiRegitMuPixelPairStepTracks'),
+                      cms.InputTag('hiRegitMuDetachedTripletStepTracks'),
+                      cms.InputTag('hiRegitMuMixedTripletStepTracks'),
+                      cms.InputTag('hiRegitMuPixelLessStepTracks'),
+                      cms.InputTag('hiRegitMuTobTecStepTracks')
                      ),
-    hasSelector=cms.vint32(0,0),
-    selectedTrackQuals = cms.VInputTag(cms.InputTag(""),cms.InputTag("")),
-    setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1), pQual=cms.bool(True)),  # should this be False?
+    hasSelector=cms.vint32(1,1,1,1,1,1,1,1,1,1),
+    selectedTrackQuals = cms.VInputTag(
+    cms.InputTag("hiInitialStepSelector","hiInitialStep"),
+    cms.InputTag("hiSecondPixelTripletStepSelector","hiSecondPixelTripletStep"),
+    cms.InputTag("hiPixelPairStepSelector","hiPixelPairStep"),
+    cms.InputTag("hiRegitMuInitialStepSelector","hiRegitMuInitialStepLoose"),
+    cms.InputTag("hiRegitMuLowPtTripletStepSelector","hiRegitMuLowPtTripletStepLoose"),
+    cms.InputTag("hiRegitMuPixelPairStepSelector","hiRegitMuPixelPairStep"),
+    cms.InputTag("hiRegitMuDetachedTripletStepSelector","hiRegitMuDetachedTripletStep"),
+    cms.InputTag("hiRegitMuMixedTripletStepSelector","hiRegitMuMixedTripletStep"),
+    cms.InputTag("hiRegitMuPixelLessStepSelector","hiRegitMuPixelLessStep"),
+    cms.InputTag("hiRegitMuTobTecStepSelector","hiRegitMuTobTecStep")
+    ),                    
+    setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6,7,8,9), pQual=cms.bool(True)),  # should this be False?
                              ),
     copyExtras = True,
-    # makeReKeyedSeeds = cms.untracked.bool(False)
+    makeReKeyedSeeds = cms.untracked.bool(False)
     )