Tracking iteration names changed to match iteration Python labels

Alignment/HIPAlignmentAlgorithm/src/LhcTrackAnalyzer.cc

@@ -162,14 +162,14 @@ LhcTrackAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
 	  int myalgo=-88;
 	  if(track->algo()==reco::TrackBase::undefAlgorithm)myalgo=0;
 	  if(track->algo()==reco::TrackBase::ctf)myalgo=1;
-	  if(track->algo()==reco::TrackBase::iter0)myalgo=4;
-	  if(track->algo()==reco::TrackBase::iter1)myalgo=5;
-	  if(track->algo()==reco::TrackBase::iter2)myalgo=6;
-	  if(track->algo()==reco::TrackBase::iter3)myalgo=7;
-	  if(track->algo()==reco::TrackBase::iter4)myalgo=8;
-	  if(track->algo()==reco::TrackBase::iter5)myalgo=9;
-	  if(track->algo()==reco::TrackBase::iter6)myalgo=10;
-	  if(track->algo()==reco::TrackBase::iter7)myalgo=11;
+	  if(track->algo()==reco::TrackBase::initialStep)myalgo=4;
+	  if(track->algo()==reco::TrackBase::lowPtTripletStep)myalgo=5;
+	  if(track->algo()==reco::TrackBase::pixelPairStep)myalgo=6;
+	  if(track->algo()==reco::TrackBase::detachedTripletStep)myalgo=7;
+	  if(track->algo()==reco::TrackBase::mixedTripletStep)myalgo=8;
+	  if(track->algo()==reco::TrackBase::pixelLessStep)myalgo=9;
+	  if(track->algo()==reco::TrackBase::tobTecStep)myalgo=10;
+	  if(track->algo()==reco::TrackBase::jetCoreRegionalStep)myalgo=11;
 	  trkAlgo_[nTracks_]  = myalgo;
 
 	  int myquality=-99;

Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py

@@ -28,7 +28,7 @@
 	MinimumTotalLayers = cms.untracked.int32(11),
 	MinimumPixelLayers = cms.untracked.int32(3),
 	MaximumNormChi2 = cms.untracked.double(2.0),
-	TrackAlgorithm = cms.untracked.vstring('iter0'), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+	TrackAlgorithm = cms.untracked.vstring('initialStep'), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
 	TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
         InputBeamWidth = cms.untracked.double(-1.0), ## if -1 use the value calculated by the analyzer
 	FractionOfFittedTrks = cms.untracked.double(0.9),

CommonTools/Utils/test/testExpressionParser.cc

