Merge pull request #11044 from VinInn/tkDQM76x

Vertex and tracking DQM: fix histo scales, add ngood vertex, Add valid,lost,missing inner/outer hits 2d-histos
cms-sw · Sep 16, 2015 · 9667652 · 9667652
2 parents d2db716 + dfec2ee
commit 9667652
Show file tree

Hide file tree

Showing 9 changed files with 284 additions and 140 deletions.
diff --git a/DQM/TrackingMonitor/interface/TrackAnalyzer.h b/DQM/TrackingMonitor/interface/TrackAnalyzer.h
@@ -136,6 +136,21 @@ class TrackAnalyzer
 	    , NumberOfValidRecHitsPerTrackVsEta(NULL)
 	    , NumberOfValidRecHitVsPhiVsEtaPerTrack(NULL)
 
+            , NumberOfLostRecHitsPerTrackVsPhi(NULL)
+            , NumberOfLostRecHitsPerTrackVsTheta(NULL)
+            , NumberOfLostRecHitsPerTrackVsEta(NULL)
+            , NumberOfLostRecHitVsPhiVsEtaPerTrack(NULL)
+
+            , NumberOfMIRecHitsPerTrackVsPhi(NULL)
+            , NumberOfMIRecHitsPerTrackVsTheta(NULL)
+            , NumberOfMIRecHitsPerTrackVsEta(NULL)
+            , NumberOfMIRecHitVsPhiVsEtaPerTrack(NULL)
+
+            , NumberOfMORecHitsPerTrackVsPhi(NULL)
+            , NumberOfMORecHitsPerTrackVsTheta(NULL)
+            , NumberOfMORecHitsPerTrackVsEta(NULL)
+            , NumberOfMORecHitVsPhiVsEtaPerTrack(NULL)
+
 	    , NumberOfLayersPerTrackVsPhi(NULL)
 	    , NumberOfLayersPerTrackVsTheta(NULL)
 	    , NumberOfLayersPerTrackVsEta(NULL)
@@ -183,6 +198,21 @@ class TrackAnalyzer
 	  MonitorElement* NumberOfValidRecHitsPerTrackVsEta;
 	  MonitorElement* NumberOfValidRecHitVsPhiVsEtaPerTrack;
 
+          MonitorElement* NumberOfLostRecHitsPerTrackVsPhi;
+          MonitorElement* NumberOfLostRecHitsPerTrackVsTheta;
+          MonitorElement* NumberOfLostRecHitsPerTrackVsEta;
+          MonitorElement* NumberOfLostRecHitVsPhiVsEtaPerTrack;
+
+          MonitorElement* NumberOfMIRecHitsPerTrackVsPhi;
+          MonitorElement* NumberOfMIRecHitsPerTrackVsTheta;
+          MonitorElement* NumberOfMIRecHitsPerTrackVsEta;
+          MonitorElement* NumberOfMIRecHitVsPhiVsEtaPerTrack;
+
+          MonitorElement* NumberOfMORecHitsPerTrackVsPhi;
+          MonitorElement* NumberOfMORecHitsPerTrackVsTheta;
+          MonitorElement* NumberOfMORecHitsPerTrackVsEta;
+          MonitorElement* NumberOfMORecHitVsPhiVsEtaPerTrack;
+
 	  MonitorElement* NumberOfLayersPerTrackVsPhi;
 	  MonitorElement* NumberOfLayersPerTrackVsTheta;
 	  MonitorElement* NumberOfLayersPerTrackVsEta;
@@ -202,24 +232,44 @@ class TrackAnalyzer
 	MonitorElement* NumberOfRecHitsPerTrack;
 	MonitorElement* NumberOfValidRecHitsPerTrack;
 	MonitorElement* NumberOfLostRecHitsPerTrack;
+        MonitorElement* NumberOfMIRecHitsPerTrack = nullptr;
+        MonitorElement* NumberOfMORecHitsPerTrack = nullptr;
+
 
-	MonitorElement* NumberOfRecHitsPerTrackVsPhi;
-	MonitorElement* NumberOfRecHitsPerTrackVsTheta;
-	MonitorElement* NumberOfRecHitsPerTrackVsEta;
-	MonitorElement* NumberOfRecHitVsPhiVsEtaPerTrack;
+	MonitorElement* NumberOfRecHitsPerTrackVsPhi = nullptr;
+	MonitorElement* NumberOfRecHitsPerTrackVsTheta = nullptr;
+	MonitorElement* NumberOfRecHitsPerTrackVsEta = nullptr;
+	MonitorElement* NumberOfRecHitVsPhiVsEtaPerTrack = nullptr;
 
