Merge remote-tracking branch 'my-cmssw/mtvBhadronPixel' into fixClust…

…erTPPreSplitting_patatrack_pr193

Validation/RecoTrack/python/PostProcessorTracker_cfi.py

@@ -270,9 +270,9 @@ def _addNoFlow(module):
 )
 
 postProcessorTrackTrackingOnly = postProcessorTrack.clone()
-postProcessorTrackTrackingOnly.subDirs.extend(["Tracking/TrackSeeding/*", "Tracking/PixelTrack/*", "Tracking/PixelTrackFromPV/*", "Tracking/PixelTrackFromPVAllTP/*"])
+postProcessorTrackTrackingOnly.subDirs.extend(["Tracking/TrackSeeding/*", "Tracking/PixelTrack/*", "Tracking/PixelTrackFromPV/*", "Tracking/PixelTrackFromPVAllTP/*", "Tracking/PixelTrackBHadron/*"])
 postProcessorTrackSummaryTrackingOnly = postProcessorTrackSummary.clone()
-postProcessorTrackSummaryTrackingOnly.subDirs.extend(["Tracking/TrackSeeding", "Tracking/PixelTrack", "Tracking/PixelTrackFromPV/*", "Tracking/PixelTrackFromPVAllTP/*"])
+postProcessorTrackSummaryTrackingOnly.subDirs.extend(["Tracking/TrackSeeding", "Tracking/PixelTrack", "Tracking/PixelTrackFromPV/*", "Tracking/PixelTrackFromPVAllTP/*", "Tracking/PixelTrackBHadron/*"])
 
 postProcessorTrackSequenceTrackingOnly = cms.Sequence(
     postProcessorTrackTrackingOnly+

Validation/RecoTrack/python/TrackValidation_cff.py

@@ -793,11 +793,20 @@ def _uniqueFirstLayers(layerList):
     doSimPlots = False,
     doSimTrackPlots = False,
 )
+trackValidatorBHadronPixelTrackingOnly = trackValidatorPixelTrackingOnly.clone(
+    dirName = "Tracking/PixelTrackBHadron/",
+    label_tp_effic = "trackingParticlesBHadron",
+    label_tp_effic_refvector = True,
+    doSimPlots = True,
+    doRecoTrackPlots = False, # Fake rate is defined wrt. all TPs, and that is already included in trackValidator
+    dodEdxPlots = False,
+)
 
 
 tracksValidationTruthPixelTrackingOnly = tracksValidationTruth.copy()
 tracksValidationTruthPixelTrackingOnly.replace(trackingParticleRecoTrackAsssociation, trackingParticlePixelTrackAsssociation)
 tracksValidationTruthPixelTrackingOnly.replace(VertexAssociatorByPositionAndTracks, PixelVertexAssociatorByPositionAndTracks)
+tracksValidationTruthPixelTrackingOnly.add(trackingParticlesBHadron)
 
 tracksPreValidationPixelTrackingOnly = cms.Task(
     tracksValidationTruthPixelTrackingOnly,
@@ -807,6 +816,7 @@ def _uniqueFirstLayers(layerList):
 tracksValidationPixelTrackingOnly = cms.Sequence(
     trackValidatorPixelTrackingOnly +
     trackValidatorFromPVPixelTrackingOnly +
+    trackValidatorFromPVAllTPPixelTrackingOnly +
     trackValidatorFromPVAllTPPixelTrackingOnly,
     tracksPreValidationPixelTrackingOnly
 )

Validation/RecoTrack/python/plotting/html.py

@@ -63,6 +63,8 @@ def _allToBTV(s):
     return s.replace("All", "BTV-like")
 def _ptCut(s):
     return s.replace("Tracks", "Tracks pT > 0.9 GeV").replace("tracks", "tracks pT > 0.9 GeV")
+def _allToPixel(s):
+    return s.replace("All", "Pixel")
 def _toPixel(s):
     return s.replace("Tracks", "Pixel tracks")
 _trackQualityNameOrder = collections.OrderedDict([
@@ -198,6 +200,7 @@ def _toPixel(s):
     ("pixel", "Pixel tracks"),
     ("pixelFromPV", _toPixel(_fromPVName)),
     ("pixelFromPVAllTP", _toPixel(_fromPVAllTPName)),
+    ("pixelbhadron", _allToPixel(_bhadronName)),
     # These are for vertices
     ("genvertex", "Gen vertices"),
     ("pixelVertices", "Pixel vertices"),
@@ -248,6 +251,7 @@ def _sectionNameLegend():
         "bhadron_btvLike": _bhadronLegend.replace("All tracks", _btvLegend),
         "pixelFromPV": _fromPVLegend,
         "pixelFromPVAllTP": _fromPVAllTPLegend,
+        "pixelbhadron": _bhadronLegend,
     }
 
 class Table:

Validation/RecoTrack/python/plotting/trackingPlots.py

@@ -1360,6 +1360,7 @@ def _appendPixelTrackingPlots(lastDirName, name):
 _appendPixelTrackingPlots("PixelTrack", "pixel")
 _appendPixelTrackingPlots("PixelTrackFromPV", "pixelFromPV")
 _appendPixelTrackingPlots("PixelTrackFromPVAllTP", "pixelFromPVAllTP")
+_appendPixelTrackingPlots("PixelTrackBHadron", "pixelbhadron")
 
 
 # MiniAOD