---

yaml
---
r: 73197
b: "refs/heads/CMSSW_7_1_X"
c: 4c6e037
h: "refs/heads/CMSSW_7_1_X"
i:
  73195: d96ce84
v: v3

[refs]

@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 055f24cd575a7b394119963574f530ad67524ac0
+"refs/heads/CMSSW_7_1_X": 4c6e03702d8aeb028639352755c600bfe34f40ee

trunk/RecoTracker/FinalTrackSelectors/python/MergeLargeD0TrackCollections_cff.py

@@ -4,40 +4,45 @@
 # Merge standard tracking with additional, optional large impact-parameter tracking iterations
 #
 
-import RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi
+import RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi
 # Track filtering and quality.
 #   input:    generalTracks,largeD0step1WithMaterialTracks,largeD0step2WithMaterialTracks,largeD0step3WithMaterialTracks,largeD0step4WithMaterialTracks,largeD0step5WithMaterialTracks
 #   output:   mergeLargeD0step5Step
 #   sequence: largeD0TrackCollectionMerging
 
 #
-mergeLargeD0step1 = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone()
-mergeLargeD0step1.TrackProducer1 = 'generalTracks'
-mergeLargeD0step1.TrackProducer2 = 'largeD0step1Trk'
-mergeLargeD0step1.promoteTrackQuality = True
+mergeLargeD0step1 = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
+    TrackProducer1 = 'generalTracks',
+    TrackProducer2 = 'largeD0step1Trk',
+    promoteTrackQuality = True
+    )
 
 #
-mergeLargeD0step2 = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone()
-mergeLargeD0step2.TrackProducer1 = 'mergeLargeD0step1'
-mergeLargeD0step2.TrackProducer2 = 'largeD0step2Trk'
-mergeLargeD0step2.promoteTrackQuality = True
+mergeLargeD0step2 = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
+    TrackProducer1 = 'mergeLargeD0step1',
+    TrackProducer2 = 'largeD0step2Trk',
+    promoteTrackQuality = True
+    )
 
 #
-mergeLargeD0step3 = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone()
-mergeLargeD0step3.TrackProducer1 = 'mergeLargeD0step2'
-mergeLargeD0step3.TrackProducer2 = 'largeD0step3Trk'
-mergeLargeD0step3.promoteTrackQuality = True
+mergeLargeD0step3 = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
+    TrackProducer1 = 'mergeLargeD0step2',
+    TrackProducer2 = 'largeD0step3Trk',
+    promoteTrackQuality = True
+    )
 
 #
-mergeLargeD0step4 = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone()
-mergeLargeD0step4.TrackProducer1 = 'mergeLargeD0step3'
-mergeLargeD0step4.TrackProducer2 = 'largeD0step4Trk'
-mergeLargeD0step4.promoteTrackQuality = True
+mergeLargeD0step4 = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
+    TrackProducer1 = 'mergeLargeD0step3',
+    TrackProducer2 = 'largeD0step4Trk',
+    promoteTrackQuality = True,
+    )
 
 #
-mergeLargeD0step5 = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone()
-mergeLargeD0step5.TrackProducer1 = 'mergeLargeD0step4'
-mergeLargeD0step5.TrackProducer2 = 'largeD0step5Trk'
-mergeLargeD0step5.promoteTrackQuality = True
+mergeLargeD0step5 = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
+    TrackProducer1 = 'mergeLargeD0step4',
+    TrackProducer2 = 'largeD0step5Trk',
+    promoteTrackQuality = True,
+    )
 
 largeD0TrackCollectionMerging = cms.Sequence(mergeLargeD0step1 * mergeLargeD0step2 * mergeLargeD0step3 * mergeLargeD0step4 * mergeLargeD0step5) 

trunk/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py

@@ -1,39 +1,39 @@
 import FWCore.ParameterSet.Config as cms
 
-import RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi
+import RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi
 # Track filtering and quality.
 #   input:    zeroStepTracksWithQuality,preMergingFirstStepTracksWithQuality,secStep,thStep,pixellessStep
 #   output:   generalTracks
 #   sequence: trackCollectionMerging
 
 #
 
-firstStepTracksWithQuality = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone(
+firstStepTracksWithQuality = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
     TrackProducer1 = 'zeroStepTracksWithQuality',
     TrackProducer2 = 'preMergingFirstStepTracksWithQuality',
     promoteTrackQuality = False
     )
 
 
-merge2nd3rdTracks = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone(
+merge2nd3rdTracks = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
     TrackProducer1 = 'secStep',
     TrackProducer2 = 'thStep',
     promoteTrackQuality = True
     )
 
-merge4th5thTracks = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone(
+merge4th5thTracks = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
     TrackProducer1 = 'pixellessStep',
     TrackProducer2 = 'tobtecStep',
     promoteTrackQuality = True
     )
 
-iterTracks = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone(
+iterTracks = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
     TrackProducer1 = 'merge2nd3rdTracks',
     TrackProducer2 = 'merge4th5thTracks',
     promoteTrackQuality = True
     )
 
