Merge pull request #11463 from threus/sistripdqm_plotranges_74x

updated x-axes for several SiStripDQM MEs (74x)
cms-sw · Oct 9, 2015 · 656105d · 656105d
2 parents fd2d3ec + f136639
commit 656105d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py
@@ -67,25 +67,21 @@
 SiStripMonitorTrack_cosmicTk.Mod_On        = False
 
 # Clone for CKF Tracks
-import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
 SiStripMonitorTrack_ckf = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
 SiStripMonitorTrack_ckf.TrackProducer      = 'ctfWithMaterialTracksP5'
 SiStripMonitorTrack_ckf.Mod_On             = False
 
 # Clone fir Road Search  Tracks
-#import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
 #SiStripMonitorTrack_rs = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
 #SiStripMonitorTrack_rs.TrackProducer       = 'rsWithMaterialTracksP5'
 #SiStripMonitorTrack_rs.Mod_On              = True
 
 # Clone for General Tracks (for Collision)
-import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
 SiStripMonitorTrack_gentk = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
 SiStripMonitorTrack_gentk.TrackProducer    = 'generalTracks'
 SiStripMonitorTrack_gentk.Mod_On           = False
 
 # Clone for Heavy Ion Tracks (for HI Collisions)
-import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
 SiStripMonitorTrack_hi = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
 SiStripMonitorTrack_hi.TrackProducer    = 'hiGeneralTracks'
 SiStripMonitorTrack_hi.Mod_On           = True

diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_Cosmic_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_Cosmic_cff.py
@@ -51,13 +51,12 @@
 SiStripMonitorCluster.TH1StripNoise2ApvCycle.globalswitchon=True
 SiStripMonitorCluster.TH1StripNoise3ApvCycle.globalswitchon=True
 SiStripMonitorCluster.TH1TotalNumberOfClusters.subdetswitchon = True
+SiStripMonitorCluster.TH1TotalNumberOfClusters.xmax = cms.double(1999.5)
 SiStripMonitorCluster.ClusterHisto = True
-SiStripMonitorCluster.TH1NClusStrip.Nbinsx = cms.int32(200)
-SiStripMonitorCluster.TH1NClusStrip.xmax = cms.double(3999.5)
+SiStripMonitorCluster.TH1NClusStrip.Nbinsx = cms.int32(100)
+SiStripMonitorCluster.TH1NClusStrip.xmax = cms.double(1999.5)
 SiStripMonitorCluster.TH1NClusPx.Nbinsx = cms.int32(100)
 SiStripMonitorCluster.TH1NClusPx.xmax = cms.double(999.5)
-SiStripMonitorCluster.TH1TotalNumberOfClusters.Nbinx = cms.int32(100)
-SiStripMonitorCluster.TH1TotalNumberOfClusters.xmax = cms.double(1999.5)
 
 # SiStripMonitorTrack ####
 # Clone for Cosmic Tracks
@@ -67,10 +66,10 @@
 SiStripMonitorTrack_cosmicTk.Mod_On        = False
 
 # Clone for CKF Tracks
-import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
 SiStripMonitorTrack_ckf = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone()
 SiStripMonitorTrack_ckf.TrackProducer      = 'ctfWithMaterialTracksP5'
 SiStripMonitorTrack_ckf.Mod_On             = False
+SiStripMonitorTrack_ckf.TH1nClustersOff.xmax = cms.double(1999.5)
 
 # Clone for Road Search  Tracks
 #import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
@@ -85,7 +84,6 @@
 MonitorTrackResiduals_cosmicTk.trajectoryInput     = 'cosmictrackfinderP5'
 MonitorTrackResiduals_cosmicTk.Mod_On              = False
 # Clone for CKF Tracks
-import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
 MonitorTrackResiduals_ckf = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
 MonitorTrackResiduals_ckf.trajectoryInput          = 'ctfWithMaterialTracksP5'
 MonitorTrackResiduals_ckf.Mod_On                   = False
@@ -105,7 +103,6 @@
 TrackMon_cosmicTk.doSeedParameterHistos            = True
 
 # Clone for CKF Tracks
-import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
 TrackMon_ckf = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
 TrackMon_ckf.TrackProducer                         = 'ctfWithMaterialTracksP5'
 TrackMon_ckf.AlgoName                              = 'CKFTk'