-	MonitorElement* NumberOfValidRecHitsPerTrackVsPhi;
-	MonitorElement* NumberOfValidRecHitsPerTrackVsTheta;
-	MonitorElement* NumberOfValidRecHitsPerTrackVsEta;
-	MonitorElement* NumberOfValidRecHitVsPhiVsEtaPerTrack;
+	MonitorElement* NumberOfValidRecHitsPerTrackVsPhi = nullptr;
+	MonitorElement* NumberOfValidRecHitsPerTrackVsTheta = nullptr;
+	MonitorElement* NumberOfValidRecHitsPerTrackVsEta = nullptr;
+	MonitorElement* NumberOfValidRecHitVsPhiVsEtaPerTrack = nullptr;
+
+          MonitorElement* NumberOfLostRecHitsPerTrackVsPhi = nullptr;
+          MonitorElement* NumberOfLostRecHitsPerTrackVsTheta = nullptr;
+          MonitorElement* NumberOfLostRecHitsPerTrackVsEta = nullptr;
+          MonitorElement* NumberOfLostRecHitVsPhiVsEtaPerTrack = nullptr;
+
+          MonitorElement* NumberOfMIRecHitsPerTrackVsPhi = nullptr;
+          MonitorElement* NumberOfMIRecHitsPerTrackVsTheta = nullptr;
+          MonitorElement* NumberOfMIRecHitsPerTrackVsEta = nullptr;
+          MonitorElement* NumberOfMIRecHitVsPhiVsEtaPerTrack = nullptr;
+
+          MonitorElement* NumberOfMORecHitsPerTrackVsPhi = nullptr;
+          MonitorElement* NumberOfMORecHitsPerTrackVsTheta = nullptr;
+          MonitorElement* NumberOfMORecHitsPerTrackVsEta = nullptr;
+          MonitorElement* NumberOfMORecHitVsPhiVsEtaPerTrack = nullptr;
+
+
 
-	MonitorElement* NumberOfLayersPerTrack;
+	MonitorElement* NumberOfLayersPerTrack[4] = {nullptr,nullptr,nullptr,nullptr};
 
 	MonitorElement* NumberOfLayersPerTrackVsPhi;
 	MonitorElement* NumberOfLayersPerTrackVsTheta;
 	MonitorElement* NumberOfLayersPerTrackVsEta;
 
-	MonitorElement* NumberOfLayersVsPhiVsEtaPerTrack;
+	MonitorElement* NumberOfLayersVsPhiVsEtaPerTrack[4]= {nullptr,nullptr,nullptr,nullptr};
 
 	MonitorElement* Chi2;
 	MonitorElement* Chi2Prob;
@@ -254,7 +304,7 @@ class TrackAnalyzer
 	MonitorElement* zPointOfClosestApproach;
 	MonitorElement* zPointOfClosestApproachToPV;
 	MonitorElement* zPointOfClosestApproachVsPhi;
-	MonitorElement* algorithm;
+	MonitorElement *algorithm, *oriAlgo;
 	// TESTING MEs
 	MonitorElement* TESTDistanceOfClosestApproachToBS;
 	MonitorElement* TESTDistanceOfClosestApproachToBSVsPhi;

diff --git a/DQM/TrackingMonitor/interface/TrackingMonitor.h b/DQM/TrackingMonitor/interface/TrackingMonitor.h
@@ -128,7 +128,7 @@ class TrackingMonitor : public DQMEDAnalyzer
 	MonitorElement* NumberOfRecHitsPerTrackVsLS;
 
 	// Monitoring PU
-	MonitorElement* NumberOfTracksVsGoodPVtx;
+	MonitorElement *NumberOfTracksVsGoodPVtx, *NumberOfTracksVsPUPVtx;
 	MonitorElement* NumberOfTracksVsBXlumi;
 
 	// add in order to deal with LS transitions

diff --git a/DQM/TrackingMonitor/python/TrackerCollisionTrackingMonitor_cfi.py b/DQM/TrackingMonitor/python/TrackerCollisionTrackingMonitor_cfi.py
@@ -47,9 +47,9 @@
 TrackerCollisionTrackMon.doGoodTrackRecHitVsPhiVsEtaPerTrack = cms.bool(True)
 TrackerCollisionTrackMon.doLayersVsPhiVsEtaPerTrack          = cms.bool(True)
 TrackerCollisionTrackMon.doGoodTrackLayersVsPhiVsEtaPerTrack = cms.bool(True)
-#TrackerCollisionTrackMon.doPUmonitoring                      = cms.bool(True)
-#TrackerCollisionTrackMon.doPlotsVsBXlumi                     = cms.bool(True)
-#TrackerCollisionTrackMon.doPlotsVsGoodPVtx                   = cms.bool(True)
+TrackerCollisionTrackMon.doPUmonitoring                      = cms.bool(False)
+TrackerCollisionTrackMon.doPlotsVsBXlumi                     = cms.bool(False)
+TrackerCollisionTrackMon.doPlotsVsGoodPVtx                   = cms.bool(True)
 
 # LS analysis
 TrackerCollisionTrackMon.doLumiAnalysis       = cms.bool(True)     

diff --git a/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py b/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py
@@ -74,7 +74,7 @@
     doTrackPxPyPlots                    = cms.bool(False),
     doPUmonitoring                      = cms.bool(False),
     doPlotsVsBXlumi                     = cms.bool(False),
-    doPlotsVsGoodPVtx                   = cms.bool(False),
+    doPlotsVsGoodPVtx                   = cms.bool(True),
     doHIPlots                           = cms.bool(False),                              
     qualityString = cms.string("highPurity"),                      
     #which seed plots to do