-generalTracks = RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.ctfrsTrackListMerger.clone(
+generalTracks = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
     TrackProducer1 = 'firstStepTracksWithQuality',
     TrackProducer2 = 'iterTracks',
     promoteTrackQuality = True,

trunk/RecoTracker/FinalTrackSelectors/python/ctfrsTrackListMerger_cfi.py

@@ -10,42 +10,14 @@
 # RecoTracker/FinalTrackSelectors
 #
 # 
-# sequence dependency:
-#
-# - ctfWithMaterialTracks: include "RecoTracker/TrackProducer/data/CTFFinalFitWithMaterial.cff"
-# - rsWithMaterialTracks: include "RecoTracker/TrackProducer/data/RSFinalFitWithMaterial.cff"
-#
-#
-# service dependency:
-#
-# - geometry:          include "Geometry/CMSCommonData/data/cmsIdealGeometryXML.cfi"
-# - tracker geometry:  include "Geometry/TrackerGeometryBuilder/data/trackerGeometry.cfi"
-# - tracker numbering: include "Geometry/TrackerNumberingBuilder/data/trackerNumberingGeometry.cfi"
-#
-# function:
-#
 # cleans and merges ctf and rs Track lists and put new list back in Event
-ctfrsTrackListMerger = cms.EDProducer("SimpleTrackListMerger",
-    # minimum shared fraction to be called duplicate
-    ShareFrac = cms.double(0.66),
-    # minimum pT in GeV/c
-    MinPT = cms.double(0.05),
-    # minimum difference in rechit position in cm
-    # negative Epsilon uses sharedInput for comparison
-    Epsilon = cms.double(-0.001),
-    # maximum chisq/dof
-    MaxNormalizedChisq = cms.double(1000.0),
-    # minimum number of RecHits used in fit
-    MinFound = cms.int32(3),
-    # module laber of RS Tracks from KF with material propagator
+
+import RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi
+ctfrsTrackListMerger = RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi.simpleTrackListMerger.clone(
     TrackProducer2 = cms.string('rsWithMaterialTracks'),
-    # module laber of CTF Tracks from KF with material propagator
-    #string TrackProducer1 = "ctfWithMaterialTracks"
-    TrackProducer1 = cms.string('generalTracks'),
-    # set new quality for confirmed tracks
-    promoteTrackQuality = cms.bool(False),
-    newQuality = cms.string('confirmed'),
-    copyExtras = cms.untracked.bool(False)
+    TrackProducer1 = cms.string('generalTracks')
 )
 
+print "one should use RecoTracker.FinalTrackSelectors.simpleTrackListMerger_cfi instead of RecoTracker.FinalTrackSelectors.ctfrsTrackListMerger_cfi.py"
+
 

trunk/RecoTracker/FinalTrackSelectors/python/ctfrsMCTrackListMerger_cfi.py → trunk/RecoTracker/FinalTrackSelectors/python/simpleTrackListMerger_cfi.py

@@ -16,16 +16,9 @@
 # - rsWithMaterialTracks: include "RecoTracker/TrackProducer/data/RSFinalFitWithMaterial.cff"
 #
 #
-# service dependency:
-#
-# - geometry:          include "Geometry/CMSCommonData/data/cmsIdealGeometryXML.cfi"
-# - tracker geometry:  include "Geometry/TrackerGeometryBuilder/data/trackerGeometry.cfi"
-# - tracker numbering: include "Geometry/TrackerNumberingBuilder/data/trackerNumberingGeometry.cfi"
-#
-# function:
-#
 # cleans and merges ctf and rs Track lists and put new list back in Event
-ctfrsMCTrackListMerger = cms.EDProducer("SimpleTrackListMerger",
+
+simpleTrackListMerger = cms.EDProducer("SimpleTrackListMerger",
     # minimum shared fraction to be called duplicate
     ShareFrac = cms.double(0.66),
     # minimum pT in GeV/c
@@ -34,13 +27,17 @@
     # negative Epsilon uses sharedInput for comparison
     Epsilon = cms.double(-0.001),
     # maximum chisq/dof
-    MaxNormalizedChisq = cms.double(20.0),
+    MaxNormalizedChisq = cms.double(1000.0),
     # minimum number of RecHits used in fit
-    MinFound = cms.int32(8),
+    MinFound = cms.int32(3),
     # module laber of RS Tracks from KF with material propagator
-    TrackProducer2 = cms.string('rsWithMaterialTracks'),
+    TrackProducer2 = cms.string(''),
     # module laber of CTF Tracks from KF with material propagator
-    TrackProducer1 = cms.string('ctfWithMaterialTracks')
+    TrackProducer1 = cms.string(''),
+    # set new quality for confirmed tracks
+    promoteTrackQuality = cms.bool(False),
+    newQuality = cms.string('confirmed'),
+    copyExtras = cms.untracked.bool(False)
 )