@@ -139,7 +139,7 @@ void testExpressionParser::checkAll() {
   edm::TestHandle<reco::TrackExtraCollection> h(&trkExtras, pid);
   reco::TrackExtraRef trkExtraRef(h, 0);
   trk.setExtra(trkExtraRef);
-  trk.setAlgorithm(reco::Track::iter2);
+  trk.setAlgorithm(reco::Track::pixelPairStep);
   {
     edm::TypeWithDict t(typeid(reco::Track));
     o = edm::ObjectWithDict(t, & trk);
@@ -153,7 +153,7 @@ void testExpressionParser::checkAll() {
     checkTrack("hitPattern.numberOfValidHits", trk.hitPattern().numberOfValidHits());
     checkTrack("extra.outerPhi", trk.extra()->outerPhi());
     checkTrack("referencePoint.R", trk.referencePoint().R());
-    checkTrack("algo", reco::Track::iter2);
+    checkTrack("algo", reco::Track::pixelPairStep);
     checkTrack("quality('highPurity')", trk.quality(reco::TrackBase::highPurity));
     checkTrack("cosh(theta)", cosh(trk.theta()));
     checkTrack("hypot(px, py)", hypot(trk.px(), trk.py()));

DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py

@@ -28,7 +28,7 @@
                               	   MinimumTotalLayers = cms.untracked.int32(6),
                               	   MinimumPixelLayers = cms.untracked.int32(0),
                               	   MaximumNormChi2 = cms.untracked.double(10.0),
-                              	   TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+                              	   TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
                               	   TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
 			      	   InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
 				   FractionOfFittedTrks = cms.untracked.double(0.9),

DQM/BeamMonitor/python/BeamMonitorBx_cff.py

@@ -31,7 +31,7 @@
                                 MinimumTotalLayers = cms.untracked.int32(6),
                                 MinimumPixelLayers = cms.untracked.int32(0),
                                 MaximumNormChi2 = cms.untracked.double(10.0),
-                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
                                 TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
 			        InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
 				FractionOfFittedTrks = cms.untracked.double(0.9),

DQM/BeamMonitor/python/BeamMonitor_Cosmics_cff.py

@@ -24,7 +24,7 @@
                                 MinimumTotalLayers = cms.untracked.int32(0),
                                 MinimumPixelLayers = cms.untracked.int32(0),
                                 MaximumNormChi2 = cms.untracked.double(100.0),
-                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
                                 TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
 			        InputBeamWidth = cms.untracked.double(-1.0), ## if -1 use the value calculated by the analyzer
                                 FractionOfFittedTrks = cms.untracked.double(0.9),

DQM/BeamMonitor/python/BeamMonitor_MC_cff.py

@@ -26,7 +26,7 @@
                                 MinimumTotalLayers = cms.untracked.int32(11),
                                 MinimumPixelLayers = cms.untracked.int32(3),
                                 MaximumNormChi2 = cms.untracked.double(2.0),
-                                TrackAlgorithm = cms.untracked.vstring('iter0'), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+                                TrackAlgorithm = cms.untracked.vstring('initialStep'), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
                                 TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
 			        InputBeamWidth = cms.untracked.double(-1.0), ## if -1 use the value calculated by the analyzer
 				FractionOfFittedTrks = cms.untracked.double(0.9),

DQM/BeamMonitor/python/BeamMonitor_PixelLess_cff.py

@@ -24,7 +24,7 @@
                                 MinimumTotalLayers = cms.untracked.int32(6),
                                 MinimumPixelLayers = cms.untracked.int32(0),
                                 MaximumNormChi2 = cms.untracked.double(5.0),
-                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
                                 TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
 			        InputBeamWidth = cms.untracked.double(-1.0), ## if -1 use the value calculated by the analyzer
 				FractionOfFittedTrks = cms.untracked.double(0.9),

DQM/BeamMonitor/python/BeamMonitor_Pixel_cff.py

@@ -31,7 +31,7 @@
                                 MinimumTotalLayers = cms.untracked.int32(3),
                                 MinimumPixelLayers = cms.untracked.int32(3),
                                 MaximumNormChi2 = cms.untracked.double(30.0),
-                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
                                 TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
 			        InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
 				FractionOfFittedTrks = cms.untracked.double(0.9),

DQM/BeamMonitor/python/BeamMonitor_cff.py

@@ -31,7 +31,7 @@
                                 MinimumTotalLayers = cms.untracked.int32(6),
                                 MinimumPixelLayers = cms.untracked.int32(0),
                                 MaximumNormChi2 = cms.untracked.double(10.0),
-                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
+                                TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
                                 TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
 			        InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
 				FractionOfFittedTrks = cms.untracked.double(0.9),

DQM/DataScouting/test/HLTvsRECOstudies/hlt_data.py

@@ -7346,7 +7346,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter0" ),
+    AlgorithmName = cms.string( "initialStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltPFlowTrackSelectionHighPurity = cms.EDProducer( "AnalyticalTrackSelector",
@@ -7530,7 +7530,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter1" ),
+    AlgorithmName = cms.string( "lowPtTripletStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter1PFlowTrackSelectionHighPurityLoose = cms.EDProducer( "AnalyticalTrackSelector",
@@ -7772,7 +7772,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter2" ),
+    AlgorithmName = cms.string( "pixelPairStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter2PFlowTrackSelectionHighPurity = cms.EDProducer( "AnalyticalTrackSelector",
@@ -7971,7 +7971,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter3" ),
+    AlgorithmName = cms.string( "detachedTripletStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter3PFlowTrackSelectionHighPurityLoose = cms.EDProducer( "AnalyticalTrackSelector",
@@ -8213,7 +8213,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter4" ),
+    AlgorithmName = cms.string( "mixedTripletStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter4PFlowTrackSelectionHighPurity = cms.EDProducer( "AnalyticalTrackSelector",
@@ -16882,7 +16882,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter0" ),
+    AlgorithmName = cms.string( "initialStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltTau3MuTrackSelectionHighPurity = cms.EDProducer( "AnalyticalTrackSelector",
@@ -17008,7 +17008,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter1" ),
+    AlgorithmName = cms.string( "lowPtTripletStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter1Tau3MuTrackSelectionHighPurityLoose = cms.EDProducer( "AnalyticalTrackSelector",
@@ -17192,7 +17192,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter2" ),
+    AlgorithmName = cms.string( "pixelPairStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter2Tau3MuTrackSelectionHighPurity = cms.EDProducer( "AnalyticalTrackSelector",
@@ -17333,7 +17333,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter3" ),
+    AlgorithmName = cms.string( "detachedTripletStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter3Tau3MuTrackSelectionHighPurityLoose = cms.EDProducer( "AnalyticalTrackSelector",
@@ -17517,7 +17517,7 @@
     NavigationSchool = cms.string( "" ),
     TrajectoryInEvent = cms.bool( True ),
     TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
-    AlgorithmName = cms.string( "iter4" ),
+    AlgorithmName = cms.string( "mixedTripletStep" ),
     Propagator = cms.string( "hltESPRungeKuttaTrackerPropagator" )
 )
 process.hltIter4Tau3MuTrackSelectionHighPurity = cms.EDProducer( "AnalyticalTrackSelector",

DQM/TrackingMonitor/python/TrackingMonitorSeedNumber_Phase1PU140_cff.py

@@ -9,7 +9,7 @@
 Phase1Pu70TrackMonStep0.TrackProducer = cms.InputTag("generalTracks")
 Phase1Pu70TrackMonStep0.SeedProducer  = cms.InputTag("initialStepSeeds")
 Phase1Pu70TrackMonStep0.TCProducer    = cms.InputTag("initialStepTrackCandidates")
-Phase1Pu70TrackMonStep0.AlgoName      = cms.string('iter0')
+Phase1Pu70TrackMonStep0.AlgoName      = cms.string('initialStep')
 Phase1Pu70TrackMonStep0.TkSeedSizeBin = cms.int32(100) # could be 50 ?
 Phase1Pu70TrackMonStep0.TkSeedSizeMax = cms.double(5000)                         
 Phase1Pu70TrackMonStep0.TkSeedSizeMin = cms.double(0)
@@ -21,7 +21,7 @@
 Phase1Pu70TrackMonStep1.TrackProducer = cms.InputTag("generalTracks")
 Phase1Pu70TrackMonStep1.SeedProducer  = cms.InputTag("highPtTripletStepSeeds")
 Phase1Pu70TrackMonStep1.TCProducer    = cms.InputTag("highPtTripletStepTrackCandidates")
-Phase1Pu70TrackMonStep1.AlgoName      = cms.string('iter1')
+Phase1Pu70TrackMonStep1.AlgoName      = cms.string('lowPtTripletStep')
 Phase1Pu70TrackMonStep1.TkSeedSizeBin = cms.int32(100)
 Phase1Pu70TrackMonStep1.TkSeedSizeMax = cms.double(30000)                         
 Phase1Pu70TrackMonStep1.TkSeedSizeMin = cms.double(0)
@@ -33,7 +33,7 @@
 Phase1Pu70TrackMonStep2.TrackProducer = cms.InputTag("generalTracks")
 Phase1Pu70TrackMonStep2.SeedProducer  = cms.InputTag("lowPtQuadStepSeeds")
 Phase1Pu70TrackMonStep2.TCProducer    = cms.InputTag("lowPtQuadStepTrackCandidates")
-Phase1Pu70TrackMonStep2.AlgoName      = cms.string('iter2')
+Phase1Pu70TrackMonStep2.AlgoName      = cms.string('pixelPairStep')
 Phase1Pu70TrackMonStep2.TkSeedSizeBin = cms.int32(100)
 Phase1Pu70TrackMonStep2.TkSeedSizeMax = cms.double(30000)                         
 Phase1Pu70TrackMonStep2.TkSeedSizeMin = cms.double(0)
@@ -45,7 +45,7 @@
 Phase1Pu70TrackMonStep3.TrackProducer = cms.InputTag("generalTracks")
 Phase1Pu70TrackMonStep3.SeedProducer  = cms.InputTag("lowPtTripletStepSeeds")
 Phase1Pu70TrackMonStep3.TCProducer    = cms.InputTag("lowPtTripletStepTrackCandidates")
-Phase1Pu70TrackMonStep3.AlgoName      = cms.string('iter3')
+Phase1Pu70TrackMonStep3.AlgoName      = cms.string('detachedTripletStep')
 Phase1Pu70TrackMonStep3.TkSeedSizeBin = cms.int32(400)
 Phase1Pu70TrackMonStep3.TkSeedSizeMax = cms.double(100000)                         
 Phase1Pu70TrackMonStep3.TkSeedSizeMin = cms.double(0)
@@ -57,7 +57,7 @@
 Phase1Pu70TrackMonStep4.TrackProducer = cms.InputTag("generalTracks")
 Phase1Pu70TrackMonStep4.SeedProducer  = cms.InputTag("detachedQuadStepSeeds")
 Phase1Pu70TrackMonStep4.TCProducer    = cms.InputTag("detachedQuadStepTrackCandidates")
-Phase1Pu70TrackMonStep4.AlgoName      = cms.string('iter4')
+Phase1Pu70TrackMonStep4.AlgoName      = cms.string('mixedTripletStep')
 Phase1Pu70TrackMonStep4.TkSeedSizeBin = cms.int32(400)
 Phase1Pu70TrackMonStep4.TkSeedSizeMax = cms.double(200000)                         
 Phase1Pu70TrackMonStep4.TkSeedSizeMin = cms.double(0)
@@ -69,7 +69,7 @@
 Phase1Pu70TrackMonStep5.TrackProducer = cms.InputTag("generalTracks")
 Phase1Pu70TrackMonStep5.SeedProducer  = cms.InputTag("pixelPairStepSeeds")
 Phase1Pu70TrackMonStep5.TCProducer    = cms.InputTag("pixelPairStepTrackCandidates")
-Phase1Pu70TrackMonStep5.AlgoName      = cms.string('iter5')
+Phase1Pu70TrackMonStep5.AlgoName      = cms.string('pixelLessStep')
 Phase1Pu70TrackMonStep5.TkSeedSizeBin = cms.int32(400)
 Phase1Pu70TrackMonStep5.TkSeedSizeMax = cms.double(200000)                         
 Phase1Pu70TrackMonStep5.TkSeedSizeMin = cms.double(0)