diff --git a/DQM/TrackingMonitor/python/MonitorTrackInnerTrackMuons_cff.py b/DQM/TrackingMonitor/python/MonitorTrackInnerTrackMuons_cff.py index 0f72de38652e1..00dba96b13d72 100644 --- a/DQM/TrackingMonitor/python/MonitorTrackInnerTrackMuons_cff.py +++ b/DQM/TrackingMonitor/python/MonitorTrackInnerTrackMuons_cff.py @@ -45,9 +45,17 @@ MonitorTrackMuonsInnerTrack.TkSizeMax = 10. MonitorTrackMuonsInnerTrack.phiErrMax = 0.001 MonitorTrackMuonsInnerTrack.etaErrMax = 0.001 -MonitorTrackMuonsInnerTrack.PVBin = 40 -MonitorTrackMuonsInnerTrack.PVMin = 0.5 -MonitorTrackMuonsInnerTrack.PVMax = 120.5 +MonitorTrackMuonsInnerTrack.PVBin = 40 +MonitorTrackMuonsInnerTrack.PVMin = -0.5 +MonitorTrackMuonsInnerTrack.PVMax = 79.5 ## it might need to be adjust if CMS asks to have lumi levelling at lower values + + +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase1Pixel.toModify(MonitorTrackMuonsInnerTrack, EtaBin=31, EtaMin=-3., EtaMax=3.) +phase2_tracker.toModify(MonitorTrackMuonsInnerTrack, EtaBin=46, EtaMin=-4.5, EtaMax=4.5) +phase2_tracker.toModify(MonitorTrackMuonsInnerTrack, PVBin=125, PVMin=-0.5, PVMax=249.5) + #MonitorTrackINNMuons = cms.Sequence(muonInnerTrack+MonitorTrackMuonsInnerTrack) MonitorTrackINNMuons = cms.Sequence(cms.ignore(muonsPt10)+muonInnerTrack+MonitorTrackMuonsInnerTrack) diff --git a/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py b/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py index 66b5467a83c68..9b83419704b0e 100644 --- a/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py +++ b/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py @@ -414,9 +414,9 @@ # Overcoming the 255 arguments limit # TrackingRegion monitoring -TrackMon.PVBin = cms.int32 ( 150 ) -TrackMon.PVMin = cms.double( 0.5) -TrackMon.PVMax = cms.double( 150.5) +TrackMon.PVBin = cms.int32 ( 40 ) +TrackMon.PVMin = cms.double( -0.5) +TrackMon.PVMax = cms.double( 79.5) ## it might need to be adjust if CMS asks to have lumi levelling at lower values TrackMon.RegionProducer = cms.InputTag("") TrackMon.RegionCandidates = cms.InputTag("") @@ -435,5 +435,8 @@ from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase1Pixel.toModify(TrackMon, EtaBin=30, EtaMin=-3, EtaMax=3) +phase1Pixel.toModify(TrackMon, EtaBin=31, EtaMin=-3., EtaMax=3.) +phase1Pixel.toModify(TrackMon, LUMIBin=300, LUMIMin=200., LUMIMax=20000.) phase2_tracker.toModify(TrackMon, EtaBin=46, EtaMin=-4.5, EtaMax=4.5) +phase2_tracker.toModify(TrackMon, PVBin=125, PVMin=-0.5, PVMax=249.5) +phase2_tracker.toModify(TrackMon, LUMIBin=700, LUMIMin=0., LUMIMax=70000.) diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc index 2e8c01b6cc35f..31ec5f7ba4c44 100644 --- a/DQM/TrackingMonitor/src/TrackAnalyzer.cc +++ b/DQM/TrackingMonitor/src/TrackAnalyzer.cc @@ -234,7 +234,7 @@ void TrackAnalyzer::bookHistosForEfficiencyFromHitPatter(DQMStore::IBooker &iboo int PVBin = conf_->getParameter ("PVBin"); float PVMin = conf_->getParameter("PVMin"); float PVMax = conf_->getParameter("PVMax"); - + int NBINS[] = { PVBin, int(GetLumi::lastBunchCrossing), LUMIBin, LUMIBin}; float MIN[] = { PVMin, 0.5, LUMIMin, LUMIMin }; @@ -251,7 +251,7 @@ void TrackAnalyzer::bookHistosForEfficiencyFromHitPatter(DQMStore::IBooker &iboo std::string name = ""; for (int i=0; i1); + logQ = (i>1); // VsLUMI mon = i; if (useInac) mon+=monQuantity::END; nbins = NBINS[i]; diff --git a/DQM/TrackingMonitor/src/TrackingMonitor.cc b/DQM/TrackingMonitor/src/TrackingMonitor.cc index 48f2d822a9cf4..1ab49b49693bb 100644 --- a/DQM/TrackingMonitor/src/TrackingMonitor.cc +++ b/DQM/TrackingMonitor/src/TrackingMonitor.cc @@ -338,7 +338,6 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, histname = "NumberOfGoodPVtxWO0VsLS_" + CategoryName; NumberOfGoodPVtxWO0VsLS = ibooker.bookProfile(histname,histname, LSBin,LSMin,LSMax,GoodPVtxMin,3.*GoodPVtxMax,""); - NumberOfGoodPVtxWO0VsLS->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfGoodPVtxWO0VsLS->setAxisTitle("#Lumi section",1); NumberOfGoodPVtxWO0VsLS->setAxisTitle("Mean number of good PV",2); @@ -356,38 +355,32 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, histname = "NumberEventsVsBX_" + CategoryName; NumberEventsOfVsBX = ibooker.book1D(histname,histname, BXBin,BXMin,BXMax); - NumberEventsOfVsBX->getTH1()->SetCanExtend(TH1::kAllAxes); NumberEventsOfVsBX->setAxisTitle("BX",1); NumberEventsOfVsBX->setAxisTitle("Number of events",2); histname = "NumberOfTracksVsBX_"+ CategoryName; NumberOfTracksVsBX = ibooker.bookProfile(histname,histname, BXBin,BXMin,BXMax, TKNoMin, TKNoMax*3.,""); - NumberOfTracksVsBX->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfTracksVsBX->setAxisTitle("BX",1); NumberOfTracksVsBX->setAxisTitle("Number of Tracks",2); histname = "NumberOfRecHitsPerTrackVsBX_" + CategoryName; NumberOfRecHitsPerTrackVsBX = ibooker.bookProfile(histname,histname, BXBin,BXMin,BXMax,0.,200.,""); - NumberOfRecHitsPerTrackVsBX->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfRecHitsPerTrackVsBX->setAxisTitle("BX",1); NumberOfRecHitsPerTrackVsBX->setAxisTitle("Mean number of Valid RecHits per track",2); histname = "NumberOfGoodPVtxVsBX_" + CategoryName; NumberOfGoodPVtxVsBX = ibooker.bookProfile(histname,histname, BXBin,BXMin,BXMax,GoodPVtxMin,3.*GoodPVtxMax,""); - NumberOfGoodPVtxVsBX->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfGoodPVtxVsBX->setAxisTitle("BX",1); NumberOfGoodPVtxVsBX->setAxisTitle("Mean number of good PV",2); histname = "NumberOfGoodPVtxWO0VsBX_" + CategoryName; NumberOfGoodPVtxWO0VsBX = ibooker.bookProfile(histname,histname, BXBin,BXMin,BXMax,GoodPVtxMin,3.*GoodPVtxMax,""); - NumberOfGoodPVtxWO0VsBX->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfGoodPVtxWO0VsBX->setAxisTitle("BX",1); NumberOfGoodPVtxWO0VsBX->setAxisTitle("Mean number of good PV",2); if (doFractionPlot_) { histname = "GoodTracksFractionVsBX_"+ CategoryName; GoodTracksFractionVsBX = ibooker.bookProfile(histname,histname, BXBin,BXMin,BXMax,0,1.1,""); - GoodTracksFractionVsBX->getTH1()->SetCanExtend(TH1::kAllAxes); GoodTracksFractionVsBX->setAxisTitle("BX",1); GoodTracksFractionVsBX->setAxisTitle("Fraction of Good Tracks",2); } @@ -407,61 +400,53 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, if ( doPlotsVsGoodPVtx_ ) { ibooker.setCurrentFolder(MEFolderName+"/PUmonitoring"); // get binning from the configuration - int GoodPVtxBin = conf->getParameter("GoodPVtxBin"); - double GoodPVtxMin = conf->getParameter("GoodPVtxMin"); - double GoodPVtxMax = conf->getParameter("GoodPVtxMax"); + int PVBin = conf->getParameter ("PVBin"); + float PVMin = conf->getParameter("PVMin"); + float PVMax = conf->getParameter("PVMax"); histname = "NumberOfTracksVsGoodPVtx"; - NumberOfTracksVsGoodPVtx = ibooker.bookProfile(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax,TKNoMin, TKNoMax*5.,""); - NumberOfTracksVsGoodPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfTracksVsGoodPVtx = ibooker.bookProfile(histname,histname,PVBin,PVMin,PVMax,TKNoMin, TKNoMax*5.,""); NumberOfTracksVsGoodPVtx->setAxisTitle("Number of PV",1); NumberOfTracksVsGoodPVtx->setAxisTitle("Mean number of Tracks per Event",2); histname = "NumberOfTracksVsPUPVtx"; - NumberOfTracksVsPUPVtx = ibooker.bookProfile(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax,0., 5000.,""); - NumberOfTracksVsPUPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfTracksVsPUPVtx = ibooker.bookProfile(histname,histname,PVBin,PVMin,PVMax,0., TKNoMax*5.,""); NumberOfTracksVsPUPVtx->setAxisTitle("Number of PU",1); NumberOfTracksVsPUPVtx->setAxisTitle("Mean number of Tracks per PUvtx",2); histname = "NumberEventsVsGoodPVtx"; - NumberEventsOfVsGoodPVtx = ibooker.book1D(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax); - NumberEventsOfVsGoodPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberEventsOfVsGoodPVtx = ibooker.book1D(histname,histname,PVBin,PVMin,PVMax); NumberEventsOfVsGoodPVtx->setAxisTitle("Number of good PV (PU)",1); NumberEventsOfVsGoodPVtx->setAxisTitle("Number of events",2); if (doFractionPlot_) { histname = "GoodTracksFractionVsGoodPVtx"; - GoodTracksFractionVsGoodPVtx = ibooker.bookProfile(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax,0., 1.1,""); - GoodTracksFractionVsGoodPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + GoodTracksFractionVsGoodPVtx = ibooker.bookProfile(histname,histname,PVBin,PVMin,PVMax,0., 1.1,""); GoodTracksFractionVsGoodPVtx->setAxisTitle("Number of good PV (PU)",1); GoodTracksFractionVsGoodPVtx->setAxisTitle("Mean fraction of good tracks",2); } histname = "NumberOfRecHitsPerTrackVsGoodPVtx"; - NumberOfRecHitsPerTrackVsGoodPVtx = ibooker.bookProfile(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax,0., 200.,""); - NumberOfRecHitsPerTrackVsGoodPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfRecHitsPerTrackVsGoodPVtx = ibooker.bookProfile(histname,histname,PVBin,PVMin,PVMax,0., 200.,""); NumberOfRecHitsPerTrackVsGoodPVtx->setAxisTitle("Number of good PV (PU)",1); NumberOfRecHitsPerTrackVsGoodPVtx->setAxisTitle("Mean number of valid rechits per Tracks",2); histname = "NumberOfPVtxVsGoodPVtx"; - NumberOfPVtxVsGoodPVtx = ibooker.bookProfile(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax,0., 3.*GoodPVtxMax,""); - NumberOfPVtxVsGoodPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfPVtxVsGoodPVtx = ibooker.bookProfile(histname,histname,PVBin,PVMin,PVMax,0., 3.*PVMax,""); NumberOfPVtxVsGoodPVtx->setAxisTitle("Number of good PV (PU)",1); NumberOfPVtxVsGoodPVtx->setAxisTitle("Mean number of vertices",2); double NClusPxMin = conf->getParameter("NClusPxMin"); double NClusPxMax = conf->getParameter("NClusPxMax"); histname = "NumberOfPixelClustersVsGoodPVtx"; - NumberOfPixelClustersVsGoodPVtx = ibooker.bookProfile(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax,NClusPxMin,3.*NClusPxMax,""); - NumberOfPixelClustersVsGoodPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfPixelClustersVsGoodPVtx = ibooker.bookProfile(histname,histname,PVBin,PVMin,PVMax,NClusPxMin,3.*NClusPxMax,""); NumberOfPixelClustersVsGoodPVtx->setAxisTitle("Number of good PV (PU)",1); NumberOfPixelClustersVsGoodPVtx->setAxisTitle("Mean number of pixel clusters",2); double NClusStrMin = conf->getParameter("NClusStrMin"); double NClusStrMax = conf->getParameter("NClusStrMax"); histname = "NumberOfStripClustersVsGoodPVtx"; - NumberOfStripClustersVsGoodPVtx = ibooker.bookProfile(histname,histname,GoodPVtxBin,GoodPVtxMin,GoodPVtxMax,NClusStrMin,3.*NClusStrMax,""); - NumberOfStripClustersVsGoodPVtx->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfStripClustersVsGoodPVtx = ibooker.bookProfile(histname,histname,PVBin,PVMin,PVMax,NClusStrMin,3.*NClusStrMax,""); NumberOfStripClustersVsGoodPVtx->setAxisTitle("Number of good PV (PU)",1); NumberOfStripClustersVsGoodPVtx->setAxisTitle("Mean number of strip clusters",2); @@ -476,42 +461,36 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, histname = "NumberEventsVsLUMI"; NumberEventsOfVsLUMI = ibooker.book1D(histname,histname,LUMIBin,LUMIMin,LUMIMax); - NumberEventsOfVsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); NumberEventsOfVsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); NumberEventsOfVsLUMI->setAxisTitle("Number of events",2); histname = "NumberOfTracksVsLUMI"; NumberOfTracksVsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,0., 2000.,""); - NumberOfTracksVsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfTracksVsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); NumberOfTracksVsLUMI->setAxisTitle("Mean number of vertices",2); if (doFractionPlot_) { histname = "GoodTracksFractionVsLUMI"; GoodTracksFractionVsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,0., 1.1,""); - GoodTracksFractionVsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); GoodTracksFractionVsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); GoodTracksFractionVsLUMI->setAxisTitle("Mean number of vertices",2); } histname = "NumberOfRecHitsPerTrackVsLUMI"; NumberOfRecHitsPerTrackVsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,0., 200.,""); - NumberOfRecHitsPerTrackVsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfRecHitsPerTrackVsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); NumberOfRecHitsPerTrackVsLUMI->setAxisTitle("Mean number of vertices",2); - double GoodPVtxMin = conf->getParameter("GoodPVtxMin"); - double GoodPVtxMax = conf->getParameter("GoodPVtxMax"); + double PVMin = conf->getParameter("PVMin"); + double PVMax = conf->getParameter("PVMax"); histname = "NumberOfGoodPVtxVsLUMI"; - NumberOfGoodPVtxVsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,GoodPVtxMin,3.*GoodPVtxMax,""); - NumberOfGoodPVtxVsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfGoodPVtxVsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,PVMin,3.*PVMax,""); NumberOfGoodPVtxVsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); NumberOfGoodPVtxVsLUMI->setAxisTitle("Mean number of vertices",2); histname = "NumberOfGoodPVtxWO0VsLUMI"; - NumberOfGoodPVtxWO0VsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,GoodPVtxMin,3.*GoodPVtxMax,""); - NumberOfGoodPVtxWO0VsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); + NumberOfGoodPVtxWO0VsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,PVMin,3.*PVMax,""); NumberOfGoodPVtxWO0VsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); NumberOfGoodPVtxWO0VsLUMI->setAxisTitle("Mean number of vertices",2); @@ -519,7 +498,6 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, double NClusPxMax = conf->getParameter("NClusPxMax"); histname = "NumberOfPixelClustersVsGoodPVtx"; NumberOfPixelClustersVsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,NClusPxMin,3.*NClusPxMax,""); - NumberOfPixelClustersVsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfPixelClustersVsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); NumberOfPixelClustersVsLUMI->setAxisTitle("Mean number of pixel clusters",2); @@ -527,7 +505,6 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, double NClusStrMax = conf->getParameter("NClusStrMax"); histname = "NumberOfStripClustersVsLUMI"; NumberOfStripClustersVsLUMI = ibooker.bookProfile(histname,histname,LUMIBin,LUMIMin,LUMIMax,NClusStrMin,3.*NClusStrMax,""); - NumberOfStripClustersVsLUMI->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfStripClustersVsLUMI->setAxisTitle("scal lumi [10e30 Hz cm^{-2}]",1); NumberOfStripClustersVsLUMI->setAxisTitle("Mean number of strip clusters",2); @@ -544,7 +521,6 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, histname = "NumberOfTracksVsBXlumi_"+ CategoryName; NumberOfTracksVsBXlumi = ibooker.bookProfile(histname,histname, BXlumiBin,BXlumiMin,BXlumiMax, TKNoMin, 3.*TKNoMax,""); - NumberOfTracksVsBXlumi->getTH1()->SetCanExtend(TH1::kAllAxes); NumberOfTracksVsBXlumi->setAxisTitle("lumi BX [10^{30}Hzcm^{-2}]",1); NumberOfTracksVsBXlumi->setAxisTitle("Mean number of Tracks",2); diff --git a/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py b/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py index 7b6bd0c7d95fa..5e17a463763df 100644 --- a/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py +++ b/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py @@ -275,7 +275,6 @@ selectedTracks.extend( ['highPurityPt1'] ) selectedTracks.extend( ['highPurityPtRange0to1'] ) selectedTracks.extend( ['highPurityPV0p1'] ) -selectedTracks.extend( ['highPurityPV0p1'] ) #selectedTracks2runSequence=cms.Sequence() #for tracks in selectedTracks :