Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated x-axes for several SiStripDQM MEs (75x) #11464

Merged
merged 1 commit into from Oct 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py
Expand Up @@ -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
Expand Down
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions DQM/SiStripMonitorClient/src/SiStripQualityChecker.cc
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py
Expand Up @@ -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)
),

Expand Down
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorTrack/python/SiStripMonitorTrack_cfi.py
Expand Up @@ -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(
Expand Down
5 changes: 5 additions & 0 deletions DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc
Expand Up @@ -444,6 +444,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;
Expand All @@ -462,12 +463,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
Expand Down