From eb9d4b069d972a437260f9c628187dbba07ff81a Mon Sep 17 00:00:00 2001 From: Vincenzo Innocente Date: Sun, 27 Aug 2017 14:56:03 +0200 Subject: [PATCH 1/6] tune histo limits --- .../python/TrackingMonitorSeedNumber_cff.py | 5 ++ .../python/TrackingMonitor_cfi.py | 8 ++-- DQM/TrackingMonitor/src/TrackAnalyzer.cc | 17 +++---- .../src/TrackBuildingAnalyzer.cc | 23 +++++----- DQM/TrackingMonitor/src/V0Monitor.cc | 2 +- .../IterTrackingModules4seedMonitoring_cfi.py | 46 +++++++++++-------- 6 files changed, 57 insertions(+), 44 deletions(-) diff --git a/DQM/TrackingMonitor/python/TrackingMonitorSeedNumber_cff.py b/DQM/TrackingMonitor/python/TrackingMonitorSeedNumber_cff.py index 262765e9a5700..3525a3b1fea99 100644 --- a/DQM/TrackingMonitor/python/TrackingMonitorSeedNumber_cff.py +++ b/DQM/TrackingMonitor/python/TrackingMonitorSeedNumber_cff.py @@ -37,6 +37,7 @@ TrackMonStep2.TkSeedSizeBin = cms.int32(400) TrackMonStep2.TkSeedSizeMax = cms.double(100000) TrackMonStep2.TkSeedSizeMin = cms.double(0) +TrackMonStep2.TCSizeMax = cms.double(199.5) TrackMonStep2.NClusPxBin = cms.int32(100) TrackMonStep2.NClusPxMax = cms.double(20000) TrackMonStep2.ClusterLabels = cms.vstring('Pix') @@ -61,6 +62,7 @@ TrackMonStep4.TkSeedSizeBin = cms.int32(400) TrackMonStep4.TkSeedSizeMax = cms.double(200000) TrackMonStep4.TkSeedSizeMin = cms.double(0) +TrackMonStep4.TCSizeMax = cms.double(199.5) TrackMonStep4.NClusStrBin = cms.int32(500) TrackMonStep4.NClusStrMax = cms.double(100000) TrackMonStep4.ClusterLabels = cms.vstring('Tot') @@ -85,6 +87,7 @@ TrackMonStep6.TkSeedSizeBin = cms.int32(400) TrackMonStep6.TkSeedSizeMax = cms.double(100000) TrackMonStep6.TkSeedSizeMin = cms.double(0) +TrackMonStep6.TCSizeMax = cms.double(199.5) TrackMonStep6.NClusStrBin = cms.int32(500) TrackMonStep6.NClusStrMax = cms.double(100000) TrackMonStep6.ClusterLabels = cms.vstring('Strip') @@ -97,6 +100,7 @@ TrackMonStep9.TkSeedSizeBin = cms.int32(15) TrackMonStep9.TkSeedSizeMax = cms.double(14.5) TrackMonStep9.TkSeedSizeMin = cms.double(-0.5) +TrackMonStep9.TCSizeMax = cms.double(199.5) TrackMonStep9.NClusStrBin = cms.int32(500) TrackMonStep9.NClusStrMax = cms.double(100000) TrackMonStep9.ClusterLabels = cms.vstring('Strip') @@ -109,6 +113,7 @@ TrackMonStep10.TkSeedSizeBin = cms.int32(15) TrackMonStep10.TkSeedSizeMax = cms.double(14.5) TrackMonStep10.TkSeedSizeMin = cms.double(-0.5) +TrackMonStep10.TCSizeMax = cms.double(199.5) TrackMonStep10.NClusStrBin = cms.int32(500) TrackMonStep10.NClusStrMax = cms.double(100000) TrackMonStep10.ClusterLabels = cms.vstring('Strip') diff --git a/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py b/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py index e6e7d87ced0e5..dc5e01e10cc88 100644 --- a/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py +++ b/DQM/TrackingMonitor/python/TrackingMonitor_cfi.py @@ -141,13 +141,13 @@ TkSizeMin = cms.double(-0.5), # Number of seeds per Event - TkSeedSizeBin = cms.int32(150), - TkSeedSizeMax = cms.double(149.5), + TkSeedSizeBin = cms.int32(200), + TkSeedSizeMax = cms.double(999.5), TkSeedSizeMin = cms.double(-0.5), # Number of Track Cadidates per Event - TCSizeBin = cms.int32(150), - TCSizeMax = cms.double(149.5), + TCSizeBin = cms.int32(200), + TCSizeMax = cms.double(999.5), TCSizeMin = cms.double(-0.5), # num rec hits diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc index dfa47187ca7c3..9fe2a40839f06 100644 --- a/DQM/TrackingMonitor/src/TrackAnalyzer.cc +++ b/DQM/TrackingMonitor/src/TrackAnalyzer.cc @@ -649,19 +649,19 @@ void TrackAnalyzer::bookHistosForHitProperties(DQMStore::IBooker & ibooker) { stoppingSource->setAxisTitle("Number of Tracks",2); histname = "stoppingSourceVSeta_"; - stoppingSourceVSeta = ibooker.book2D(histname+CategoryName, histname+CategoryName, EtaBin, EtaMin, EtaMax, StopReasonNameSize, 0., double(StopReasonNameSize)); + stoppingSourceVSeta = ibooker.bookProfile(histname+CategoryName, histname+CategoryName, + EtaBin, EtaMin, EtaMax, 2, 0., 2.); stoppingSourceVSeta->setAxisTitle("track #eta",1); - stoppingSourceVSeta->setAxisTitle("stopping reason",2); + stoppingSourceVSeta->setAxisTitle("stopped fraction",2); histname = "stoppingSourceVSphi_"; - stoppingSourceVSphi = ibooker.book2D(histname+CategoryName, histname+CategoryName, PhiBin, PhiMin, PhiMax, StopReasonNameSize, 0., double(StopReasonNameSize)); + stoppingSourceVSphi = ibooker.bookProfile(histname+CategoryName, histname+CategoryName, + PhiBin, PhiMin, PhiMax, 2, 0., 2.); stoppingSourceVSphi->setAxisTitle("track #phi",1); - stoppingSourceVSphi->setAxisTitle("stopping reason",2); + stoppingSourceVSphi->setAxisTitle("stopped fraction",2); for (size_t ibin=0; ibinsetBinLabel(ibin+1,StopReasonName::StopReasonName[ibin],1); - stoppingSourceVSeta->setBinLabel(ibin+1,StopReasonName::StopReasonName[ibin],2); - stoppingSourceVSphi->setBinLabel(ibin+1,StopReasonName::StopReasonName[ibin],2); } } @@ -1129,9 +1129,10 @@ void TrackAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // stopping source int max = stoppingSource->getNbinsX(); double stop = track.stopReason() > max ? double(max-1) : static_cast(track.stopReason()); + double stopped = int(StopReason::NOT_STOPPED)==track.stopReason() ? 0. : 1.; stoppingSource->Fill(stop); - stoppingSourceVSeta->Fill(track.eta(),stop); - stoppingSourceVSphi->Fill(track.phi(),stop); + stoppingSourceVSeta->Fill(track.eta(),stopped); + stoppingSourceVSphi->Fill(track.phi(),stopped); } if ( doLumiAnalysis_ ) { diff --git a/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc b/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc index 388a985bc1c47..215fa0d46b3cb 100644 --- a/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc +++ b/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc @@ -230,31 +230,29 @@ void TrackBuildingAnalyzer::initHisto(DQMStore::IBooker & ibooker, const edm::Pa stoppingSource->setAxisTitle("Number of Tracks",2); histname = "StoppingSourceVSeta_"+seedProducer.label() + "_"; - stoppingSourceVSeta = ibooker.book2D(histname+CatagoryName, + stoppingSourceVSeta = ibooker.bookProfile(histname+CatagoryName, histname+CatagoryName, EtaBin, EtaMin, EtaMax, - StopReasonNameSize, - 0., double(StopReasonNameSize)); + 2, + 0., 2.); stoppingSourceVSeta->setAxisTitle("track #eta",1); - stoppingSourceVSeta->setAxisTitle("stopping reason",2); + stoppingSourceVSeta->setAxisTitle("fraction stopped",2); histname = "StoppingSourceVSphi_"+seedProducer.label() + "_"; - stoppingSourceVSphi = ibooker.book2D(histname+CatagoryName, + stoppingSourceVSphi = ibooker.bookProfile(histname+CatagoryName, histname+CatagoryName, PhiBin, PhiMin, PhiMax, - StopReasonNameSize, - 0., double(StopReasonNameSize)); + 2, + 0., 2.); stoppingSourceVSphi->setAxisTitle("track #phi",1); - stoppingSourceVSphi->setAxisTitle("stopping reason",2); + stoppingSourceVSphi->setAxisTitle("fraction stopped",2); for (size_t ibin=0; ibinsetBinLabel(ibin+1,StopReasonName::StopReasonName[ibin],1); - stoppingSourceVSeta->setBinLabel(ibin+1,StopReasonName::StopReasonName[ibin],2); - stoppingSourceVSphi->setBinLabel(ibin+1,StopReasonName::StopReasonName[ibin],2); } } @@ -475,9 +473,10 @@ void TrackBuildingAnalyzer::analyze // stopping source int max = stoppingSource->getNbinsX(); double stop = candidate.stopReason() > max ? double(max-1) : static_cast(candidate.stopReason()); + double stopped = int(StopReason::NOT_STOPPED)==candidate.stopReason() ? 0. : 1.; stoppingSource ->Fill(stop); - stoppingSourceVSeta ->Fill(eta,stop); - stoppingSourceVSphi ->Fill(phi,stop); + stoppingSourceVSeta ->Fill(eta,stopped); + stoppingSourceVSphi ->Fill(phi,stopped); } if (doTCPlots){ diff --git a/DQM/TrackingMonitor/src/V0Monitor.cc b/DQM/TrackingMonitor/src/V0Monitor.cc index 230002ca9fb38..891a5ffc28e73 100644 --- a/DQM/TrackingMonitor/src/V0Monitor.cc +++ b/DQM/TrackingMonitor/src/V0Monitor.cc @@ -136,7 +136,7 @@ void V0Monitor::bookHistograms(DQMStore::IBooker & ibooker, v0_mass_vs_pt_ = bookProfile(ibooker,"v0_mass_vs_pt", "mass vs pt", "p_{T} [GeV]","mass [GeV]",pt_binning_, mass_binning_); v0_mass_vs_eta_ = bookProfile(ibooker,"v0_mass_vs_eta","mass vs eta","#eta", "mass [GeV]",eta_binning_,mass_binning_); - MEbinning delta_binning; delta_binning.nbins = 100; delta_binning.xmin = -1.; delta_binning.xmax = 1.; + MEbinning delta_binning; delta_binning.nbins = 100; delta_binning.xmin = -0.2; delta_binning.xmax = 0.2; v0_deltaMass_ = bookHisto1D(ibooker,"v0_deltaMass", "deltaMass", "m-m_{PDG}/m_{DPG}", "events",delta_binning ); v0_deltaMass_vs_pt_ = bookProfile(ibooker,"v0_deltaMass_vs_pt", "deltaMass vs pt", "p_{T} [GeV]", "m-m_{PDG}/m_{DPG}", pt_binning_, delta_binning); v0_deltaMass_vs_eta_ = bookProfile(ibooker,"v0_deltaMass_vs_eta", "deltaMass vs eta", "#eta", "m-m_{PDG}/m_{DPG}", eta_binning_, delta_binning); diff --git a/DQM/TrackingMonitorSource/python/IterTrackingModules4seedMonitoring_cfi.py b/DQM/TrackingMonitorSource/python/IterTrackingModules4seedMonitoring_cfi.py index af29316efea91..fd5daf72fa5c0 100644 --- a/DQM/TrackingMonitorSource/python/IterTrackingModules4seedMonitoring_cfi.py +++ b/DQM/TrackingMonitorSource/python/IterTrackingModules4seedMonitoring_cfi.py @@ -6,6 +6,7 @@ trackSeedSizeBin = {} trackSeedSizeMin = {} trackSeedSizeMax = {} +TCSizeMax = {} clusterLabel = {} clusterBin = {} clusterMax = {} @@ -32,7 +33,7 @@ trackCandInputTag['lowPtQuadStep'] = cms.InputTag("lowPtQuadStepTrackCandidates") trackSeedSizeBin ['lowPtQuadStep'] = cms.int32(100) trackSeedSizeMin ['lowPtQuadStep'] = cms.double(0) -trackSeedSizeMax ['lowPtQuadStep'] = cms.double(30000) +trackSeedSizeMax ['lowPtQuadStep'] = cms.double(10000) clusterLabel ['lowPtQuadStep'] = cms.vstring('Pix') clusterBin ['lowPtQuadStep'] = cms.int32(100) clusterMax ['lowPtQuadStep'] = cms.double(20000) @@ -50,7 +51,8 @@ trackCandInputTag['pixelPairStep'] = cms.InputTag("pixelPairStepTrackCandidates") trackSeedSizeBin ['pixelPairStep'] = cms.int32(400) trackSeedSizeMin ['pixelPairStep'] = cms.double(0) -trackSeedSizeMax ['pixelPairStep'] = cms.double(100000) +trackSeedSizeMax ['pixelPairStep'] = cms.double(10000) +TCSizeMax ['pixelPairStep'] = cms.double(199.5) clusterLabel ['pixelPairStep'] = cms.vstring('Pix') clusterBin ['pixelPairStep'] = cms.int32(100) clusterMax ['pixelPairStep'] = cms.double(20000) @@ -59,7 +61,8 @@ trackCandInputTag['detachedQuadStep'] = cms.InputTag("detachedQuadStepTrackCandidates") trackSeedSizeBin ['detachedQuadStep'] = cms.int32(100) trackSeedSizeMin ['detachedQuadStep'] = cms.double(0) -trackSeedSizeMax ['detachedQuadStep'] = cms.double(30000) +trackSeedSizeMax ['detachedQuadStep'] = cms.double(10000) +TCSizeMax ['detachedQuadStep'] = cms.double(199.5) clusterLabel ['detachedQuadStep'] = cms.vstring('Pix') clusterBin ['detachedQuadStep'] = cms.int32(100) clusterMax ['detachedQuadStep'] = cms.double(20000) @@ -75,11 +78,12 @@ seedInputTag ['mixedTripletStep'] = cms.InputTag("mixedTripletStepSeeds") trackCandInputTag['mixedTripletStep'] = cms.InputTag("mixedTripletStepTrackCandidates") -trackSeedSizeBin ['mixedTripletStep'] = cms.int32(400) +trackSeedSizeBin ['mixedTripletStep'] = cms.int32(200) trackSeedSizeMin ['mixedTripletStep'] = cms.double(0) -trackSeedSizeMax ['mixedTripletStep'] = cms.double(200000) +trackSeedSizeMax ['mixedTripletStep'] = cms.double(10000) +TCSizeMax ['mixedTripletStep'] = cms.double(199.5) clusterLabel ['mixedTripletStep'] = cms.vstring('Tot') -clusterBin ['mixedTripletStep'] = cms.int32(500) +clusterBin ['mixedTripletStep'] = cms.int32(100) clusterMax ['mixedTripletStep'] = cms.double(100000) seedInputTag ['pixelLessStep'] = cms.InputTag("pixelLessStepSeeds") @@ -96,44 +100,48 @@ trackSeedSizeBin ['tobTecStep'] = cms.int32(400) trackSeedSizeMin ['tobTecStep'] = cms.double(0) trackSeedSizeMax ['tobTecStep'] = cms.double(100000) +TCSizeMax ['tobTecStep'] = cms.double(199.5) clusterLabel ['tobTecStep'] = cms.vstring('Strip') -clusterBin ['tobTecStep'] = cms.int32(500) +clusterBin ['tobTecStep'] = cms.int32(100) clusterMax ['tobTecStep'] = cms.double(100000) seedInputTag ['muonSeededStepInOut'] = cms.InputTag("muonSeededSeedsInOut") trackCandInputTag['muonSeededStepInOut'] = cms.InputTag("muonSeededTrackCandidatesInOut") -trackSeedSizeBin ['muonSeededStepInOut'] = cms.int32(15) +trackSeedSizeBin ['muonSeededStepInOut'] = cms.int32(30) trackSeedSizeMin ['muonSeededStepInOut'] = cms.double(-0.5) -trackSeedSizeMax ['muonSeededStepInOut'] = cms.double(14.5) +trackSeedSizeMax ['muonSeededStepInOut'] = cms.double(29.5) +TCSizeMax ['muonSeededStepInOut'] = cms.double(199.5) clusterLabel ['muonSeededStepInOut'] = cms.vstring('Strip') -clusterBin ['muonSeededStepInOut'] = cms.int32(500) +clusterBin ['muonSeededStepInOut'] = cms.int32(100) clusterMax ['muonSeededStepInOut'] = cms.double(100000) seedInputTag ['muonSeededStepOutIn'] = cms.InputTag("muonSeededSeedsOutIn") trackCandInputTag['muonSeededStepOutIn'] = cms.InputTag("muonSeededTrackCandidatesOutIn") -trackSeedSizeBin ['muonSeededStepOutIn'] = cms.int32(15) +trackSeedSizeBin ['muonSeededStepOutIn'] = cms.int32(30) trackSeedSizeMin ['muonSeededStepOutIn'] = cms.double(-0.5) -trackSeedSizeMax ['muonSeededStepOutIn'] = cms.double(14.5) +trackSeedSizeMax ['muonSeededStepOutIn'] = cms.double(29.5) +TCSizeMax ['muonSeededStepOutIn'] = cms.double(199.5) clusterLabel ['muonSeededStepOutIn'] = cms.vstring('Strip') -clusterBin ['muonSeededStepOutIn'] = cms.int32(500) +clusterBin ['muonSeededStepOutIn'] = cms.int32(100) clusterMax ['muonSeededStepOutIn'] = cms.double(100000) seedInputTag ['muonSeededStepOutInDisplaced'] = cms.InputTag("muonSeededSeedsOutInDisplaced") trackCandInputTag['muonSeededStepOutInDisplaced'] = cms.InputTag("muonSeededTrackCandidatesOutInDisplacedg") -trackSeedSizeBin ['muonSeededStepOutInDisplaced'] = cms.int32(15) +trackSeedSizeBin ['muonSeededStepOutInDisplaced'] = cms.int32(30) trackSeedSizeMin ['muonSeededStepOutInDisplaced'] = cms.double(-0.5) -trackSeedSizeMax ['muonSeededStepOutInDisplaced'] = cms.double(14.5) +trackSeedSizeMax ['muonSeededStepOutInDisplaced'] = cms.double(29.5) +TCSizeMax ['muonSeededStepOutInDisplaced'] = cms.double(199.5) clusterLabel ['muonSeededStepOutInDisplaced'] = cms.vstring('Strip') -clusterBin ['muonSeededStepOutInDisplaced'] = cms.int32(500) +clusterBin ['muonSeededStepOutInDisplaced'] = cms.int32(100) clusterMax ['muonSeededStepOutInDisplaced'] = cms.double(100000) seedInputTag ['jetCoreRegionalStep'] = cms.InputTag("jetCoreRegionalStepSeeds") trackCandInputTag['jetCoreRegionalStep'] = cms.InputTag("jetCoreRegionalStepTrackCandidates") -trackSeedSizeBin ['jetCoreRegionalStep'] = cms.int32(15) +trackSeedSizeBin ['jetCoreRegionalStep'] = cms.int32(100) trackSeedSizeMin ['jetCoreRegionalStep'] = cms.double(-0.5) -trackSeedSizeMax ['jetCoreRegionalStep'] = cms.double(14.5) +trackSeedSizeMax ['jetCoreRegionalStep'] = cms.double(199.5) clusterLabel ['jetCoreRegionalStep'] = cms.vstring('Tot') -clusterBin ['jetCoreRegionalStep'] = cms.int32(500) +clusterBin ['jetCoreRegionalStep'] = cms.int32(100) clusterMax ['jetCoreRegionalStep'] = cms.double(100000) for _eraName, _postfix, _era in _cfg.allEras(): From 1563916b6174ec6182c6d6a0e39c1ead519f0926 Mon Sep 17 00:00:00 2001 From: Vincenzo Innocente Date: Sun, 27 Aug 2017 14:59:40 +0200 Subject: [PATCH 2/6] tidy --- DQM/TrackingMonitor/src/TrackAnalyzer.cc | 6 ++-- .../src/TrackBuildingAnalyzer.cc | 30 +++++++++---------- DQM/TrackingMonitor/src/V0Monitor.cc | 4 +-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc index 9fe2a40839f06..7d8c24e907db4 100644 --- a/DQM/TrackingMonitor/src/TrackAnalyzer.cc +++ b/DQM/TrackingMonitor/src/TrackAnalyzer.cc @@ -972,7 +972,7 @@ void TrackAnalyzer::setNumberOfGoodVertices(const edm::Event & iEvent) { edm::Handle recoPrimaryVerticesHandle; iEvent.getByToken(pvToken_, recoPrimaryVerticesHandle); if (recoPrimaryVerticesHandle.isValid()) - if (recoPrimaryVerticesHandle->size() > 0) + if (!recoPrimaryVerticesHandle->empty()) for (auto v : *recoPrimaryVerticesHandle) if (v.ndof() >= pvNDOF_ && !v.isFake()) ++good_vertices_; @@ -988,7 +988,7 @@ void TrackAnalyzer::setLumi(const edm::Event & iEvent, const edm::EventSetup& iS edm::Handle lumiScalers; iEvent.getByToken(lumiscalersToken_, lumiScalers); - if ( lumiScalers.isValid() && lumiScalers->size() ) { + if ( lumiScalers.isValid() && !lumiScalers->empty() ) { LumiScalersCollection::const_iterator scalit = lumiScalers->begin(); scal_lumi_ = scalit->instantLumi(); } else @@ -1168,7 +1168,7 @@ void TrackAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe if(doDCAPlots_ || doPVPlots_ || doSIPPlots_ || doAllPlots_) { edm::Handle recoPrimaryVerticesHandle; iEvent.getByToken(pvToken_,recoPrimaryVerticesHandle); - if (recoPrimaryVerticesHandle.isValid() && recoPrimaryVerticesHandle->size() > 0) { + if (recoPrimaryVerticesHandle.isValid() && !recoPrimaryVerticesHandle->empty()) { const reco::Vertex& pv = (*recoPrimaryVerticesHandle)[0]; diff --git a/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc b/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc index 215fa0d46b3cb..24d7ffd8a3bf6 100644 --- a/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc +++ b/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc @@ -19,20 +19,20 @@ #include TrackBuildingAnalyzer::TrackBuildingAnalyzer(const edm::ParameterSet& iConfig) - : SeedPt(NULL) - , SeedEta(NULL) - , SeedPhi(NULL) - , SeedPhiVsEta(NULL) - , SeedTheta(NULL) - , SeedQ(NULL) - , SeedDxy(NULL) - , SeedDz(NULL) - , NumberOfRecHitsPerSeed(NULL) - , NumberOfRecHitsPerSeedVsPhiProfile(NULL) - , NumberOfRecHitsPerSeedVsEtaProfile(NULL) - , stoppingSource(NULL) - , stoppingSourceVSeta(NULL) - , stoppingSourceVSphi(NULL) + : SeedPt(nullptr) + , SeedEta(nullptr) + , SeedPhi(nullptr) + , SeedPhiVsEta(nullptr) + , SeedTheta(nullptr) + , SeedQ(nullptr) + , SeedDxy(nullptr) + , SeedDz(nullptr) + , NumberOfRecHitsPerSeed(nullptr) + , NumberOfRecHitsPerSeedVsPhiProfile(nullptr) + , NumberOfRecHitsPerSeedVsEtaProfile(nullptr) + , stoppingSource(nullptr) + , stoppingSourceVSeta(nullptr) + , stoppingSourceVSphi(nullptr) { } @@ -50,7 +50,7 @@ void TrackBuildingAnalyzer::initHisto(DQMStore::IBooker & ibooker, const edm::Pa // std::cout << "[TrackBuildingAnalyzer::beginRun] AlgoName: " << AlgoName << std::endl; // use the AlgoName and Quality Name - std::string CatagoryName = AlgoName; + const std::string& CatagoryName = AlgoName; // get binning from the configuration int TrackPtBin = iConfig.getParameter( "TrackPtBin"); diff --git a/DQM/TrackingMonitor/src/V0Monitor.cc b/DQM/TrackingMonitor/src/V0Monitor.cc index 891a5ffc28e73..75fff1c91e985 100644 --- a/DQM/TrackingMonitor/src/V0Monitor.cc +++ b/DQM/TrackingMonitor/src/V0Monitor.cc @@ -119,7 +119,7 @@ void V0Monitor::bookHistograms(DQMStore::IBooker & ibooker, std::string histname, histtitle; std::string currentFolder = folderName_ ; - ibooker.setCurrentFolder(currentFolder.c_str()); + ibooker.setCurrentFolder(currentFolder); MEbinning N_binning; N_binning.nbins = 15; N_binning.xmin = -0.5; N_binning.xmax = 14.5; v0_N_ = bookHisto1D(ibooker,"v0_N", "# v0", "# v0", "events",N_binning); @@ -187,7 +187,7 @@ void V0Monitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) float lumi = -1.; edm::Handle lumiScalers; iEvent.getByToken(lumiscalersToken_, lumiScalers); - if ( lumiScalers.isValid() && lumiScalers->size() ) { + if ( lumiScalers.isValid() && !lumiScalers->empty() ) { LumiScalersCollection::const_iterator scalit = lumiScalers->begin(); lumi = scalit->instantLumi(); } else From 3080f792412b6151d009279bbff1b898e56e72b5 Mon Sep 17 00:00:00 2001 From: Vincenzo Innocente Date: Sun, 27 Aug 2017 15:37:55 +0200 Subject: [PATCH 3/6] add fraction of candidates --- DQM/TrackingMonitor/interface/TrackingMonitor.h | 1 + DQM/TrackingMonitor/src/TrackingMonitor.cc | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/DQM/TrackingMonitor/interface/TrackingMonitor.h b/DQM/TrackingMonitor/interface/TrackingMonitor.h index 74be29249bf4c..bdb0722fc6460 100644 --- a/DQM/TrackingMonitor/interface/TrackingMonitor.h +++ b/DQM/TrackingMonitor/interface/TrackingMonitor.h @@ -127,6 +127,7 @@ class TrackingMonitor : public DQMEDAnalyzer // Track Candidates MonitorElement * NumberOfTrackCandidates; + MonitorElement * FractionCandidatesOverSeeds; // Cluster Properties std::vector NumberOfTrkVsClusters; diff --git a/DQM/TrackingMonitor/src/TrackingMonitor.cc b/DQM/TrackingMonitor/src/TrackingMonitor.cc index 5e06a42b3a126..c95b7a12a72d4 100644 --- a/DQM/TrackingMonitor/src/TrackingMonitor.cc +++ b/DQM/TrackingMonitor/src/TrackingMonitor.cc @@ -50,6 +50,7 @@ TrackingMonitor::TrackingMonitor(const edm::ParameterSet& iConfig) , NumberOfSeeds(NULL) , NumberOfSeeds_lumiFlag(NULL) , NumberOfTrackCandidates(NULL) + , FractionCandidatesOverSeeds(NULL) // , NumberOfGoodTrkVsClus(NULL) , NumberEventsOfVsLS(NULL) , NumberOfTracksVsLS(NULL) @@ -613,6 +614,12 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, NumberOfTrackCandidates = ibooker.book1D(histname, histname, TCNoBin, TCNoMin, TCNoMax); NumberOfTrackCandidates->setAxisTitle("Number of Track Candidates per Event", 1); NumberOfTrackCandidates->setAxisTitle("Number of Event", 2); + + histname = "FractionOfCandOverSeeds_"+ tcProducer.label() + "_"+ CategoryName; + FractionCandidatesOverSeeds = ibooker.book1D(histname, histname, 100, 0., 1.); + FractionCandidatesOverSeeds->setAxisTitle("Number of Track Candidates / Number of Seeds per Event", 1); + FractionCandidatesOverSeeds->setAxisTitle("Number of Event", 2); + } theTrackBuildingAnalyzer->initHisto(ibooker,*conf); @@ -855,6 +862,14 @@ void TrackingMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& i const reco::BeamSpot& bs = *recoBeamSpotHandle; NumberOfTrackCandidates->Fill(theTCCollection.size()); + + // get the seed collection + edm::Handle > seedHandle; + iEvent.getByToken(seedToken_, seedHandle ); + const edm::View& seedCollection = *seedHandle; + if (seedHandle.isValid() && !seedCollection.empty()) + FractionCandidatesOverSeeds->Fill(double(theTCCollection.size())/double(seedCollection.size())); + iSetup.get().get(builderName,theTTRHBuilder); for( TrackCandidateCollection::const_iterator cand = theTCCollection.begin(); cand != theTCCollection.end(); ++cand) { From 93a8cba9b2475dba01793b9277ad20875646caae Mon Sep 17 00:00:00 2001 From: Vincenzo Innocente Date: Sun, 27 Aug 2017 15:39:37 +0200 Subject: [PATCH 4/6] tidy --- .../interface/TrackingMonitor.h | 8 +- DQM/TrackingMonitor/src/TrackingMonitor.cc | 76 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/DQM/TrackingMonitor/interface/TrackingMonitor.h b/DQM/TrackingMonitor/interface/TrackingMonitor.h index bdb0722fc6460..0204d0d6ba68e 100644 --- a/DQM/TrackingMonitor/interface/TrackingMonitor.h +++ b/DQM/TrackingMonitor/interface/TrackingMonitor.h @@ -55,17 +55,17 @@ class TrackingMonitor : public DQMEDAnalyzer using QualityMaskCollection = std::vector; explicit TrackingMonitor(const edm::ParameterSet&); - ~TrackingMonitor(); + ~TrackingMonitor() override; virtual void beginJob(void); virtual void setMaxMinBin(std::vector & ,std::vector & ,std::vector & ,double, double, int, double, double, int); virtual void setNclus(const edm::Event&, std::vector & ); - virtual void beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& eSetup) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + void beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& eSetup) override; + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; // virtual void beginRun(const edm::Run&, const edm::EventSetup&); - virtual void endRun(const edm::Run&, const edm::EventSetup&) override; + void endRun(const edm::Run&, const edm::EventSetup&) override; private: void doProfileX(TH2 * th2, MonitorElement* me); diff --git a/DQM/TrackingMonitor/src/TrackingMonitor.cc b/DQM/TrackingMonitor/src/TrackingMonitor.cc index c95b7a12a72d4..3f42a194538d3 100644 --- a/DQM/TrackingMonitor/src/TrackingMonitor.cc +++ b/DQM/TrackingMonitor/src/TrackingMonitor.cc @@ -42,49 +42,49 @@ TrackingMonitor::TrackingMonitor(const edm::ParameterSet& iConfig) : confID_ ( iConfig.id() ) , theTrackBuildingAnalyzer( new TrackBuildingAnalyzer(iConfig) ) - , NumberOfTracks(NULL) - , NumberOfMeanRecHitsPerTrack(NULL) - , NumberOfMeanLayersPerTrack(NULL) + , NumberOfTracks(nullptr) + , NumberOfMeanRecHitsPerTrack(nullptr) + , NumberOfMeanLayersPerTrack(nullptr) // , NumberOfGoodTracks(NULL) - , FractionOfGoodTracks(NULL) - , NumberOfSeeds(NULL) - , NumberOfSeeds_lumiFlag(NULL) - , NumberOfTrackCandidates(NULL) - , FractionCandidatesOverSeeds(NULL) + , FractionOfGoodTracks(nullptr) + , NumberOfSeeds(nullptr) + , NumberOfSeeds_lumiFlag(nullptr) + , NumberOfTrackCandidates(nullptr) + , FractionCandidatesOverSeeds(nullptr) // , NumberOfGoodTrkVsClus(NULL) - , NumberEventsOfVsLS(NULL) - , NumberOfTracksVsLS(NULL) + , NumberEventsOfVsLS(nullptr) + , NumberOfTracksVsLS(nullptr) // , NumberOfGoodTracksVsLS(NULL) - , GoodTracksFractionVsLS(NULL) + , GoodTracksFractionVsLS(nullptr) // , GoodTracksNumberOfRecHitsPerTrackVsLS(NULL) // ADD by Mia for PU monitoring // vertex plots to be moved in ad hoc class - , NumberOfGoodPVtxVsLS(NULL) - , NumberOfGoodPVtxWO0VsLS(NULL) - , NumberEventsOfVsBX (NULL) - , NumberOfTracksVsBX(NULL) - , GoodTracksFractionVsBX(NULL) - , NumberOfRecHitsPerTrackVsBX(NULL) - , NumberOfGoodPVtxVsBX(NULL) - , NumberOfGoodPVtxWO0VsBX(NULL) - , NumberOfTracksVsBXlumi(NULL) - , NumberOfTracksVsGoodPVtx(NULL) - , NumberOfTracksVsPUPVtx(NULL) - , NumberEventsOfVsGoodPVtx(NULL) - , GoodTracksFractionVsGoodPVtx(NULL) - , NumberOfRecHitsPerTrackVsGoodPVtx(NULL) - , NumberOfPVtxVsGoodPVtx(NULL) - , NumberOfPixelClustersVsGoodPVtx(NULL) - , NumberOfStripClustersVsGoodPVtx(NULL) - , NumberEventsOfVsLUMI(NULL) - , NumberOfTracksVsLUMI(NULL) - , GoodTracksFractionVsLUMI(NULL) - , NumberOfRecHitsPerTrackVsLUMI(NULL) - , NumberOfGoodPVtxVsLUMI(NULL) - , NumberOfGoodPVtxWO0VsLUMI(NULL) - , NumberOfPixelClustersVsLUMI(NULL) - , NumberOfStripClustersVsLUMI(NULL) - , NumberOfTracks_lumiFlag(NULL) + , NumberOfGoodPVtxVsLS(nullptr) + , NumberOfGoodPVtxWO0VsLS(nullptr) + , NumberEventsOfVsBX (nullptr) + , NumberOfTracksVsBX(nullptr) + , GoodTracksFractionVsBX(nullptr) + , NumberOfRecHitsPerTrackVsBX(nullptr) + , NumberOfGoodPVtxVsBX(nullptr) + , NumberOfGoodPVtxWO0VsBX(nullptr) + , NumberOfTracksVsBXlumi(nullptr) + , NumberOfTracksVsGoodPVtx(nullptr) + , NumberOfTracksVsPUPVtx(nullptr) + , NumberEventsOfVsGoodPVtx(nullptr) + , GoodTracksFractionVsGoodPVtx(nullptr) + , NumberOfRecHitsPerTrackVsGoodPVtx(nullptr) + , NumberOfPVtxVsGoodPVtx(nullptr) + , NumberOfPixelClustersVsGoodPVtx(nullptr) + , NumberOfStripClustersVsGoodPVtx(nullptr) + , NumberEventsOfVsLUMI(nullptr) + , NumberOfTracksVsLUMI(nullptr) + , GoodTracksFractionVsLUMI(nullptr) + , NumberOfRecHitsPerTrackVsLUMI(nullptr) + , NumberOfGoodPVtxVsLUMI(nullptr) + , NumberOfGoodPVtxWO0VsLUMI(nullptr) + , NumberOfPixelClustersVsLUMI(nullptr) + , NumberOfStripClustersVsLUMI(nullptr) + , NumberOfTracks_lumiFlag(nullptr) // , NumberOfGoodTracks_lumiFlag(NULL) , builderName ( iConfig.getParameter("TTRHBuilder")) @@ -716,7 +716,7 @@ void TrackingMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& i float lumi = -1.; edm::Handle lumiScalers; iEvent.getByToken(lumiscalersToken_, lumiScalers); - if ( lumiScalers.isValid() && lumiScalers->size() ) { + if ( lumiScalers.isValid() && !lumiScalers->empty() ) { LumiScalersCollection::const_iterator scalit = lumiScalers->begin(); lumi = scalit->instantLumi(); } else From 22dc45ad12d8303f3b2e728c2529545ec9749afb Mon Sep 17 00:00:00 2001 From: Vincenzo Innocente Date: Sun, 27 Aug 2017 15:40:48 +0200 Subject: [PATCH 5/6] tune it for lambda as well --- DQM/TrackingMonitor/src/V0Monitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/TrackingMonitor/src/V0Monitor.cc b/DQM/TrackingMonitor/src/V0Monitor.cc index 75fff1c91e985..4d9ae199c62b8 100644 --- a/DQM/TrackingMonitor/src/V0Monitor.cc +++ b/DQM/TrackingMonitor/src/V0Monitor.cc @@ -136,7 +136,7 @@ void V0Monitor::bookHistograms(DQMStore::IBooker & ibooker, v0_mass_vs_pt_ = bookProfile(ibooker,"v0_mass_vs_pt", "mass vs pt", "p_{T} [GeV]","mass [GeV]",pt_binning_, mass_binning_); v0_mass_vs_eta_ = bookProfile(ibooker,"v0_mass_vs_eta","mass vs eta","#eta", "mass [GeV]",eta_binning_,mass_binning_); - MEbinning delta_binning; delta_binning.nbins = 100; delta_binning.xmin = -0.2; delta_binning.xmax = 0.2; + MEbinning delta_binning; delta_binning.nbins = 150; delta_binning.xmin = -0.15; delta_binning.xmax = 0.15; v0_deltaMass_ = bookHisto1D(ibooker,"v0_deltaMass", "deltaMass", "m-m_{PDG}/m_{DPG}", "events",delta_binning ); v0_deltaMass_vs_pt_ = bookProfile(ibooker,"v0_deltaMass_vs_pt", "deltaMass vs pt", "p_{T} [GeV]", "m-m_{PDG}/m_{DPG}", pt_binning_, delta_binning); v0_deltaMass_vs_eta_ = bookProfile(ibooker,"v0_deltaMass_vs_eta", "deltaMass vs eta", "#eta", "m-m_{PDG}/m_{DPG}", eta_binning_, delta_binning); From fc8bd8e9d689efc96c2ef7c8cfc1c1689dc43a9b Mon Sep 17 00:00:00 2001 From: Vincenzo Innocente Date: Sun, 27 Aug 2017 16:03:16 +0200 Subject: [PATCH 6/6] show 1 --- DQM/TrackingMonitor/src/TrackingMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/TrackingMonitor/src/TrackingMonitor.cc b/DQM/TrackingMonitor/src/TrackingMonitor.cc index 3f42a194538d3..44d4ff538eff8 100644 --- a/DQM/TrackingMonitor/src/TrackingMonitor.cc +++ b/DQM/TrackingMonitor/src/TrackingMonitor.cc @@ -616,7 +616,7 @@ void TrackingMonitor::bookHistograms(DQMStore::IBooker & ibooker, NumberOfTrackCandidates->setAxisTitle("Number of Event", 2); histname = "FractionOfCandOverSeeds_"+ tcProducer.label() + "_"+ CategoryName; - FractionCandidatesOverSeeds = ibooker.book1D(histname, histname, 100, 0., 1.); + FractionCandidatesOverSeeds = ibooker.book1D(histname, histname, 101, 0., 1.01); FractionCandidatesOverSeeds->setAxisTitle("Number of Track Candidates / Number of Seeds per Event", 1); FractionCandidatesOverSeeds->setAxisTitle("Number of Event", 2);