@@ -121,7 +118,6 @@
 #TrackMon_rs.doSeedParameterHistos                  = True
 
 # Clone for Beam Halo Muon Tracks
-import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi
 TrackMon_bhmuon = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone()
 TrackMon_bhmuon.TrackProducer                      = 'ctfWithMaterialTracksBeamHaloMuon'
 TrackMon_bhmuon.AlgoName                           = 'BHMuonTk'
@@ -151,7 +147,6 @@
 #TrackEffMon_rs.FolderName                          = 'Tracking/TrackParameters/TrackEfficiency'
 
 # Clone for Beam Halo  Tracks
-import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi
 TrackEffMon_bhmuon = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone()
 TrackEffMon_bhmuon.TKTrackCollection               = 'ctfWithMaterialTracksBeamHaloMuon'
 TrackEffMon_bhmuon.AlgoName                        = 'BHMuonTk'

diff --git a/DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc b/DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc
@@ -98,9 +98,9 @@ void SiStripQualityChecker::bookStatus(DQMStore* dqm_store) {
 	 it != SubDetFolderMap.end(); it++) {
       ibin++;
       std::string det = it->first;
-      DetFractionReportMap->setBinLabel(ibin,det);
-      SToNReportMap->setBinLabel(ibin,det);
-      SummaryReportMap->setBinLabel(ibin,det);
+      DetFractionReportMap->setBinLabel(ibin,it->second);
+      SToNReportMap->setBinLabel(ibin,it->second);
+      SummaryReportMap->setBinLabel(ibin,it->second);
 
       SubDetMEs local_mes;
 

diff --git a/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py b/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py
@@ -145,9 +145,9 @@
     ),
 
     TH1TotalNumberOfClusters = cms.PSet(
-        Nbinx          = cms.int32(80),
+        Nbinx          = cms.int32(100),
         xmin           = cms.double(-0.5),
-        xmax           = cms.double(15999.5),
+        xmax           = cms.double(14999.5),
         subdetswitchon = cms.bool(False)
     ),
 

diff --git a/DQM/SiStripMonitorTrack/python/SiStripMonitorTrack_cfi.py b/DQM/SiStripMonitorTrack/python/SiStripMonitorTrack_cfi.py
@@ -36,9 +36,9 @@
                              xmax  = cms.double(1999.5)
                              ),   
 
-    TH1nClustersOff = cms.PSet( Nbinx = cms.int32(200),
+    TH1nClustersOff = cms.PSet( Nbinx = cms.int32(100),
                              xmin  = cms.double(-0.5),
-                             xmax  = cms.double(3999.5)
+                             xmax  = cms.double(14999.5)
                              ),
 
     TH1ClusterCharge = cms.PSet(

diff --git a/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc b/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc
@@ -443,6 +443,7 @@ void SiStripMonitorTrack::bookSubDetMEs(DQMStore::IBooker & ibooker , std::strin
   std::string subdet_tag;
   subdet_tag = "__" + name;
   std::string completeName;
+  std::string axisName;
 
   SubDetMEs theSubDetMEs;
   theSubDetMEs.totNClustersOnTrack                  = 0;
@@ -461,12 +462,16 @@ void SiStripMonitorTrack::bookSubDetMEs(DQMStore::IBooker & ibooker , std::strin
 
   // TotalNumber of Cluster OnTrack
   completeName = "Summary_TotalNumberOfClusters_OnTrack" + subdet_tag;
+  axisName = "Number of on-track clusters in " + name;
   theSubDetMEs.nClustersOnTrack = bookME1D(ibooker , "TH1nClustersOn", completeName.c_str());
+  theSubDetMEs.nClustersOnTrack->setAxisTitle(axisName.c_str());
   theSubDetMEs.nClustersOnTrack->getTH1()->StatOverflows(kTRUE);
 
   // TotalNumber of Cluster OffTrack
   completeName = "Summary_TotalNumberOfClusters_OffTrack" + subdet_tag;
+  axisName = "Number of off-track clusters in " + name;
   theSubDetMEs.nClustersOffTrack = bookME1D(ibooker , "TH1nClustersOff", completeName.c_str());
+  theSubDetMEs.nClustersOffTrack->setAxisTitle(axisName.c_str());
   theSubDetMEs.nClustersOffTrack->getTH1()->StatOverflows(kTRUE);
 
   // Cluster StoN On Track