Merge pull request #16661 from makortel/fixMTVmva

Fix MultiTrackValidator MVA monitoring (81X)
cms-sw · Nov 24, 2016 · e40a23d · e40a23d
2 parents e152c5c + 18b2b56
commit e40a23d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/RecoTracker/IterativeTracking/python/iterativeTkConfig.py b/RecoTracker/IterativeTracking/python/iterativeTkConfig.py
@@ -143,9 +143,14 @@ def createEarlySequence(eraName, postfix, modDict):
         seq += modDict[it]
     return seq
 
-def iterationAlgos(postfix):
+def iterationAlgos(postfix, includeSequenceName=False):
     muonVariable = "_iterations_muonSeeded"+postfix
-    return [_modulePrefix(i) for i in globals()["_iterations"+postfix] + globals().get(muonVariable, _iterations_muonSeeded)]
+    iterations = globals()["_iterations"+postfix] + globals().get(muonVariable, _iterations_muonSeeded)
+
+    if includeSequenceName:
+        return [(_modulePrefix(i), i) for i in iterations]
+    else:
+        return [_modulePrefix(i) for i in iterations]
 
 def _seedOrTrackProducers(postfix, typ):
     ret = []

diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py
@@ -195,15 +195,23 @@ def _getSeedingLayers(seedProducers):
     locals()["_seedingLayerSets"+_postfix] = _getSeedingLayers(locals()["_seedProducers"+_postfix])
 
 # MVA selectors
-def _getMVASelectors(iterations):
+def _getMVASelectors(postfix):
     import RecoTracker.IterativeTracking.iterativeTk_cff as _iterativeTk_cff
 
     # assume naming convention that the iteration name (when first
     # letter in lower case) is the selector name
     pset = cms.untracked.PSet()
-    for iterName in iterations:
+    for iterName, seqName in _cfg.iterationAlgos(postfix, includeSequenceName=True):
         if hasattr(_iterativeTk_cff, iterName):
             mod = getattr(_iterativeTk_cff, iterName)
+            seq = getattr(_iterativeTk_cff, seqName)
+
+            # Ignore iteration if the MVA selector module is not in the sequence
+            try:
+                seq.index(mod)
+            except:
+                continue
+
             typeName = mod._TypedParameterizable__type
             classifiers = []
             if typeName == "ClassifierMerger":
@@ -215,7 +223,7 @@ def _getMVASelectors(iterations):
 
     return pset
 for _eraName, _postfix, _era in _relevantEras:
-    locals()["_mvaSelectors"+_postfix] = _getMVASelectors(_cfg.iterationAlgos(_postfix))
+    locals()["_mvaSelectors"+_postfix] = _getMVASelectors(_postfix)
 
 # Validation iterative steps
 _sequenceForEachEra(_addSelectorsByAlgo, args=["_algos"], names="_selectorsByAlgo", sequence="_tracksValidationSelectorsByAlgo", modDict=globals())