Add .711,.713,.714 workflows and show LST seeds for initialStep and HighPtTripletStep

Author: Brunella DAnzi

DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py

@@ -401,7 +401,7 @@ def _copyIfExists(mod, pset, name):
     SeedProducer = "lstInputProducer"
 )
 seedingLST.toModify(locals()["TrackSeedMonhighPtTripletStep"],
-    SeedProducer = "highPtTripletStepTrajectorySeedsLST"
+    SeedProducer = "highPtTripletStepSeedsPixelsWithLST"
 )
 _LST_TrackSeedMonSequence = TrackSeedMonSequence.copyAndExclude([locals()["TrackSeedMoninitialStep"]])
 (seedingLST | trackingLST).toReplaceWith(TrackSeedMonSequence, _LST_TrackSeedMonSequence)

RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py

@@ -256,7 +256,7 @@
 ))
 (pp_on_XeXe_2017 | pp_on_AA).toModify(highPtTripletStepTrackCandidatesMkFitConfig, minPt=0.7)
 (trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesMkFitSeeds,
-    seeds = 'highPtTripletStepTrajectorySeedsLST'
+    seeds = 'highPtTripletStepSeedsPixelsWithLST'
 )
 (trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesMkFit,
     stripHits = cms.InputTag("mkFitSiPhase2Hits"),
@@ -282,12 +282,12 @@
 
 from RecoTracker.LST.lstOutputConverter_cfi import lstOutputConverter as _lstOutputConverter
 (trackingPhase2PU140 & trackingLST).toReplaceWith(highPtTripletStepTrackCandidates, _lstOutputConverter.clone())
-highPtTripletStepTrajectorySeedsLST = _lstOutputConverter.clone(
+highPtTripletStepSeedsPixelsWithLST = _lstOutputConverter.clone(
     includeNonpLSTSs = cms.bool(True)
 )
 
 (trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toReplaceWith(highPtTripletStepTrackCandidates, mkFitOutputConverter_cfi.mkFitOutputConverter.clone(
-    seeds = 'highPtTripletStepTrajectorySeedsLST',
+    seeds = 'highPtTripletStepSeedsPixelsWithLST',
     mkFitSeeds = 'highPtTripletStepTrackCandidatesMkFitSeeds',
     tracks = 'highPtTripletStepTrackCandidatesMkFit',
     candMVASel = False,
@@ -435,7 +435,12 @@
 (trackingPhase2PU140 & seedingLST & trackingLST & trackingMkFitHighPtTripletStep).toModify(lstInputProducer,
     ptCut = cms.double(0.1)
 )
-_HighPtTripletStepTask_LST_mkFit.add(highPtTripletStepTrajectorySeedsLST,highPtTripletStepTrackCandidatesMkFitSeeds, highPtTripletStepTrackCandidatesMkFit, highPtTripletStepTrackCandidatesMkFitConfig)
+import RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cfi
+highPtTripletStepSeedsPixelsOnly = RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cfi.globalCombinedSeeds.clone(
+    seedCollections = ['initialStepSeeds','highPtTripletStepSeeds']
+)
+
+_HighPtTripletStepTask_LST_mkFit.add(highPtTripletStepSeedsPixelsWithLST,highPtTripletStepTrackCandidatesMkFitSeeds, highPtTripletStepTrackCandidatesMkFit, highPtTripletStepTrackCandidatesMkFitConfig,highPtTripletStepSeedsPixelsOnly)
 (trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toReplaceWith(HighPtTripletStepTask,_HighPtTripletStepTask_LST_mkFit)
 
 from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
@@ -444,7 +449,7 @@
 lstProducerSerialSync = makeSerialClone(lstProducer, lstInput = "lstInputProducerSerialSync")
 
 highPtTripletStepTrackCandidatesSerialSync = highPtTripletStepTrackCandidates.clone()
-(trackingPhase2PU140 & alpakaValidationLST & trackingLST).toModify(highPtTripletStepTrackCandidatesSerialSync,
+(~seedingLST & trackingPhase2PU140 & alpakaValidationLST & trackingLST).toModify(highPtTripletStepTrackCandidatesSerialSync,
     lstOutput = "lstProducerSerialSync",
     lstInput = "lstInputProducerSerialSync",
     lstPixelSeeds = "lstInputProducerSerialSync"
@@ -459,7 +464,18 @@
                                          highPtTripletStepTracksSerialSync, highPtTripletStepSelectorSerialSync
 )
 _HighPtTripletStepTask_LST_mkFitSerialSync = _HighPtTripletStepTask_LSTSerialSync.copy()
-_HighPtTripletStepTask_LST_mkFitSerialSync.add(highPtTripletStepTrajectorySeedsLST,highPtTripletStepTrackCandidatesMkFitSeeds, highPtTripletStepTrackCandidatesMkFit, highPtTripletStepTrackCandidatesMkFitConfig)
+highPtTripletStepSeedsPixelsWithLSTSerialSync  =  highPtTripletStepSeedsPixelsWithLST.clone()
+(trackingPhase2PU140 & alpakaValidationLST & trackingLST & seedingLST & trackingMkFitHighPtTripletStep).toModify(highPtTripletStepSeedsPixelsWithLSTSerialSync,
+    lstOutput = "lstProducerSerialSync",
+    lstInput = "lstInputProducerSerialSync",
+    lstPixelSeeds = "lstInputProducerSerialSync"
+)
+(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesSerialSync, seeds = 'highPtTripletStepSeedsPixelsWithLSTSerialSync')
+highPtTripletStepTrackCandidatesMkFitSeedsSerialSync = highPtTripletStepTrackCandidatesMkFitSeeds.clone()
+(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesMkFitSeedsSerialSync, seeds = 'highPtTripletStepSeedsPixelsWithLSTSerialSync')
+highPtTripletStepTrackCandidatesMkFitSerialSync = highPtTripletStepTrackCandidatesMkFit.clone()
+(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesMkFitSerialSync, seeds = 'highPtTripletStepTrackCandidatesMkFitSeedsSerialSync')
+_HighPtTripletStepTask_LST_mkFitSerialSync.add(highPtTripletStepSeedsPixelsWithLSTSerialSync,highPtTripletStepTrackCandidatesMkFitSeedsSerialSync, highPtTripletStepTrackCandidatesMkFitSerialSync, highPtTripletStepTrackCandidatesMkFitConfig)
 HighPtTripletStepTaskSerialSync = cms.Task()
 (trackingPhase2PU140 & alpakaValidationLST & trackingLST).toReplaceWith(HighPtTripletStepTaskSerialSync, _HighPtTripletStepTask_LSTSerialSync)
 (trackingPhase2PU140 & alpakaValidationLST & trackingLST & seedingLST & trackingMkFitHighPtTripletStep).toReplaceWith(HighPtTripletStepTaskSerialSync,_HighPtTripletStepTask_LST_mkFitSerialSync)

RecoTracker/IterativeTracking/python/iterativeTkConfig.py

@@ -112,6 +112,12 @@
 
 
 _multipleSeedProducers_trackingPhase2PU140 = {}
+from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
+from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
+from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
+from Configuration.ProcessModifiers.trackingMkFitHighPtTripletStep_cff import trackingMkFitHighPtTripletStep
+(trackingPhase2PU140 & seedingLST & trackingLST & trackingMkFitHighPtTripletStep).toModify(_multipleSeedProducers_trackingPhase2PU140, func=lambda x: x.update({"highPtTripletStep": ["PixelsOnly", "PixelsWithLST"]}))
+
 _oldStyleHasSelector = set([
     "InitialStep",
     "HighPtTripletStep",
@@ -189,8 +195,6 @@ def iterationAlgos(postfix, includeSequenceName=False):
     else:
         return [_modulePrefix(i) for i in iterations]
 
-from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
-from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
 def _seedOrTrackProducers(postfix, typ):
     ret = []
     iters = globals()["_iterations"+postfix]

Validation/RecoTrack/python/TrackValidation_cff.py

@@ -21,10 +21,10 @@
 import RecoTracker.IterativeTracking.iterativeTkUtils as _utils
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 from Configuration.ProcessModifiers.hltClusterSplitting_cff import hltClusterSplitting
-
 ####Importing phase2 modifier
 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
-
+from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
+from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
 ### First define the stuff for the standard validation sequence
 ## Track selectors
 for _eraName, _postfix, _era in _cfg.allEras():
@@ -33,11 +33,12 @@
     if _eraName in ["trackingLowPU", "trackingPhase2PU140"]: # these don't have preSplitting
         _seedProd = []
         _trackProd = []
-
     locals()["_algos"+_postfix] = ["generalTracks"] + _cfg.iterationAlgos(_postfix) + ["duplicateMerge"]
     locals()["_seedProducersPreSplitting"+_postfix] = _seedProd
     locals()["_trackProducersPreSplitting"+_postfix] = _trackProd
     locals()["_seedProducers"+_postfix] = _cfg.seedProducers(_postfix)
+    if seedingLST._isChosen():
+        locals()["_seedProducers"+_postfix] = _cfg.seedProducers(_postfix) + ["highPtTripletStepSeedsPixelsWithLST"] + ["highPtTripletStepSeedsPixelsOnly"]
     locals()["_trackProducers"+_postfix] = _cfg.trackProducers(_postfix)
 
     if _eraName != "trackingPhase2PU140":
@@ -48,6 +49,8 @@
 _removeForFastSimSeedProducers =["initialStepSeedsPreSplitting",
                                  "jetCoreRegionalStepSeeds",
                                  "jetCoreRegionalStepSeedsBarrel","jetCoreRegionalStepSeedsEndcap",
+                                 "highPtTripletStepSeedsPixelsWithLST",
+                                 "highPtTripletStepSeedsPixelsOnly",
                                  "displacedRegionalStepSeeds",
                                  "muonSeededSeedsInOut",
                                  "muonSeededSeedsOutIn"]
@@ -140,12 +143,15 @@ def _addSelectorsByOriginalAlgoMask(modules, midfix, algoParam,modDict):
         names.append(modNameNew)
         task.add(mod)
     return (names, task)
+
 def _addSeedToTrackProducers(seedProducers,modDict):
     names = []
     task = cms.Task()
     for seed in seedProducers:
         modName = ("seedTracks"+seed).replace(":", "MI")
         if modName not in modDict:
+            if modName == "seedTracksinitialStepSeeds" and seedingLST._isChosen():
+                continue
             mod = _trajectorySeedTracks.clone(src=seed)
             modDict[modName] = mod
         else:
@@ -986,6 +992,11 @@ def _uniqueFirstLayers(layerList):
                  label = [ "seedTracksjetCoreRegionalStepSeedsBarrel","seedTracksjetCoreRegionalStepSeedsEndcap" ],
                  doResolutionPlotsForLabels = [ "seedTracksjetCoreRegionalStepSeedsBarrel","seedTracksjetCoreRegionalStepSeedsEndcap" ]
       )
+    if 'highPtTripletStep' in _cfg.iterationAlgos(_postfix) :
+        _setForEra(trackValidatorSeedingTrackingOnly, _eraName, _era,
+                 label = ["seedTrackshighPtTripletStepSeedsPixelsWithLST", "highPtTripletStepSeedsPixelsOnly"],
+                doResolutionPlotsForLabels = ["seedTrackshighPtTripletStepSeedsPixelsWithLST", "highPtTripletStepSeedsPixelsOnly"]
+)
 
 for _eraName, _postfix, _era in _relevantErasAndFastSim:
     _setForEra(trackValidatorSeedingTrackingOnly, _eraName, _era, label = locals()["_seedSelectors"+_postfix])

Validation/RecoTrack/python/plotting/trackingPlots.py

@@ -1489,6 +1489,8 @@ def modules(self):
                      "mkFitSiPixelHits",
                      "mkFitEventOfHits"]),
     Iteration("highPtTripletStep",
+              seeding=["highPtTripletStepSeedsPixelsWithLST",
+                       "highPtTripletStepSeedsPixelsOnly"],
               selection=["highPtTripletStepClassifier1",
                          "highPtTripletStepClassifier2",
                          "highPtTripletStepClassifier3",