From df569b771762ab55503f2719d61bdcf359b5d269 Mon Sep 17 00:00:00 2001 From: Markus Seidel Date: Tue, 20 Jul 2021 20:23:57 +0200 Subject: [PATCH 01/27] Allow HcalPulseContainment timePhase definition as in SIM --- .../HcalPulseContainmentCorrection.h | 2 ++ .../interface/HcalPulseContainmentManager.h | 5 ++-- .../plugins/HcalPulseContainmentTest.cc | 5 +++- .../HcalAlgos/src/HcalPulseContainmentAlgo.cc | 24 ++++++++++++------- .../HcalAlgos/src/HcalPulseContainmentAlgo.h | 4 +++- .../src/HcalPulseContainmentCorrection.cc | 6 +++-- .../src/HcalPulseContainmentManager.cc | 9 +++---- .../HcalTPGAlgos/src/HcaluLUTTPGCoder.cc | 2 +- .../HcalRecAlgos/src/HcalSimpleRecAlgo.cc | 2 +- .../HcalRecAlgos/src/SimpleHBHEPhase1Algo.cc | 2 +- .../HcalRecAlgos/src/ZdcSimpleRecAlgo.cc | 2 +- 11 files changed, 41 insertions(+), 22 deletions(-) diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentCorrection.h b/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentCorrection.h index 95797dd7a311e..b134d75288f36 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentCorrection.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentCorrection.h @@ -16,11 +16,13 @@ class HcalPulseContainmentCorrection { public: HcalPulseContainmentCorrection(int num_samples, float fixedphase_ns, + bool phaseAsInSim, float max_fracerror, const HcalTimeSlew* hcalTimeSlew_delay); HcalPulseContainmentCorrection(const HcalPulseShape* shape, int num_samples, float fixedphase_ns, + bool phaseAsInSim, float max_fracerror, const HcalTimeSlew* hcalTimeSlew_delay); double getCorrection(double fc_ampl) const; diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentManager.h b/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentManager.h index 8d557a9beddfb..de1b49933fc5d 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentManager.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalPulseContainmentManager.h @@ -10,9 +10,9 @@ class HcalPulseContainmentManager { public: // for callers not calling beginRun(EventSetup) - HcalPulseContainmentManager(float max_fracerror); + HcalPulseContainmentManager(float max_fracerror, bool phaseAsInSim); // for callers calling beginRun(EventSetup) - HcalPulseContainmentManager(float max_fracerror, edm::ConsumesCollector iC); + HcalPulseContainmentManager(float max_fracerror, bool phaseAsInSim, edm::ConsumesCollector iC); double correction(const HcalDetId& detId, int toAdd, float fixedphase_ns, double fc_ampl); const HcalPulseContainmentCorrection* get(const HcalDetId& detId, int toAdd, float fixedphase_ns); @@ -38,6 +38,7 @@ class HcalPulseContainmentManager { HcalPulseShapes shapes_; float fixedphase_ns_; float max_fracerror_; + bool phaseAsInSim_; const edm::ESGetToken delayToken_; const HcalTimeSlew* hcalTimeSlew_delay_; diff --git a/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc b/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc index f019030824127..ef93a2eb3470d 100644 --- a/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc +++ b/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc @@ -48,7 +48,7 @@ void HcalPulseContainmentTest::analyze(const edm::Event& iEvent, const edm::Even float fixedphase_ns = 6.0; float max_fracerror = 0.02; std::unique_ptr manager; - manager = std::make_unique(max_fracerror); + manager = std::make_unique(max_fracerror, true); manager->setTimeSlew(hcalTimeSlew_delay_); HcalDetId hb1(HcalBarrel, 1, 1, 1); @@ -65,6 +65,9 @@ void HcalPulseContainmentTest::analyze(const edm::Event& iEvent, const edm::Even double corr4 = manager->correction(he1, 4, fixedphase_ns, fc); assert(corr4 == corr1); std::cout << corr1 << " " << corr2 << " " << corr3 << " " << corr4 << " " << std::endl; + // test 1TS correction at high energy + double corr5 = manager->correction(hb1, 1, fixedphase_ns, 100000.); + std::cout << corr5 << std::endl; } //define this as a plug-in diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc index 0fee109a3f9ca..3db4cace4b078 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc @@ -11,8 +11,10 @@ // HcalPulseContainmentAlgo::HcalPulseContainmentAlgo(int num_samples, double fixedphase_ns, + bool phaseAsInSim, const HcalTimeSlew* hcalTimeSlew_delay) : fixedphasens_(fixedphase_ns), + phaseAsInSim_(phaseAsInSim), integrator_(&(HcalPulseShapes().hbShape())), hcalTimeSlew_delay_(hcalTimeSlew_delay) { init(num_samples); @@ -21,8 +23,9 @@ HcalPulseContainmentAlgo::HcalPulseContainmentAlgo(int num_samples, HcalPulseContainmentAlgo::HcalPulseContainmentAlgo(const HcalPulseShape* shape, int num_samples, double fixedphase_ns, + bool phaseAsInSim, const HcalTimeSlew* hcalTimeSlew_delay) - : fixedphasens_(fixedphase_ns), integrator_(shape), hcalTimeSlew_delay_(hcalTimeSlew_delay) { + : fixedphasens_(fixedphase_ns), phaseAsInSim_(phaseAsInSim), integrator_(shape), hcalTimeSlew_delay_(hcalTimeSlew_delay) { init(num_samples); } @@ -48,7 +51,7 @@ void HcalPulseContainmentAlgo::init(int num_samples) { #if 0 char s[80]; sprintf (s, "%7.3f %8.5f %8.5f\n", tmin, bin0val, bin1val); - cout << s; + std::cout << s << std::endl; #endif if (bin1val > bin0val) { @@ -56,18 +59,23 @@ void HcalPulseContainmentAlgo::init(int num_samples) { break; } } - #if 0 - cout << "time0shiftns_ = " << time0shiftns_ << endl; + std::cout << "time0shiftns_ = " << time0shiftns_ << std::endl; #endif } std::pair HcalPulseContainmentAlgo::calcpair(double truefc) { double timeslew_ns = hcalTimeSlew_delay_->delay(std::max(0.0, (double)truefc), HcalTimeSlew::Medium); - double shift_ns = fixedphasens_ - time0shiftns_ + timeslew_ns; - //std::cout << "SHIFT " << fixedphasens_ << " " << time0shiftns_ << " " << timeslew_ns << std::endl; - double tmin = -shift_ns; + double tmin = 0; + if (phaseAsInSim_) { // timePhase as in hcalSimParameters, no time0shift + tmin = fixedphasens_ - timeslew_ns; + } + else { // Run 2: timePhase opposite to SIM, time0shift + double shift_ns = fixedphasens_ - time0shiftns_ + timeslew_ns; + //std::cout << "SHIFT " << fixedphasens_ << " " << time0shiftns_ << " " << timeslew_ns << std::endl; + tmin = -shift_ns; + } double tmax = tmin + integrationwindowns_; //double integral = shape_.integrate( tmin, tmax ); @@ -80,7 +88,7 @@ std::pair HcalPulseContainmentAlgo::calcpair(double truefc) { char s[80]; sprintf (s, "%8.2f %8.4f %8.4f %8.5f %8.5f %8.5f ", truefc, tmin, tmax, integral, corfactor, recofc); - cout << s; + std::cout << s << std::endl; #endif std::pair thepair(recofc, corfactor); diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h index 048d0cb6166f9..424d792ce9025 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h @@ -11,8 +11,9 @@ class HcalPulseContainmentAlgo { HcalPulseContainmentAlgo(const HcalPulseShape* shape, int num_samples, double fixedphase_ns, + bool phaseAsInSim, const HcalTimeSlew* hcalTimeSlew_delay); - HcalPulseContainmentAlgo(int num_samples, double fixedphase_ns, const HcalTimeSlew* hcalTimeSlew_delay); + HcalPulseContainmentAlgo(int num_samples, double fixedphase_ns, bool phaseAsInSim, const HcalTimeSlew* hcalTimeSlew_delay); std::pair calcpair(double); private: @@ -20,6 +21,7 @@ class HcalPulseContainmentAlgo { double fixedphasens_; double integrationwindowns_; double time0shiftns_; + bool phaseAsInSim_; HcalShapeIntegrator integrator_; const HcalTimeSlew* hcalTimeSlew_delay_; }; diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentCorrection.cc b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentCorrection.cc index 6b0882a7f15fc..8c7ec55d58cc8 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentCorrection.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentCorrection.cc @@ -16,9 +16,10 @@ // HcalPulseContainmentCorrection::HcalPulseContainmentCorrection(int num_samples, float fixedphase_ns, + bool phaseAsInSim, float max_fracerror, const HcalTimeSlew* hcalTimeSlew_delay) { - HcalPulseContainmentAlgo corFalgo(num_samples, (double)fixedphase_ns, hcalTimeSlew_delay); + HcalPulseContainmentAlgo corFalgo(num_samples, (double)fixedphase_ns, phaseAsInSim, hcalTimeSlew_delay); // Generate lookup map for the correction function, never exceeding // a maximum fractional error for lookups. @@ -37,9 +38,10 @@ HcalPulseContainmentCorrection::HcalPulseContainmentCorrection(int num_samples, HcalPulseContainmentCorrection::HcalPulseContainmentCorrection(const HcalPulseShape* shape, int num_samples, float fixedphase_ns, + bool phaseAsInSim, float max_fracerror, const HcalTimeSlew* hcalTimeSlew_delay) { - HcalPulseContainmentAlgo corFalgo(shape, num_samples, (double)fixedphase_ns, hcalTimeSlew_delay); + HcalPulseContainmentAlgo corFalgo(shape, num_samples, (double)fixedphase_ns, phaseAsInSim, hcalTimeSlew_delay); genlkupmap(1.0, 200000.0f, // generation domain max_fracerror, // maximum fractional error diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc index a3bb99bf29f92..e520ebc3a8313 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc @@ -3,15 +3,16 @@ #include "FWCore/Framework/interface/EventSetup.h" #include -HcalPulseContainmentManager::HcalPulseContainmentManager(float max_fracerror) - : entries_(), shapes_(), max_fracerror_(max_fracerror) { +HcalPulseContainmentManager::HcalPulseContainmentManager(float max_fracerror, bool phaseAsInSim) + : entries_(), shapes_(), max_fracerror_(max_fracerror), phaseAsInSim_(phaseAsInSim) { hcalTimeSlew_delay_ = nullptr; } -HcalPulseContainmentManager::HcalPulseContainmentManager(float max_fracerror, edm::ConsumesCollector iC) +HcalPulseContainmentManager::HcalPulseContainmentManager(float max_fracerror, bool phaseAsInSim, edm::ConsumesCollector iC) : entries_(), shapes_(iC), max_fracerror_(max_fracerror), + phaseAsInSim_(phaseAsInSim), delayToken_(iC.esConsumes(edm::ESInputTag("", "HBHE"))) {} void HcalPulseContainmentManager::beginRun(edm::EventSetup const& es) { @@ -75,7 +76,7 @@ const HcalPulseContainmentCorrection* HcalPulseContainmentManager::get(const Hca toAdd, fixedphase_ns, shape, - HcalPulseContainmentCorrection(shape, toAdd, fixedphase_ns, max_fracerror_, hcalTimeSlew_delay_)); + HcalPulseContainmentCorrection(shape, toAdd, fixedphase_ns, phaseAsInSim_, max_fracerror_, hcalTimeSlew_delay_)); entries_.push_back(entry); return &(entries_.back().correction_); } diff --git a/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc b/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc index d6aadc9312574..3009cc3b1d9a8 100644 --- a/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc +++ b/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc @@ -81,7 +81,7 @@ void HcaluLUTTPGCoder::init(const HcalTopology* top, const HcalTimeSlew* delay) linearLSB_QIE8_ = 1.; linearLSB_QIE11_ = 1.; linearLSB_QIE11Overlap_ = 1.; - pulseCorr_ = std::make_unique(MaximumFractionalError); + pulseCorr_ = std::make_unique(MaximumFractionalError, false); firstHBEta_ = topo_->firstHBRing(); lastHBEta_ = topo_->lastHBRing(); nHBEta_ = (lastHBEta_ - firstHBEta_ + 1); diff --git a/RecoLocalCalo/HcalRecAlgos/src/HcalSimpleRecAlgo.cc b/RecoLocalCalo/HcalRecAlgos/src/HcalSimpleRecAlgo.cc index aee1991e5ecd2..fb5748841d9b5 100644 --- a/RecoLocalCalo/HcalRecAlgos/src/HcalSimpleRecAlgo.cc +++ b/RecoLocalCalo/HcalRecAlgos/src/HcalSimpleRecAlgo.cc @@ -29,7 +29,7 @@ HcalSimpleRecAlgo::HcalSimpleRecAlgo(bool correctForTimeslew, setLeakCorrection_(false), puCorrMethod_(0) { hcalTimeSlew_delay_ = nullptr; - pulseCorr_ = std::make_unique(MaximumFractionalError, iC); + pulseCorr_ = std::make_unique(MaximumFractionalError, false, iC); } void HcalSimpleRecAlgo::beginRun(edm::EventSetup const& es) { diff --git a/RecoLocalCalo/HcalRecAlgos/src/SimpleHBHEPhase1Algo.cc b/RecoLocalCalo/HcalRecAlgos/src/SimpleHBHEPhase1Algo.cc index 0f6bc9d34f343..f2935eacad6ae 100644 --- a/RecoLocalCalo/HcalRecAlgos/src/SimpleHBHEPhase1Algo.cc +++ b/RecoLocalCalo/HcalRecAlgos/src/SimpleHBHEPhase1Algo.cc @@ -30,7 +30,7 @@ SimpleHBHEPhase1Algo::SimpleHBHEPhase1Algo(const int firstSampleShift, std::unique_ptr mahi, edm::ConsumesCollector iC) : delayToken_(iC.esConsumes(edm::ESInputTag("", "HBHE"))), - pulseCorr_(PulseContainmentFractionalError, iC), + pulseCorr_(PulseContainmentFractionalError, false, iC), firstSampleShift_(firstSampleShift), samplesToAdd_(samplesToAdd), phaseNS_(phaseNS), diff --git a/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc b/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc index 1d25ccc0bacfd..fa7144e92752b 100644 --- a/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc +++ b/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc @@ -21,7 +21,7 @@ ZdcSimpleRecAlgo::ZdcSimpleRecAlgo(int recoMethod) : recoMethod_(recoMethod), co void ZdcSimpleRecAlgo::initPulseCorr(int toadd, const HcalTimeSlew* hcalTimeSlew_delay) { if (correctForPulse_) { pulseCorr_ = - std::make_unique(toadd, phaseNS_, MaximumFractionalError, hcalTimeSlew_delay); + std::make_unique(toadd, phaseNS_, false, MaximumFractionalError, hcalTimeSlew_delay); } } //static float timeshift_ns_zdc(float wpksamp); From 6ecc037e261f20072adac5ae1f6d51f559bf087f Mon Sep 17 00:00:00 2001 From: Markus Seidel Date: Wed, 21 Jul 2021 09:10:53 +0200 Subject: [PATCH 02/27] Apply code-format/checks --- .../HcalAlgos/src/HcalPulseContainmentAlgo.cc | 10 ++++++---- .../HcalAlgos/src/HcalPulseContainmentAlgo.h | 5 ++++- .../HcalAlgos/src/HcalPulseContainmentManager.cc | 4 +++- RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc index 3db4cace4b078..1f63dac812d07 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc @@ -25,7 +25,10 @@ HcalPulseContainmentAlgo::HcalPulseContainmentAlgo(const HcalPulseShape* shape, double fixedphase_ns, bool phaseAsInSim, const HcalTimeSlew* hcalTimeSlew_delay) - : fixedphasens_(fixedphase_ns), phaseAsInSim_(phaseAsInSim), integrator_(shape), hcalTimeSlew_delay_(hcalTimeSlew_delay) { + : fixedphasens_(fixedphase_ns), + phaseAsInSim_(phaseAsInSim), + integrator_(shape), + hcalTimeSlew_delay_(hcalTimeSlew_delay) { init(num_samples); } @@ -68,10 +71,9 @@ std::pair HcalPulseContainmentAlgo::calcpair(double truefc) { double timeslew_ns = hcalTimeSlew_delay_->delay(std::max(0.0, (double)truefc), HcalTimeSlew::Medium); double tmin = 0; - if (phaseAsInSim_) { // timePhase as in hcalSimParameters, no time0shift + if (phaseAsInSim_) { // timePhase as in hcalSimParameters, no time0shift tmin = fixedphasens_ - timeslew_ns; - } - else { // Run 2: timePhase opposite to SIM, time0shift + } else { // Run 2: timePhase opposite to SIM, time0shift double shift_ns = fixedphasens_ - time0shiftns_ + timeslew_ns; //std::cout << "SHIFT " << fixedphasens_ << " " << time0shiftns_ << " " << timeslew_ns << std::endl; tmin = -shift_ns; diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h index 424d792ce9025..1ef50fde90eb4 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.h @@ -13,7 +13,10 @@ class HcalPulseContainmentAlgo { double fixedphase_ns, bool phaseAsInSim, const HcalTimeSlew* hcalTimeSlew_delay); - HcalPulseContainmentAlgo(int num_samples, double fixedphase_ns, bool phaseAsInSim, const HcalTimeSlew* hcalTimeSlew_delay); + HcalPulseContainmentAlgo(int num_samples, + double fixedphase_ns, + bool phaseAsInSim, + const HcalTimeSlew* hcalTimeSlew_delay); std::pair calcpair(double); private: diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc index e520ebc3a8313..c2cc0be6515dd 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentManager.cc @@ -8,7 +8,9 @@ HcalPulseContainmentManager::HcalPulseContainmentManager(float max_fracerror, bo hcalTimeSlew_delay_ = nullptr; } -HcalPulseContainmentManager::HcalPulseContainmentManager(float max_fracerror, bool phaseAsInSim, edm::ConsumesCollector iC) +HcalPulseContainmentManager::HcalPulseContainmentManager(float max_fracerror, + bool phaseAsInSim, + edm::ConsumesCollector iC) : entries_(), shapes_(iC), max_fracerror_(max_fracerror), diff --git a/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc b/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc index fa7144e92752b..80db86a7f8140 100644 --- a/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc +++ b/RecoLocalCalo/HcalRecAlgos/src/ZdcSimpleRecAlgo.cc @@ -20,8 +20,8 @@ ZdcSimpleRecAlgo::ZdcSimpleRecAlgo(int recoMethod) : recoMethod_(recoMethod), co void ZdcSimpleRecAlgo::initPulseCorr(int toadd, const HcalTimeSlew* hcalTimeSlew_delay) { if (correctForPulse_) { - pulseCorr_ = - std::make_unique(toadd, phaseNS_, false, MaximumFractionalError, hcalTimeSlew_delay); + pulseCorr_ = std::make_unique( + toadd, phaseNS_, false, MaximumFractionalError, hcalTimeSlew_delay); } } //static float timeshift_ns_zdc(float wpksamp); From 5a1934540263b20dd0ff3e805a65f3f8b73ee5de Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Thu, 29 Jul 2021 13:23:49 +0200 Subject: [PATCH 03/27] Bugfix: CSC neighboring chamber fill position. (RPC does not have this mistake.) --- DQM/L1TMonitor/src/L1TStage2EMTF.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc index ca12e2b7639a6..c7c511fabdeb6 100644 --- a/DQM/L1TMonitor/src/L1TStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2EMTF.cc @@ -637,7 +637,7 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { cscLCTOccupancy->Fill(cscid_n + cscid_offset, endcap * 5.5); } if (Hit->Neighbor() == true) { - cscDQMOccupancy->Fill(sector * 7 - 4, hist_index, evt_wgt); + cscDQMOccupancy->Fill( (sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); } } @@ -773,8 +773,8 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { } else { // Map neighbor chambers to "fake" CSC IDs: 1/3 --> 1, 1/6 --> 2, 1/9 --> 3, 2/3 --> 4, 2/9 --> 5, etc. //int cscid_n = (station == 1 ? (cscid / 3) : (station * 2) + ((cscid - 3) / 6) ); - cscLCTTiming[histIndexBX.at(trackHitBX)]->Fill(sector * 7 - 4, hist_index, evt_wgt); - cscTimingTot->Fill(sector * 7 - 4, hist_index, evt_wgt); + cscLCTTiming[histIndexBX.at(trackHitBX)]->Fill( (sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); + cscTimingTot->Fill( (sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); } // Fill RPC timing with matched CSC LCTs From bfee8bd1613fb9216578a344a97ce82f53b92e28 Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Thu, 29 Jul 2021 18:31:46 +0200 Subject: [PATCH 04/27] Add GEM plots to EMTF DQM sequence. --- DQM/L1TMonitor/interface/L1TStage2EMTF.h | 21 ++ DQM/L1TMonitor/src/L1TStage2EMTF.cc | 246 ++++++++++++++++++++++- 2 files changed, 266 insertions(+), 1 deletion(-) diff --git a/DQM/L1TMonitor/interface/L1TStage2EMTF.h b/DQM/L1TMonitor/interface/L1TStage2EMTF.h index fd1684723850c..c437479690a5f 100644 --- a/DQM/L1TMonitor/interface/L1TStage2EMTF.h +++ b/DQM/L1TMonitor/interface/L1TStage2EMTF.h @@ -44,6 +44,7 @@ class L1TStage2EMTF : public DQMOneEDAnalyzer<> { MonitorElement* cscLCTTiming[5]; MonitorElement* cscLCTTimingFrac[5]; MonitorElement* cscTimingTot; + MonitorElement* emtfTrackModeVsCSCBXDiff[8]; // Add mode vs BXdiff comparison Dec 07 2020 MonitorElement* emtfnTracks; MonitorElement* emtfTracknHits; @@ -84,6 +85,26 @@ class L1TStage2EMTF : public DQMOneEDAnalyzer<> { MonitorElement* rpcChamberTheta[12]; MonitorElement* rpcHitTimingInTrack; + MonitorElement* emtfTrackModeVsRPCBXDiff[6]; // Add mode vs BXdiff comparison Dec 07 2020 + + // Add GEMs Oct 27 2020 + MonitorElement* hitTypeBX; + MonitorElement* gemHitBX; + MonitorElement* gemHitOccupancy; + MonitorElement* gemHitTiming[5]; + MonitorElement* gemHitTimingFrac[5]; + MonitorElement* gemHitTimingTot; + MonitorElement* gemChamberPad[2]; + MonitorElement* gemChamberPartition[2]; + MonitorElement* emtfTrackBXVsGEMHit[3]; + MonitorElement* emtfTrackModeVsGEMBXDiff[2]; // Add mode vs BXdiff comparison Dec 07 2020 + + // GEM vs CSC Dec 06 2020 + MonitorElement* gemHitPhi[2]; + MonitorElement* gemHitTheta[2]; + MonitorElement* gemHitVScscLCTPhi[2]; + MonitorElement* gemHitVScscLCTTheta[2]; + MonitorElement* gemHitVScscLCTBX[2]; }; #endif diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc index c7c511fabdeb6..dacddee4c843e 100644 --- a/DQM/L1TMonitor/src/L1TStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2EMTF.cc @@ -118,6 +118,39 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, } rpcHitOccupancy->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing + // GEM Monitor Elements + // Add GEM Oct 27 2020 + hitTypeBX = ibooker.book2D("hitTypeBX", "Hit Type BX", 4, 0.5, 4.5, 7, -3, 4); + hitTypeBX->setBinLabel(1, "CSC", 1); + hitTypeBX->setBinLabel(2, "RPC", 1); + hitTypeBX->setBinLabel(3, "GEM", 1); + hitTypeBX->setBinLabel(4, "Tot", 1); + for (int ybin = 1; ybin < 8; ybin++ ) hitTypeBX->setBinLabel(ybin, std::to_string(ybin-4), 2); + + gemHitBX = ibooker.book2D("gemHitBX", "GEM Hit BX", 7, -3, 4, 2, 0, 2); + gemHitBX->setAxisTitle("BX", 1); + for (int xbin = 1, xbin_label = -3; xbin <= 7; ++xbin, ++xbin_label) { + gemHitBX->setBinLabel(xbin, std::to_string(xbin_label), 1); + } + gemHitBX->setBinLabel(1, "GE-1/1", 2); + gemHitBX->setBinLabel(2, "GE+1/1", 2); + + gemHitOccupancy = ibooker.book2D("gemHitOccupancy", "GEM Chamber Occupancy", 42, 1, 43, 2, 0, 2); + gemHitOccupancy->setAxisTitle("10#circ Chambers (N=neighbor)", 1); + count = 0; + for (int xbin = 1; xbin < 43; ++xbin) { + gemHitOccupancy->setBinLabel(xbin, std::to_string(xbin - count), 1); + if (xbin == 2 || xbin == 9 || xbin == 16 || xbin == 23 || xbin == 30 || xbin == 37) { + ++xbin; + ++count; + gemHitOccupancy->setBinLabel(xbin, "N", 1); + } + } + + gemHitOccupancy->setBinLabel(1, "GE-1/1", 2); + gemHitOccupancy->setBinLabel(2, "GE+1/1", 2); + gemHitOccupancy->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing + // Track Monitor Elements emtfnTracks = ibooker.book1D("emtfnTracks", "Number of EMTF Tracks per Event", 11, 0, 11); for (int xbin = 1; xbin <= 10; ++xbin) { @@ -301,6 +334,31 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, } } + // GEM Input Nov 03 2020 + ibooker.setCurrentFolder(monitorDir + "/GEMInput"); + for (int hist = 0; hist < 2; hist++) { + if (hist == 0) { + name = "GENeg11"; + label = "GE-1/1"; + } + if (hist == 1) { + name = "GEPos11"; + label = "GE+1/1"; + } + nChambs = 36; + nStrips = 192; //use nStrips for number of pads + gemChamberPad[hist] = ibooker.book2D("gemChamberPad" + name, "GEM Chamber Pad " + label, nChambs, 1, 1 + nChambs, nStrips, 0, nStrips); // pads 0-191 + gemChamberPad[hist]->setAxisTitle("Chamber, " + label, 1); + gemChamberPad[hist]->setAxisTitle("Pad", 2); + gemChamberPartition[hist] = ibooker.book2D("gemChamberPartition" + name, "GEM Chamber Partition " + label, nChambs, 1, 1 + nChambs, 9, 0, 9); // partitions 1-8 or 0-7. There have been changes in different firmware/unpacker verisions. + gemChamberPartition[hist]->setAxisTitle("Chamber, " + label, 1); + gemChamberPartition[hist]->setAxisTitle("Partition", 2); + for (int bin = 1; bin <= nChambs; ++bin) { + gemChamberPad[hist]->setBinLabel(bin, std::to_string(bin), 1); + gemChamberPartition[hist]->setBinLabel(bin, std::to_string(bin), 1); + } + } + // CSC LCT and RPC Hit Timing ibooker.setCurrentFolder(monitorDir + "/Timing"); @@ -309,6 +367,9 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, rpcHitTimingTot = ibooker.book2D("rpcHitTimingTot", "RPC Chamber Occupancy ", 42, 1, 43, 12, 0, 12); rpcHitTimingTot->setAxisTitle("Sector (N=neighbor)", 1); + + gemHitTimingTot = ibooker.book2D("gemHitTimingTot", "GEM Chamber Occupancy ", 42, 1, 43, 2, 0, 2); // Add GEM Timing Oct 27 2020 + gemHitTimingTot->setAxisTitle("10#circ Chamber (N=neighbor)", 1); const std::array nameBX{{"BXNeg1", "BXPos1", "BXNeg2", "BXPos2", "BX0"}}; const std::array labelBX{{"BX -1", "BX +1", "BX -2", "BX +2", "BX 0"}}; @@ -364,6 +425,33 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, } //if (hist == 4) continue; // Don't book for BX = 0 + // Add GEM Timing Oct 27 2020 + gemHitTiming[hist] = + ibooker.book2D("gemHitTiming" + nameBX[hist], "GEM Chamber Occupancy " + labelBX[hist], 42, 1, 43, 2, 0, 2); + gemHitTiming[hist]->setAxisTitle("10#circ Chamber", 1); + count = 0; + for (int xbin = 1; xbin < 43; ++xbin) { + gemHitTiming[hist]->setBinLabel(xbin, std::to_string(xbin - count), 1); + if (hist == 0) + gemHitTimingTot->setBinLabel(xbin, std::to_string(xbin - count), 1); //only fill once in the loop + if (xbin == 2 || xbin == 9 || xbin == 16 || xbin == 23 || xbin == 30 || xbin == 37) { + ++xbin; + ++count; + gemHitTiming[hist]->setBinLabel(xbin, "N", 1); + if (hist == 0) + gemHitTimingTot->setBinLabel(xbin, "N", 1); + } + } + + gemHitTiming[hist]->setBinLabel(1, "GE-1/1", 2); + gemHitTiming[hist]->setBinLabel(2, "GE+1/1", 2); + if (hist == 0) { + gemHitTimingTot->setBinLabel(1, "GE-1/1", 2); + gemHitTimingTot->setBinLabel(2, "GE+1/1", 2); + gemHitTimingTot->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing + } + gemHitTiming[hist]->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing + count = 0; cscLCTTimingFrac[hist] = ibooker.book2D( "cscLCTTimingFrac" + nameBX[hist], "CSC Chamber Occupancy " + labelBX[hist], 42, 1, 43, 20, 0, 20); @@ -391,6 +479,23 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, rpcHitTimingFrac[hist]->setBinLabel(bin, "RE-" + rpc_label[bin - 1], 2); rpcHitTimingFrac[hist]->setBinLabel(13 - bin, "RE+" + rpc_label[bin - 1], 2); } + + // Add GEM Timing Oct 27 2020 + gemHitTimingFrac[hist] = ibooker.book2D( + "gemHitTimingFrac" + nameBX[hist], "GEM Chamber Occupancy " + labelBX[hist], 42, 1, 43, 2, 0, 2); + gemHitTimingFrac[hist]->setAxisTitle("10#circ Chambers", 1); + count = 0; + for (int xbin = 1; xbin < 43; ++xbin) { + gemHitTimingFrac[hist]->setBinLabel(xbin, std::to_string(xbin - count), 1); + if (xbin == 2 || xbin == 9 || xbin == 16 || xbin == 23 || xbin == 30 || xbin == 37) { + ++xbin; + ++count; + gemHitTimingFrac[hist]->setBinLabel(xbin, "N", 1); + } + } + gemHitTimingFrac[hist]->setBinLabel(1, "GE-1/1", 2); + gemHitTimingFrac[hist]->setBinLabel(2, "GE+1/1", 2); + gemHitTimingFrac[hist]->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing } rpcHitTimingInTrack = @@ -436,6 +541,76 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, emtfTrackBXVsRPCHit[hist]->setBinLabel(bin, std::to_string(bin_label), 1); emtfTrackBXVsRPCHit[hist]->setBinLabel(bin, std::to_string(bin_label), 2); } + // Add GEM vs track BX Dec 05 2020 + emtfTrackBXVsGEMHit[hist] = ibooker.book2D("emtfTrackBXVsGEMHit" + nameNumStation[hist], + "EMTF " + labelNumStation[hist] + " BX vs GEM Hit BX", + 7, + -3, + 4, + 7, + -3, + 4); + emtfTrackBXVsGEMHit[hist]->setAxisTitle("Hit BX", 1); + emtfTrackBXVsGEMHit[hist]->setAxisTitle("Track BX", 2); + for (int bin = 1, bin_label = -3; bin <= 7; ++bin, ++bin_label) { + emtfTrackBXVsGEMHit[hist]->setBinLabel(bin, std::to_string(bin_label), 1); + emtfTrackBXVsGEMHit[hist]->setBinLabel(bin, std::to_string(bin_label), 2); + } + } // End loop: for (int hist = 0; hist < 3; ++hist) + + // Add mode vs BXdiff comparison Dec 07 2020 + const std::array nameGEMStation{{"GENeg11", "GEPos11"}}; + const std::array labelGEMStation{{"GE-1/1", "GE+1/1"}}; + const std::array nameCSCStation{{"MENeg4", "MENeg3", "MENeg2", "MENeg1", "MEPos1", "MEPos2", "MEPos3", "MEPos4"}}; + const std::array labelCSCStation{{"ME-4", "ME-3", "ME-2", "ME-1", "ME+1", "ME+2", "ME+3", "ME+4"}}; + const std::array nameRPCStation{{"RENeg4", "RENeg3", "RENeg2", "REPos2", "REPos3", "REPos4"}}; + const std::array labelRPCStation{{"RE-4", "RE-3", "RE-2", "RE+2", "RE+3", "RE+4"}}; + + for (int iGEM = 0; iGEM < 2; iGEM++) { + emtfTrackModeVsGEMBXDiff[iGEM] = ibooker.book2D("emtfTrackModeVsGEMBXDiff" + nameGEMStation[iGEM], + "EMTF Track Mode vs (Track BX - GEM BX) " + labelGEMStation[iGEM], + 9, -4, 5, 16, 0, 16); + emtfTrackModeVsGEMBXDiff[iGEM]->setAxisTitle("Track BX - GEM BX", 1); + emtfTrackModeVsGEMBXDiff[iGEM]->setAxisTitle("Track Mode", 2); + } + for (int iCSC = 0; iCSC < 8; iCSC++) { + emtfTrackModeVsCSCBXDiff[iCSC] = ibooker.book2D("emtfTrackModeVsCSCBXDiff" + nameCSCStation[iCSC], + "EMTF Track Mode vs (Track BX - LCT BX) " + labelCSCStation[iCSC], + 9, -4, 5, 16, 0, 16); + emtfTrackModeVsCSCBXDiff[iCSC]->setAxisTitle("Track BX - LCT BX", 1); + emtfTrackModeVsCSCBXDiff[iCSC]->setAxisTitle("Track Mode", 2); + } + for (int iRPC = 0; iRPC < 6; iRPC++) { + emtfTrackModeVsRPCBXDiff[iRPC] = ibooker.book2D("emtfTrackModeVsRPCBXDiff" + nameRPCStation[iRPC], + "EMTF Track Mode vs (Track BX - RPC BX) " + labelRPCStation[iRPC], + 9, -4, 5, 16, 0, 16); + emtfTrackModeVsRPCBXDiff[iRPC]->setAxisTitle("Track BX - RPC BX", 1); + emtfTrackModeVsRPCBXDiff[iRPC]->setAxisTitle("Track Mode", 2); + } + + // GEM vs CSC Dec 06 2020 + ibooker.setCurrentFolder(monitorDir + "/GEMVsCSC"); + for (int hist = 0; hist < 2; hist++){ + gemHitPhi[hist] = ibooker.book2D("gemHitPhi" + nameGEMStation[hist], "GEM Hit Phi " + labelGEMStation[hist], 4921, 0, 4921, 6, 1, 7); + gemHitTheta[hist] = ibooker.book2D("gemHitTheta" + nameGEMStation[hist], "GEM Hit Theta " + labelGEMStation[hist], 128, 0, 128, 6, 1, 7); + gemHitVScscLCTPhi[hist] = ibooker.book2D("gemHitVScscLCTPhi" + nameGEMStation[hist], "GEM Hit Phi - CSC LCT Phi " + labelGEMStation[hist], + 1200, -600, 600, 36, 1, 37); // one chamber is 10 degrees, 60 integer phi per degree + gemHitVScscLCTTheta[hist] = ibooker.book2D("gemHitVScscLCTTheta" + nameGEMStation[hist], "GEM Hit Theta - CSC LCT Theta " + labelGEMStation[hist], + 20, -10, 10, 36, 1, 37); // 0.1 eta is at most 9.5 integer theta (between eta 1.5 and 1.6) + gemHitVScscLCTBX[hist] = ibooker.book2D("gemHitVScscLCTBX" + nameGEMStation[hist], "GEM Hit BX - CSC LCT BX " + labelGEMStation[hist], + 9, -4, 5, 36, 1, 37); + + gemHitPhi[hist]->setAxisTitle("Integer #phi", 1); + gemHitTheta[hist]->setAxisTitle("Integer #theta", 1); + gemHitVScscLCTPhi[hist]->setAxisTitle("Integer #phi", 1); + gemHitVScscLCTTheta[hist]->setAxisTitle("Integer #theta", 1); + gemHitVScscLCTBX[hist]->setAxisTitle("GEM BX - CSC BX", 1); + + gemHitPhi[hist]->setAxisTitle("Sector", 2); + gemHitTheta[hist]->setAxisTitle("Sector", 2); + gemHitVScscLCTPhi[hist]->setAxisTitle("Chamber", 2); + gemHitVScscLCTTheta[hist]->setAxisTitle("Chamber", 2); + gemHitVScscLCTBX[hist]->setAxisTitle("Chamber", 2); } // Muon Cand @@ -659,7 +834,28 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { rpcHitOccupancy->Fill((Hit->Sector_RPC() - 1) * 7 + 7, hist_index + 0.5); } } - } + + // Add GEM Oct 27 2020 + hitTypeBX->Fill(4, Hit->BX()); + if (Hit->Is_CSC() == true) hitTypeBX->Fill(1, Hit->BX()); + else if (Hit->Is_RPC() == true) hitTypeBX->Fill(2, Hit->BX()); + else if (Hit->Is_GEM() == true) hitTypeBX->Fill(3, Hit->BX()); + + if (Hit->Is_GEM() == true) { + gemHitBX->Fill(Hit->BX(), (endcap > 0) ? 1.5 : 0.5); + hist_index = (endcap > 0) ? 1 : 0; + if (Hit->Neighbor() == false) { + gemChamberPad[hist_index]->Fill(chamber, Hit->Pad()); + gemChamberPartition[hist_index]->Fill(chamber, Hit->Partition()); + gemHitOccupancy->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); // follow CSC convention + } + else { + gemChamberPad[hist_index]->Fill( (Hit->Sector()%6)*6+2 , Hit->Pad()); + gemChamberPartition[hist_index]->Fill( (Hit->Sector()%6)*6+2, Hit->Partition()); + gemHitOccupancy->Fill( (Hit->Sector()%6+1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); // follow CSC convention + } + } // End of if (Hit->Is_GEM() == true) + } // End of for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) // Tracks edm::Handle TrackCollection; @@ -725,8 +921,16 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { for (const auto& iTrkHit : Track->Hits()) { if (iTrkHit.Is_CSC() == true) { emtfTrackBXVsCSCLCT[hist_index2]->Fill(iTrkHit.BX(), Track->BX()); + int iCSC = (endcap > 0) ? (iTrkHit.Station() + 3) : (4 - iTrkHit.Station()); + emtfTrackModeVsCSCBXDiff[iCSC]->Fill( Track->BX() - iTrkHit.BX(), mode); // Add mode vs BXdiff comparison Dec 07 2020 } else if (iTrkHit.Is_RPC() == true) { emtfTrackBXVsRPCHit[hist_index2]->Fill(iTrkHit.BX(), Track->BX()); + int iRPC = (endcap > 0) ? (iTrkHit.Station() + 2) : (4 - iTrkHit.Station()); + emtfTrackModeVsRPCBXDiff[iRPC]->Fill( Track->BX() - iTrkHit.BX(), mode); // Add mode vs BXdiff comparison Dec 07 2020 + } else if (iTrkHit.Is_GEM() == true) { + emtfTrackBXVsGEMHit[hist_index2]->Fill(iTrkHit.BX(), Track->BX()); + int iGEM = (endcap > 0) ? 1 : 0; + emtfTrackModeVsGEMBXDiff[iGEM]->Fill( Track->BX() - iTrkHit.BX(), mode); // Add mode vs BXdiff comparison Dec 07 2020 } } @@ -799,6 +1003,35 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { hist_index + 0.5); } // End loop: for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) } // End conditional: if (trackHitBX == 0 && ring == 2) + + // Fill GEM timing with matched CSC LCTs + if (trackHitBX == 0 && station == 1 && ring == 1) { // GEM only in station 1 + for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) { + if (Hit->Is_GEM() == false) + continue; + if (std::abs(Track->Eta() - Hit->Eta()) > 0.1) + continue; + if (Hit->Endcap() != endcap || Hit->Station() != station || Hit->Chamber() != chamber || Hit->Neighbor() != neighbor) //different neighbor requirement from RPC + continue; + if (std::abs(Hit->BX()) > 2) + continue; + + if (neighbor == false) { + gemHitTiming[histIndexBX.at(Hit->BX())]->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); + int ihist = (endcap > 0)? 1 : 0; + gemHitPhi[ihist]->Fill(Hit->Phi_fp(), sector); + gemHitTheta[ihist]->Fill(Hit->Theta_fp(), sector); + gemHitVScscLCTPhi[ihist]->Fill( Hit->Phi_fp() - TrkHit.Phi_fp(), chamber); // GEM vs CSC Dec 06 2020 + gemHitVScscLCTTheta[ihist]->Fill( Hit->Theta_fp() - TrkHit.Theta_fp(), chamber); + gemHitVScscLCTBX[ihist]->Fill( Hit->BX() - TrkHit.BX(), chamber); + } else { + gemHitTiming[histIndexBX.at(Hit->BX())]->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + } + + } // End loop: for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) + } // End conditional: if (trackHitBX == 0 && station == 1 && ring == 1) } // End conditional: if (TrkHit.Is_CSC() == true) // Maps RPC station and ring to monitor element index @@ -822,6 +1055,16 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { hist_index = 11 - hist_index; rpcHitTiming[histIndexBX.at(trackHitBX)]->Fill((TrkHit.Sector_RPC() - 1) * 7, hist_index + 0.5); } + // Add GEM Timing Oct 27 2020 + if (TrkHit.Is_GEM() == true) { + if (neighbor == false) { + gemHitTiming[histIndexBX.at(trackHitBX)]->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); + } else { + gemHitTiming[histIndexBX.at(trackHitBX)]->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + } + } // End condition: if (TrkHit.Is_GEM() == true) } // End loop: for (int iHit = 0; iHit < numHits; ++iHit) } ////////////////////////////////////////////////// @@ -834,6 +1077,7 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { for (int hist_index = 0; hist_index < 5; ++hist_index) { cscLCTTimingFrac[hist_index]->getTH2F()->Divide(cscLCTTiming[hist_index]->getTH2F(), cscTimingTot->getTH2F()); rpcHitTimingFrac[hist_index]->getTH2F()->Divide(rpcHitTiming[hist_index]->getTH2F(), rpcHitTimingTot->getTH2F()); + gemHitTimingFrac[hist_index]->getTH2F()->Divide(gemHitTiming[hist_index]->getTH2F(), gemHitTimingTot->getTH2F()); } // Regional Muon Candidates From d8f8c994c5ae00120ee141edbe7f4f4941d29848 Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Fri, 30 Jul 2021 13:11:14 +0200 Subject: [PATCH 05/27] Fix neighboring chamber fill position for GEM timing plots. --- DQM/L1TMonitor/src/L1TStage2EMTF.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc index dacddee4c843e..a5d221e778844 100644 --- a/DQM/L1TMonitor/src/L1TStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2EMTF.cc @@ -1026,8 +1026,8 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { gemHitVScscLCTTheta[ihist]->Fill( Hit->Theta_fp() - TrkHit.Theta_fp(), chamber); gemHitVScscLCTBX[ihist]->Fill( Hit->BX() - TrkHit.BX(), chamber); } else { - gemHitTiming[histIndexBX.at(Hit->BX())]->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); - gemHitTimingTot->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTiming[histIndexBX.at(Hit->BX())]->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); } } // End loop: for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) @@ -1061,8 +1061,8 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { gemHitTiming[histIndexBX.at(trackHitBX)]->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); gemHitTimingTot->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); } else { - gemHitTiming[histIndexBX.at(trackHitBX)]->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); - gemHitTimingTot->Fill(sector * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTiming[histIndexBX.at(trackHitBX)]->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); } } // End condition: if (TrkHit.Is_GEM() == true) } // End loop: for (int iHit = 0; iHit < numHits; ++iHit) From d97e22308825a5752545c3d53f636ec49d033750 Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Fri, 30 Jul 2021 13:12:18 +0200 Subject: [PATCH 06/27] Updates with code format check. --- DQM/L1TMonitor/interface/L1TStage2EMTF.h | 8 +- DQM/L1TMonitor/src/L1TStage2EMTF.cc | 173 +++++++++++++++-------- 2 files changed, 117 insertions(+), 64 deletions(-) diff --git a/DQM/L1TMonitor/interface/L1TStage2EMTF.h b/DQM/L1TMonitor/interface/L1TStage2EMTF.h index c437479690a5f..0eb52b7854b19 100644 --- a/DQM/L1TMonitor/interface/L1TStage2EMTF.h +++ b/DQM/L1TMonitor/interface/L1TStage2EMTF.h @@ -44,7 +44,7 @@ class L1TStage2EMTF : public DQMOneEDAnalyzer<> { MonitorElement* cscLCTTiming[5]; MonitorElement* cscLCTTimingFrac[5]; MonitorElement* cscTimingTot; - MonitorElement* emtfTrackModeVsCSCBXDiff[8]; // Add mode vs BXdiff comparison Dec 07 2020 + MonitorElement* emtfTrackModeVsCSCBXDiff[8]; // Add mode vs BXdiff comparison Dec 07 2020 MonitorElement* emtfnTracks; MonitorElement* emtfTracknHits; @@ -85,7 +85,7 @@ class L1TStage2EMTF : public DQMOneEDAnalyzer<> { MonitorElement* rpcChamberTheta[12]; MonitorElement* rpcHitTimingInTrack; - MonitorElement* emtfTrackModeVsRPCBXDiff[6]; // Add mode vs BXdiff comparison Dec 07 2020 + MonitorElement* emtfTrackModeVsRPCBXDiff[6]; // Add mode vs BXdiff comparison Dec 07 2020 // Add GEMs Oct 27 2020 MonitorElement* hitTypeBX; @@ -97,9 +97,9 @@ class L1TStage2EMTF : public DQMOneEDAnalyzer<> { MonitorElement* gemChamberPad[2]; MonitorElement* gemChamberPartition[2]; MonitorElement* emtfTrackBXVsGEMHit[3]; - MonitorElement* emtfTrackModeVsGEMBXDiff[2]; // Add mode vs BXdiff comparison Dec 07 2020 + MonitorElement* emtfTrackModeVsGEMBXDiff[2]; // Add mode vs BXdiff comparison Dec 07 2020 - // GEM vs CSC Dec 06 2020 + // GEM vs CSC Dec 06 2020 MonitorElement* gemHitPhi[2]; MonitorElement* gemHitTheta[2]; MonitorElement* gemHitVScscLCTPhi[2]; diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc index a5d221e778844..9a8901987f7f2 100644 --- a/DQM/L1TMonitor/src/L1TStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2EMTF.cc @@ -118,14 +118,15 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, } rpcHitOccupancy->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing - // GEM Monitor Elements + // GEM Monitor Elements // Add GEM Oct 27 2020 hitTypeBX = ibooker.book2D("hitTypeBX", "Hit Type BX", 4, 0.5, 4.5, 7, -3, 4); hitTypeBX->setBinLabel(1, "CSC", 1); hitTypeBX->setBinLabel(2, "RPC", 1); hitTypeBX->setBinLabel(3, "GEM", 1); hitTypeBX->setBinLabel(4, "Tot", 1); - for (int ybin = 1; ybin < 8; ybin++ ) hitTypeBX->setBinLabel(ybin, std::to_string(ybin-4), 2); + for (int ybin = 1; ybin < 8; ybin++) + hitTypeBX->setBinLabel(ybin, std::to_string(ybin - 4), 2); gemHitBX = ibooker.book2D("gemHitBX", "GEM Hit BX", 7, -3, 4, 2, 0, 2); gemHitBX->setAxisTitle("BX", 1); @@ -149,7 +150,7 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, gemHitOccupancy->setBinLabel(1, "GE-1/1", 2); gemHitOccupancy->setBinLabel(2, "GE+1/1", 2); - gemHitOccupancy->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing + gemHitOccupancy->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing // Track Monitor Elements emtfnTracks = ibooker.book1D("emtfnTracks", "Number of EMTF Tracks per Event", 11, 0, 11); @@ -346,11 +347,20 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, label = "GE+1/1"; } nChambs = 36; - nStrips = 192; //use nStrips for number of pads - gemChamberPad[hist] = ibooker.book2D("gemChamberPad" + name, "GEM Chamber Pad " + label, nChambs, 1, 1 + nChambs, nStrips, 0, nStrips); // pads 0-191 + nStrips = 192; //use nStrips for number of pads + gemChamberPad[hist] = ibooker.book2D( + "gemChamberPad" + name, "GEM Chamber Pad " + label, nChambs, 1, 1 + nChambs, nStrips, 0, nStrips); // pads 0-191 gemChamberPad[hist]->setAxisTitle("Chamber, " + label, 1); gemChamberPad[hist]->setAxisTitle("Pad", 2); - gemChamberPartition[hist] = ibooker.book2D("gemChamberPartition" + name, "GEM Chamber Partition " + label, nChambs, 1, 1 + nChambs, 9, 0, 9); // partitions 1-8 or 0-7. There have been changes in different firmware/unpacker verisions. + gemChamberPartition[hist] = + ibooker.book2D("gemChamberPartition" + name, + "GEM Chamber Partition " + label, + nChambs, + 1, + 1 + nChambs, + 9, + 0, + 9); // partitions 1-8 or 0-7. There have been changes in different firmware/unpacker verisions. gemChamberPartition[hist]->setAxisTitle("Chamber, " + label, 1); gemChamberPartition[hist]->setAxisTitle("Partition", 2); for (int bin = 1; bin <= nChambs; ++bin) { @@ -368,7 +378,8 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, rpcHitTimingTot = ibooker.book2D("rpcHitTimingTot", "RPC Chamber Occupancy ", 42, 1, 43, 12, 0, 12); rpcHitTimingTot->setAxisTitle("Sector (N=neighbor)", 1); - gemHitTimingTot = ibooker.book2D("gemHitTimingTot", "GEM Chamber Occupancy ", 42, 1, 43, 2, 0, 2); // Add GEM Timing Oct 27 2020 + gemHitTimingTot = + ibooker.book2D("gemHitTimingTot", "GEM Chamber Occupancy ", 42, 1, 43, 2, 0, 2); // Add GEM Timing Oct 27 2020 gemHitTimingTot->setAxisTitle("10#circ Chamber (N=neighbor)", 1); const std::array nameBX{{"BXNeg1", "BXPos1", "BXNeg2", "BXPos2", "BX0"}}; const std::array labelBX{{"BX -1", "BX +1", "BX -2", "BX +2", "BX 0"}}; @@ -448,7 +459,7 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, if (hist == 0) { gemHitTimingTot->setBinLabel(1, "GE-1/1", 2); gemHitTimingTot->setBinLabel(2, "GE+1/1", 2); - gemHitTimingTot->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing + gemHitTimingTot->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing } gemHitTiming[hist]->getTH2F()->GetXaxis()->SetCanExtend(false); // Needed to stop multi-thread summing @@ -481,8 +492,8 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, } // Add GEM Timing Oct 27 2020 - gemHitTimingFrac[hist] = ibooker.book2D( - "gemHitTimingFrac" + nameBX[hist], "GEM Chamber Occupancy " + labelBX[hist], 42, 1, 43, 2, 0, 2); + gemHitTimingFrac[hist] = + ibooker.book2D("gemHitTimingFrac" + nameBX[hist], "GEM Chamber Occupancy " + labelBX[hist], 42, 1, 43, 2, 0, 2); gemHitTimingFrac[hist]->setAxisTitle("10#circ Chambers", 1); count = 0; for (int xbin = 1; xbin < 43; ++xbin) { @@ -543,25 +554,26 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, } // Add GEM vs track BX Dec 05 2020 emtfTrackBXVsGEMHit[hist] = ibooker.book2D("emtfTrackBXVsGEMHit" + nameNumStation[hist], - "EMTF " + labelNumStation[hist] + " BX vs GEM Hit BX", - 7, - -3, - 4, - 7, - -3, - 4); + "EMTF " + labelNumStation[hist] + " BX vs GEM Hit BX", + 7, + -3, + 4, + 7, + -3, + 4); emtfTrackBXVsGEMHit[hist]->setAxisTitle("Hit BX", 1); emtfTrackBXVsGEMHit[hist]->setAxisTitle("Track BX", 2); for (int bin = 1, bin_label = -3; bin <= 7; ++bin, ++bin_label) { emtfTrackBXVsGEMHit[hist]->setBinLabel(bin, std::to_string(bin_label), 1); emtfTrackBXVsGEMHit[hist]->setBinLabel(bin, std::to_string(bin_label), 2); } - } // End loop: for (int hist = 0; hist < 3; ++hist) + } // End loop: for (int hist = 0; hist < 3; ++hist) // Add mode vs BXdiff comparison Dec 07 2020 const std::array nameGEMStation{{"GENeg11", "GEPos11"}}; const std::array labelGEMStation{{"GE-1/1", "GE+1/1"}}; - const std::array nameCSCStation{{"MENeg4", "MENeg3", "MENeg2", "MENeg1", "MEPos1", "MEPos2", "MEPos3", "MEPos4"}}; + const std::array nameCSCStation{ + {"MENeg4", "MENeg3", "MENeg2", "MENeg1", "MEPos1", "MEPos2", "MEPos3", "MEPos4"}}; const std::array labelCSCStation{{"ME-4", "ME-3", "ME-2", "ME-1", "ME+1", "ME+2", "ME+3", "ME+4"}}; const std::array nameRPCStation{{"RENeg4", "RENeg3", "RENeg2", "REPos2", "REPos3", "REPos4"}}; const std::array labelRPCStation{{"RE-4", "RE-3", "RE-2", "RE+2", "RE+3", "RE+4"}}; @@ -569,36 +581,71 @@ void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, for (int iGEM = 0; iGEM < 2; iGEM++) { emtfTrackModeVsGEMBXDiff[iGEM] = ibooker.book2D("emtfTrackModeVsGEMBXDiff" + nameGEMStation[iGEM], "EMTF Track Mode vs (Track BX - GEM BX) " + labelGEMStation[iGEM], - 9, -4, 5, 16, 0, 16); + 9, + -4, + 5, + 16, + 0, + 16); emtfTrackModeVsGEMBXDiff[iGEM]->setAxisTitle("Track BX - GEM BX", 1); emtfTrackModeVsGEMBXDiff[iGEM]->setAxisTitle("Track Mode", 2); } for (int iCSC = 0; iCSC < 8; iCSC++) { emtfTrackModeVsCSCBXDiff[iCSC] = ibooker.book2D("emtfTrackModeVsCSCBXDiff" + nameCSCStation[iCSC], "EMTF Track Mode vs (Track BX - LCT BX) " + labelCSCStation[iCSC], - 9, -4, 5, 16, 0, 16); + 9, + -4, + 5, + 16, + 0, + 16); emtfTrackModeVsCSCBXDiff[iCSC]->setAxisTitle("Track BX - LCT BX", 1); emtfTrackModeVsCSCBXDiff[iCSC]->setAxisTitle("Track Mode", 2); } for (int iRPC = 0; iRPC < 6; iRPC++) { emtfTrackModeVsRPCBXDiff[iRPC] = ibooker.book2D("emtfTrackModeVsRPCBXDiff" + nameRPCStation[iRPC], "EMTF Track Mode vs (Track BX - RPC BX) " + labelRPCStation[iRPC], - 9, -4, 5, 16, 0, 16); + 9, + -4, + 5, + 16, + 0, + 16); emtfTrackModeVsRPCBXDiff[iRPC]->setAxisTitle("Track BX - RPC BX", 1); emtfTrackModeVsRPCBXDiff[iRPC]->setAxisTitle("Track Mode", 2); } // GEM vs CSC Dec 06 2020 ibooker.setCurrentFolder(monitorDir + "/GEMVsCSC"); - for (int hist = 0; hist < 2; hist++){ - gemHitPhi[hist] = ibooker.book2D("gemHitPhi" + nameGEMStation[hist], "GEM Hit Phi " + labelGEMStation[hist], 4921, 0, 4921, 6, 1, 7); - gemHitTheta[hist] = ibooker.book2D("gemHitTheta" + nameGEMStation[hist], "GEM Hit Theta " + labelGEMStation[hist], 128, 0, 128, 6, 1, 7); - gemHitVScscLCTPhi[hist] = ibooker.book2D("gemHitVScscLCTPhi" + nameGEMStation[hist], "GEM Hit Phi - CSC LCT Phi " + labelGEMStation[hist], - 1200, -600, 600, 36, 1, 37); // one chamber is 10 degrees, 60 integer phi per degree - gemHitVScscLCTTheta[hist] = ibooker.book2D("gemHitVScscLCTTheta" + nameGEMStation[hist], "GEM Hit Theta - CSC LCT Theta " + labelGEMStation[hist], - 20, -10, 10, 36, 1, 37); // 0.1 eta is at most 9.5 integer theta (between eta 1.5 and 1.6) - gemHitVScscLCTBX[hist] = ibooker.book2D("gemHitVScscLCTBX" + nameGEMStation[hist], "GEM Hit BX - CSC LCT BX " + labelGEMStation[hist], - 9, -4, 5, 36, 1, 37); + for (int hist = 0; hist < 2; hist++) { + gemHitPhi[hist] = ibooker.book2D( + "gemHitPhi" + nameGEMStation[hist], "GEM Hit Phi " + labelGEMStation[hist], 4921, 0, 4921, 6, 1, 7); + gemHitTheta[hist] = ibooker.book2D( + "gemHitTheta" + nameGEMStation[hist], "GEM Hit Theta " + labelGEMStation[hist], 128, 0, 128, 6, 1, 7); + gemHitVScscLCTPhi[hist] = ibooker.book2D("gemHitVScscLCTPhi" + nameGEMStation[hist], + "GEM Hit Phi - CSC LCT Phi " + labelGEMStation[hist], + 1200, + -600, + 600, + 36, + 1, + 37); // one chamber is 10 degrees, 60 integer phi per degree + gemHitVScscLCTTheta[hist] = ibooker.book2D("gemHitVScscLCTTheta" + nameGEMStation[hist], + "GEM Hit Theta - CSC LCT Theta " + labelGEMStation[hist], + 20, + -10, + 10, + 36, + 1, + 37); // 0.1 eta is at most 9.5 integer theta (between eta 1.5 and 1.6) + gemHitVScscLCTBX[hist] = ibooker.book2D("gemHitVScscLCTBX" + nameGEMStation[hist], + "GEM Hit BX - CSC LCT BX " + labelGEMStation[hist], + 9, + -4, + 5, + 36, + 1, + 37); gemHitPhi[hist]->setAxisTitle("Integer #phi", 1); gemHitTheta[hist]->setAxisTitle("Integer #theta", 1); @@ -812,7 +859,7 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { cscLCTOccupancy->Fill(cscid_n + cscid_offset, endcap * 5.5); } if (Hit->Neighbor() == true) { - cscDQMOccupancy->Fill( (sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); + cscDQMOccupancy->Fill((sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); } } @@ -837,9 +884,12 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { // Add GEM Oct 27 2020 hitTypeBX->Fill(4, Hit->BX()); - if (Hit->Is_CSC() == true) hitTypeBX->Fill(1, Hit->BX()); - else if (Hit->Is_RPC() == true) hitTypeBX->Fill(2, Hit->BX()); - else if (Hit->Is_GEM() == true) hitTypeBX->Fill(3, Hit->BX()); + if (Hit->Is_CSC() == true) + hitTypeBX->Fill(1, Hit->BX()); + else if (Hit->Is_RPC() == true) + hitTypeBX->Fill(2, Hit->BX()); + else if (Hit->Is_GEM() == true) + hitTypeBX->Fill(3, Hit->BX()); if (Hit->Is_GEM() == true) { gemHitBX->Fill(Hit->BX(), (endcap > 0) ? 1.5 : 0.5); @@ -847,15 +897,14 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { if (Hit->Neighbor() == false) { gemChamberPad[hist_index]->Fill(chamber, Hit->Pad()); gemChamberPartition[hist_index]->Fill(chamber, Hit->Partition()); - gemHitOccupancy->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); // follow CSC convention - } - else { - gemChamberPad[hist_index]->Fill( (Hit->Sector()%6)*6+2 , Hit->Pad()); - gemChamberPartition[hist_index]->Fill( (Hit->Sector()%6)*6+2, Hit->Partition()); - gemHitOccupancy->Fill( (Hit->Sector()%6+1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); // follow CSC convention + gemHitOccupancy->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); // follow CSC convention + } else { + gemChamberPad[hist_index]->Fill((Hit->Sector() % 6) * 6 + 2, Hit->Pad()); + gemChamberPartition[hist_index]->Fill((Hit->Sector() % 6) * 6 + 2, Hit->Partition()); + gemHitOccupancy->Fill((Hit->Sector() % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); // follow CSC convention } - } // End of if (Hit->Is_GEM() == true) - } // End of for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) + } // End of if (Hit->Is_GEM() == true) + } // End of for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) // Tracks edm::Handle TrackCollection; @@ -922,15 +971,18 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { if (iTrkHit.Is_CSC() == true) { emtfTrackBXVsCSCLCT[hist_index2]->Fill(iTrkHit.BX(), Track->BX()); int iCSC = (endcap > 0) ? (iTrkHit.Station() + 3) : (4 - iTrkHit.Station()); - emtfTrackModeVsCSCBXDiff[iCSC]->Fill( Track->BX() - iTrkHit.BX(), mode); // Add mode vs BXdiff comparison Dec 07 2020 + emtfTrackModeVsCSCBXDiff[iCSC]->Fill(Track->BX() - iTrkHit.BX(), + mode); // Add mode vs BXdiff comparison Dec 07 2020 } else if (iTrkHit.Is_RPC() == true) { emtfTrackBXVsRPCHit[hist_index2]->Fill(iTrkHit.BX(), Track->BX()); int iRPC = (endcap > 0) ? (iTrkHit.Station() + 2) : (4 - iTrkHit.Station()); - emtfTrackModeVsRPCBXDiff[iRPC]->Fill( Track->BX() - iTrkHit.BX(), mode); // Add mode vs BXdiff comparison Dec 07 2020 + emtfTrackModeVsRPCBXDiff[iRPC]->Fill(Track->BX() - iTrkHit.BX(), + mode); // Add mode vs BXdiff comparison Dec 07 2020 } else if (iTrkHit.Is_GEM() == true) { emtfTrackBXVsGEMHit[hist_index2]->Fill(iTrkHit.BX(), Track->BX()); int iGEM = (endcap > 0) ? 1 : 0; - emtfTrackModeVsGEMBXDiff[iGEM]->Fill( Track->BX() - iTrkHit.BX(), mode); // Add mode vs BXdiff comparison Dec 07 2020 + emtfTrackModeVsGEMBXDiff[iGEM]->Fill(Track->BX() - iTrkHit.BX(), + mode); // Add mode vs BXdiff comparison Dec 07 2020 } } @@ -977,8 +1029,8 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { } else { // Map neighbor chambers to "fake" CSC IDs: 1/3 --> 1, 1/6 --> 2, 1/9 --> 3, 2/3 --> 4, 2/9 --> 5, etc. //int cscid_n = (station == 1 ? (cscid / 3) : (station * 2) + ((cscid - 3) / 6) ); - cscLCTTiming[histIndexBX.at(trackHitBX)]->Fill( (sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); - cscTimingTot->Fill( (sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); + cscLCTTiming[histIndexBX.at(trackHitBX)]->Fill((sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); + cscTimingTot->Fill((sector % 6 + 1) * 7 - 4, hist_index, evt_wgt); } // Fill RPC timing with matched CSC LCTs @@ -1005,13 +1057,14 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { } // End conditional: if (trackHitBX == 0 && ring == 2) // Fill GEM timing with matched CSC LCTs - if (trackHitBX == 0 && station == 1 && ring == 1) { // GEM only in station 1 + if (trackHitBX == 0 && station == 1 && ring == 1) { // GEM only in station 1 for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) { if (Hit->Is_GEM() == false) continue; if (std::abs(Track->Eta() - Hit->Eta()) > 0.1) continue; - if (Hit->Endcap() != endcap || Hit->Station() != station || Hit->Chamber() != chamber || Hit->Neighbor() != neighbor) //different neighbor requirement from RPC + if (Hit->Endcap() != endcap || Hit->Station() != station || Hit->Chamber() != chamber || + Hit->Neighbor() != neighbor) //different neighbor requirement from RPC continue; if (std::abs(Hit->BX()) > 2) continue; @@ -1019,15 +1072,15 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { if (neighbor == false) { gemHitTiming[histIndexBX.at(Hit->BX())]->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); gemHitTimingTot->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); - int ihist = (endcap > 0)? 1 : 0; + int ihist = (endcap > 0) ? 1 : 0; gemHitPhi[ihist]->Fill(Hit->Phi_fp(), sector); gemHitTheta[ihist]->Fill(Hit->Theta_fp(), sector); - gemHitVScscLCTPhi[ihist]->Fill( Hit->Phi_fp() - TrkHit.Phi_fp(), chamber); // GEM vs CSC Dec 06 2020 - gemHitVScscLCTTheta[ihist]->Fill( Hit->Theta_fp() - TrkHit.Theta_fp(), chamber); - gemHitVScscLCTBX[ihist]->Fill( Hit->BX() - TrkHit.BX(), chamber); + gemHitVScscLCTPhi[ihist]->Fill(Hit->Phi_fp() - TrkHit.Phi_fp(), chamber); // GEM vs CSC Dec 06 2020 + gemHitVScscLCTTheta[ihist]->Fill(Hit->Theta_fp() - TrkHit.Theta_fp(), chamber); + gemHitVScscLCTBX[ihist]->Fill(Hit->BX() - TrkHit.BX(), chamber); } else { - gemHitTiming[histIndexBX.at(Hit->BX())]->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); - gemHitTimingTot->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTiming[histIndexBX.at(Hit->BX())]->Fill((sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill((sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); } } // End loop: for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) @@ -1061,11 +1114,11 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { gemHitTiming[histIndexBX.at(trackHitBX)]->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); gemHitTimingTot->Fill(chamber_bin(1, 1, chamber), (endcap > 0) ? 1.5 : 0.5); } else { - gemHitTiming[histIndexBX.at(trackHitBX)]->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); - gemHitTimingTot->Fill( (sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTiming[histIndexBX.at(trackHitBX)]->Fill((sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); + gemHitTimingTot->Fill((sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); } - } // End condition: if (TrkHit.Is_GEM() == true) - } // End loop: for (int iHit = 0; iHit < numHits; ++iHit) + } // End condition: if (TrkHit.Is_GEM() == true) + } // End loop: for (int iHit = 0; iHit < numHits; ++iHit) } ////////////////////////////////////////////////// /// End block for CSC LCT and RPC hit timing /// From 927d90342772001185a9c95e83dc0ac8ba4c79a3 Mon Sep 17 00:00:00 2001 From: Markus Seidel Date: Mon, 2 Aug 2021 13:25:51 +0200 Subject: [PATCH 07/27] LogPrint instead of cout --- .../HcalAlgos/plugins/HcalPulseContainmentTest.cc | 7 +++++-- .../HcalAlgos/src/HcalPulseContainmentAlgo.cc | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc b/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc index ef93a2eb3470d..8a2cd79ac2fa4 100644 --- a/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc +++ b/CalibCalorimetry/HcalAlgos/plugins/HcalPulseContainmentTest.cc @@ -64,10 +64,13 @@ void HcalPulseContainmentTest::analyze(const edm::Event& iEvent, const edm::Even // HB and HE have the same shape here double corr4 = manager->correction(he1, 4, fixedphase_ns, fc); assert(corr4 == corr1); - std::cout << corr1 << " " << corr2 << " " << corr3 << " " << corr4 << " " << std::endl; + edm::LogPrint("HcalPulseContainmentTest") << corr1 << " " << corr2 << " " << corr3 << " " << corr4; // test 1TS correction at high energy double corr5 = manager->correction(hb1, 1, fixedphase_ns, 100000.); - std::cout << corr5 << std::endl; + edm::LogPrint("HcalPulseContainmentTest") << corr5; + // test 2TS correction at high energy + double corr6 = manager->correction(hb1, 2, fixedphase_ns, 100000.); + edm::LogPrint("HcalPulseContainmentTest") << corr6; } //define this as a plug-in diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc index 1f63dac812d07..bc7464f4d6903 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalPulseContainmentAlgo.cc @@ -54,7 +54,7 @@ void HcalPulseContainmentAlgo::init(int num_samples) { #if 0 char s[80]; sprintf (s, "%7.3f %8.5f %8.5f\n", tmin, bin0val, bin1val); - std::cout << s << std::endl; + edm::LogPrint("HcalPulseContainmentAlgo") << s; #endif if (bin1val > bin0val) { @@ -63,7 +63,7 @@ void HcalPulseContainmentAlgo::init(int num_samples) { } } #if 0 - std::cout << "time0shiftns_ = " << time0shiftns_ << std::endl; + edm::LogPrint("HcalPulseContainmentAlgo") << "time0shiftns_ = " << time0shiftns_; #endif } @@ -75,14 +75,14 @@ std::pair HcalPulseContainmentAlgo::calcpair(double truefc) { tmin = fixedphasens_ - timeslew_ns; } else { // Run 2: timePhase opposite to SIM, time0shift double shift_ns = fixedphasens_ - time0shiftns_ + timeslew_ns; - //std::cout << "SHIFT " << fixedphasens_ << " " << time0shiftns_ << " " << timeslew_ns << std::endl; + //edm::LogPrint("HcalPulseContainmentAlgo") << "SHIFT " << fixedphasens_ << " " << time0shiftns_ << " " << timeslew_ns; tmin = -shift_ns; } double tmax = tmin + integrationwindowns_; //double integral = shape_.integrate( tmin, tmax ); double integral = integrator_(tmin, tmax); - //std::cout << "INTEGRAL " << integral << " " << truefc << " " << tmin << " " << tmax << std::endl; + //edm::LogPrint("HcalPulseContainmentAlgo") << "INTEGRAL " << integral << " " << truefc << " " << tmin << " " << tmax; double corfactor = 1.0 / integral; double recofc = (double)truefc * integral; @@ -90,7 +90,7 @@ std::pair HcalPulseContainmentAlgo::calcpair(double truefc) { char s[80]; sprintf (s, "%8.2f %8.4f %8.4f %8.5f %8.5f %8.5f ", truefc, tmin, tmax, integral, corfactor, recofc); - std::cout << s << std::endl; + edm::LogPrint("HcalPulseContainmentAlgo") << s; #endif std::pair thepair(recofc, corfactor); From 22e8a34591d6a0af2813ed27d251fe45b1f5e486 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Mon, 2 Aug 2021 17:32:08 +0200 Subject: [PATCH 08/27] [CommonTools] move public header in to interface directory --- .../RecoAlgos/{src => interface}/TrackToRefCandidate.h | 0 .../RecoAlgos/plugins/ChargedRefCandidateProducer.cc | 2 +- .../plugins/ConcreteChargedRefCandidateProducer.cc | 2 +- CommonTools/Utils/{src => interface}/ExpressionBase.h | 0 CommonTools/Utils/{src => interface}/ExpressionPtr.h | 0 CommonTools/Utils/{src => interface}/Grammar.h | 0 CommonTools/Utils/{src => interface}/SelectorBase.h | 0 CommonTools/Utils/{src => interface}/SelectorPtr.h | 0 CommonTools/Utils/interface/StringCutObjectSelector.h | 4 ++-- CommonTools/Utils/interface/StringObjectFunction.h | 4 ++-- CommonTools/Utils/interface/cutParser.h | 2 +- CommonTools/Utils/interface/expressionParser.h | 2 +- CommonTools/Utils/{src => interface}/returnType.h | 0 CommonTools/Utils/src/AndCombiner.h | 4 ++-- CommonTools/Utils/src/AnyObjSelector.h | 2 +- CommonTools/Utils/src/BinarySelector.h | 4 ++-- CommonTools/Utils/src/CutSetter.h | 2 +- CommonTools/Utils/src/ExpressionBinaryOperator.h | 2 +- CommonTools/Utils/src/ExpressionCondition.h | 4 ++-- CommonTools/Utils/src/ExpressionNumber.h | 2 +- CommonTools/Utils/src/ExpressionQuaterOperator.h | 2 +- CommonTools/Utils/src/ExpressionSetter.h | 2 +- CommonTools/Utils/src/ExpressionUnaryOperator.h | 2 +- CommonTools/Utils/src/ExpressionVar.h | 2 +- CommonTools/Utils/src/ExpressionVarSetter.cc | 2 +- CommonTools/Utils/src/LogicalBinaryOperator.h | 2 +- CommonTools/Utils/src/LogicalUnaryOperator.h | 2 +- CommonTools/Utils/src/MethodInvoker.cc | 2 +- CommonTools/Utils/src/MethodSetter.cc | 2 +- CommonTools/Utils/src/NotCombiner.h | 4 ++-- CommonTools/Utils/src/OrCombiner.h | 4 ++-- CommonTools/Utils/src/SelectorStack.h | 2 +- CommonTools/Utils/src/TrinarySelector.h | 4 ++-- CommonTools/Utils/src/cutParser.cc | 2 +- CommonTools/Utils/src/expressionParser.cc | 2 +- CommonTools/Utils/src/returnType.cc | 2 +- DQM/Physics/src/QcdUeDQM.cc | 2 +- Fireworks/Core/interface/FWExpressionEvaluator.h | 8 ++++---- Fireworks/Core/interface/FWItemValueGetter.h | 8 ++++---- Fireworks/Core/interface/FWModelFilter.h | 4 ++-- Fireworks/Core/src/FWExpressionEvaluator.cc | 2 +- Fireworks/Core/src/FWExpressionValidator.cc | 2 +- Fireworks/Core/src/FWGUIManager.cc | 2 +- Fireworks/Core/src/FWItemValueGetter.cc | 2 +- Fireworks/Core/src/FWModelExpressionSelector.cc | 2 +- Fireworks/Core/src/FWModelFilter.cc | 2 +- PhysicsTools/FWLite/interface/ScannerHelpers.h | 8 ++++---- PhysicsTools/FWLite/src/ScannerHelpers.cc | 4 ++-- PhysicsTools/FWLite/src/classes.h | 8 ++++---- 49 files changed, 64 insertions(+), 64 deletions(-) rename CommonTools/RecoAlgos/{src => interface}/TrackToRefCandidate.h (100%) rename CommonTools/Utils/{src => interface}/ExpressionBase.h (100%) rename CommonTools/Utils/{src => interface}/ExpressionPtr.h (100%) rename CommonTools/Utils/{src => interface}/Grammar.h (100%) rename CommonTools/Utils/{src => interface}/SelectorBase.h (100%) rename CommonTools/Utils/{src => interface}/SelectorPtr.h (100%) rename CommonTools/Utils/{src => interface}/returnType.h (100%) diff --git a/CommonTools/RecoAlgos/src/TrackToRefCandidate.h b/CommonTools/RecoAlgos/interface/TrackToRefCandidate.h similarity index 100% rename from CommonTools/RecoAlgos/src/TrackToRefCandidate.h rename to CommonTools/RecoAlgos/interface/TrackToRefCandidate.h diff --git a/CommonTools/RecoAlgos/plugins/ChargedRefCandidateProducer.cc b/CommonTools/RecoAlgos/plugins/ChargedRefCandidateProducer.cc index 3a13ee6177e55..0d0d9b768f8a3 100644 --- a/CommonTools/RecoAlgos/plugins/ChargedRefCandidateProducer.cc +++ b/CommonTools/RecoAlgos/plugins/ChargedRefCandidateProducer.cc @@ -9,7 +9,7 @@ * */ -#include "CommonTools/RecoAlgos/src/TrackToRefCandidate.h" +#include "CommonTools/RecoAlgos/interface/TrackToRefCandidate.h" #include "FWCore/Framework/interface/MakerMacros.h" typedef CandidateProducer, diff --git a/CommonTools/RecoAlgos/plugins/ConcreteChargedRefCandidateProducer.cc b/CommonTools/RecoAlgos/plugins/ConcreteChargedRefCandidateProducer.cc index d52b71d162e5b..e171c86e59eaa 100644 --- a/CommonTools/RecoAlgos/plugins/ConcreteChargedRefCandidateProducer.cc +++ b/CommonTools/RecoAlgos/plugins/ConcreteChargedRefCandidateProducer.cc @@ -11,7 +11,7 @@ * */ -#include "CommonTools/RecoAlgos/src/TrackToRefCandidate.h" +#include "CommonTools/RecoAlgos/interface/TrackToRefCandidate.h" #include "FWCore/Framework/interface/MakerMacros.h" typedef CandidateProducer diff --git a/CommonTools/Utils/src/ExpressionBase.h b/CommonTools/Utils/interface/ExpressionBase.h similarity index 100% rename from CommonTools/Utils/src/ExpressionBase.h rename to CommonTools/Utils/interface/ExpressionBase.h diff --git a/CommonTools/Utils/src/ExpressionPtr.h b/CommonTools/Utils/interface/ExpressionPtr.h similarity index 100% rename from CommonTools/Utils/src/ExpressionPtr.h rename to CommonTools/Utils/interface/ExpressionPtr.h diff --git a/CommonTools/Utils/src/Grammar.h b/CommonTools/Utils/interface/Grammar.h similarity index 100% rename from CommonTools/Utils/src/Grammar.h rename to CommonTools/Utils/interface/Grammar.h diff --git a/CommonTools/Utils/src/SelectorBase.h b/CommonTools/Utils/interface/SelectorBase.h similarity index 100% rename from CommonTools/Utils/src/SelectorBase.h rename to CommonTools/Utils/interface/SelectorBase.h diff --git a/CommonTools/Utils/src/SelectorPtr.h b/CommonTools/Utils/interface/SelectorPtr.h similarity index 100% rename from CommonTools/Utils/src/SelectorPtr.h rename to CommonTools/Utils/interface/SelectorPtr.h diff --git a/CommonTools/Utils/interface/StringCutObjectSelector.h b/CommonTools/Utils/interface/StringCutObjectSelector.h index 918aacf7e6e0e..10f6d4aef7a8f 100644 --- a/CommonTools/Utils/interface/StringCutObjectSelector.h +++ b/CommonTools/Utils/interface/StringCutObjectSelector.h @@ -7,8 +7,8 @@ * $Id: StringCutObjectSelector.h,v 1.4 2012/06/26 21:09:37 wmtan Exp $ */ #include "FWCore/Utilities/interface/EDMException.h" -#include "CommonTools/Utils/src/SelectorPtr.h" -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" #include "CommonTools/Utils/interface/cutParser.h" #include "FWCore/Reflection/interface/ObjectWithDict.h" diff --git a/CommonTools/Utils/interface/StringObjectFunction.h b/CommonTools/Utils/interface/StringObjectFunction.h index b691d007a33a9..123238a48ef2a 100644 --- a/CommonTools/Utils/interface/StringObjectFunction.h +++ b/CommonTools/Utils/interface/StringObjectFunction.h @@ -7,8 +7,8 @@ * $Id: StringObjectFunction.h,v 1.4 2012/06/26 21:09:37 wmtan Exp $ */ #include "FWCore/Utilities/interface/EDMException.h" -#include "CommonTools/Utils/src/ExpressionPtr.h" -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" #include "CommonTools/Utils/interface/expressionParser.h" #include "FWCore/Reflection/interface/ObjectWithDict.h" diff --git a/CommonTools/Utils/interface/cutParser.h b/CommonTools/Utils/interface/cutParser.h index 1201ce7291aff..77a215a2f1de2 100644 --- a/CommonTools/Utils/interface/cutParser.h +++ b/CommonTools/Utils/interface/cutParser.h @@ -1,6 +1,6 @@ #ifndef CommonTools_Utils_cutParset_h #define CommonTools_Utils_cutParset_h -#include "CommonTools/Utils/src/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" #include "CommonTools/Utils/interface/Exception.h" #include "FWCore/Reflection/interface/TypeWithDict.h" #include diff --git a/CommonTools/Utils/interface/expressionParser.h b/CommonTools/Utils/interface/expressionParser.h index 74be6792daef7..bdaa6191bda62 100644 --- a/CommonTools/Utils/interface/expressionParser.h +++ b/CommonTools/Utils/interface/expressionParser.h @@ -1,6 +1,6 @@ #ifndef CommonTools_Utils_expressionParset_h #define CommonTools_Utils_expressionParset_h -#include "CommonTools/Utils/src/ExpressionPtr.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" #include "CommonTools/Utils/interface/Exception.h" #include "FWCore/Reflection/interface/TypeWithDict.h" #include diff --git a/CommonTools/Utils/src/returnType.h b/CommonTools/Utils/interface/returnType.h similarity index 100% rename from CommonTools/Utils/src/returnType.h rename to CommonTools/Utils/interface/returnType.h diff --git a/CommonTools/Utils/src/AndCombiner.h b/CommonTools/Utils/src/AndCombiner.h index e5c1c917a29d5..0a8ed4dc419e7 100644 --- a/CommonTools/Utils/src/AndCombiner.h +++ b/CommonTools/Utils/src/AndCombiner.h @@ -10,8 +10,8 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/SelectorBase.h" -#include "CommonTools/Utils/src/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" namespace reco { namespace parser { diff --git a/CommonTools/Utils/src/AnyObjSelector.h b/CommonTools/Utils/src/AnyObjSelector.h index c313c75a54d4d..9fbf951ded10b 100644 --- a/CommonTools/Utils/src/AnyObjSelector.h +++ b/CommonTools/Utils/src/AnyObjSelector.h @@ -1,6 +1,6 @@ #ifndef CommonTools_Utils_AnyObjSelector_h #define CommonTools_Utils_AnyObjSelector_h -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorBase.h" namespace reco { namespace parser { diff --git a/CommonTools/Utils/src/BinarySelector.h b/CommonTools/Utils/src/BinarySelector.h index 84caa6650a2a8..acfe31fdf62fe 100644 --- a/CommonTools/Utils/src/BinarySelector.h +++ b/CommonTools/Utils/src/BinarySelector.h @@ -10,8 +10,8 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/SelectorBase.h" -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/SelectorBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" #include "CommonTools/Utils/src/ComparisonBase.h" namespace reco { diff --git a/CommonTools/Utils/src/CutSetter.h b/CommonTools/Utils/src/CutSetter.h index 45fa9731ae7c6..5c4f37a85fc5f 100644 --- a/CommonTools/Utils/src/CutSetter.h +++ b/CommonTools/Utils/src/CutSetter.h @@ -10,7 +10,7 @@ * \version $Revision: 1.3 $ * */ -#include "CommonTools/Utils/src/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" #include "CommonTools/Utils/src/SelectorStack.h" #include diff --git a/CommonTools/Utils/src/ExpressionBinaryOperator.h b/CommonTools/Utils/src/ExpressionBinaryOperator.h index 48f4b93f3fba5..aaa7c479881db 100644 --- a/CommonTools/Utils/src/ExpressionBinaryOperator.h +++ b/CommonTools/Utils/src/ExpressionBinaryOperator.h @@ -10,7 +10,7 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" #include "CommonTools/Utils/src/ExpressionStack.h" namespace reco { diff --git a/CommonTools/Utils/src/ExpressionCondition.h b/CommonTools/Utils/src/ExpressionCondition.h index d085bc1c8ae3d..5a59facbd527b 100644 --- a/CommonTools/Utils/src/ExpressionCondition.h +++ b/CommonTools/Utils/src/ExpressionCondition.h @@ -10,8 +10,8 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/ExpressionBase.h" -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" +#include "CommonTools/Utils/interface/SelectorBase.h" #include "CommonTools/Utils/src/SelectorStack.h" #include "CommonTools/Utils/src/ExpressionStack.h" diff --git a/CommonTools/Utils/src/ExpressionNumber.h b/CommonTools/Utils/src/ExpressionNumber.h index 79548235cfe1a..f6bfe7d88890f 100644 --- a/CommonTools/Utils/src/ExpressionNumber.h +++ b/CommonTools/Utils/src/ExpressionNumber.h @@ -10,7 +10,7 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" namespace reco { namespace parser { diff --git a/CommonTools/Utils/src/ExpressionQuaterOperator.h b/CommonTools/Utils/src/ExpressionQuaterOperator.h index 3ee97a2de4f70..e3c856f184340 100644 --- a/CommonTools/Utils/src/ExpressionQuaterOperator.h +++ b/CommonTools/Utils/src/ExpressionQuaterOperator.h @@ -10,7 +10,7 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" #include "CommonTools/Utils/src/ExpressionStack.h" namespace reco { diff --git a/CommonTools/Utils/src/ExpressionSetter.h b/CommonTools/Utils/src/ExpressionSetter.h index 6c44f01926c38..b1538e0a304e2 100644 --- a/CommonTools/Utils/src/ExpressionSetter.h +++ b/CommonTools/Utils/src/ExpressionSetter.h @@ -10,7 +10,7 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/ExpressionPtr.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" #include "CommonTools/Utils/src/ExpressionStack.h" namespace reco { diff --git a/CommonTools/Utils/src/ExpressionUnaryOperator.h b/CommonTools/Utils/src/ExpressionUnaryOperator.h index eef6d182012d9..8657673931dab 100644 --- a/CommonTools/Utils/src/ExpressionUnaryOperator.h +++ b/CommonTools/Utils/src/ExpressionUnaryOperator.h @@ -10,7 +10,7 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" #include "CommonTools/Utils/src/ExpressionStack.h" namespace reco { diff --git a/CommonTools/Utils/src/ExpressionVar.h b/CommonTools/Utils/src/ExpressionVar.h index 1e4cde048e0ac..f79f897b70a21 100644 --- a/CommonTools/Utils/src/ExpressionVar.h +++ b/CommonTools/Utils/src/ExpressionVar.h @@ -10,7 +10,7 @@ * */ -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" #include "CommonTools/Utils/src/MethodInvoker.h" #include "CommonTools/Utils/src/TypeCode.h" diff --git a/CommonTools/Utils/src/ExpressionVarSetter.cc b/CommonTools/Utils/src/ExpressionVarSetter.cc index 2d964567743f4..4942868b400d7 100644 --- a/CommonTools/Utils/src/ExpressionVarSetter.cc +++ b/CommonTools/Utils/src/ExpressionVarSetter.cc @@ -1,6 +1,6 @@ #include "CommonTools/Utils/src/ExpressionVarSetter.h" #include "CommonTools/Utils/src/ExpressionVar.h" -#include "CommonTools/Utils/src/returnType.h" +#include "CommonTools/Utils/interface/returnType.h" #include "CommonTools/Utils/interface/Exception.h" #include using namespace reco::parser; diff --git a/CommonTools/Utils/src/LogicalBinaryOperator.h b/CommonTools/Utils/src/LogicalBinaryOperator.h index b3a6ed8929bee..0f2cfadd3da49 100644 --- a/CommonTools/Utils/src/LogicalBinaryOperator.h +++ b/CommonTools/Utils/src/LogicalBinaryOperator.h @@ -10,7 +10,7 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorBase.h" #include "CommonTools/Utils/src/SelectorStack.h" namespace reco { diff --git a/CommonTools/Utils/src/LogicalUnaryOperator.h b/CommonTools/Utils/src/LogicalUnaryOperator.h index 49d4e20b92ecc..d24d64ffe3469 100644 --- a/CommonTools/Utils/src/LogicalUnaryOperator.h +++ b/CommonTools/Utils/src/LogicalUnaryOperator.h @@ -10,7 +10,7 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorBase.h" #include "CommonTools/Utils/src/SelectorStack.h" namespace reco { diff --git a/CommonTools/Utils/src/MethodInvoker.cc b/CommonTools/Utils/src/MethodInvoker.cc index 41fd3b4da4c74..787a94ce81362 100644 --- a/CommonTools/Utils/src/MethodInvoker.cc +++ b/CommonTools/Utils/src/MethodInvoker.cc @@ -3,7 +3,7 @@ #include "CommonTools/Utils/src/ExpressionVar.h" #include "CommonTools/Utils/src/MethodSetter.h" #include "CommonTools/Utils/src/findMethod.h" -#include "CommonTools/Utils/src/returnType.h" +#include "CommonTools/Utils/interface/returnType.h" #include "FWCore/Utilities/interface/EDMException.h" #include diff --git a/CommonTools/Utils/src/MethodSetter.cc b/CommonTools/Utils/src/MethodSetter.cc index 966fcab9771c7..36457fbda939d 100644 --- a/CommonTools/Utils/src/MethodSetter.cc +++ b/CommonTools/Utils/src/MethodSetter.cc @@ -5,7 +5,7 @@ #include "CommonTools/Utils/src/MethodInvoker.h" #include "CommonTools/Utils/src/findDataMember.h" #include "CommonTools/Utils/src/findMethod.h" -#include "CommonTools/Utils/src/returnType.h" +#include "CommonTools/Utils/interface/returnType.h" #include diff --git a/CommonTools/Utils/src/NotCombiner.h b/CommonTools/Utils/src/NotCombiner.h index f89eebfd42179..c54d464c08121 100644 --- a/CommonTools/Utils/src/NotCombiner.h +++ b/CommonTools/Utils/src/NotCombiner.h @@ -10,8 +10,8 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/SelectorBase.h" -#include "CommonTools/Utils/src/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" namespace reco { namespace parser { diff --git a/CommonTools/Utils/src/OrCombiner.h b/CommonTools/Utils/src/OrCombiner.h index 0b861a9e5c7a7..d324002d37186 100644 --- a/CommonTools/Utils/src/OrCombiner.h +++ b/CommonTools/Utils/src/OrCombiner.h @@ -10,8 +10,8 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/SelectorBase.h" -#include "CommonTools/Utils/src/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" namespace reco { namespace parser { diff --git a/CommonTools/Utils/src/SelectorStack.h b/CommonTools/Utils/src/SelectorStack.h index fd535053bb1e2..b47febde0f666 100644 --- a/CommonTools/Utils/src/SelectorStack.h +++ b/CommonTools/Utils/src/SelectorStack.h @@ -11,7 +11,7 @@ * */ #include -#include "CommonTools/Utils/src/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" namespace reco { namespace parser { diff --git a/CommonTools/Utils/src/TrinarySelector.h b/CommonTools/Utils/src/TrinarySelector.h index 27fcda5536b14..56af002d5783b 100644 --- a/CommonTools/Utils/src/TrinarySelector.h +++ b/CommonTools/Utils/src/TrinarySelector.h @@ -10,8 +10,8 @@ * \version $Revision: 1.2 $ * */ -#include "CommonTools/Utils/src/SelectorBase.h" -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/SelectorBase.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" #include "CommonTools/Utils/src/ComparisonBase.h" namespace reco { diff --git a/CommonTools/Utils/src/cutParser.cc b/CommonTools/Utils/src/cutParser.cc index ebb10956aaef3..2b22c19acd471 100644 --- a/CommonTools/Utils/src/cutParser.cc +++ b/CommonTools/Utils/src/cutParser.cc @@ -1,6 +1,6 @@ #include "CommonTools/Utils/interface/cutParser.h" #include "CommonTools/Utils/src/AnyObjSelector.h" -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "FWCore/Utilities/interface/EDMException.h" using namespace reco::parser; diff --git a/CommonTools/Utils/src/expressionParser.cc b/CommonTools/Utils/src/expressionParser.cc index b53b2a91b1548..72d7762f96d7f 100644 --- a/CommonTools/Utils/src/expressionParser.cc +++ b/CommonTools/Utils/src/expressionParser.cc @@ -1,4 +1,4 @@ -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "FWCore/Utilities/interface/EDMException.h" #include "CommonTools/Utils/interface/expressionParser.h" diff --git a/CommonTools/Utils/src/returnType.cc b/CommonTools/Utils/src/returnType.cc index 74bfda2a21cf6..4a544dda54e1a 100644 --- a/CommonTools/Utils/src/returnType.cc +++ b/CommonTools/Utils/src/returnType.cc @@ -1,4 +1,4 @@ -#include "CommonTools/Utils/src/returnType.h" +#include "CommonTools/Utils/interface/returnType.h" #include "FWCore/Reflection/interface/FunctionWithDict.h" #include "FWCore/Reflection/interface/TypeWithDict.h" diff --git a/DQM/Physics/src/QcdUeDQM.cc b/DQM/Physics/src/QcdUeDQM.cc index d77c2e5265aa0..cf42e21baf121 100644 --- a/DQM/Physics/src/QcdUeDQM.cc +++ b/DQM/Physics/src/QcdUeDQM.cc @@ -17,7 +17,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "CommonTools/RecoAlgos/src/TrackToRefCandidate.h" +#include "CommonTools/RecoAlgos/interface/TrackToRefCandidate.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" diff --git a/Fireworks/Core/interface/FWExpressionEvaluator.h b/Fireworks/Core/interface/FWExpressionEvaluator.h index 7fa43dc8e1082..eec4c5d17f66b 100644 --- a/Fireworks/Core/interface/FWExpressionEvaluator.h +++ b/Fireworks/Core/interface/FWExpressionEvaluator.h @@ -23,10 +23,10 @@ #include "FWCore/Reflection/interface/TypeWithDict.h" // user include files -#include "CommonTools/Utils/src/SelectorPtr.h" -#include "CommonTools/Utils/src/SelectorBase.h" -#include "CommonTools/Utils/src/ExpressionPtr.h" -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" // forward declarations diff --git a/Fireworks/Core/interface/FWItemValueGetter.h b/Fireworks/Core/interface/FWItemValueGetter.h index d0f499057773f..476dbcf4f8c3c 100644 --- a/Fireworks/Core/interface/FWItemValueGetter.h +++ b/Fireworks/Core/interface/FWItemValueGetter.h @@ -24,10 +24,10 @@ #include "Rtypes.h" #include "FWCore/Reflection/interface/TypeWithDict.h" -#include "CommonTools/Utils/src/SelectorPtr.h" -#include "CommonTools/Utils/src/SelectorBase.h" -#include "CommonTools/Utils/src/ExpressionPtr.h" -#include "CommonTools/Utils/src/ExpressionBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" class FWItemValueGetter { public: diff --git a/Fireworks/Core/interface/FWModelFilter.h b/Fireworks/Core/interface/FWModelFilter.h index 04e47c9b716ff..65cbbeb775bdc 100644 --- a/Fireworks/Core/interface/FWModelFilter.h +++ b/Fireworks/Core/interface/FWModelFilter.h @@ -23,8 +23,8 @@ #include "FWCore/Reflection/interface/TypeWithDict.h" // user include files -#include "CommonTools/Utils/src/SelectorPtr.h" -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" // forward declarations diff --git a/Fireworks/Core/src/FWExpressionEvaluator.cc b/Fireworks/Core/src/FWExpressionEvaluator.cc index 35f48a9eadb4a..f515ab1bb7226 100644 --- a/Fireworks/Core/src/FWExpressionEvaluator.cc +++ b/Fireworks/Core/src/FWExpressionEvaluator.cc @@ -18,7 +18,7 @@ // user include files #include "Fireworks/Core/interface/FWExpressionEvaluator.h" #include "Fireworks/Core/interface/FWExpressionException.h" -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "CommonTools/Utils/interface/Exception.h" #include "Fireworks/Core/src/expressionFormatHelpers.h" diff --git a/Fireworks/Core/src/FWExpressionValidator.cc b/Fireworks/Core/src/FWExpressionValidator.cc index f4ace1a3a09dc..f087ffd1069b5 100644 --- a/Fireworks/Core/src/FWExpressionValidator.cc +++ b/Fireworks/Core/src/FWExpressionValidator.cc @@ -20,7 +20,7 @@ // user include files #include "Fireworks/Core/src/FWExpressionValidator.h" -#include "CommonTools/Utils/src/returnType.h" +#include "CommonTools/Utils/interface/returnType.h" // // constants, enums and typedefs diff --git a/Fireworks/Core/src/FWGUIManager.cc b/Fireworks/Core/src/FWGUIManager.cc index d9e48e14cd581..9ca2cd2bb64d3 100644 --- a/Fireworks/Core/src/FWGUIManager.cc +++ b/Fireworks/Core/src/FWGUIManager.cc @@ -85,7 +85,7 @@ #include "FWCore/Common/interface/EventBase.h" -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "CommonTools/Utils/interface/Exception.h" // constants, enums and typedefs diff --git a/Fireworks/Core/src/FWItemValueGetter.cc b/Fireworks/Core/src/FWItemValueGetter.cc index 3ee0aa44d5d99..d894f2c88003d 100644 --- a/Fireworks/Core/src/FWItemValueGetter.cc +++ b/Fireworks/Core/src/FWItemValueGetter.cc @@ -22,7 +22,7 @@ #include "Fireworks/Core/interface/FWExpressionEvaluator.h" #include "Fireworks/Core/interface/FWExpressionException.h" -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "CommonTools/Utils/interface/Exception.h" #include "Fireworks/Core/src/expressionFormatHelpers.h" diff --git a/Fireworks/Core/src/FWModelExpressionSelector.cc b/Fireworks/Core/src/FWModelExpressionSelector.cc index 7a93a0a66c2b7..b99ccad488482 100644 --- a/Fireworks/Core/src/FWModelExpressionSelector.cc +++ b/Fireworks/Core/src/FWModelExpressionSelector.cc @@ -16,7 +16,7 @@ #include "FWCore/Reflection/interface/ObjectWithDict.h" #include "FWCore/Reflection/interface/TypeWithDict.h" -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "CommonTools/Utils/interface/Exception.h" // user include files diff --git a/Fireworks/Core/src/FWModelFilter.cc b/Fireworks/Core/src/FWModelFilter.cc index ac0e3aece9bc2..a4325546a5978 100644 --- a/Fireworks/Core/src/FWModelFilter.cc +++ b/Fireworks/Core/src/FWModelFilter.cc @@ -19,7 +19,7 @@ #include "Fireworks/Core/interface/FWModelFilter.h" #include "Fireworks/Core/interface/FWExpressionException.h" -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "CommonTools/Utils/interface/Exception.h" #include "Fireworks/Core/src/expressionFormatHelpers.h" diff --git a/PhysicsTools/FWLite/interface/ScannerHelpers.h b/PhysicsTools/FWLite/interface/ScannerHelpers.h index 9f4538c799322..cb5b16648323e 100644 --- a/PhysicsTools/FWLite/interface/ScannerHelpers.h +++ b/PhysicsTools/FWLite/interface/ScannerHelpers.h @@ -11,10 +11,10 @@ // AFAIK These includes are needed to build the dictionary // but must be kept hidden if CINT sees this class #if !defined(__CINT__) && !defined(__MAKECINT__) -#include "CommonTools/Utils/src/ExpressionPtr.h" -#include "CommonTools/Utils/src/SelectorPtr.h" -#include "CommonTools/Utils/src/ExpressionBase.h" -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" +#include "CommonTools/Utils/interface/SelectorBase.h" #endif namespace helper { diff --git a/PhysicsTools/FWLite/src/ScannerHelpers.cc b/PhysicsTools/FWLite/src/ScannerHelpers.cc index 60c71ab250b1f..ba6719551a06b 100644 --- a/PhysicsTools/FWLite/src/ScannerHelpers.cc +++ b/PhysicsTools/FWLite/src/ScannerHelpers.cc @@ -1,7 +1,7 @@ #include -#include "CommonTools/Utils/src/ExpressionPtr.h" -#include "CommonTools/Utils/src/Grammar.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" +#include "CommonTools/Utils/interface/Grammar.h" #include "FWCore/Utilities/interface/EDMException.h" #include diff --git a/PhysicsTools/FWLite/src/classes.h b/PhysicsTools/FWLite/src/classes.h index 1f1812cbdba4b..51cf809912a73 100644 --- a/PhysicsTools/FWLite/src/classes.h +++ b/PhysicsTools/FWLite/src/classes.h @@ -1,9 +1,9 @@ //#include "PhysicsTools/FWLite/interface/FWLiteCandEvaluator.h" -#include "CommonTools/Utils/src/ExpressionPtr.h" -#include "CommonTools/Utils/src/ExpressionBase.h" -#include "CommonTools/Utils/src/SelectorPtr.h" -#include "CommonTools/Utils/src/SelectorBase.h" +#include "CommonTools/Utils/interface/ExpressionPtr.h" +#include "CommonTools/Utils/interface/ExpressionBase.h" +#include "CommonTools/Utils/interface/SelectorPtr.h" +#include "CommonTools/Utils/interface/SelectorBase.h" #include #include "PhysicsTools/FWLite/interface/ScannerHelpers.h" From 477cc2fcea4336fbcf30f1c9cc85edeafcc2ee43 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 3 Aug 2021 12:01:32 +0200 Subject: [PATCH 09/27] Update DummyHepMCAnalyzer --- .../HepMCCandAlgos/test/BuildFile.xml | 2 + .../HepMCCandAlgos/test/DummyHepMCAnalyzer.cc | 66 +++++++++++-------- .../HepMCCandAlgos/test/dumpHepMC_cfg.py | 13 ++-- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml b/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml index bb1ec8d810b3f..dd250949ce54d 100644 --- a/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml +++ b/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml @@ -1,4 +1,6 @@ + + diff --git a/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc b/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc index 2f5dcac5248b2..2bb18046957fe 100644 --- a/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc +++ b/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc @@ -1,55 +1,69 @@ -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h" #include "FWCore/Utilities/interface/EDMException.h" -#include -using namespace std; -using namespace edm; -using namespace HepMC; +#include "FWCore/MessageLogger/interface/MessageLogger.h" -class DummyHepMCAnalyzer : public EDAnalyzer { +class DummyHepMCAnalyzer : public edm::one::EDAnalyzer<> { private: bool dumpHepMC_; bool dumpPDF_; bool checkPDG_; + edm::EDGetTokenT srcToken_; public: - explicit DummyHepMCAnalyzer(const ParameterSet& cfg) - : dumpHepMC_(cfg.getUntrackedParameter("dumpHepMC", false)), - dumpPDF_(cfg.getUntrackedParameter("dumpPDF", false)), - checkPDG_(cfg.getUntrackedParameter("checkPDG", false)), - srcToken_(consumes(cfg.getParameter("src"))) {} + explicit DummyHepMCAnalyzer(const edm::ParameterSet& cfg) + : dumpHepMC_(cfg.getUntrackedParameter("dumpHepMC")), + dumpPDF_(cfg.getUntrackedParameter("dumpPDF")), + checkPDG_(cfg.getUntrackedParameter("checkPDG")), + srcToken_(consumes(cfg.getParameter("src"))) {} -private: - void analyze(const Event& evt, const EventSetup& es) override { - Handle hepMC; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked("dumpHepMC", true); + desc.addUntracked("dumpPDF", false); + desc.addUntracked("checkPDG", false); + desc.add("src", edm::InputTag("generatorSmeared")) + ->setComment("Input generated HepMC event after vtx smearing"); + descriptions.add("dummyHepMCAnalyzer", desc); + } + + void analyze(const edm::Event& evt, const edm::EventSetup& es) override { + edm::Handle hepMC; evt.getByToken(srcToken_, hepMC); - const GenEvent* mc = hepMC->GetEvent(); - if (mc == 0) - throw edm::Exception(edm::errors::InvalidReference) << "HepMC has null pointer to GenEvent" << endl; - const size_t size = mc->particles_size(); - cout << "\n particles #: " << size << endl; - if (dumpPDF_) - std::cout << "\n PDF info: " << mc->pdf_info() << std::endl; - if (dumpHepMC_) + + const HepMC::GenEvent* mc = hepMC->GetEvent(); + if (mc == 0) { + throw edm::Exception(edm::errors::InvalidReference) << "HepMC has null pointer to GenEvent"; + } + edm::LogPrint("HepMCAnalyzer") << "\n particles #: " << mc->particles_size(); + + if (dumpPDF_) { + edm::LogPrint("HepMCAnalyzer") << "\n PDF info: " << mc->pdf_info(); + } + + if (dumpHepMC_) { mc->print(std::cout); + } + if (checkPDG_) { edm::ESHandle fPDGTable; es.getData(fPDGTable); for (HepMC::GenEvent::particle_const_iterator part = mc->particles_begin(); part != mc->particles_end(); ++part) { const HepPDT::ParticleData* PData = fPDGTable->particle(HepPDT::ParticleID((*part)->pdg_id())); - if (!PData) - std::cout << "Missing entry in particle table for PDG code = " << (*part)->pdg_id() << std::endl; + if (!PData) { + edm::LogWarning("HepMCAnalyzer") << "Missing entry in particle table for PDG code = " << (*part)->pdg_id(); + } } } } - EDGetTokenT srcToken_; }; #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/PhysicsTools/HepMCCandAlgos/test/dumpHepMC_cfg.py b/PhysicsTools/HepMCCandAlgos/test/dumpHepMC_cfg.py index 7b16d0f6b0f9b..f41d51ec9d086 100644 --- a/PhysicsTools/HepMCCandAlgos/test/dumpHepMC_cfg.py +++ b/PhysicsTools/HepMCCandAlgos/test/dumpHepMC_cfg.py @@ -9,16 +9,13 @@ input = cms.untracked.int32(-1) ) process.source = cms.Source("PoolSource", - fileNames = cms.untracked.vstring('file:gen.root') + fileNames = cms.untracked.vstring('file:step1.root') ) -process.dummy = cms.EDAnalyzer("DummyHepMCAnalyzer", - src = cms.InputTag("VtxSmeared"), - dumpHepMC = cms.untracked.bool(True), - dumpPDF = cms.untracked.bool(False), - checkPDG = cms.untracked.bool(False) -) +process.load("PhysicsTools.HepMCCandAlgos.dummyHepMCAnalyzer_cfi") +process.dummyHepMCAnalyzer.dumpPDF = True +process.dummyHepMCAnalyzer.checkPDG = True -process.p = cms.Path(process.dummy) +process.p = cms.Path(process.dummyHepMCAnalyzer) From df1648a905ef4c59db149a649a829c523bb541e7 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 3 Aug 2021 12:09:03 +0200 Subject: [PATCH 10/27] Update VtxTester --- IOMC/EventVertexGenerators/test/BuildFile.xml | 5 +- IOMC/EventVertexGenerators/test/VtxTester.cc | 150 +++++++++--------- IOMC/EventVertexGenerators/test/VtxTester.h | 34 ---- .../test/test_vertex_cfg.py | 72 +++++++++ 4 files changed, 154 insertions(+), 107 deletions(-) delete mode 100644 IOMC/EventVertexGenerators/test/VtxTester.h create mode 100644 IOMC/EventVertexGenerators/test/test_vertex_cfg.py diff --git a/IOMC/EventVertexGenerators/test/BuildFile.xml b/IOMC/EventVertexGenerators/test/BuildFile.xml index 72c69ccee7276..ae538e4126d8e 100644 --- a/IOMC/EventVertexGenerators/test/BuildFile.xml +++ b/IOMC/EventVertexGenerators/test/BuildFile.xml @@ -1,9 +1,12 @@ - + + + + diff --git a/IOMC/EventVertexGenerators/test/VtxTester.cc b/IOMC/EventVertexGenerators/test/VtxTester.cc index 6e6ec6c61f1f6..99b517be5bb66 100644 --- a/IOMC/EventVertexGenerators/test/VtxTester.cc +++ b/IOMC/EventVertexGenerators/test/VtxTester.cc @@ -1,96 +1,102 @@ +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/Utilities/interface/EDGetToken.h" +#include "DataFormats/Common/interface/Handle.h" -#include - -#include "IOMC/EventVertexGenerators/test/VtxTester.h" - +#include "FWCore/Framework/interface/Event.h" #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Utilities/interface/InputTag.h" -// essentials !!! -#include "FWCore/Framework/interface/Event.h" -//#include "DataFormats/Common/interface/Handle.h" -#include "DataFormats/Common/interface/Handle.h" +#include "FWCore/ServiceRegistry/interface/Service.h" +#include "CommonTools/UtilAlgos/interface/TFileService.h" #include "TFile.h" #include "TH1.h" #include "TH2.h" +#include "CLHEP/Units/PhysicalConstants.h" +#include "CLHEP/Units/SystemOfUnits.h" + #include "FWCore/Framework/interface/MakerMacros.h" -using namespace edm; -using namespace std; - -VtxTester::VtxTester(const ParameterSet&) { - fOutputFile = 0; - fVtxHistz = 0; - fVtxHistx = 0; - fVtxHisty = 0; - fVtxHistxy = 0; - fPhiHistOrg = 0; - fPhiHistSmr = 0; - fEtaHistOrg = 0; - fEtaHistSmr = 0; +class VtxTester : public edm::one::EDAnalyzer<> { +public: + // + explicit VtxTester(const edm::ParameterSet&); + virtual ~VtxTester() {} + + void beginJob() override {} + void analyze(const edm::Event&, const edm::EventSetup&) override; + void endJob() override {} + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + +private: + edm::EDGetTokenT srcHepMCToken_; + + TH1D* fVtxHistTime_; + TH1D* fVtxHistz_; + TH2D* fVtxHistzTime_; + TH1D* fVtxHistx_; + TH1D* fVtxHisty_; + TH2D* fVtxHistxy_; + TH1D* fPhiHist_; + TH1D* fEtaHist_; +}; + +VtxTester::VtxTester(const edm::ParameterSet& cfg) + : srcHepMCToken_(consumes(cfg.getParameter("src"))) { + edm::Service fs; + + fVtxHistTime_ = fs->make("VtxHistTime", "#vtx, t [ns]", 60, -0.9, 0.9); + fVtxHistz_ = fs->make("VtxHistz", "#vtx, z [mm]", 400, -200., 200.); + fVtxHistzTime_ = fs->make("VtxHistzTime", "#vtx time [ns] vs z [mm]", 400, -200., 200., 60, -0.9, 0.9); + fVtxHistx_ = fs->make("VtxHistx", "#vtx, x [mm]", 200, -1., 1.); + fVtxHisty_ = fs->make("VtxHisty", "#vtx, y [mm]", 200, -1., 1.); + fVtxHistxy_ = fs->make("VtxHistxy", "#vtx y vs x [mm]", 200, -1., 1., 200, -1., 1.); + + fPhiHist_ = fs->make("PhiHist", "#vtx phi", 70, -3.5, 3.5); + fEtaHist_ = fs->make("EtaHist", "#vtx eta", 120, -6., 6.); } -void VtxTester::beginJob() { - fOutputFile = new TFile("VtxTest.root", "RECREATE"); - fVtxHistz = new TH1D("VtxHistz", "Test Z-spread", 100, -250., 250.); - fVtxHistx = new TH1D("VtxHistx", "Test X-spread", 500, -1., 1.); - fVtxHisty = new TH1D("VtxHisty", "Test Y-spread", 500, -1., 1.); - fVtxHistxy = new TH2D("VtxHistxy", "Test X-Y spread", 700, -1., 1., 700, -1., 1.); +void VtxTester::analyze(const edm::Event& e, const edm::EventSetup&) { + edm::Handle theGenEvent; + e.getByToken(srcHepMCToken_, theGenEvent); - fPhiHistOrg = new TH1D("PhiHistOrg", "Test Phi, org.", 80, -4., 4.); - fPhiHistSmr = new TH1D("PhiHistSmr", "Test Phi, smr.", 80, -4., 4.); - fEtaHistOrg = new TH1D("EtaHistOrg", "Test Eta, org.", 80, -4., 4.); - fEtaHistSmr = new TH1D("EtaHistSmr", "Test Eta, smr.", 80, -4., 4.); + if (theGenEvent.isValid()) { + const HepMC::GenEvent* Evt = theGenEvent->GetEvent(); - return; -} + // take only 1st vertex for now - it's been tested only of PGuns... + + HepMC::GenEvent::vertex_const_iterator Vtx = Evt->vertices_begin(); + + fVtxHistTime_->Fill((*Vtx)->position().t() * CLHEP::mm / CLHEP::c_light); + fVtxHistz_->Fill((*Vtx)->position().z() * CLHEP::mm); + fVtxHistzTime_->Fill((*Vtx)->position().z() * CLHEP::mm, (*Vtx)->position().t() * CLHEP::mm / CLHEP::c_light); + fVtxHistx_->Fill((*Vtx)->position().x() * CLHEP::mm); + fVtxHisty_->Fill((*Vtx)->position().y() * CLHEP::mm); + fVtxHistxy_->Fill((*Vtx)->position().x() * CLHEP::mm, (*Vtx)->position().y() * CLHEP::mm); -void VtxTester::analyze(const Event& e, const EventSetup&) { - vector > EvtHandles; - e.getManyByType(EvtHandles); - - for (unsigned int i = 0; i < EvtHandles.size(); i++) { - if (EvtHandles[i].isValid()) { - const HepMC::GenEvent* Evt = EvtHandles[i]->GetEvent(); - - // take only 1st vertex for now - it's been tested only of PGuns... - // - HepMC::GenEvent::vertex_const_iterator Vtx = Evt->vertices_begin(); - - for (HepMC::GenEvent::particle_const_iterator Part = Evt->particles_begin(); Part != Evt->particles_end(); - Part++) { - //HepLorentzVector Mom = (*Part)->momentum() ; - HepMC::FourVector Mom = (*Part)->momentum(); - double Phi = Mom.phi(); - double Eta = -log(tan(Mom.theta() / 2.)); - - //if ( EvtHandles[i].provenance()->moduleLabel() == "VtxSmeared" ) - //{ - fVtxHistz->Fill((*Vtx)->position().z()); - fVtxHistx->Fill((*Vtx)->position().x()); - fVtxHisty->Fill((*Vtx)->position().y()); - fVtxHistxy->Fill((*Vtx)->position().x(), (*Vtx)->position().y()); - fPhiHistSmr->Fill(Phi); - fEtaHistSmr->Fill(Eta); - //} - //else - //{ - //fPhiHistOrg->Fill( Phi ) ; - //fEtaHistOrg->Fill( Eta ) ; - //} - } + for (HepMC::GenEvent::particle_const_iterator Part = Evt->particles_begin(); Part != Evt->particles_end(); Part++) { + HepMC::FourVector Mom = (*Part)->momentum(); + double Phi = Mom.phi(); + double Eta = -log(tan(Mom.theta() / 2.)); + + fPhiHist_->Fill(Phi); + fEtaHist_->Fill(Eta); } } return; } -void VtxTester::endJob() { - fOutputFile->Write(); - fOutputFile->Close(); - - return; +void VtxTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("src", edm::InputTag("generatorSmeared")) + ->setComment("Input generated HepMC event after vtx smearing"); + descriptions.add("vtxTester", desc); } DEFINE_FWK_MODULE(VtxTester); diff --git a/IOMC/EventVertexGenerators/test/VtxTester.h b/IOMC/EventVertexGenerators/test/VtxTester.h deleted file mode 100644 index d0f86b279c5e6..0000000000000 --- a/IOMC/EventVertexGenerators/test/VtxTester.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef VtxTester_H -#define VtxTester_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -// forward declarations -class TFile; -class TH1D; -class TH2D; - -class VtxTester : public edm::EDAnalyzer { -public: - // - explicit VtxTester(const edm::ParameterSet&); - virtual ~VtxTester() {} - - virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void beginJob() override; - virtual void endJob() override; - -private: - // - TFile* fOutputFile; - TH1D* fVtxHistz; - TH1D* fVtxHistx; - TH1D* fVtxHisty; - TH2D* fVtxHistxy; - TH1D* fPhiHistOrg; - TH1D* fPhiHistSmr; - TH1D* fEtaHistOrg; - TH1D* fEtaHistSmr; -}; - -#endif diff --git a/IOMC/EventVertexGenerators/test/test_vertex_cfg.py b/IOMC/EventVertexGenerators/test/test_vertex_cfg.py new file mode 100644 index 0000000000000..7ea7c0c5fbbbc --- /dev/null +++ b/IOMC/EventVertexGenerators/test/test_vertex_cfg.py @@ -0,0 +1,72 @@ +import FWCore.ParameterSet.Config as cms + +process = cms.Process('TestVertex') + +# import of standard configurations +process.load('Configuration.StandardSequences.Services_cff') +process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') +process.load('FWCore.MessageService.MessageLogger_cfi') +process.load('Configuration.EventContent.EventContent_cff') +process.load('Configuration.StandardSequences.Generator_cff') +process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') +process.load('GeneratorInterface.Core.genFilterSummary_cff') +process.load('Configuration.StandardSequences.EndOfProcess_cff') + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(200000), + # input = cms.untracked.int32(100), + output = cms.optional.untracked.allowed(cms.int32,cms.PSet) +) + +# Input source +process.source = cms.Source("EmptySource") + +# Output definition + +process.RAWSIMoutput = cms.OutputModule("PoolOutputModule", + fileName = cms.untracked.string('file:step1.root'), + outputCommands = process.RAWSIMEventContent.outputCommands, +) + +# Additional output definition + +# Other statements +process.genstepfilter.triggerConditions=cms.vstring("generation_step") + +process.generator = cms.EDFilter("Pythia8PtGun", + PGunParameters = cms.PSet( + AddAntiParticle = cms.bool(True), + MaxEta = cms.double(2.85), + MaxPhi = cms.double(3.14159265359), + MaxPt = cms.double(100.0), + MinEta = cms.double(-2.85), + MinPhi = cms.double(-3.14159265359), + MinPt = cms.double(2.0), + ParticleID = cms.vint32(-13) + ), + PythiaParameters = cms.PSet( + parameterSets = cms.vstring() + ), + Verbosity = cms.untracked.int32(0), + firstRun = cms.untracked.uint32(1), + psethack = cms.string('single mu pt 2 to 100') +) + +process.vtxtester = cms.EDAnalyzer("VtxTester") + +process.TFileService = cms.Service("TFileService", + fileName = cms.string('vtxTester.root') +) + +# Path and EndPath definitions +process.generation_step = cms.Path(process.pgen+process.vtxtester) +process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) +process.RAWSIMoutput_step = cms.EndPath(process.RAWSIMoutput) + +# Schedule definition +process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.RAWSIMoutput_step) +# filter all path with the production filter sequence +for path in process.paths: + getattr(process,path).insert(0, process.generator) + +process.MessageLogger.cerr.FwkReport.reportEvery = 10000 From 37739b58437bba5179a1ec8c2145ce113e62faa8 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Tue, 3 Aug 2021 14:13:22 +0200 Subject: [PATCH 11/27] HLT menu migration to CMSSW 12_0_0_pre5 --- HLTrigger/Configuration/python/HLT_FULL_cff.py | 11 +++++++---- HLTrigger/Configuration/python/HLT_Fake1_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_Fake2_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_Fake_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_GRun_cff.py | 11 +++++++---- HLTrigger/Configuration/python/HLT_HIon_cff.py | 7 +++++-- HLTrigger/Configuration/python/HLT_PIon_cff.py | 7 +++++-- HLTrigger/Configuration/python/HLT_PRef_cff.py | 11 +++++++---- .../Configuration/python/customizeHLTforCMSSW.py | 7 ------- HLTrigger/Configuration/test/OnLine_HLT_FULL.py | 11 +++++++---- HLTrigger/Configuration/test/OnLine_HLT_Fake.py | 4 ++-- HLTrigger/Configuration/test/OnLine_HLT_Fake1.py | 4 ++-- HLTrigger/Configuration/test/OnLine_HLT_Fake2.py | 4 ++-- HLTrigger/Configuration/test/OnLine_HLT_GRun.py | 11 +++++++---- HLTrigger/Configuration/test/OnLine_HLT_HIon.py | 7 +++++-- HLTrigger/Configuration/test/OnLine_HLT_PIon.py | 7 +++++-- HLTrigger/Configuration/test/OnLine_HLT_PRef.py | 11 +++++++---- 17 files changed, 74 insertions(+), 51 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index a0e68f75a51f5..43a292b6bf64c 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/HLT --type FULL -# /dev/CMSSW_12_0_0/HLT/V5 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/HLT/V8 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V5') + tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V8') ) fragment.transferSystem = cms.PSet( @@ -6576,6 +6576,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) @@ -126991,8 +126994,8 @@ fragment.HLT_ZeroBias_FirstBXAfterTrain_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasFirstBunchAfterTrain + fragment.hltPreZeroBiasFirstBXAfterTrain + fragment.HLTEndSequence ) fragment.AlCa_RPCMuonNormalisation_v13 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu5IorSingleMu14erIorSingleMu16er + fragment.hltPreAlCaRPCMuonNormalisation + fragment.hltRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence ) fragment.AlCa_HIRPCMuonNormalisation_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu7to30 + fragment.hltPreAlCaHIRPCMuonNormalisation + fragment.hltHIRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence ) -fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) -fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) +fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) +fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) fragment.MC_ReducedIterativeTracking_v12 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCReducedIterativeTracking + fragment.HLTRecoJetSequenceAK4PrePF + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence + fragment.HLTDoLocalStripSequence + fragment.HLTIterativeTrackingIter02 + fragment.HLTEndSequence ) fragment.MC_PFMET_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCPFMET + fragment.HLTAK4PFJetsSequence + fragment.hltPFMETProducer + fragment.hltPFMETOpenFilter + fragment.HLTEndSequence ) fragment.MC_AK4PFJets_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCAK4PFJets + fragment.HLTAK4PFJetsSequence + fragment.hltAK4PFJetCollection20Filter + fragment.HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py index ee63a08f54f19..82a303167cc05 100644 --- a/HLTrigger/Configuration/python/HLT_Fake1_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake1_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake1 --type Fake1 -# /dev/CMSSW_12_0_0/Fake1/V4 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/Fake1/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V4') + tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V5') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_Fake2_cff.py b/HLTrigger/Configuration/python/HLT_Fake2_cff.py index f09403a75b7a9..f8b93f6dca7c9 100644 --- a/HLTrigger/Configuration/python/HLT_Fake2_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake2_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake2 --type Fake2 -# /dev/CMSSW_12_0_0/Fake2/V4 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/Fake2/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V4') + tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V5') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py index 17b2039b270d7..5ff5332957f07 100644 --- a/HLTrigger/Configuration/python/HLT_Fake_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake --type Fake -# /dev/CMSSW_12_0_0/Fake/V4 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/Fake/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V4') + tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V5') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index 105ae3ef9a642..8d25920a02729 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/GRun --type GRun -# /dev/CMSSW_12_0_0/GRun/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/GRun/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/GRun/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/GRun/V5') ) fragment.transferSystem = cms.PSet( @@ -5216,6 +5216,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) @@ -90833,8 +90836,8 @@ fragment.HLT_ZeroBias_LastCollisionInTrain_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasLastBunchInTrain + fragment.hltPreZeroBiasLastCollisionInTrain + fragment.HLTEndSequence ) fragment.HLT_ZeroBias_FirstBXAfterTrain_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasFirstBunchAfterTrain + fragment.hltPreZeroBiasFirstBXAfterTrain + fragment.HLTEndSequence ) fragment.AlCa_RPCMuonNormalisation_v13 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu5IorSingleMu14erIorSingleMu16er + fragment.hltPreAlCaRPCMuonNormalisation + fragment.hltRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence ) -fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) -fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) +fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) +fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) fragment.MC_ReducedIterativeTracking_v12 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCReducedIterativeTracking + fragment.HLTRecoJetSequenceAK4PrePF + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence + fragment.HLTDoLocalStripSequence + fragment.HLTIterativeTrackingIter02 + fragment.HLTEndSequence ) fragment.MC_PFMET_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCPFMET + fragment.HLTAK4PFJetsSequence + fragment.hltPFMETProducer + fragment.hltPFMETOpenFilter + fragment.HLTEndSequence ) fragment.MC_AK4PFJets_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCAK4PFJets + fragment.HLTAK4PFJetsSequence + fragment.hltAK4PFJetCollection20Filter + fragment.HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index 9a173b55ebe3e..94218edea6335 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/HIon --type HIon -# /dev/CMSSW_12_0_0/HIon/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/HIon/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/HIon/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/HIon/V5') ) fragment.transferSystem = cms.PSet( @@ -4379,6 +4379,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 24c497bc38839..823b8f11eb0a0 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/PIon --type PIon -# /dev/CMSSW_12_0_0/PIon/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/PIon/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/PIon/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/PIon/V5') ) fragment.transferSystem = cms.PSet( @@ -3850,6 +3850,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 281076ab4f3b4..91cbd4951b3ff 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/PRef --type PRef -# /dev/CMSSW_12_0_0/PRef/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/PRef/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/PRef/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/PRef/V5') ) fragment.transferSystem = cms.PSet( @@ -3929,6 +3929,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) @@ -10983,8 +10986,8 @@ fragment.AlCa_EcalPhiSym_v9 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sZeroBiasIorAlwaysTrueIorIsolatedBunch + fragment.hltPreAlCaEcalPhiSym + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.hltEcalPhiSymFilter + fragment.HLTEndSequence ) fragment.HLT_ZeroBias_FirstCollisionAfterAbortGap_v5 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasFirstCollisionAfterAbortGap + fragment.hltPreZeroBiasFirstCollisionAfterAbortGap + fragment.HLTEndSequence ) fragment.AlCa_HIRPCMuonNormalisation_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu7to30 + fragment.hltPreAlCaHIRPCMuonNormalisation + fragment.hltHIRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence ) -fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) -fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) +fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) +fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence ) fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltScalersRawToDigi + fragment.hltFEDSelector + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse ) fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltPreHLTAnalyzerEndpath + fragment.hltL1TGlobalSummary + fragment.hltTrigReport ) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 918d903c0be12..104df35b34944 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -129,10 +129,6 @@ def customiseFor2018Input(process): return process -def customiseFor34120(process): - """Ensure TrackerAdditionalParametersPerDetRcd ESProducer is run""" - process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi") - return process # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -140,7 +136,4 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) - if menuType in ["GRun","HIon","PIon","PRef"]: - process = customiseFor34120(process) - return process diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 655c4bca16a94..487d9e336b0ce 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_12_0_0/HLT/V5 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/HLT/V8 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFULL" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V5') + tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V8') ) process.transferSystem = cms.PSet( @@ -6721,6 +6721,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -133692,8 +133695,8 @@ process.HLT_ZeroBias_FirstBXAfterTrain_v3 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ZeroBiasFirstBunchAfterTrain + process.hltPreZeroBiasFirstBXAfterTrain + process.HLTEndSequence ) process.AlCa_RPCMuonNormalisation_v13 = cms.Path( process.HLTBeginSequence + process.hltL1sSingleMu5IorSingleMu14erIorSingleMu16er + process.hltPreAlCaRPCMuonNormalisation + process.hltRPCMuonNormaL1Filtered0 + process.HLTMuonLocalRecoSequence + process.HLTEndSequence ) process.AlCa_HIRPCMuonNormalisation_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sSingleMu7to30 + process.hltPreAlCaHIRPCMuonNormalisation + process.hltHIRPCMuonNormaL1Filtered0 + process.HLTMuonLocalRecoSequence + process.HLTEndSequence ) -process.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( process.HLTBeginSequenceRandom + process.hltPixelTrackerHVOn + process.hltPreAlCaLumiPixelsCountsRandom + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) -process.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( process.HLTBeginSequence + process.hltPixelTrackerHVOn + process.hltL1sZeroBias + process.hltPreAlCaLumiPixelsCountsZeroBias + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) +process.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( process.HLTBeginSequenceRandom + process.hltScalersRawToDigi + process.hltPixelTrackerHVOn + process.hltPreAlCaLumiPixelsCountsRandom + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) +process.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( process.HLTBeginSequence + process.hltScalersRawToDigi + process.hltPixelTrackerHVOn + process.hltL1sZeroBias + process.hltPreAlCaLumiPixelsCountsZeroBias + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) process.MC_ReducedIterativeTracking_v12 = cms.Path( process.HLTBeginSequence + process.hltPreMCReducedIterativeTracking + process.HLTRecoJetSequenceAK4PrePF + process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.HLTEndSequence ) process.MC_PFMET_v17 = cms.Path( process.HLTBeginSequence + process.hltPreMCPFMET + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMETOpenFilter + process.HLTEndSequence ) process.MC_AK4PFJets_v17 = cms.Path( process.HLTBeginSequence + process.hltPreMCAK4PFJets + process.HLTAK4PFJetsSequence + process.hltAK4PFJetCollection20Filter + process.HLTEndSequence ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index bf910274a95e2..f51d4740afba8 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/Fake --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root -# /dev/CMSSW_12_0_0/Fake/V4 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/Fake/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V4') + tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V5') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py index 0a4ba14f78dcb..76a53fbf3f2bf 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/Fake1 --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root -# /dev/CMSSW_12_0_0/Fake1/V4 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/Fake1/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake1" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V4') + tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V5') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py index a89e8c43a0889..870da09717e7c 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/Fake2 --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root -# /dev/CMSSW_12_0_0/Fake2/V4 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/Fake2/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake2" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V4') + tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V5') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index b20016c6935b4..cdb5db2c49fad 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_12_0_0/GRun/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/GRun/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTGRun" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/GRun/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/GRun/V5') ) process.transferSystem = cms.PSet( @@ -5361,6 +5361,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -93791,8 +93794,8 @@ process.HLT_ZeroBias_LastCollisionInTrain_v3 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ZeroBiasLastBunchInTrain + process.hltPreZeroBiasLastCollisionInTrain + process.HLTEndSequence ) process.HLT_ZeroBias_FirstBXAfterTrain_v3 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ZeroBiasFirstBunchAfterTrain + process.hltPreZeroBiasFirstBXAfterTrain + process.HLTEndSequence ) process.AlCa_RPCMuonNormalisation_v13 = cms.Path( process.HLTBeginSequence + process.hltL1sSingleMu5IorSingleMu14erIorSingleMu16er + process.hltPreAlCaRPCMuonNormalisation + process.hltRPCMuonNormaL1Filtered0 + process.HLTMuonLocalRecoSequence + process.HLTEndSequence ) -process.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( process.HLTBeginSequenceRandom + process.hltPixelTrackerHVOn + process.hltPreAlCaLumiPixelsCountsRandom + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) -process.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( process.HLTBeginSequence + process.hltPixelTrackerHVOn + process.hltL1sZeroBias + process.hltPreAlCaLumiPixelsCountsZeroBias + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) +process.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( process.HLTBeginSequenceRandom + process.hltScalersRawToDigi + process.hltPixelTrackerHVOn + process.hltPreAlCaLumiPixelsCountsRandom + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) +process.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( process.HLTBeginSequence + process.hltScalersRawToDigi + process.hltPixelTrackerHVOn + process.hltL1sZeroBias + process.hltPreAlCaLumiPixelsCountsZeroBias + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) process.MC_ReducedIterativeTracking_v12 = cms.Path( process.HLTBeginSequence + process.hltPreMCReducedIterativeTracking + process.HLTRecoJetSequenceAK4PrePF + process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.HLTEndSequence ) process.MC_PFMET_v17 = cms.Path( process.HLTBeginSequence + process.hltPreMCPFMET + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMETOpenFilter + process.HLTEndSequence ) process.MC_AK4PFJets_v17 = cms.Path( process.HLTBeginSequence + process.hltPreMCAK4PFJets + process.HLTAK4PFJetsSequence + process.hltAK4PFJetCollection20Filter + process.HLTEndSequence ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index ca35f9ae641cd..f49ea9be77752 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/HIon --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_12_0_0/HIon/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/HIon/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTHIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/HIon/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/HIon/V5') ) process.transferSystem = cms.PSet( @@ -4524,6 +4524,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index c9fcf1e98cd7c..1b5088bd5160b 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_12_0_0/PIon/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/PIon/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/PIon/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/PIon/V5') ) process.transferSystem = cms.PSet( @@ -3995,6 +3995,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index d8b51d1550f14..090cd884fad83 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_0_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_12_0_0/PRef/V3 (CMSSW_12_0_0_pre4) +# /dev/CMSSW_12_0_0/PRef/V5 (CMSSW_12_0_0_pre5) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPRef" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_0_0/PRef/V3') + tableName = cms.string('/dev/CMSSW_12_0_0/PRef/V5') ) process.transferSystem = cms.PSet( @@ -4074,6 +4074,9 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) +process.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", + appendToDataLabel = cms.string( "" ) +) process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", appendToDataLabel = cms.string( "" ), fromDDD = cms.bool( False ), @@ -11800,8 +11803,8 @@ process.AlCa_EcalPhiSym_v9 = cms.Path( process.HLTBeginSequence + process.hltL1sZeroBiasIorAlwaysTrueIorIsolatedBunch + process.hltPreAlCaEcalPhiSym + process.HLTDoFullUnpackingEgammaEcalSequence + process.hltEcalPhiSymFilter + process.HLTEndSequence ) process.HLT_ZeroBias_FirstCollisionAfterAbortGap_v5 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ZeroBiasFirstCollisionAfterAbortGap + process.hltPreZeroBiasFirstCollisionAfterAbortGap + process.HLTEndSequence ) process.AlCa_HIRPCMuonNormalisation_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sSingleMu7to30 + process.hltPreAlCaHIRPCMuonNormalisation + process.hltHIRPCMuonNormaL1Filtered0 + process.HLTMuonLocalRecoSequence + process.HLTEndSequence ) -process.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( process.HLTBeginSequenceRandom + process.hltPixelTrackerHVOn + process.hltPreAlCaLumiPixelsCountsRandom + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) -process.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( process.HLTBeginSequence + process.hltPixelTrackerHVOn + process.hltL1sZeroBias + process.hltPreAlCaLumiPixelsCountsZeroBias + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) +process.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( process.HLTBeginSequenceRandom + process.hltScalersRawToDigi + process.hltPixelTrackerHVOn + process.hltPreAlCaLumiPixelsCountsRandom + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) +process.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( process.HLTBeginSequence + process.hltScalersRawToDigi + process.hltPixelTrackerHVOn + process.hltL1sZeroBias + process.hltPreAlCaLumiPixelsCountsZeroBias + process.hltSiPixelDigis + process.hltSiPixelClusters + process.hltAlcaPixelClusterCounts + process.HLTEndSequence ) process.HLTriggerFinalPath = cms.Path( process.hltGtStage2Digis + process.hltScalersRawToDigi + process.hltFEDSelector + process.hltTriggerSummaryAOD + process.hltTriggerSummaryRAW + process.hltBoolFalse ) process.HLTAnalyzerEndpath = cms.EndPath( process.hltGtStage2Digis + process.hltPreHLTAnalyzerEndpath + process.hltL1TGlobalSummary + process.hltTrigReport ) process.PhysicsCommissioningOutput = cms.EndPath( process.hltGtStage2Digis + process.hltPrePhysicsCommissioningOutput + process.hltOutputPhysicsCommissioning ) From 7a99a9d8e79796362bf6701308a40d96b1333175 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 3 Aug 2021 15:15:44 +0200 Subject: [PATCH 12/27] [TrackingTools] Move public headers on to interface directory --- RecoTracker/TkDetLayers/src/TIBLayer.cc | 2 +- RecoTracker/TkNavigation/plugins/BeamHaloNavigationSchool.cc | 2 +- RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc | 2 +- RecoTracker/TkNavigation/plugins/SimpleNavigationSchool.cc | 2 +- TrackingTools/DetLayers/{src => interface}/DetLessZ.h | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) rename TrackingTools/DetLayers/{src => interface}/DetLessZ.h (92%) diff --git a/RecoTracker/TkDetLayers/src/TIBLayer.cc b/RecoTracker/TkDetLayers/src/TIBLayer.cc index 70744c64721a5..360adc4d16bdc 100644 --- a/RecoTracker/TkDetLayers/src/TIBLayer.cc +++ b/RecoTracker/TkDetLayers/src/TIBLayer.cc @@ -11,7 +11,7 @@ #include "TrackingTools/DetLayers/interface/DetLayerException.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "TrackingTools/GeomPropagators/interface/HelixBarrelCylinderCrossing.h" -#include "TrackingTools/DetLayers/src/DetLessZ.h" +#include "TrackingTools/DetLayers/interface/DetLessZ.h" typedef GeometricSearchDet::DetWithState DetWithState; diff --git a/RecoTracker/TkNavigation/plugins/BeamHaloNavigationSchool.cc b/RecoTracker/TkNavigation/plugins/BeamHaloNavigationSchool.cc index 8826bc25cb17e..a549a0f02ec10 100644 --- a/RecoTracker/TkNavigation/plugins/BeamHaloNavigationSchool.cc +++ b/RecoTracker/TkNavigation/plugins/BeamHaloNavigationSchool.cc @@ -22,7 +22,7 @@ class dso_hidden BeamHaloNavigationSchool final : public SimpleNavigationSchool #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "TrackingTools/DetLayers/src/DetLessZ.h" +#include "TrackingTools/DetLayers/interface/DetLessZ.h" #include "TrackingTools/DetLayers/interface/BarrelDetLayer.h" #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" diff --git a/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc b/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc index cf09f7b623876..50bd9c348d310 100644 --- a/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc +++ b/RecoTracker/TkNavigation/plugins/CosmicNavigationSchool.cc @@ -66,7 +66,7 @@ class dso_hidden CosmicNavigationSchool : public SimpleNavigationSchool { #include "TrackingTools/DetLayers/interface/BarrelDetLayer.h" #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" -#include "TrackingTools/DetLayers/src/DetLessZ.h" +#include "TrackingTools/DetLayers/interface/DetLessZ.h" #include #include diff --git a/RecoTracker/TkNavigation/plugins/SimpleNavigationSchool.cc b/RecoTracker/TkNavigation/plugins/SimpleNavigationSchool.cc index 6d80ce4572902..d3b71282b435d 100644 --- a/RecoTracker/TkNavigation/plugins/SimpleNavigationSchool.cc +++ b/RecoTracker/TkNavigation/plugins/SimpleNavigationSchool.cc @@ -9,7 +9,7 @@ #include "TrackingTools/DetLayers/interface/BarrelDetLayer.h" #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" -#include "TrackingTools/DetLayers/src/DetLessZ.h" +#include "TrackingTools/DetLayers/interface/DetLessZ.h" #include "DataFormats/GeometrySurface/interface/BoundCylinder.h" #include "DataFormats/GeometrySurface/interface/BoundDisk.h" diff --git a/TrackingTools/DetLayers/src/DetLessZ.h b/TrackingTools/DetLayers/interface/DetLessZ.h similarity index 92% rename from TrackingTools/DetLayers/src/DetLessZ.h rename to TrackingTools/DetLayers/interface/DetLessZ.h index 52201a8718410..483da8b290f11 100644 --- a/TrackingTools/DetLayers/src/DetLessZ.h +++ b/TrackingTools/DetLayers/interface/DetLessZ.h @@ -4,7 +4,6 @@ /** Comparison operator for Dets based on the Z. */ -#include "TrackingTools/DetLayers/src/DetLessZ.h" #include "TrackingTools/DetLayers/interface/GeometricSearchDet.h" inline bool isDetLessZ(const GeometricSearchDet* a, const GeometricSearchDet* b) { From aa1b0eaeb327af9c730a0026a2ccc8edb3e677d3 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 3 Aug 2021 15:36:38 +0200 Subject: [PATCH 13/27] [RecoParticleFlow] Cleanup for unused/private header --- RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc b/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc index cbdf10387c375..10705052ed890 100644 --- a/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc +++ b/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc @@ -12,7 +12,7 @@ #include "RecoVertex/AdaptiveVertexFit/interface/AdaptiveVertexFitter.h" #include "RecoVertex/KalmanVertexFit/interface/KalmanVertexSmoother.h" -#include "PhysicsTools/RecoAlgos/plugins/KalmanVertexFitter.h" +#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" From bd652559e6694c1dcca2e3a38767e20c701ccb69 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 3 Aug 2021 16:07:50 +0200 Subject: [PATCH 14/27] Update SimG4Core/Application dumpers --- SimG4Core/Application/test/BuildFile.xml | 3 +- .../Application/test/SimHitCaloHitDumper.cc | 260 +++++++++--------- .../test/SimTrackSimVertexDumper.cc | 94 +++---- .../test/runSimHitCaloHitDumper_cfg.py | 13 +- .../test/runSimTrackSimVertexDumper_cfg.py | 15 +- 5 files changed, 188 insertions(+), 197 deletions(-) diff --git a/SimG4Core/Application/test/BuildFile.xml b/SimG4Core/Application/test/BuildFile.xml index ab0f523c24e23..933807d300b68 100644 --- a/SimG4Core/Application/test/BuildFile.xml +++ b/SimG4Core/Application/test/BuildFile.xml @@ -1,6 +1,7 @@ - + + diff --git a/SimG4Core/Application/test/SimHitCaloHitDumper.cc b/SimG4Core/Application/test/SimHitCaloHitDumper.cc index 61df41fd81512..549a0d62281c1 100644 --- a/SimG4Core/Application/test/SimHitCaloHitDumper.cc +++ b/SimG4Core/Application/test/SimHitCaloHitDumper.cc @@ -1,16 +1,16 @@ // system include files #include #include -#include -#include // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/Utilities/interface/EDGetToken.h" +#include "DataFormats/Common/interface/Handle.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "DataFormats/Common/interface/Handle.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" @@ -18,94 +18,96 @@ #include "SimDataFormats/CaloHit/interface/PCaloHit.h" #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h" -class SimHitCaloHitDumper : public edm::EDAnalyzer { +class SimHitCaloHitDumper : public edm::one::EDAnalyzer<> { public: - SimHitCaloHitDumper(const edm::ParameterSet& iConfig); + SimHitCaloHitDumper(const edm::ParameterSet&); ~SimHitCaloHitDumper() override{}; void analyze(const edm::Event&, const edm::EventSetup&) override; void beginJob() override{}; void endJob() override{}; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: std::string moduleName; - edm::EDGetTokenT PixelBarrelLowTofToken; - edm::EDGetTokenT PixelBarrelHighTofToken; - edm::EDGetTokenT PixelEndcapLowTofToken; - edm::EDGetTokenT PixelEndcapHighTofToken; - edm::EDGetTokenT TrackerTIBLowTofToken; - edm::EDGetTokenT TrackerTIBHighTofToken; - edm::EDGetTokenT TrackerTIDLowTofToken; - edm::EDGetTokenT TrackerTIDHighTofToken; - edm::EDGetTokenT TrackerTOBLowTofToken; - edm::EDGetTokenT TrackerTOBHighTofToken; - edm::EDGetTokenT TrackerTECLowTofToken; - edm::EDGetTokenT TrackerTECHighTofToken; - - edm::EDGetTokenT MuonDTToken; - edm::EDGetTokenT MuonCSCToken; - edm::EDGetTokenT MuonRPCToken; - - edm::EDGetTokenT FastTimerBTLToken; - edm::EDGetTokenT FastTimerETLToken; - - edm::EDGetTokenT EcalEBToken; - edm::EDGetTokenT EcalEEToken; - edm::EDGetTokenT EcalESToken; - edm::EDGetTokenT HcalToken; - edm::EDGetTokenT CaloTkToken; - edm::EDGetTokenT ZDCToken; - edm::EDGetTokenT CastorTUToken; - edm::EDGetTokenT CastorPLToken; - edm::EDGetTokenT CastorFIToken; - edm::EDGetTokenT CastorBUToken; + edm::EDGetTokenT PixelBarrelLowTofToken_; + edm::EDGetTokenT PixelBarrelHighTofToken_; + edm::EDGetTokenT PixelEndcapLowTofToken_; + edm::EDGetTokenT PixelEndcapHighTofToken_; + edm::EDGetTokenT TrackerTIBLowTofToken_; + edm::EDGetTokenT TrackerTIBHighTofToken_; + edm::EDGetTokenT TrackerTIDLowTofToken_; + edm::EDGetTokenT TrackerTIDHighTofToken_; + edm::EDGetTokenT TrackerTOBLowTofToken_; + edm::EDGetTokenT TrackerTOBHighTofToken_; + edm::EDGetTokenT TrackerTECLowTofToken_; + edm::EDGetTokenT TrackerTECHighTofToken_; + + edm::EDGetTokenT MuonDTToken_; + edm::EDGetTokenT MuonCSCToken_; + edm::EDGetTokenT MuonRPCToken_; + + edm::EDGetTokenT FastTimerBTLToken_; + edm::EDGetTokenT FastTimerETLToken_; + + edm::EDGetTokenT EcalEBToken_; + edm::EDGetTokenT EcalEEToken_; + edm::EDGetTokenT EcalESToken_; + edm::EDGetTokenT HcalToken_; + edm::EDGetTokenT CaloTkToken_; + edm::EDGetTokenT ZDCToken_; + edm::EDGetTokenT CastorTUToken_; + edm::EDGetTokenT CastorPLToken_; + edm::EDGetTokenT CastorFIToken_; + edm::EDGetTokenT CastorBUToken_; }; SimHitCaloHitDumper::SimHitCaloHitDumper(const edm::ParameterSet& iConfig) - : moduleName(iConfig.getParameter("moduleName")) { - PixelBarrelLowTofToken = + : moduleName(iConfig.getParameter("moduleLabelG4")) { + PixelBarrelLowTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelBarrelLowTof")); - PixelBarrelHighTofToken = + PixelBarrelHighTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelBarrelHighTof")); - PixelEndcapLowTofToken = + PixelEndcapLowTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelEndcapLowTof")); - PixelEndcapHighTofToken = + PixelEndcapHighTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelEndcapHighTof")); - TrackerTIBLowTofToken = + TrackerTIBLowTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIBLowTof")); - TrackerTIBHighTofToken = + TrackerTIBHighTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIBHighTof")); - TrackerTIDLowTofToken = + TrackerTIDLowTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIDLowTof")); - TrackerTIDHighTofToken = + TrackerTIDHighTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIDHighTof")); - TrackerTOBLowTofToken = + TrackerTOBLowTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTOBLowTof")); - TrackerTOBHighTofToken = + TrackerTOBHighTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTOBHighTof")); - TrackerTECLowTofToken = + TrackerTECLowTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTECLowTof")); - TrackerTECHighTofToken = + TrackerTECHighTofToken_ = consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTECHighTof")); - MuonDTToken = consumes(edm::InputTag(std::string(moduleName), "MuonDTHits")); - MuonCSCToken = consumes(edm::InputTag(std::string(moduleName), "MuonCSCHits")); - MuonRPCToken = consumes(edm::InputTag(std::string(moduleName), "MuonRPCHits")); - - FastTimerBTLToken = consumes(edm::InputTag(std::string(moduleName), "FastTimerHitsBarrel")); - FastTimerETLToken = consumes(edm::InputTag(std::string(moduleName), "FastTimerHitsEndcap")); - - EcalEBToken = consumes(edm::InputTag(std::string(moduleName), "EBHits")); - EcalEEToken = consumes(edm::InputTag(std::string(moduleName), "EEHits")); - EcalESToken = consumes(edm::InputTag(std::string(moduleName), "ESHits")); - HcalToken = consumes(edm::InputTag(std::string(moduleName), "HcalHits")); - CaloTkToken = consumes(edm::InputTag(std::string(moduleName), "CaloTkHits")); - ZDCToken = consumes(edm::InputTag(std::string(moduleName), "ZDC")); - CastorTUToken = consumes(edm::InputTag(std::string(moduleName), "CastorTUHits")); - CastorPLToken = consumes(edm::InputTag(std::string(moduleName), "CastorPLHits")); - CastorFIToken = consumes(edm::InputTag(std::string(moduleName), "CastorFIHits")); - CastorBUToken = consumes(edm::InputTag(std::string(moduleName), "CastorBUHits")); + MuonDTToken_ = consumes(edm::InputTag(std::string(moduleName), "MuonDTHits")); + MuonCSCToken_ = consumes(edm::InputTag(std::string(moduleName), "MuonCSCHits")); + MuonRPCToken_ = consumes(edm::InputTag(std::string(moduleName), "MuonRPCHits")); + + FastTimerBTLToken_ = consumes(edm::InputTag(std::string(moduleName), "FastTimerHitsBarrel")); + FastTimerETLToken_ = consumes(edm::InputTag(std::string(moduleName), "FastTimerHitsEndcap")); + + EcalEBToken_ = consumes(edm::InputTag(std::string(moduleName), "EBHits")); + EcalEEToken_ = consumes(edm::InputTag(std::string(moduleName), "EEHits")); + EcalESToken_ = consumes(edm::InputTag(std::string(moduleName), "ESHits")); + HcalToken_ = consumes(edm::InputTag(std::string(moduleName), "HcalHits")); + CaloTkToken_ = consumes(edm::InputTag(std::string(moduleName), "CaloTkHits")); + ZDCToken_ = consumes(edm::InputTag(std::string(moduleName), "ZDC")); + CastorTUToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorTUHits")); + CastorPLToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorPLHits")); + CastorFIToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorFIHits")); + CastorBUToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorBUHits")); } void SimHitCaloHitDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { @@ -150,36 +152,36 @@ void SimHitCaloHitDumper::analyze(const edm::Event& iEvent, const edm::EventSetu edm::Handle CastorFIHits; edm::Handle CastorBUHits; - iEvent.getByToken(PixelBarrelLowTofToken, PixelBarrelHitsLowTof); - iEvent.getByToken(PixelBarrelHighTofToken, PixelBarrelHitsHighTof); - iEvent.getByToken(PixelEndcapLowTofToken, PixelEndcapHitsLowTof); - iEvent.getByToken(PixelEndcapHighTofToken, PixelEndcapHitsHighTof); - iEvent.getByToken(TrackerTIBLowTofToken, TIBHitsLowTof); - iEvent.getByToken(TrackerTIBHighTofToken, TIBHitsHighTof); - iEvent.getByToken(TrackerTIDLowTofToken, TIDHitsLowTof); - iEvent.getByToken(TrackerTIDHighTofToken, TIDHitsHighTof); - iEvent.getByToken(TrackerTOBLowTofToken, TOBHitsLowTof); - iEvent.getByToken(TrackerTOBHighTofToken, TOBHitsHighTof); - iEvent.getByToken(TrackerTECLowTofToken, TECHitsLowTof); - iEvent.getByToken(TrackerTECHighTofToken, TECHitsHighTof); - - iEvent.getByToken(MuonDTToken, DTHits); - iEvent.getByToken(MuonCSCToken, CSCHits); - iEvent.getByToken(MuonRPCToken, RPCHits); - - iEvent.getByToken(EcalEBToken, EBHits); - iEvent.getByToken(EcalEEToken, EEHits); - iEvent.getByToken(EcalESToken, ESHits); - iEvent.getByToken(HcalToken, HcalHits); - iEvent.getByToken(CaloTkToken, CaloTkHits); - iEvent.getByToken(ZDCToken, ZDCHits); - iEvent.getByToken(CastorTUToken, CastorTUHits); - iEvent.getByToken(CastorPLToken, CastorPLHits); - iEvent.getByToken(CastorFIToken, CastorFIHits); - iEvent.getByToken(CastorBUToken, CastorBUHits); - - iEvent.getByToken(FastTimerBTLToken, BTLHits); - iEvent.getByToken(FastTimerETLToken, ETLHits); + iEvent.getByToken(PixelBarrelLowTofToken_, PixelBarrelHitsLowTof); + iEvent.getByToken(PixelBarrelHighTofToken_, PixelBarrelHitsHighTof); + iEvent.getByToken(PixelEndcapLowTofToken_, PixelEndcapHitsLowTof); + iEvent.getByToken(PixelEndcapHighTofToken_, PixelEndcapHitsHighTof); + iEvent.getByToken(TrackerTIBLowTofToken_, TIBHitsLowTof); + iEvent.getByToken(TrackerTIBHighTofToken_, TIBHitsHighTof); + iEvent.getByToken(TrackerTIDLowTofToken_, TIDHitsLowTof); + iEvent.getByToken(TrackerTIDHighTofToken_, TIDHitsHighTof); + iEvent.getByToken(TrackerTOBLowTofToken_, TOBHitsLowTof); + iEvent.getByToken(TrackerTOBHighTofToken_, TOBHitsHighTof); + iEvent.getByToken(TrackerTECLowTofToken_, TECHitsLowTof); + iEvent.getByToken(TrackerTECHighTofToken_, TECHitsHighTof); + + iEvent.getByToken(MuonDTToken_, DTHits); + iEvent.getByToken(MuonCSCToken_, CSCHits); + iEvent.getByToken(MuonRPCToken_, RPCHits); + + iEvent.getByToken(EcalEBToken_, EBHits); + iEvent.getByToken(EcalEEToken_, EEHits); + iEvent.getByToken(EcalESToken_, ESHits); + iEvent.getByToken(HcalToken_, HcalHits); + iEvent.getByToken(CaloTkToken_, CaloTkHits); + iEvent.getByToken(ZDCToken_, ZDCHits); + iEvent.getByToken(CastorTUToken_, CastorTUHits); + iEvent.getByToken(CastorPLToken_, CastorPLHits); + iEvent.getByToken(CastorFIToken_, CastorFIHits); + iEvent.getByToken(CastorBUToken_, CastorBUHits); + + iEvent.getByToken(FastTimerBTLToken_, BTLHits); + iEvent.getByToken(FastTimerETLToken_, ETLHits); int oldsize = 0; @@ -352,79 +354,79 @@ void SimHitCaloHitDumper::analyze(const edm::Event& iEvent, const edm::EventSetu theMTDComposition.push_back(label27); } - std::cout << "\n SimHit / CaloHit structure dump \n" << std::endl; - std::cout << " Tracker Hits in the event = " << theTrackerHits.size() << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n SimHit / CaloHit structure dump \n"; + edm::LogPrint("SimHitCaloHitDumper") << " Tracker Hits in the event = " << theTrackerHits.size(); + edm::LogPrint("SimHitCaloHitDumper") << "\n"; // for (std::vector::iterator isim = theTrackerHits.begin(); // isim != theTrackerHits.end(); ++isim){ - // std::cout << (*isim) << " Track Id = " << isim->trackId() << std::endl; + // edm::LogPrint("SimHitCaloHitDumper") << (*isim) << " Track Id = " << isim->trackId() ; // } int nhit = 0; for (std::vector >::iterator icoll = theTrackerComposition.begin(); icoll != theTrackerComposition.end(); ++icoll) { - std::cout << "\n" << std::endl; - std::cout << (*icoll).second << " hits in the event = " << (*icoll).first << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; + edm::LogPrint("SimHitCaloHitDumper") << (*icoll).second << " hits in the event = " << (*icoll).first; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; for (int ihit = 0; ihit < (*icoll).first; ++ihit) { - std::cout << theTrackerHits[nhit] << " Track Id = " << theTrackerHits[nhit].trackId() << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << theTrackerHits[nhit] << " Track Id = " << theTrackerHits[nhit].trackId(); nhit++; } } - std::cout << "\n Muon Hits in the event = " << theMuonHits.size() << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n Muon Hits in the event = " << theMuonHits.size(); + edm::LogPrint("SimHitCaloHitDumper") << "\n"; // for (std::vector::iterator isim = theMuonHits.begin(); // isim != theMuonHits.end(); ++isim){ - // std::cout << (*isim) << " Track Id = " << isim->trackId() << std::endl; + // edm::LogPrint("SimHitCaloHitDumper") << (*isim) << " Track Id = " << isim->trackId() ; // } nhit = 0; for (std::vector >::iterator icoll = theMuonComposition.begin(); icoll != theMuonComposition.end(); ++icoll) { - std::cout << "\n" << std::endl; - std::cout << (*icoll).second << " hits in the event = " << (*icoll).first << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; + edm::LogPrint("SimHitCaloHitDumper") << (*icoll).second << " hits in the event = " << (*icoll).first; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; for (int ihit = 0; ihit < (*icoll).first; ++ihit) { - std::cout << theMuonHits[nhit] << " Track Id = " << theMuonHits[nhit].trackId() << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << theMuonHits[nhit] << " Track Id = " << theMuonHits[nhit].trackId(); nhit++; } } - std::cout << "\n MTD Hits in the event = " << theMTDHits.size() << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n MTD Hits in the event = " << theMTDHits.size(); + edm::LogPrint("SimHitCaloHitDumper") << "\n"; // for (std::vector::iterator isim = theMTDHits.begin(); // isim != theMTDHits.end(); ++isim){ - // std::cout << (*isim) << " Track Id = " << isim->trackId() << std::endl; + // edm::LogPrint("SimHitCaloHitDumper") << (*isim) << " Track Id = " << isim->trackId() ; // } nhit = 0; for (std::vector >::iterator icoll = theMTDComposition.begin(); icoll != theMTDComposition.end(); ++icoll) { - std::cout << "\n" << std::endl; - std::cout << (*icoll).second << " hits in the event = " << (*icoll).first << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; + edm::LogPrint("SimHitCaloHitDumper") << (*icoll).second << " hits in the event = " << (*icoll).first; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; for (int ihit = 0; ihit < (*icoll).first; ++ihit) { - std::cout << theMTDHits[nhit] << " Track Id = " << theMTDHits[nhit].trackId() << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << theMTDHits[nhit] << " Track Id = " << theMTDHits[nhit].trackId(); nhit++; } } - std::cout << "\n Calorimeter Hits in the event = " << theCaloHits.size() << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n Calorimeter Hits in the event = " << theCaloHits.size(); + edm::LogPrint("SimHitCaloHitDumper") << "\n"; // for (std::vector::iterator isim = theCaloHits.begin(); // isim != theCaloHits.end(); ++isim){ - // std::cout << (*isim) << std::endl; + // edm::LogPrint("SimHitCaloHitDumper") << (*isim) ; // } nhit = 0; for (std::vector >::iterator icoll = theCaloComposition.begin(); icoll != theCaloComposition.end(); ++icoll) { - std::cout << "\n" << std::endl; - std::cout << (*icoll).second << " hits in the event = " << (*icoll).first << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; + edm::LogPrint("SimHitCaloHitDumper") << (*icoll).second << " hits in the event = " << (*icoll).first; + edm::LogPrint("SimHitCaloHitDumper") << "\n"; for (int ihit = 0; ihit < (*icoll).first; ++ihit) { - std::cout << theCaloHits[nhit] << std::endl; + edm::LogPrint("SimHitCaloHitDumper") << theCaloHits[nhit]; nhit++; } } @@ -432,6 +434,12 @@ void SimHitCaloHitDumper::analyze(const edm::Event& iEvent, const edm::EventSetu return; } +void SimHitCaloHitDumper::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("moduleLabelG4", "g4SimHits")->setComment("Module for input SimHit/CaloHit collections"); + descriptions.add("simHitCaloHitDumper", desc); +} + #include "FWCore/Framework/interface/MakerMacros.h" //define this as a plug-in diff --git a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc index de50d5b0727eb..4b1bca952086f 100644 --- a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc +++ b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc @@ -1,28 +1,15 @@ -// -*- C++ -*- -// -// Package: SimTrackerDumper -// Class: SimTrackSimVertexDumper -// -/* - Description: - - Implementation: - -*/ -// -// - // system include files -#include #include // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/Utilities/interface/EDGetToken.h" +#include "DataFormats/Common/interface/Handle.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" @@ -36,7 +23,7 @@ #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" #include "HepMC/GenEvent.h" -class SimTrackSimVertexDumper : public edm::EDAnalyzer { +class SimTrackSimVertexDumper : public edm::one::EDAnalyzer<> { public: explicit SimTrackSimVertexDumper(const edm::ParameterSet&); ~SimTrackSimVertexDumper() override{}; @@ -45,26 +32,22 @@ class SimTrackSimVertexDumper : public edm::EDAnalyzer { void beginJob() override{}; void endJob() override{}; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: - edm::InputTag hepmcLabel; - edm::InputTag simtkLabel; - edm::InputTag simvtxLabel; - bool dumpHepMC; - - edm::EDGetTokenT hepmcToken; - edm::EDGetTokenT simTrackToken; - edm::EDGetTokenT simVertexToken; + edm::EDGetTokenT hepmcToken_; + edm::EDGetTokenT simTrackToken_; + edm::EDGetTokenT simVertexToken_; + bool dumpHepMC_; }; SimTrackSimVertexDumper::SimTrackSimVertexDumper(const edm::ParameterSet& iConfig) - : hepmcLabel(iConfig.getParameter("moduleLabelHepMC")), - simtkLabel(iConfig.getParameter("moduleLabelTk")), - simvtxLabel(iConfig.getParameter("moduleLabelVtx")), - dumpHepMC(iConfig.getUntrackedParameter("dumpHepMC", "false")) { - hepmcToken = consumes(hepmcLabel); - simTrackToken = consumes(simtkLabel); - simVertexToken = consumes(simvtxLabel); -} + : hepmcToken_(consumes(iConfig.getParameter("moduleLabelHepMC"))), + simTrackToken_( + consumes(edm::InputTag(iConfig.getParameter("moduleLabelG4")))), + simVertexToken_( + consumes(edm::InputTag(iConfig.getParameter("moduleLabelG4")))), + dumpHepMC_(iConfig.getUntrackedParameter("dumpHepMC")) {} // // member functions @@ -81,52 +64,61 @@ void SimTrackSimVertexDumper::analyze(const edm::Event& iEvent, const edm::Event edm::Handle SimTk; edm::Handle SimVtx; - iEvent.getByToken(hepmcToken, MCEvt); + iEvent.getByToken(hepmcToken_, MCEvt); const HepMC::GenEvent* evt = MCEvt->GetEvent(); - iEvent.getByToken(simTrackToken, SimTk); - iEvent.getByToken(simVertexToken, SimVtx); + iEvent.getByToken(simTrackToken_, SimTk); + iEvent.getByToken(simVertexToken_, SimVtx); theSimTracks.insert(theSimTracks.end(), SimTk->begin(), SimTk->end()); theSimVertexes.insert(theSimVertexes.end(), SimVtx->begin(), SimVtx->end()); - std::cout << "\n SimVertex / SimTrack structure dump \n" << std::endl; - std::cout << " SimVertex in the event = " << theSimVertexes.size() << std::endl; - std::cout << " SimTracks in the event = " << theSimTracks.size() << std::endl; - std::cout << "\n" << std::endl; + edm::LogPrint("DumpTkVtx") << "\n SimVertex / SimTrack structure dump \n"; + edm::LogPrint("DumpTkVtx") << " SimVertex in the event = " << theSimVertexes.size(); + edm::LogPrint("DumpTkVtx") << " SimTracks in the event = " << theSimTracks.size(); + edm::LogPrint("DumpTkVtx") << "\n"; for (unsigned int isimvtx = 0; isimvtx < theSimVertexes.size(); isimvtx++) { - std::cout << "SimVertex " << isimvtx << " = " << theSimVertexes[isimvtx] << "\n" << std::endl; + edm::LogPrint("DumpTkVtx") << "SimVertex " << isimvtx << " = " << theSimVertexes[isimvtx] << "\n"; for (unsigned int isimtk = 0; isimtk < theSimTracks.size(); isimtk++) { if (theSimTracks[isimtk].vertIndex() >= 0 && std::abs(theSimTracks[isimtk].vertIndex()) == (int)isimvtx) { - std::cout << " SimTrack " << isimtk << " = " << theSimTracks[isimtk] - << " Track Id = " << theSimTracks[isimtk].trackId() << std::endl; + edm::LogPrint("DumpTkVtx") << " SimTrack " << isimtk << " = " << theSimTracks[isimtk] + << " Track Id = " << theSimTracks[isimtk].trackId(); // for debugging purposes - if (dumpHepMC) { + if (dumpHepMC_) { if (theSimTracks[isimtk].genpartIndex() != -1) { HepMC::GenParticle* part = evt->barcode_to_particle(theSimTracks[isimtk].genpartIndex()); if (part) { - std::cout << " ---> Corresponding to HepMC particle " << *part << std::endl; + edm::LogPrint("DumpTkVtx") << " ---> Corresponding to HepMC particle " << *part; } else { - std::cout << " ---> Corresponding HepMC particle to barcode " << theSimTracks[isimtk].genpartIndex() - << " not in selected event " << std::endl; + edm::LogPrint("DumpTkVtx") << " ---> Corresponding HepMC particle to barcode " + << theSimTracks[isimtk].genpartIndex() << " not in selected event "; } } } } } - std::cout << "\n" << std::endl; + edm::LogPrint("DumpTkVtx") << "\n"; } for (std::vector::iterator isimtk = theSimTracks.begin(); isimtk != theSimTracks.end(); ++isimtk) { if (isimtk->noVertex()) { - std::cout << "SimTrack without an associated Vertex = " << *isimtk << std::endl; + edm::LogPrint("DumpTkVtx") << "SimTrack without an associated Vertex = " << *isimtk; } } return; } +void SimTrackSimVertexDumper::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("moduleLabelHepMC", edm::InputTag("generatorSmeared")) + ->setComment("Input generated HepMC event after vtx smearing"); + desc.add("moduleLabelG4", "g4SimHits")->setComment("Module for input SimTrack/SimVertex collection"); + desc.addUntracked("dumpHepMC", false); + descriptions.add("simTrackSimVertexDumper", desc); +} + #include "FWCore/Framework/interface/MakerMacros.h" //define this as a plug-in diff --git a/SimG4Core/Application/test/runSimHitCaloHitDumper_cfg.py b/SimG4Core/Application/test/runSimHitCaloHitDumper_cfg.py index 5c8dfcd2d782f..ee3a493bfef23 100644 --- a/SimG4Core/Application/test/runSimHitCaloHitDumper_cfg.py +++ b/SimG4Core/Application/test/runSimHitCaloHitDumper_cfg.py @@ -1,21 +1,16 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("SimCaloHitDump") -process.load("FWCore.MessageLogger.MessageLogger_cfi") - process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") +process.load("FWCore.MessageLogger.MessageLogger_cfi") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) process.source = cms.Source("PoolSource", - fileNames = cms.untracked.vstring('file:myfile.root') + fileNames = cms.untracked.vstring('file:step1.root') ) -process.prod = cms.EDAnalyzer("SimHitCaloHitDumper", - moduleName = cms.string("g4SimHits") -) - -process.p1 = cms.Path(process.prod) - +process.load("SimG4Core.Application.simHitCaloHitDumper_cfi") +process.p1 = cms.Path(process.simHitCaloHitDumper) diff --git a/SimG4Core/Application/test/runSimTrackSimVertexDumper_cfg.py b/SimG4Core/Application/test/runSimTrackSimVertexDumper_cfg.py index a476fd04d8196..de3b61f9c11db 100644 --- a/SimG4Core/Application/test/runSimTrackSimVertexDumper_cfg.py +++ b/SimG4Core/Application/test/runSimTrackSimVertexDumper_cfg.py @@ -2,21 +2,16 @@ process = cms.Process("SimTkVtxDump") process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") +process.load("FWCore.MessageLogger.MessageLogger_cfi") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) process.source = cms.Source("PoolSource", - fileNames = cms.untracked.vstring('file:myfile.root') + fileNames = cms.untracked.vstring('file:step1.root') ) -process.prod = cms.EDAnalyzer("SimTrackSimVertexDumper", - moduleLabelTk = cms.InputTag('g4SimHits'), - moduleLabelVtx = cms.InputTag('g4SimHits'), - dumpHepMC = cms.untracked.bool(True), - moduleLabelHepMC = cms.InputTag('generatorSmeared') -) - -process.p1 = cms.Path(process.prod) - +process.load("SimG4Core.Application.simTrackSimVertexDumper_cfi") +process.simTrackSimVertexDumper.dumpHepMC = True +process.p1 = cms.Path(process.simTrackSimVertexDumper) From 10cf74897cfb3c5c646d820884bfb308f8df8d94 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Tue, 3 Aug 2021 16:47:49 +0200 Subject: [PATCH 15/27] HLT menu migration to CMSSW 12_0_0_pre5 --- HLTrigger/Configuration/python/HLT_FULL_cff.py | 3 --- HLTrigger/Configuration/python/HLT_GRun_cff.py | 3 --- HLTrigger/Configuration/python/HLT_HIon_cff.py | 3 --- HLTrigger/Configuration/python/HLT_PIon_cff.py | 3 --- HLTrigger/Configuration/python/HLT_PRef_cff.py | 3 --- HLTrigger/Configuration/python/Tools/confdb.py | 1 + 6 files changed, 1 insertion(+), 15 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 43a292b6bf64c..5b4580f8a598e 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -6576,9 +6576,6 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) -fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", - appendToDataLabel = cms.string( "" ) -) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index 8d25920a02729..98ecafb08a7a2 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -5216,9 +5216,6 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) -fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", - appendToDataLabel = cms.string( "" ) -) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index 94218edea6335..df69c66724c8a 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -4379,9 +4379,6 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) -fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", - appendToDataLabel = cms.string( "" ) -) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 823b8f11eb0a0..e0fd7e44c150e 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -3850,9 +3850,6 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) -fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", - appendToDataLabel = cms.string( "" ) -) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 91cbd4951b3ff..cc28b493c22d3 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -3929,9 +3929,6 @@ useMagVolumes = cms.bool( True ), returnTangentPlane = cms.bool( True ) ) -fragment.TrackerAdditionalParametersPerDetESModule = cms.ESProducer( "TrackerAdditionalParametersPerDetESModule", - appendToDataLabel = cms.string( "" ) -) fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) diff --git a/HLTrigger/Configuration/python/Tools/confdb.py b/HLTrigger/Configuration/python/Tools/confdb.py index 0a070de199e4c..bec45a86a9ba3 100644 --- a/HLTrigger/Configuration/python/Tools/confdb.py +++ b/HLTrigger/Configuration/python/Tools/confdb.py @@ -791,6 +791,7 @@ def buildOptions(self): self.options['esmodules'].append( "-SiStripRecHitMatcherESProducer" ) self.options['esmodules'].append( "-SiStripQualityESProducer" ) self.options['esmodules'].append( "-StripCPEfromTrackAngleESProducer" ) + self.options['esmodules'].append( "-TrackerAdditionalParametersPerDetESModule" ) self.options['esmodules'].append( "-TrackerDigiGeometryESModule" ) self.options['esmodules'].append( "-TrackerGeometricDetESModule" ) self.options['esmodules'].append( "-VolumeBasedMagneticFieldESProducer" ) From b21566c97cdf36c2f306eb56e99b8f76c2284e06 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 3 Aug 2021 17:00:30 +0200 Subject: [PATCH 16/27] Update SimDigiDumper --- SimGeneral/Debugging/test/BuildFile.xml | 3 + SimGeneral/Debugging/test/SimDigiDumper.cc | 350 ++++++++++-------- SimGeneral/Debugging/test/SimDigiDumper.h | 77 ---- .../Debugging/test/runSimDigiDumper_cfg.py | 24 +- 4 files changed, 203 insertions(+), 251 deletions(-) delete mode 100644 SimGeneral/Debugging/test/SimDigiDumper.h diff --git a/SimGeneral/Debugging/test/BuildFile.xml b/SimGeneral/Debugging/test/BuildFile.xml index 631b7e8b0991d..bfebb9a82fac3 100644 --- a/SimGeneral/Debugging/test/BuildFile.xml +++ b/SimGeneral/Debugging/test/BuildFile.xml @@ -7,6 +7,9 @@ + + + diff --git a/SimGeneral/Debugging/test/SimDigiDumper.cc b/SimGeneral/Debugging/test/SimDigiDumper.cc index 4a7c3113499c3..6f049a957f2df 100644 --- a/SimGeneral/Debugging/test/SimDigiDumper.cc +++ b/SimGeneral/Debugging/test/SimDigiDumper.cc @@ -1,38 +1,94 @@ // system include files -#include - -#include "SimGeneral/Debugging/test/SimDigiDumper.h" +#include // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/Utilities/interface/EDGetToken.h" +#include "FWCore/Utilities/interface/InputTag.h" +#include "DataFormats/Common/interface/Handle.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +#include "DataFormats/Common/interface/DetSetVector.h" +// ecal calorimeter info +#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h" +// hcal calorimeter info +#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h" +// silicon strip info +#include "DataFormats/SiStripDigi/interface/SiStripDigi.h" +// silicon pixel info +#include "DataFormats/SiPixelDigi/interface/PixelDigi.h" +// muon DT info +#include "DataFormats/DTDigi/interface/DTDigiCollection.h" +// muon CSC Strip info +#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h" +// muon CSC Wire info +#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h" +// muon RPC info +#include "DataFormats/RPCDigi/interface/RPCDigiCollection.h" +// BTL/ETL info +#include "DataFormats/FTLDigi/interface/FTLDigiCollections.h" + #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" +class SimDigiDumper : public edm::one::EDAnalyzer<> { +public: + explicit SimDigiDumper(const edm::ParameterSet&); + virtual ~SimDigiDumper(){}; -#include "FWCore/MessageLogger/interface/MessageLogger.h" + virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void beginJob(){}; + virtual void endJob(){}; -// muon geometry info -//#include "Geometry/DTGeometry/interface/DTGeometry.h" -//#include "Geometry/Records/interface/MuonGeometryRecord.h" -//#include "Geometry/Records/interface/MuonNumberingRecord.h" + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); -// muon DT info -#include "CondFormats/DTObjects/interface/DTT0.h" +private: + edm::EDGetTokenT ECalEBSrc_; + edm::EDGetTokenT ECalEESrc_; + edm::EDGetTokenT ECalESSrc_; + + edm::EDGetTokenT HCalSrc_; + edm::EDGetTokenT HCalHOSrc_; + edm::EDGetTokenT HCalHFSrc_; + + edm::EDGetTokenT ZdcSrc_; + + edm::EDGetTokenT > SiStripSrc_; + + edm::EDGetTokenT > SiPxlSrc_; + + edm::EDGetTokenT MuDTSrc_; + + edm::EDGetTokenT MuCSCStripSrc_; + + edm::EDGetTokenT MuCSCWireSrc_; + + edm::EDGetTokenT MuRPCSrc_; + + edm::EDGetTokenT BTLSrc_; + edm::EDGetTokenT ETLSrc_; + + static const int sdSiTIB = 3; + static const int sdSiTID = 4; + static const int sdSiTOB = 5; + static const int sdSiTEC = 6; + static const int sdPxlBrl = 1; + static const int sdPxlFwd = 2; +}; SimDigiDumper::SimDigiDumper(const edm::ParameterSet& iPSet) { //get Labels to use to extract information ECalEBSrc_ = consumes(iPSet.getParameter("ECalEBSrc")); ECalEESrc_ = consumes(iPSet.getParameter("ECalEESrc")); ECalESSrc_ = consumes(iPSet.getParameter("ECalESSrc")); - HCalDigi_ = consumes(iPSet.getParameter("HCalDigi")); - HCalHODigi_ = consumes(iPSet.getParameter("HCalDigi")); - HCalHFDigi_ = consumes(iPSet.getParameter("HCalDigi")); - ZdcDigi_ = consumes(iPSet.getParameter("ZdcDigi")); + HCalSrc_ = consumes(iPSet.getParameter("HCalSrc")); + HCalHOSrc_ = consumes(iPSet.getParameter("HCalSrc")); + HCalHFSrc_ = consumes(iPSet.getParameter("HCalSrc")); + ZdcSrc_ = consumes(iPSet.getParameter("ZdcSrc")); SiStripSrc_ = consumes >(iPSet.getParameter("SiStripSrc")); SiPxlSrc_ = consumes >(iPSet.getParameter("SiPxlSrc")); MuDTSrc_ = consumes(iPSet.getParameter("MuDTSrc")); @@ -41,38 +97,6 @@ SimDigiDumper::SimDigiDumper(const edm::ParameterSet& iPSet) { MuRPCSrc_ = consumes(iPSet.getParameter("MuRPCSrc")); BTLSrc_ = consumes(iPSet.getParameter("BTLSrc")); ETLSrc_ = consumes(iPSet.getParameter("ETLSrc")); - - // TODO(proper responsible): update the cout, for sure not my - // business. - - // // print out Parameter Set information being used - // std::cout - // << "\n===============================\n" - // << "Dumping event digis for the collections:\n" - // << " ECalEBSrc = " << ECalEBSrc_.label() - // << ":" << ECalEBSrc_.instance() << "\n" - // << " ECalEESrc = " << ECalEESrc_.label() - // << ":" << ECalEESrc_.instance() << "\n" - // << " ECalESSrc = " << ECalESSrc_.label() - // << ":" << ECalESSrc_.instance() << "\n" - // << " HCalDigi = " << HCalDigi_.label() - // << ":" << HCalDigi_.instance() << "\n" - // << " ZdcDigi = " << ZdcDigi_.label() - // << ":" << ZdcDigi_.instance() << "\n" - // << " SiStripSrc = " << SiStripSrc_.label() - // << ":" << SiStripSrc_.instance() << "\n" - // << " SiPixelSrc = " << SiPxlSrc_.label() - // << ":" << SiPxlSrc_.instance() << "\n" - // << " MuDTSrc = " << MuDTSrc_.label() - // << ":" << MuDTSrc_.instance() << "\n" - // << " MuCSCStripSrc = " << MuCSCStripSrc_.label() - // << ":" << MuCSCStripSrc_.instance() << "\n" - // << " MuCSCWireSrc = " << MuCSCWireSrc_.label() - // << ":" << MuCSCWireSrc_.instance() << "\n" - // << " MuRPCSrc = " << MuRPCSrc_.label() - // << ":" << MuRPCSrc_.instance() << "\n" - // << "===============================\n" - // << std::endl; } // @@ -90,18 +114,18 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe const EBDigiCollection* EBdigis = 0; iEvent.getByToken(ECalEBSrc_, EcalDigiEB); if (!EcalDigiEB.isValid()) { - std::cout << "Unable to find EcalDigiEB in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find EcalDigiEB in event!"; } else { EBdigis = EcalDigiEB.product(); if (EcalDigiEB->size() == 0) isBarrel = false; - std::cout << "Ecal Barrel, digi multiplicity = " << EcalDigiEB->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "Ecal Barrel, digi multiplicity = " << EcalDigiEB->size(); if (isBarrel) { // loop over digis for (unsigned int digis = 0; digis < EcalDigiEB->size(); ++digis) { EBDataFrame ebdf = (*EBdigis)[digis]; - std::cout << ebdf << std::endl; + edm::LogPrint("SimDigiDumper") << ebdf; } } } @@ -112,18 +136,18 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe const EEDigiCollection* EEdigis = 0; iEvent.getByToken(ECalEESrc_, EcalDigiEE); if (!EcalDigiEE.isValid()) { - std::cout << "Unable to find EcalDigiEE in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find EcalDigiEE in event!"; } else { EEdigis = EcalDigiEE.product(); if (EcalDigiEE->size() == 0) isEndcap = false; - std::cout << "Ecal Endcap, digi multiplicity = " << EcalDigiEE->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "Ecal Endcap, digi multiplicity = " << EcalDigiEE->size(); if (isEndcap) { // loop over digis for (unsigned int digis = 0; digis < EcalDigiEE->size(); ++digis) { EEDataFrame eedf = (*EEdigis)[digis]; - std::cout << eedf << std::endl; + edm::LogPrint("SimDigiDumper") << eedf; } } } @@ -134,90 +158,43 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe const ESDigiCollection* ESdigis = 0; iEvent.getByToken(ECalESSrc_, EcalDigiES); if (!EcalDigiES.isValid()) { - std::cout << "Unable to find EcalDigiES in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find EcalDigiES in event!"; } else { ESdigis = EcalDigiES.product(); if (EcalDigiES->size() == 0) isPreshower = false; - std::cout << "Ecal Preshower, digi multiplicity = " << EcalDigiES->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "Ecal Preshower, digi multiplicity = " << EcalDigiES->size(); if (isPreshower) { // loop over digis for (unsigned int digis = 0; digis < EcalDigiES->size(); ++digis) { ESDataFrame esdf = (*ESdigis)[digis]; - std::cout << esdf << std::endl; - } - } - } - - // BTL - bool isBTL = true; - edm::Handle BTLDigi; - const BTLDigiCollection* BTLdigis = 0; - iEvent.getByToken(BTLSrc_, BTLDigi); - if (!BTLDigi.isValid()) { - std::cout << "Unable to find BTLDigi in event!" << std::endl; - } else { - BTLdigis = BTLDigi.product(); - if (BTLDigi->size() == 0) - isBTL = false; - std::cout << "Barrel Timing Layer, digi multiplicity = " << BTLDigi->size() << std::endl; - - if (isBTL) { - // loop over digis - for (unsigned int digis = 0; digis < BTLDigi->size(); ++digis) { - BTLDataFrame btldf = (*BTLdigis)[digis]; - std::cout << btldf.id().rawId() << std::endl; - btldf.print(); + edm::LogPrint("SimDigiDumper") << esdf; } } } - - // ETL - bool isETL = true; - edm::Handle ETLDigi; - const ETLDigiCollection* ETLdigis = 0; - iEvent.getByToken(ETLSrc_, ETLDigi); - if (!ETLDigi.isValid()) { - std::cout << "Unable to find ETLDigi in event!" << std::endl; - } else { - ETLdigis = ETLDigi.product(); - if (ETLDigi->size() == 0) - isETL = false; - std::cout << "Endcap Timing Layer, digi multiplicity = " << ETLDigi->size() << std::endl; - - if (isETL) { - // loop over digis - for (unsigned int digis = 0; digis < ETLDigi->size(); ++digis) { - ETLDataFrame etldf = (*ETLdigis)[digis]; - std::cout << etldf.id().rawId() << std::endl; - etldf.print(); - } - } - } - // HBHE bool isHBHE = true; edm::Handle hbhe; const HBHEDigiCollection* HBHEdigis = 0; - iEvent.getByToken(HCalDigi_, hbhe); + iEvent.getByToken(HCalSrc_, hbhe); if (!hbhe.isValid()) { - std::cout << "Unable to find HBHEDataFrame in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find HBHEDataFrame in event!"; } else { HBHEdigis = hbhe.product(); if (hbhe->size() == 0) isHBHE = false; - std::cout << "HBHE, digi multiplicity = " << hbhe->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "HBHE, digi multiplicity = " << hbhe->size(); if (isHBHE) { //loop over digis for (unsigned int digis = 0; digis < hbhe->size(); ++digis) { HBHEDataFrame hehbdf = (*HBHEdigis)[digis]; - std::cout << hehbdf << std::endl; + edm::LogPrint("SimDigiDumper") << hehbdf; //edm::SortedCollection::const_iterator ihbhe; //for (ihbhe == hbhe->begin(); ihbhe != hbhe->end(); ihbhe++) { - //std::cout << "Nothing" << std::endl; - //std::cout << (*ihbhe) << std::endl; + //edm::LogPrint("SimDigiDumper") << "Nothing" ; + //edm::LogPrint("SimDigiDumper") << (*ihbhe) ; } } } @@ -226,20 +203,20 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe bool isHO = true; edm::Handle ho; const HODigiCollection* HOdigis = 0; - iEvent.getByToken(HCalHODigi_, ho); + iEvent.getByToken(HCalHOSrc_, ho); if (!ho.isValid()) { - std::cout << "Unable to find HODataFrame in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find HODataFrame in event!"; } else { HOdigis = ho.product(); if (ho->size() == 0) isHO = false; - std::cout << "HO, digi multiplicity = " << ho->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "HO, digi multiplicity = " << ho->size(); if (isHO) { //loop over digis for (unsigned int digis = 0; digis < ho->size(); ++digis) { HODataFrame hodf = (*HOdigis)[digis]; - std::cout << hodf << std::endl; + edm::LogPrint("SimDigiDumper") << hodf; } } } @@ -248,20 +225,20 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe bool isHF = true; edm::Handle hf; const HFDigiCollection* HFdigis = 0; - iEvent.getByToken(HCalHFDigi_, hf); + iEvent.getByToken(HCalHFSrc_, hf); if (!hf.isValid()) { - std::cout << "Unable to find HFDataFrame in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find HFDataFrame in event!"; } else { HFdigis = hf.product(); if (hf->size() == 0) isHF = false; - std::cout << "HF, digi multiplicity = " << hf->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "HF, digi multiplicity = " << hf->size(); if (isHF) { //loop over digis for (unsigned int digis = 0; digis < hf->size(); ++digis) { HFDataFrame hodf = (*HFdigis)[digis]; - std::cout << hodf << std::endl; + edm::LogPrint("SimDigiDumper") << hodf; } } } @@ -270,20 +247,20 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe bool isZDC = true; edm::Handle zdc; const ZDCDigiCollection* ZDCdigis = 0; - iEvent.getByToken(ZdcDigi_, zdc); + iEvent.getByToken(ZdcSrc_, zdc); if (!zdc.isValid()) { - std::cout << "Unable to find ZDCDataFrame in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find ZDCDataFrame in event!"; } else { ZDCdigis = zdc.product(); if (zdc->size() == 0) isZDC = false; - std::cout << "ZDC, digi multiplicity = " << zdc->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "ZDC, digi multiplicity = " << zdc->size(); if (isZDC) { //loop over digis for (unsigned int digis = 0; digis < zdc->size(); ++digis) { ZDCDataFrame hodf = (*ZDCdigis)[digis]; - std::cout << hodf << std::endl; + edm::LogPrint("SimDigiDumper") << hodf; } } } @@ -293,11 +270,11 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe edm::Handle > stripDigis; iEvent.getByToken(SiStripSrc_, stripDigis); if (!stripDigis.isValid()) { - std::cout << "Unable to find stripDigis in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find stripDigis in event!"; } else { if (stripDigis->size() == 0) isStrip = false; - std::cout << "Strip Tracker, digi multiplicity = " << stripDigis->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "Strip Tracker, digi multiplicity = " << stripDigis->size(); if (isStrip) { edm::DetSetVector::const_iterator DSViter; for (DSViter = stripDigis->begin(); DSViter != stripDigis->end(); ++DSViter) { @@ -308,17 +285,17 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe DetId detId(id); if (detId.subdetId() == sdSiTIB) { - std::cout << "TIB " << DSViter->data.size() << std::endl; + edm::LogPrint("SimDigiDumper") << "TIB " << DSViter->data.size(); } else if (detId.subdetId() == sdSiTOB) { - std::cout << "TOB " << DSViter->data.size() << std::endl; + edm::LogPrint("SimDigiDumper") << "TOB " << DSViter->data.size(); } else if (detId.subdetId() == sdSiTID) { - std::cout << "TID " << DSViter->data.size() << std::endl; + edm::LogPrint("SimDigiDumper") << "TID " << DSViter->data.size(); } if (detId.subdetId() == sdSiTEC) { - std::cout << "TEC " << DSViter->data.size() << std::endl; + edm::LogPrint("SimDigiDumper") << "TEC " << DSViter->data.size(); } for (iter = begin; iter != end; ++iter) { - std::cout << (*iter) << std::endl; + edm::LogPrint("SimDigiDumper") << (*iter); } } } @@ -329,11 +306,11 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe edm::Handle > pixelDigis; iEvent.getByToken(SiPxlSrc_, pixelDigis); if (!pixelDigis.isValid()) { - std::cout << "Unable to find pixelDigis in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find pixelDigis in event!"; } else { if (pixelDigis->size() == 0) isPixel = false; - std::cout << "Pixel Tracker, digi multiplicity = " << pixelDigis->size() << std::endl; + edm::LogPrint("SimDigiDumper") << "Pixel Tracker, digi multiplicity = " << pixelDigis->size(); if (isPixel) { edm::DetSetVector::const_iterator DSViter; @@ -345,12 +322,12 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe DetId detId(id); if (detId.subdetId() == sdPxlBrl) { - std::cout << "Pixel barrel " << DSViter->data.size() << std::endl; + edm::LogPrint("SimDigiDumper") << "Pixel barrel " << DSViter->data.size(); } else if (detId.subdetId() == sdPxlFwd) { - std::cout << "Pixel forward " << DSViter->data.size() << std::endl; + edm::LogPrint("SimDigiDumper") << "Pixel forward " << DSViter->data.size(); } for (iter = begin; iter != end; ++iter) { - std::cout << (*iter) << std::endl; + edm::LogPrint("SimDigiDumper") << (*iter); } } } @@ -362,32 +339,32 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe //edm::Handle dtDigis; iEvent.getByToken(MuDTSrc_, dtDigis); if (!dtDigis.isValid()) { - std::cout << "Unable to find dtDigis in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find dtDigis in event!"; } unsigned int nDT = 0; if (dtDigis->begin() == dtDigis->end()) { isDT = false; - std::cout << "dtDigis seem empty!" << std::endl; + edm::LogPrint("SimDigiDumper") << "dtDigis seem empty!"; } if (isDT) { DTDigiCollection::DigiRangeIterator dtLayerIt; for (dtLayerIt = dtDigis->begin(); dtLayerIt != dtDigis->end(); ++dtLayerIt) { const DTDigiCollection::Range& range = (*dtLayerIt).second; - std::cout << "DT layer = " << (*dtLayerIt).first << " digi " << std::endl; + edm::LogPrint("SimDigiDumper") << "DT layer = " << (*dtLayerIt).first << " digi "; for (DTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) { - std::cout << (*digiIt) << std::endl; + edm::LogPrint("SimDigiDumper") << (*digiIt); nDT++; } } } - std::cout << "DT, digi multiplicity = " << nDT << std::endl; + edm::LogPrint("SimDigiDumper") << "DT, digi multiplicity = " << nDT; // CSC strip bool isCSCStrip = true; edm::Handle cscStripDigis; iEvent.getByToken(MuCSCStripSrc_, cscStripDigis); if (!cscStripDigis.isValid()) { - std::cout << "Unable to find cscStripDigis in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find cscStripDigis in event!"; } if (cscStripDigis->begin() == cscStripDigis->end()) isCSCStrip = false; @@ -397,21 +374,21 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe CSCStripDigiCollection::DigiRangeIterator detUnitIt; for (detUnitIt = cscStripDigis->begin(); detUnitIt != cscStripDigis->end(); ++detUnitIt) { const CSCStripDigiCollection::Range& range = (*detUnitIt).second; - std::cout << "CSC detid = " << (*detUnitIt).first << " digi " << std::endl; + edm::LogPrint("SimDigiDumper") << "CSC detid = " << (*detUnitIt).first << " digi "; for (CSCStripDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) { - std::cout << (*digiIt) << std::endl; + edm::LogPrint("SimDigiDumper") << (*digiIt); nCSCStrip++; } } } - std::cout << "CSC strip, digi multiplicity = " << nCSCStrip << std::endl; + edm::LogPrint("SimDigiDumper") << "CSC strip, digi multiplicity = " << nCSCStrip; // CSC wire bool isCSCWire = true; edm::Handle cscWireDigis; iEvent.getByToken(MuCSCWireSrc_, cscWireDigis); if (!cscWireDigis.isValid()) { - std::cout << "Unable to find cscWireDigis in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find cscWireDigis in event!"; } if (cscWireDigis->begin() == cscWireDigis->end()) isCSCWire = false; @@ -421,21 +398,21 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe CSCWireDigiCollection::DigiRangeIterator detUnitIt; for (detUnitIt = cscWireDigis->begin(); detUnitIt != cscWireDigis->end(); ++detUnitIt) { const CSCWireDigiCollection::Range& range = (*detUnitIt).second; - std::cout << "CSC detid = " << (*detUnitIt).first << " digi " << std::endl; + edm::LogPrint("SimDigiDumper") << "CSC detid = " << (*detUnitIt).first << " digi "; for (CSCWireDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) { - std::cout << (*digiIt) << std::endl; + edm::LogPrint("SimDigiDumper") << (*digiIt); nCSCWire++; } } } - std::cout << "CSC wire, digi multiplicity = " << nCSCWire << std::endl; + edm::LogPrint("SimDigiDumper") << "CSC wire, digi multiplicity = " << nCSCWire; // RPC bool isRPC = true; edm::Handle rpcDigis; iEvent.getByToken(MuRPCSrc_, rpcDigis); if (!rpcDigis.isValid()) { - std::cout << "Unable to find rpcDigis in event!" << std::endl; + edm::LogPrint("SimDigiDumper") << "Unable to find rpcDigis in event!"; } if (rpcDigis->begin() == rpcDigis->end()) isRPC = false; @@ -445,17 +422,84 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe RPCDigiCollection::DigiRangeIterator detUnitIt; for (detUnitIt = rpcDigis->begin(); detUnitIt != rpcDigis->end(); ++detUnitIt) { const RPCDigiCollection::Range& range = (*detUnitIt).second; - std::cout << "RPC detid = " << (*detUnitIt).first << " digi " << std::endl; + edm::LogPrint("SimDigiDumper") << "RPC detid = " << (*detUnitIt).first << " digi "; for (RPCDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) { - std::cout << (*digiIt) << std::endl; + edm::LogPrint("SimDigiDumper") << (*digiIt); nRPC++; } } } - std::cout << "RPC, digi multiplicity = " << nRPC << std::endl; + edm::LogPrint("SimDigiDumper") << "RPC, digi multiplicity = " << nRPC; + + // BTL + bool isBTL = true; + edm::Handle BTLDigi; + const BTLDigiCollection* BTLdigis = 0; + iEvent.getByToken(BTLSrc_, BTLDigi); + if (!BTLDigi.isValid()) { + edm::LogPrint("SimDigiDumper") << "Unable to find BTLDigi in event!"; + } else { + BTLdigis = BTLDigi.product(); + if (BTLDigi->size() == 0) + isBTL = false; + edm::LogPrint("SimDigiDumper") << "Barrel Timing Layer, digi multiplicity = " << BTLDigi->size(); + + if (isBTL) { + // loop over digis + for (unsigned int digis = 0; digis < BTLDigi->size(); ++digis) { + BTLDataFrame btldf = (*BTLdigis)[digis]; + edm::LogPrint("SimDigiDumper") << btldf.id().rawId(); + btldf.print(); + } + } + } + + // ETL + bool isETL = true; + edm::Handle ETLDigi; + const ETLDigiCollection* ETLdigis = 0; + iEvent.getByToken(ETLSrc_, ETLDigi); + if (!ETLDigi.isValid()) { + edm::LogPrint("SimDigiDumper") << "Unable to find ETLDigi in event!"; + } else { + ETLdigis = ETLDigi.product(); + if (ETLDigi->size() == 0) + isETL = false; + edm::LogPrint("SimDigiDumper") << "Endcap Timing Layer, digi multiplicity = " << ETLDigi->size(); + + if (isETL) { + // loop over digis + for (unsigned int digis = 0; digis < ETLDigi->size(); ++digis) { + ETLDataFrame etldf = (*ETLdigis)[digis]; + edm::LogPrint("SimDigiDumper") << etldf.id().rawId(); + etldf.print(); + } + } + } return; } +void SimDigiDumper::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("ECalEBSrc", edm::InputTag("simEcalDigis", "ebDigis"))->setComment("ECAL barrel digis"); + desc.add("ECalEESrc", edm::InputTag("simEcalDigis", "eeDigis"))->setComment("ECAL endcap digis"); + desc.add("ECalESSrc", edm::InputTag("simEcalPreshowerDigis"))->setComment("ECAL preshower digis"); + desc.add("HCalSrc", edm::InputTag("simHcalDigis"))->setComment("HCAL digis"); + desc.add("ZdcSrc", edm::InputTag("simHcaliUnsuppressedDigis"))->setComment("ZDC digis"); + desc.add("SiStripSrc", edm::InputTag("simSiStripDigis", "ZeroSuppressed")) + ->setComment("Si strip digis"); + desc.add("SiPxlSrc", edm::InputTag("simSiPixelDigis"))->setComment("Si pixel digis"); + desc.add("MuDTSrc", edm::InputTag("simMuonDTDigis"))->setComment("DT digis"); + desc.add("MuCSCStripSrc", edm::InputTag("simMuonCSCDigis", "MuonCSCStripDigi")) + ->setComment("CSC strip digis"); + desc.add("MuCSCWireSrc", edm::InputTag("simMuonCSCDigis", "MuonCSCWireDigi")) + ->setComment("CSC wire digis"); + desc.add("MuRPCSrc", edm::InputTag("simMuonRPCDigis"))->setComment("RPC digis"); + desc.add("BTLSrc", edm::InputTag("mix", "FTLBarrel"))->setComment("BTL digis"); + desc.add("ETLSrc", edm::InputTag("mix", "FTLEndcap"))->setComment("ETL digis"); + descriptions.add("simDigiDumper", desc); +} + //define this as a plug-in DEFINE_FWK_MODULE(SimDigiDumper); diff --git a/SimGeneral/Debugging/test/SimDigiDumper.h b/SimGeneral/Debugging/test/SimDigiDumper.h deleted file mode 100644 index 864a8b7cd364a..0000000000000 --- a/SimGeneral/Debugging/test/SimDigiDumper.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef SimDigiDumper_H -#define SimDigiDumper_H -// -// -// system include files -#include - -// user include files -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Utilities/interface/InputTag.h" - -#include "DataFormats/Common/interface/DetSetVector.h" -// ecal calorimeter info -#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h" -// hcal calorimeter info -#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h" -// silicon strip info -#include "DataFormats/SiStripDigi/interface/SiStripDigi.h" -// silicon pixel info -#include "DataFormats/SiPixelDigi/interface/PixelDigi.h" -#include "DataFormats/DTDigi/interface/DTDigiCollection.h" -// muon CSC Strip info -#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h" -// muon CSC Wire info -#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h" -// muon RPC info -#include "DataFormats/RPCDigi/interface/RPCDigiCollection.h" -// BTL/ETL info -#include "DataFormats/FTLDigi/interface/FTLDigiCollections.h" - -#include - -class SimDigiDumper : public edm::EDAnalyzer { -public: - explicit SimDigiDumper(const edm::ParameterSet&); - virtual ~SimDigiDumper(){}; - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void beginJob(){}; - virtual void endJob(){}; - -private: - edm::EDGetTokenT ECalEBSrc_; - edm::EDGetTokenT ECalEESrc_; - edm::EDGetTokenT ECalESSrc_; - - edm::EDGetTokenT BTLSrc_; - edm::EDGetTokenT ETLSrc_; - - edm::EDGetTokenT HCalDigi_; - edm::EDGetTokenT HCalHODigi_; - edm::EDGetTokenT HCalHFDigi_; - - edm::EDGetTokenT ZdcDigi_; - - edm::EDGetTokenT > SiStripSrc_; - - edm::EDGetTokenT > SiPxlSrc_; - - edm::EDGetTokenT MuDTSrc_; - - edm::EDGetTokenT MuCSCStripSrc_; - - edm::EDGetTokenT MuCSCWireSrc_; - - edm::EDGetTokenT MuRPCSrc_; - - static const int sdSiTIB = 3; - static const int sdSiTID = 4; - static const int sdSiTOB = 5; - static const int sdSiTEC = 6; - static const int sdPxlBrl = 1; - static const int sdPxlFwd = 2; -}; - -#endif diff --git a/SimGeneral/Debugging/test/runSimDigiDumper_cfg.py b/SimGeneral/Debugging/test/runSimDigiDumper_cfg.py index c227f28f43bca..2fc1829f1d215 100644 --- a/SimGeneral/Debugging/test/runSimDigiDumper_cfg.py +++ b/SimGeneral/Debugging/test/runSimDigiDumper_cfg.py @@ -3,31 +3,13 @@ process = cms.Process("SimDigiDump") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") - process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) process.source = cms.Source("PoolSource", - fileNames = cms.untracked.vstring('file:myfile.root') -) - -process.prod = cms.EDAnalyzer("SimDigiDumper", - MuCSCStripSrc = cms.InputTag("simMuonCSCDigis","MuonCSCStripDigi"), - MuDTSrc = cms.InputTag("simMuonDTDigis"), - HCalDigi = cms.InputTag("simHcalDigis"), - ZdcDigi = cms.InputTag("simHcalUnsuppressedDigis"), - MuCSCWireSrc = cms.InputTag("simMuonCSCDigis","MuonCSCWireDigi"), - ECalEESrc = cms.InputTag("simEcalDigis","eeDigis"), - SiStripSrc = cms.InputTag("simSiStripDigis","ZeroSuppressed"), - SiPxlSrc = cms.InputTag("simSiPixelDigis"), - ECalEBSrc = cms.InputTag("simEcalDigis","ebDigis"), - ECalESSrc = cms.InputTag("simEcalPreshowerDigis"), - MuRPCSrc = cms.InputTag("simMuonRPCDigis"), - BTLSrc = cms.InputTag("mix","FTLBarrel"), - ETLSrc = cms.InputTag("mix","FTLEndcap"), + fileNames = cms.untracked.vstring('file:step2.root') ) -process.p1 = cms.Path(process.prod) - +process.load("SimGeneral.Debugging.simDigiDumper_cfi") +process.p1 = cms.Path(process.simDigiDumper) From 9b3757615fdffdba2dd26b811ba42ca8b63e81a3 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Tue, 3 Aug 2021 18:10:17 +0200 Subject: [PATCH 17/27] Protect HCAL GPU-related modules against empty events --- .../HcalRecProducers/src/HcalCPURecHitsProducer.cc | 5 +++++ RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc b/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc index 742662eac2dd9..108bdc76d8f28 100644 --- a/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc +++ b/RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc @@ -76,6 +76,11 @@ void HcalCPURecHitsProducer::acquire(edm::Event const& event, std::cout << "num rec Hits = " << recHits.size << std::endl; #endif + // do not try to copy the rechits if they are empty + if (recHits.size == 0) { + return; + } + auto lambdaToTransfer = [&ctx](auto& dest, auto* src) { using vector_type = typename std::remove_reference::type; using src_data_type = typename std::remove_pointer::type; diff --git a/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu b/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu index e7389185ee6b2..ac1ecc5fa0d33 100644 --- a/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu +++ b/RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu @@ -1048,14 +1048,14 @@ namespace hcal { cudaStream_t cudaStream) { auto const totalChannels = inputGPU.f01HEDigis.size + inputGPU.f5HBDigis.size + inputGPU.f3HBDigis.size; - // protections when the detector is out - if (totalChannels == 0) - return; + // FIXME: the number of channels in output might change given that some channesl might be filtered out - // FIXME: may be move this assignment to emphasize this more clearly - // FIXME: number of channels for output might change given that - // some channesl might be filtered out + // do not run when there are no rechits (e.g. if HCAL is not being read), + // but do set the size of the output collection to 0 outputGPU.recHits.size = totalChannels; + if (totalChannels == 0) { + return; + } // TODO: this can be lifted by implementing a separate kernel // similar to the default one, but properly handling the diff in #sample From efc513a6ec4185c9027c46e10b40613a992a31a4 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 3 Aug 2021 18:28:40 +0200 Subject: [PATCH 18/27] use getHandle and ValidHandle --- IOMC/EventVertexGenerators/test/VtxTester.cc | 37 +++++++++---------- .../HepMCCandAlgos/test/DummyHepMCAnalyzer.cc | 8 +--- .../test/SimTrackSimVertexDumper.cc | 12 ++---- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/IOMC/EventVertexGenerators/test/VtxTester.cc b/IOMC/EventVertexGenerators/test/VtxTester.cc index 99b517be5bb66..90f37a9a12b4e 100644 --- a/IOMC/EventVertexGenerators/test/VtxTester.cc +++ b/IOMC/EventVertexGenerators/test/VtxTester.cc @@ -2,7 +2,7 @@ #include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/Utilities/interface/EDGetToken.h" -#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/Common/interface/ValidHandle.h" #include "FWCore/Framework/interface/Event.h" #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" @@ -62,31 +62,28 @@ VtxTester::VtxTester(const edm::ParameterSet& cfg) } void VtxTester::analyze(const edm::Event& e, const edm::EventSetup&) { - edm::Handle theGenEvent; - e.getByToken(srcHepMCToken_, theGenEvent); + auto theGenEvent = makeValid(e.getHandle(srcHepMCToken_)); - if (theGenEvent.isValid()) { - const HepMC::GenEvent* Evt = theGenEvent->GetEvent(); + const HepMC::GenEvent* Evt = theGenEvent->GetEvent(); - // take only 1st vertex for now - it's been tested only of PGuns... + // take only 1st vertex for now - it's been tested only of PGuns... - HepMC::GenEvent::vertex_const_iterator Vtx = Evt->vertices_begin(); + HepMC::GenEvent::vertex_const_iterator Vtx = Evt->vertices_begin(); - fVtxHistTime_->Fill((*Vtx)->position().t() * CLHEP::mm / CLHEP::c_light); - fVtxHistz_->Fill((*Vtx)->position().z() * CLHEP::mm); - fVtxHistzTime_->Fill((*Vtx)->position().z() * CLHEP::mm, (*Vtx)->position().t() * CLHEP::mm / CLHEP::c_light); - fVtxHistx_->Fill((*Vtx)->position().x() * CLHEP::mm); - fVtxHisty_->Fill((*Vtx)->position().y() * CLHEP::mm); - fVtxHistxy_->Fill((*Vtx)->position().x() * CLHEP::mm, (*Vtx)->position().y() * CLHEP::mm); + fVtxHistTime_->Fill((*Vtx)->position().t() * CLHEP::mm / CLHEP::c_light); + fVtxHistz_->Fill((*Vtx)->position().z() * CLHEP::mm); + fVtxHistzTime_->Fill((*Vtx)->position().z() * CLHEP::mm, (*Vtx)->position().t() * CLHEP::mm / CLHEP::c_light); + fVtxHistx_->Fill((*Vtx)->position().x() * CLHEP::mm); + fVtxHisty_->Fill((*Vtx)->position().y() * CLHEP::mm); + fVtxHistxy_->Fill((*Vtx)->position().x() * CLHEP::mm, (*Vtx)->position().y() * CLHEP::mm); - for (HepMC::GenEvent::particle_const_iterator Part = Evt->particles_begin(); Part != Evt->particles_end(); Part++) { - HepMC::FourVector Mom = (*Part)->momentum(); - double Phi = Mom.phi(); - double Eta = -log(tan(Mom.theta() / 2.)); + for (HepMC::GenEvent::particle_const_iterator Part = Evt->particles_begin(); Part != Evt->particles_end(); Part++) { + HepMC::FourVector Mom = (*Part)->momentum(); + double Phi = Mom.phi(); + double Eta = -log(tan(Mom.theta() / 2.)); - fPhiHist_->Fill(Phi); - fEtaHist_->Fill(Eta); - } + fPhiHist_->Fill(Phi); + fEtaHist_->Fill(Eta); } return; diff --git a/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc b/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc index 2bb18046957fe..75cdca1737147 100644 --- a/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc +++ b/PhysicsTools/HepMCCandAlgos/test/DummyHepMCAnalyzer.cc @@ -1,7 +1,7 @@ #include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/Common/interface/ValidHandle.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -36,13 +36,9 @@ class DummyHepMCAnalyzer : public edm::one::EDAnalyzer<> { } void analyze(const edm::Event& evt, const edm::EventSetup& es) override { - edm::Handle hepMC; - evt.getByToken(srcToken_, hepMC); + auto hepMC = makeValid(evt.getHandle(srcToken_)); const HepMC::GenEvent* mc = hepMC->GetEvent(); - if (mc == 0) { - throw edm::Exception(edm::errors::InvalidReference) << "HepMC has null pointer to GenEvent"; - } edm::LogPrint("HepMCAnalyzer") << "\n particles #: " << mc->particles_size(); if (dumpPDF_) { diff --git a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc index 4b1bca952086f..9c92812bf5dc3 100644 --- a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc +++ b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc @@ -6,7 +6,7 @@ #include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/Utilities/interface/EDGetToken.h" -#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/Common/interface/ValidHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/Event.h" @@ -60,15 +60,11 @@ void SimTrackSimVertexDumper::analyze(const edm::Event& iEvent, const edm::Event std::vector theSimTracks; std::vector theSimVertexes; - edm::Handle MCEvt; - edm::Handle SimTk; - edm::Handle SimVtx; - - iEvent.getByToken(hepmcToken_, MCEvt); + auto MCEvt = edm::makeValid(iEvent.getHandle(hepmcToken_)); const HepMC::GenEvent* evt = MCEvt->GetEvent(); - iEvent.getByToken(simTrackToken_, SimTk); - iEvent.getByToken(simVertexToken_, SimVtx); + auto SimTk = edm::makeValid(iEvent.getHandle(simTrackToken_)); + auto SimVtx = edm::makeValid(iEvent.getHandle(simVertexToken_)); theSimTracks.insert(theSimTracks.end(), SimTk->begin(), SimTk->end()); theSimVertexes.insert(theSimVertexes.end(), SimVtx->begin(), SimVtx->end()); From b745dff159d30d31aad512d15c8a2f112bd2f1a4 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 3 Aug 2021 18:46:36 +0200 Subject: [PATCH 19/27] use getHandle --- .../Application/test/SimHitCaloHitDumper.cc | 91 ++++++------------- SimGeneral/Debugging/test/SimDigiDumper.cc | 47 ++++------ 2 files changed, 46 insertions(+), 92 deletions(-) diff --git a/SimG4Core/Application/test/SimHitCaloHitDumper.cc b/SimG4Core/Application/test/SimHitCaloHitDumper.cc index 549a0d62281c1..13a2ccafaddb4 100644 --- a/SimG4Core/Application/test/SimHitCaloHitDumper.cc +++ b/SimG4Core/Application/test/SimHitCaloHitDumper.cc @@ -121,67 +121,36 @@ void SimHitCaloHitDumper::analyze(const edm::Event& iEvent, const edm::EventSetu std::vector > theMTDComposition; std::vector > theCaloComposition; - edm::Handle PixelBarrelHitsLowTof; - edm::Handle PixelBarrelHitsHighTof; - edm::Handle PixelEndcapHitsLowTof; - edm::Handle PixelEndcapHitsHighTof; - edm::Handle TIBHitsLowTof; - edm::Handle TIBHitsHighTof; - edm::Handle TIDHitsLowTof; - edm::Handle TIDHitsHighTof; - edm::Handle TOBHitsLowTof; - edm::Handle TOBHitsHighTof; - edm::Handle TECHitsLowTof; - edm::Handle TECHitsHighTof; - - edm::Handle DTHits; - edm::Handle CSCHits; - edm::Handle RPCHits; - - edm::Handle BTLHits; - edm::Handle ETLHits; - - edm::Handle EBHits; - edm::Handle EEHits; - edm::Handle ESHits; - edm::Handle HcalHits; - edm::Handle CaloTkHits; - edm::Handle ZDCHits; - edm::Handle CastorTUHits; - edm::Handle CastorPLHits; - edm::Handle CastorFIHits; - edm::Handle CastorBUHits; - - iEvent.getByToken(PixelBarrelLowTofToken_, PixelBarrelHitsLowTof); - iEvent.getByToken(PixelBarrelHighTofToken_, PixelBarrelHitsHighTof); - iEvent.getByToken(PixelEndcapLowTofToken_, PixelEndcapHitsLowTof); - iEvent.getByToken(PixelEndcapHighTofToken_, PixelEndcapHitsHighTof); - iEvent.getByToken(TrackerTIBLowTofToken_, TIBHitsLowTof); - iEvent.getByToken(TrackerTIBHighTofToken_, TIBHitsHighTof); - iEvent.getByToken(TrackerTIDLowTofToken_, TIDHitsLowTof); - iEvent.getByToken(TrackerTIDHighTofToken_, TIDHitsHighTof); - iEvent.getByToken(TrackerTOBLowTofToken_, TOBHitsLowTof); - iEvent.getByToken(TrackerTOBHighTofToken_, TOBHitsHighTof); - iEvent.getByToken(TrackerTECLowTofToken_, TECHitsLowTof); - iEvent.getByToken(TrackerTECHighTofToken_, TECHitsHighTof); - - iEvent.getByToken(MuonDTToken_, DTHits); - iEvent.getByToken(MuonCSCToken_, CSCHits); - iEvent.getByToken(MuonRPCToken_, RPCHits); - - iEvent.getByToken(EcalEBToken_, EBHits); - iEvent.getByToken(EcalEEToken_, EEHits); - iEvent.getByToken(EcalESToken_, ESHits); - iEvent.getByToken(HcalToken_, HcalHits); - iEvent.getByToken(CaloTkToken_, CaloTkHits); - iEvent.getByToken(ZDCToken_, ZDCHits); - iEvent.getByToken(CastorTUToken_, CastorTUHits); - iEvent.getByToken(CastorPLToken_, CastorPLHits); - iEvent.getByToken(CastorFIToken_, CastorFIHits); - iEvent.getByToken(CastorBUToken_, CastorBUHits); - - iEvent.getByToken(FastTimerBTLToken_, BTLHits); - iEvent.getByToken(FastTimerETLToken_, ETLHits); + auto PixelBarrelHitsLowTof = iEvent.getHandle(PixelBarrelLowTofToken_); + auto PixelBarrelHitsHighTof = iEvent.getHandle(PixelBarrelHighTofToken_); + auto PixelEndcapHitsLowTof = iEvent.getHandle(PixelEndcapLowTofToken_); + auto PixelEndcapHitsHighTof = iEvent.getHandle(PixelEndcapHighTofToken_); + auto TIBHitsLowTof = iEvent.getHandle(TrackerTIBLowTofToken_); + auto TIBHitsHighTof = iEvent.getHandle(TrackerTIBHighTofToken_); + auto TIDHitsLowTof = iEvent.getHandle(TrackerTIDLowTofToken_); + auto TIDHitsHighTof = iEvent.getHandle(TrackerTIDHighTofToken_); + auto TOBHitsLowTof = iEvent.getHandle(TrackerTOBLowTofToken_); + auto TOBHitsHighTof = iEvent.getHandle(TrackerTOBHighTofToken_); + auto TECHitsLowTof = iEvent.getHandle(TrackerTECLowTofToken_); + auto TECHitsHighTof = iEvent.getHandle(TrackerTECHighTofToken_); + + auto DTHits = iEvent.getHandle(MuonDTToken_); + auto CSCHits = iEvent.getHandle(MuonCSCToken_); + auto RPCHits = iEvent.getHandle(MuonRPCToken_); + + auto EBHits = iEvent.getHandle(EcalEBToken_); + auto EEHits = iEvent.getHandle(EcalEEToken_); + auto ESHits = iEvent.getHandle(EcalESToken_); + auto HcalHits = iEvent.getHandle(HcalToken_); + auto CaloTkHits = iEvent.getHandle(CaloTkToken_); + auto ZDCHits = iEvent.getHandle(ZDCToken_); + auto CastorTUHits = iEvent.getHandle(CastorTUToken_); + auto CastorPLHits = iEvent.getHandle(CastorPLToken_); + auto CastorFIHits = iEvent.getHandle(CastorFIToken_); + auto CastorBUHits = iEvent.getHandle(CastorBUToken_); + + auto BTLHits = iEvent.getHandle(FastTimerBTLToken_); + auto ETLHits = iEvent.getHandle(FastTimerETLToken_); int oldsize = 0; diff --git a/SimGeneral/Debugging/test/SimDigiDumper.cc b/SimGeneral/Debugging/test/SimDigiDumper.cc index 6f049a957f2df..f8c3621f9fb9d 100644 --- a/SimGeneral/Debugging/test/SimDigiDumper.cc +++ b/SimGeneral/Debugging/test/SimDigiDumper.cc @@ -110,9 +110,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // ECAL Barrel bool isBarrel = true; - edm::Handle EcalDigiEB; const EBDigiCollection* EBdigis = 0; - iEvent.getByToken(ECalEBSrc_, EcalDigiEB); + auto EcalDigiEB = iEvent.getHandle(ECalEBSrc_); if (!EcalDigiEB.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find EcalDigiEB in event!"; } else { @@ -132,9 +131,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // ECAL Endcap bool isEndcap = true; - edm::Handle EcalDigiEE; const EEDigiCollection* EEdigis = 0; - iEvent.getByToken(ECalEESrc_, EcalDigiEE); + auto EcalDigiEE = iEvent.getHandle(ECalEESrc_); if (!EcalDigiEE.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find EcalDigiEE in event!"; } else { @@ -154,9 +152,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // ECAL Preshower bool isPreshower = true; - edm::Handle EcalDigiES; const ESDigiCollection* ESdigis = 0; - iEvent.getByToken(ECalESSrc_, EcalDigiES); + auto EcalDigiES = iEvent.getHandle(ECalESSrc_); if (!EcalDigiES.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find EcalDigiES in event!"; } else { @@ -173,11 +170,11 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe } } } + // HBHE bool isHBHE = true; - edm::Handle hbhe; const HBHEDigiCollection* HBHEdigis = 0; - iEvent.getByToken(HCalSrc_, hbhe); + auto hbhe = iEvent.getHandle(HCalSrc_); if (!hbhe.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find HBHEDataFrame in event!"; } else { @@ -201,9 +198,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // HO bool isHO = true; - edm::Handle ho; const HODigiCollection* HOdigis = 0; - iEvent.getByToken(HCalHOSrc_, ho); + auto ho = iEvent.getHandle(HCalHOSrc_); if (!ho.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find HODataFrame in event!"; } else { @@ -223,9 +219,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // HF bool isHF = true; - edm::Handle hf; const HFDigiCollection* HFdigis = 0; - iEvent.getByToken(HCalHFSrc_, hf); + auto hf = iEvent.getHandle(HCalHFSrc_); if (!hf.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find HFDataFrame in event!"; } else { @@ -245,9 +240,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // ZDC bool isZDC = true; - edm::Handle zdc; const ZDCDigiCollection* ZDCdigis = 0; - iEvent.getByToken(ZdcSrc_, zdc); + auto zdc = iEvent.getHandle(ZdcSrc_); if (!zdc.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find ZDCDataFrame in event!"; } else { @@ -267,8 +261,7 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // Strip Tracker bool isStrip = true; - edm::Handle > stripDigis; - iEvent.getByToken(SiStripSrc_, stripDigis); + auto stripDigis = iEvent.getHandle(SiStripSrc_); if (!stripDigis.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find stripDigis in event!"; } else { @@ -303,8 +296,7 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // Pixel Tracker bool isPixel = true; - edm::Handle > pixelDigis; - iEvent.getByToken(SiPxlSrc_, pixelDigis); + auto pixelDigis = iEvent.getHandle(SiPxlSrc_); if (!pixelDigis.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find pixelDigis in event!"; } else { @@ -335,9 +327,7 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // DT bool isDT = true; - edm::Handle dtDigis; - //edm::Handle dtDigis; - iEvent.getByToken(MuDTSrc_, dtDigis); + auto dtDigis = iEvent.getHandle(MuDTSrc_); if (!dtDigis.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find dtDigis in event!"; } @@ -361,8 +351,7 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // CSC strip bool isCSCStrip = true; - edm::Handle cscStripDigis; - iEvent.getByToken(MuCSCStripSrc_, cscStripDigis); + auto cscStripDigis = iEvent.getHandle(MuCSCStripSrc_); if (!cscStripDigis.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find cscStripDigis in event!"; } @@ -385,8 +374,7 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // CSC wire bool isCSCWire = true; - edm::Handle cscWireDigis; - iEvent.getByToken(MuCSCWireSrc_, cscWireDigis); + auto cscWireDigis = iEvent.getHandle(MuCSCWireSrc_); if (!cscWireDigis.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find cscWireDigis in event!"; } @@ -409,8 +397,7 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // RPC bool isRPC = true; - edm::Handle rpcDigis; - iEvent.getByToken(MuRPCSrc_, rpcDigis); + auto rpcDigis = iEvent.getHandle(MuRPCSrc_); if (!rpcDigis.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find rpcDigis in event!"; } @@ -433,9 +420,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // BTL bool isBTL = true; - edm::Handle BTLDigi; const BTLDigiCollection* BTLdigis = 0; - iEvent.getByToken(BTLSrc_, BTLDigi); + auto BTLDigi = iEvent.getHandle(BTLSrc_); if (!BTLDigi.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find BTLDigi in event!"; } else { @@ -456,9 +442,8 @@ void SimDigiDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // ETL bool isETL = true; - edm::Handle ETLDigi; const ETLDigiCollection* ETLdigis = 0; - iEvent.getByToken(ETLSrc_, ETLDigi); + auto ETLDigi = iEvent.getHandle(ETLSrc_); if (!ETLDigi.isValid()) { edm::LogPrint("SimDigiDumper") << "Unable to find ETLDigi in event!"; } else { From eaab48db5c2437314ab50a53562ca6ace8d6d58e Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Wed, 4 Aug 2021 10:25:06 +0200 Subject: [PATCH 20/27] Update collections and input parameter definitions --- .../Application/test/SimHitCaloHitDumper.cc | 95 +++++++++++-------- .../test/SimTrackSimVertexDumper.cc | 11 ++- SimGeneral/Debugging/test/SimDigiDumper.cc | 2 +- 3 files changed, 65 insertions(+), 43 deletions(-) diff --git a/SimG4Core/Application/test/SimHitCaloHitDumper.cc b/SimG4Core/Application/test/SimHitCaloHitDumper.cc index 13a2ccafaddb4..b628bbf144efb 100644 --- a/SimG4Core/Application/test/SimHitCaloHitDumper.cc +++ b/SimG4Core/Application/test/SimHitCaloHitDumper.cc @@ -64,50 +64,45 @@ class SimHitCaloHitDumper : public edm::one::EDAnalyzer<> { edm::EDGetTokenT CastorBUToken_; }; -SimHitCaloHitDumper::SimHitCaloHitDumper(const edm::ParameterSet& iConfig) - : moduleName(iConfig.getParameter("moduleLabelG4")) { +SimHitCaloHitDumper::SimHitCaloHitDumper(const edm::ParameterSet& iConfig) { PixelBarrelLowTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelBarrelLowTof")); + consumes(iConfig.getParameter("TrackerHitsPixelBarrelLowTof")); PixelBarrelHighTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelBarrelHighTof")); + consumes(iConfig.getParameter("TrackerHitsPixelBarrelHighTof")); PixelEndcapLowTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelEndcapLowTof")); + consumes(iConfig.getParameter("TrackerHitsPixelEndcapLowTof")); PixelEndcapHighTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsPixelEndcapHighTof")); - TrackerTIBLowTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIBLowTof")); + consumes(iConfig.getParameter("TrackerHitsPixelEndcapHighTof")); + TrackerTIBLowTofToken_ = consumes(iConfig.getParameter("TrackerHitsTIBLowTof")); TrackerTIBHighTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIBHighTof")); - TrackerTIDLowTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIDLowTof")); + consumes(iConfig.getParameter("TrackerHitsTIBHighTof")); + TrackerTIDLowTofToken_ = consumes(iConfig.getParameter("TrackerHitsTIDLowTof")); TrackerTIDHighTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTIDHighTof")); - TrackerTOBLowTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTOBLowTof")); + consumes(iConfig.getParameter("TrackerHitsTIDHighTof")); + TrackerTOBLowTofToken_ = consumes(iConfig.getParameter("TrackerHitsTOBLowTof")); TrackerTOBHighTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTOBHighTof")); - TrackerTECLowTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTECLowTof")); + consumes(iConfig.getParameter("TrackerHitsTOBHighTof")); + TrackerTECLowTofToken_ = consumes(iConfig.getParameter("TrackerHitsTECLowTof")); TrackerTECHighTofToken_ = - consumes(edm::InputTag(std::string(moduleName), "TrackerHitsTECHighTof")); - - MuonDTToken_ = consumes(edm::InputTag(std::string(moduleName), "MuonDTHits")); - MuonCSCToken_ = consumes(edm::InputTag(std::string(moduleName), "MuonCSCHits")); - MuonRPCToken_ = consumes(edm::InputTag(std::string(moduleName), "MuonRPCHits")); - - FastTimerBTLToken_ = consumes(edm::InputTag(std::string(moduleName), "FastTimerHitsBarrel")); - FastTimerETLToken_ = consumes(edm::InputTag(std::string(moduleName), "FastTimerHitsEndcap")); - - EcalEBToken_ = consumes(edm::InputTag(std::string(moduleName), "EBHits")); - EcalEEToken_ = consumes(edm::InputTag(std::string(moduleName), "EEHits")); - EcalESToken_ = consumes(edm::InputTag(std::string(moduleName), "ESHits")); - HcalToken_ = consumes(edm::InputTag(std::string(moduleName), "HcalHits")); - CaloTkToken_ = consumes(edm::InputTag(std::string(moduleName), "CaloTkHits")); - ZDCToken_ = consumes(edm::InputTag(std::string(moduleName), "ZDC")); - CastorTUToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorTUHits")); - CastorPLToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorPLHits")); - CastorFIToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorFIHits")); - CastorBUToken_ = consumes(edm::InputTag(std::string(moduleName), "CastorBUHits")); + consumes(iConfig.getParameter("TrackerHitsTECHighTof")); + + MuonDTToken_ = consumes(iConfig.getParameter("MuonDTHits")); + MuonCSCToken_ = consumes(iConfig.getParameter("MuonCSCHits")); + MuonRPCToken_ = consumes(iConfig.getParameter("MuonRPCHits")); + + FastTimerBTLToken_ = consumes(iConfig.getParameter("FastTimerHitsBarrel")); + FastTimerETLToken_ = consumes(iConfig.getParameter("FastTimerHitsEndcap")); + + EcalEBToken_ = consumes(iConfig.getParameter("EcalHitsEB")); + EcalEEToken_ = consumes(iConfig.getParameter("EcalHitsEE")); + EcalESToken_ = consumes(iConfig.getParameter("EcalHitsES")); + HcalToken_ = consumes(iConfig.getParameter("HcalHits")); + CaloTkToken_ = consumes(iConfig.getParameter("CaloHitsTk")); + ZDCToken_ = consumes(iConfig.getParameter("ZDCHITS")); + CastorTUToken_ = consumes(iConfig.getParameter("CastorTU")); + CastorPLToken_ = consumes(iConfig.getParameter("CastorPL")); + CastorFIToken_ = consumes(iConfig.getParameter("CastorFI")); + CastorBUToken_ = consumes(iConfig.getParameter("CastorBU")); } void SimHitCaloHitDumper::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { @@ -405,7 +400,33 @@ void SimHitCaloHitDumper::analyze(const edm::Event& iEvent, const edm::EventSetu void SimHitCaloHitDumper::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("moduleLabelG4", "g4SimHits")->setComment("Module for input SimHit/CaloHit collections"); + desc.add("TrackerHitsPixelBarrelLowTof", edm::InputTag("g4SimHits", "TrackerHitsPixelBarrelLowTof")); + desc.add("TrackerHitsPixelBarrelHighTof", edm::InputTag("g4SimHits", "TrackerHitsPixelBarrelHighTof")); + desc.add("TrackerHitsPixelEndcapLowTof", edm::InputTag("g4SimHits", "TrackerHitsPixelEndcapLowTof")); + desc.add("TrackerHitsPixelEndcapHighTof", edm::InputTag("g4SimHits", "TrackerHitsPixelEndcapHighTof")); + desc.add("TrackerHitsTIBLowTof", edm::InputTag("g4SimHits", "TrackerHitsTIBLowTof")); + desc.add("TrackerHitsTIBHighTof", edm::InputTag("g4SimHits", "TrackerHitsTIBHighTof")); + desc.add("TrackerHitsTIDLowTof", edm::InputTag("g4SimHits", "TrackerHitsTIDLowTof")); + desc.add("TrackerHitsTIDHighTof", edm::InputTag("g4SimHits", "TrackerHitsTIDHighTof")); + desc.add("TrackerHitsTOBLowTof", edm::InputTag("g4SimHits", "TrackerHitsTOBLowTof")); + desc.add("TrackerHitsTOBHighTof", edm::InputTag("g4SimHits", "TrackerHitsTOBHighTof")); + desc.add("TrackerHitsTECLowTof", edm::InputTag("g4SimHits", "TrackerHitsTECLowTof")); + desc.add("TrackerHitsTECHighTof", edm::InputTag("g4SimHits", "TrackerHitsTECHighTof")); + desc.add("MuonDTHits", edm::InputTag("g4SimHits", "MuonDTHits")); + desc.add("MuonCSCHits", edm::InputTag("g4SimHits", "MuonCSCHits")); + desc.add("MuonRPCHits", edm::InputTag("g4SimHits", "MuonRPCHits")); + desc.add("FastTimerHitsBarrel", edm::InputTag("g4SimHits", "FastTimerHitsBarrel")); + desc.add("FastTimerHitsEndcap", edm::InputTag("g4SimHits", "FastTimerHitsEndcap")); + desc.add("EcalHitsEB", edm::InputTag("g4SimHits", "EcalHitsEB")); + desc.add("EcalHitsEE", edm::InputTag("g4SimHits", "EcalHitsEE")); + desc.add("EcalHitsES", edm::InputTag("g4SimHits", "EcalHitsES")); + desc.add("HcalHits", edm::InputTag("g4SimHits", "HcalHits")); + desc.add("CaloHitsTk", edm::InputTag("g4SimHits", "CaloHitsTk")); + desc.add("ZDCHITS", edm::InputTag("g4SimHits", "ZDCHITS")); + desc.add("CastorTU", edm::InputTag("g4SimHits", "CastorTU")); + desc.add("CastorPL", edm::InputTag("g4SimHits", "CastorPL")); + desc.add("CastorFI", edm::InputTag("g4SimHits", "CastorFI")); + desc.add("CastorBU", edm::InputTag("g4SimHits", "CastorBU")); descriptions.add("simHitCaloHitDumper", desc); } diff --git a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc index 9c92812bf5dc3..ca62428fb7c44 100644 --- a/SimG4Core/Application/test/SimTrackSimVertexDumper.cc +++ b/SimG4Core/Application/test/SimTrackSimVertexDumper.cc @@ -43,10 +43,8 @@ class SimTrackSimVertexDumper : public edm::one::EDAnalyzer<> { SimTrackSimVertexDumper::SimTrackSimVertexDumper(const edm::ParameterSet& iConfig) : hepmcToken_(consumes(iConfig.getParameter("moduleLabelHepMC"))), - simTrackToken_( - consumes(edm::InputTag(iConfig.getParameter("moduleLabelG4")))), - simVertexToken_( - consumes(edm::InputTag(iConfig.getParameter("moduleLabelG4")))), + simTrackToken_(consumes(iConfig.getParameter("moduleLabelTk"))), + simVertexToken_(consumes(iConfig.getParameter("moduleLabelVtx"))), dumpHepMC_(iConfig.getUntrackedParameter("dumpHepMC")) {} // @@ -110,7 +108,10 @@ void SimTrackSimVertexDumper::fillDescriptions(edm::ConfigurationDescriptions& d edm::ParameterSetDescription desc; desc.add("moduleLabelHepMC", edm::InputTag("generatorSmeared")) ->setComment("Input generated HepMC event after vtx smearing"); - desc.add("moduleLabelG4", "g4SimHits")->setComment("Module for input SimTrack/SimVertex collection"); + desc.add("moduleLabelTk", edm::InputTag("g4SimHits")) + ->setComment("Module for input SimTrack collection"); + desc.add("moduleLabelVtx", edm::InputTag("g4SimHits")) + ->setComment("Module for input SimVertex collection"); desc.addUntracked("dumpHepMC", false); descriptions.add("simTrackSimVertexDumper", desc); } diff --git a/SimGeneral/Debugging/test/SimDigiDumper.cc b/SimGeneral/Debugging/test/SimDigiDumper.cc index f8c3621f9fb9d..f99316536869f 100644 --- a/SimGeneral/Debugging/test/SimDigiDumper.cc +++ b/SimGeneral/Debugging/test/SimDigiDumper.cc @@ -471,7 +471,7 @@ void SimDigiDumper::fillDescriptions(edm::ConfigurationDescriptions& description desc.add("ECalEESrc", edm::InputTag("simEcalDigis", "eeDigis"))->setComment("ECAL endcap digis"); desc.add("ECalESSrc", edm::InputTag("simEcalPreshowerDigis"))->setComment("ECAL preshower digis"); desc.add("HCalSrc", edm::InputTag("simHcalDigis"))->setComment("HCAL digis"); - desc.add("ZdcSrc", edm::InputTag("simHcaliUnsuppressedDigis"))->setComment("ZDC digis"); + desc.add("ZdcSrc", edm::InputTag("simHcalUnsuppressedDigis"))->setComment("ZDC digis"); desc.add("SiStripSrc", edm::InputTag("simSiStripDigis", "ZeroSuppressed")) ->setComment("Si strip digis"); desc.add("SiPxlSrc", edm::InputTag("simSiPixelDigis"))->setComment("Si pixel digis"); From 1251d7104469e4f7c73d589f4029393061ee2563 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 4 Aug 2021 10:32:29 +0200 Subject: [PATCH 21/27] [Geometry] Move public headers on to interface directory --- CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc | 2 +- CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc | 2 +- CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc | 2 +- CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc | 2 +- CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc | 2 +- Geometry/CSCGeometry/{src => interface}/CSCWireGroupPackage.h | 0 Geometry/CSCGeometry/interface/CSCWireTopology.h | 2 +- Geometry/CSCGeometry/src/CSCChamberSpecs.cc | 2 +- Geometry/CSCGeometry/src/CSCLayerGeometry.cc | 2 +- .../{src => interface}/CSCGeometryParsFromDD.h | 0 Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.cc | 2 +- Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.h | 2 +- Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc | 2 +- Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc | 4 ++-- Geometry/DTGeometry/test/DTRecoIdealDBLoader.cc | 2 +- .../{src => interface}/DTGeometryParsFromDD.h | 0 Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc | 2 +- .../{src => interface}/ZdcHardcodeGeometryData.h | 0 Geometry/ForwardGeometry/src/ZdcGeometry.cc | 2 +- .../{src => interface}/GEMGeometryParsFromDD.h | 0 .../{src => interface}/ME0GeometryParsFromDD.h | 0 Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc | 2 +- Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc | 2 +- .../{src => interface}/RPCGeometryParsFromDD.h | 0 Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc | 2 +- SimG4CMS/Forward/interface/ZdcShowerLibrary.h | 2 +- 26 files changed, 20 insertions(+), 20 deletions(-) rename Geometry/CSCGeometry/{src => interface}/CSCWireGroupPackage.h (100%) rename Geometry/CSCGeometryBuilder/{src => interface}/CSCGeometryParsFromDD.h (100%) rename Geometry/DTGeometryBuilder/{src => interface}/DTGeometryParsFromDD.h (100%) rename Geometry/ForwardGeometry/{src => interface}/ZdcHardcodeGeometryData.h (100%) rename Geometry/GEMGeometryBuilder/{src => interface}/GEMGeometryParsFromDD.h (100%) rename Geometry/GEMGeometryBuilder/{src => interface}/ME0GeometryParsFromDD.h (100%) rename Geometry/RPCGeometryBuilder/{src => interface}/RPCGeometryParsFromDD.h (100%) diff --git a/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc index 40c29446fd2c7..ab0ee4eb17814 100644 --- a/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc @@ -11,7 +11,7 @@ #include "Geometry/Records/interface/CSCRecoDigiParametersRcd.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h" -#include "Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.h" +#include "Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DetectorDescription/DDCMS/interface/DDCompactView.h" diff --git a/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc index 5868a325a66f1..1311f825cedde 100644 --- a/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc @@ -13,7 +13,7 @@ #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/Records/interface/MuonNumberingRecord.h" #include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h" -#include "Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h" +#include "Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DetectorDescription/DDCMS/interface/DDCompactView.h" diff --git a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc index 715b9691bfb7b..48fd98f03488b 100644 --- a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc @@ -10,7 +10,7 @@ #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/DDCMS/interface/DDCompactView.h" -#include "Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.h" +#include "Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h" #include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h" #include "Geometry/Records/interface/GEMRecoGeometryRcd.h" #include "Geometry/Records/interface/MuonNumberingRecord.h" diff --git a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc index fefc349635770..c28765de7483a 100644 --- a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc @@ -11,7 +11,7 @@ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/DDCMS/interface/DDCompactView.h" -#include "Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.h" +#include "Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h" #include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h" #include "Geometry/Records/interface/ME0RecoGeometryRcd.h" #include "Geometry/Records/interface/MuonNumberingRecord.h" diff --git a/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc index cfac40f81ea20..2c7fd91be2331 100644 --- a/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc @@ -13,7 +13,7 @@ #include "DetectorDescription/Core/interface/DDCompactView.h" #include "Geometry/Records/interface/MuonNumberingRecord.h" #include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h" -#include "Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.h" +#include "Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DetectorDescription/DDCMS/interface/DDCompactView.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" diff --git a/Geometry/CSCGeometry/src/CSCWireGroupPackage.h b/Geometry/CSCGeometry/interface/CSCWireGroupPackage.h similarity index 100% rename from Geometry/CSCGeometry/src/CSCWireGroupPackage.h rename to Geometry/CSCGeometry/interface/CSCWireGroupPackage.h diff --git a/Geometry/CSCGeometry/interface/CSCWireTopology.h b/Geometry/CSCGeometry/interface/CSCWireTopology.h index b77a8a9384aa9..afcb2d7b94807 100644 --- a/Geometry/CSCGeometry/interface/CSCWireTopology.h +++ b/Geometry/CSCGeometry/interface/CSCWireTopology.h @@ -12,7 +12,7 @@ #include "Geometry/CSCGeometry/interface/WireTopology.h" #include "Geometry/CSCGeometry/interface/CSCWireGeometry.h" #include "Geometry/CSCGeometry/src/CSCWireGrouping.h" -#include "Geometry/CSCGeometry/src/CSCWireGroupPackage.h" +#include "Geometry/CSCGeometry/interface/CSCWireGroupPackage.h" #include // for std::pair class CSCWireTopology : public WireTopology { diff --git a/Geometry/CSCGeometry/src/CSCChamberSpecs.cc b/Geometry/CSCGeometry/src/CSCChamberSpecs.cc index 96c5bd2b3c316..3d5b3c20233fd 100644 --- a/Geometry/CSCGeometry/src/CSCChamberSpecs.cc +++ b/Geometry/CSCGeometry/src/CSCChamberSpecs.cc @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/Geometry/CSCGeometry/src/CSCLayerGeometry.cc b/Geometry/CSCGeometry/src/CSCLayerGeometry.cc index ed927268f6ca1..d5f5373aa5457 100644 --- a/Geometry/CSCGeometry/src/CSCLayerGeometry.cc +++ b/Geometry/CSCGeometry/src/CSCLayerGeometry.cc @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.h b/Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h similarity index 100% rename from Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.h rename to Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.cc b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.cc index 6e8aaf5b30094..215d4f2f87d65 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.cc +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.h b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.h index dc540497302eb..38c80d3b426ed 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.h +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.h @@ -9,7 +9,7 @@ */ #include -#include +#include #include #include diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc index 44748d2616bd8..b52d43ff2a857 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc @@ -13,7 +13,7 @@ // #include "CSCGeometryBuilderFromDDD.h" #include "CSCGeometryBuilder.h" -#include "CSCGeometryParsFromDD.h" +#include "../interface/CSCGeometryParsFromDD.h" #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h" #include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h" #include "DetectorDescription/DDCMS/interface/DDFilteredView.h" diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc b/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc index fad1961a088ba..a68289956f2b5 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc @@ -10,7 +10,7 @@ // Modified: Wed, 23 December 2020 // Original author: Tim Cox */ -#include "CSCGeometryParsFromDD.h" +#include "../interface/CSCGeometryParsFromDD.h" #include "DetectorDescription/Core/interface/DDFilteredView.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h" @@ -18,7 +18,7 @@ #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h" #include "Geometry/MuonNumbering/interface/MuonGeometryNumbering.h" #include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h" -#include "Geometry/CSCGeometry/src/CSCWireGroupPackage.h" +#include "Geometry/CSCGeometry/interface/CSCWireGroupPackage.h" #include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h" #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/Geometry/DTGeometry/test/DTRecoIdealDBLoader.cc b/Geometry/DTGeometry/test/DTRecoIdealDBLoader.cc index f7b12eb87cd74..a3ebef5b2860d 100644 --- a/Geometry/DTGeometry/test/DTRecoIdealDBLoader.cc +++ b/Geometry/DTGeometry/test/DTRecoIdealDBLoader.cc @@ -7,7 +7,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESTransientHandle.h" #include "CondFormats/RecoGeometryObjects/interface/RecoIdealGeometry.h" -#include "Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h" +#include "Geometry/DTGeometryBuilderinterface/DTGeometryParsFromDD.h" #include "Geometry/Records/interface/RecoIdealGeometryRcd.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "DetectorDescription/Core/interface/DDCompactView.h" diff --git a/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h b/Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h similarity index 100% rename from Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h rename to Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h diff --git a/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc b/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc index 64305ee33ed59..d234a63f45d99 100644 --- a/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc +++ b/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc @@ -7,7 +7,7 @@ * Created: Tue, 26 Jan 2021 * */ -#include +#include #include #include #include diff --git a/Geometry/ForwardGeometry/src/ZdcHardcodeGeometryData.h b/Geometry/ForwardGeometry/interface/ZdcHardcodeGeometryData.h similarity index 100% rename from Geometry/ForwardGeometry/src/ZdcHardcodeGeometryData.h rename to Geometry/ForwardGeometry/interface/ZdcHardcodeGeometryData.h diff --git a/Geometry/ForwardGeometry/src/ZdcGeometry.cc b/Geometry/ForwardGeometry/src/ZdcGeometry.cc index 319fa1e2b102d..e7432c94b0ca9 100644 --- a/Geometry/ForwardGeometry/src/ZdcGeometry.cc +++ b/Geometry/ForwardGeometry/src/ZdcGeometry.cc @@ -2,7 +2,7 @@ #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/ForwardGeometry/interface/ZdcGeometry.h" #include "Geometry/ForwardGeometry/interface/IdealZDCTrapezoid.h" -#include "ZdcHardcodeGeometryData.h" +#include "../interface/ZdcHardcodeGeometryData.h" #include typedef CaloCellGeometry::CCGFloat CCGFloat; diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.h b/Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h similarity index 100% rename from Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.h rename to Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.h b/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h similarity index 100% rename from Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.h rename to Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc b/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc index 62b97b39cfee2..0b459bd835496 100644 --- a/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc +++ b/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc @@ -6,7 +6,7 @@ * Created: Mon, 15 Feb 2021 * */ -#include "Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.h" +#include "Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h" #include "DataFormats/MuonDetId/interface/GEMDetId.h" #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h" diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc b/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc index f6a049ac7409a..fc07ee4c59295 100644 --- a/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc +++ b/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc @@ -6,7 +6,7 @@ * Created: Thu, 25 Feb 2021 * */ -#include "Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.h" +#include "Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h" #include "DataFormats/MuonDetId/interface/ME0DetId.h" #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h" #include "DetectorDescription/Core/interface/DDFilter.h" diff --git a/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.h b/Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h similarity index 100% rename from Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.h rename to Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h diff --git a/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc b/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc index 78a42924f5961..1d67df65876bd 100644 --- a/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc +++ b/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc @@ -6,7 +6,7 @@ * Created: Mon, 09 Nov 2020 * */ -#include "Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.h" +#include "Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" #include #include diff --git a/SimG4CMS/Forward/interface/ZdcShowerLibrary.h b/SimG4CMS/Forward/interface/ZdcShowerLibrary.h index 6abf608e968d9..3ee1ec3b584f7 100644 --- a/SimG4CMS/Forward/interface/ZdcShowerLibrary.h +++ b/SimG4CMS/Forward/interface/ZdcShowerLibrary.h @@ -8,7 +8,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/ForwardGeometry/src/ZdcHardcodeGeometryData.h" +#include "Geometry/ForwardGeometry/interface/ZdcHardcodeGeometryData.h" #include "G4ParticleTable.hh" #include "G4ThreeVector.hh" From 367d8b2fcb3be5d0f5a06a8d682961a4b876ae04 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 4 Aug 2021 11:30:51 +0200 Subject: [PATCH 22/27] use full package path to include header --- Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc | 2 +- Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc | 2 +- Geometry/ForwardGeometry/src/ZdcGeometry.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc index b52d43ff2a857..ceda1d2f63f3c 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc @@ -13,7 +13,7 @@ // #include "CSCGeometryBuilderFromDDD.h" #include "CSCGeometryBuilder.h" -#include "../interface/CSCGeometryParsFromDD.h" +#include "Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h" #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h" #include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h" #include "DetectorDescription/DDCMS/interface/DDFilteredView.h" diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc b/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc index a68289956f2b5..33f98925e101d 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc @@ -10,7 +10,7 @@ // Modified: Wed, 23 December 2020 // Original author: Tim Cox */ -#include "../interface/CSCGeometryParsFromDD.h" +#include "Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h" #include "DetectorDescription/Core/interface/DDFilteredView.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h" diff --git a/Geometry/ForwardGeometry/src/ZdcGeometry.cc b/Geometry/ForwardGeometry/src/ZdcGeometry.cc index e7432c94b0ca9..861939c443348 100644 --- a/Geometry/ForwardGeometry/src/ZdcGeometry.cc +++ b/Geometry/ForwardGeometry/src/ZdcGeometry.cc @@ -2,7 +2,7 @@ #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/ForwardGeometry/interface/ZdcGeometry.h" #include "Geometry/ForwardGeometry/interface/IdealZDCTrapezoid.h" -#include "../interface/ZdcHardcodeGeometryData.h" +#include "Geometry/ForwardGeometry/interface/ZdcHardcodeGeometryData.h" #include typedef CaloCellGeometry::CCGFloat CCGFloat; From d8b5e9537d37b48ac645932727d2aa270a291038 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 4 Aug 2021 12:17:45 +0200 Subject: [PATCH 23/27] [DataFormat] Cleanup unnecessary includes of DF private headers --- CondFormats/DTObjects/src/DTRecoUncertainties.cc | 2 +- .../Phase2TrackerRawToDigi/plugins/Phase2TrackerDigiProducer.cc | 2 -- EventFilter/SiStripRawToDigi/plugins/ExcludedFEDListProducer.cc | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CondFormats/DTObjects/src/DTRecoUncertainties.cc b/CondFormats/DTObjects/src/DTRecoUncertainties.cc index ebfef7d00d391..b34f7bba49128 100644 --- a/CondFormats/DTObjects/src/DTRecoUncertainties.cc +++ b/CondFormats/DTObjects/src/DTRecoUncertainties.cc @@ -6,7 +6,7 @@ */ #include "CondFormats/DTObjects/interface/DTRecoUncertainties.h" -#include "DataFormats/MuonDetId/src/DTWireId.cc" +#include "DataFormats/MuonDetId/interface/DTWireId.h" #include using std::cout; diff --git a/EventFilter/Phase2TrackerRawToDigi/plugins/Phase2TrackerDigiProducer.cc b/EventFilter/Phase2TrackerRawToDigi/plugins/Phase2TrackerDigiProducer.cc index 8490902f45aa9..b1e58b61a5d62 100644 --- a/EventFilter/Phase2TrackerRawToDigi/plugins/Phase2TrackerDigiProducer.cc +++ b/EventFilter/Phase2TrackerRawToDigi/plugins/Phase2TrackerDigiProducer.cc @@ -6,8 +6,6 @@ #include "DataFormats/DetId/interface/DetIdCollection.h" #include "DataFormats/FEDRawData/interface/FEDNumbering.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" -#include "DataFormats/FEDRawData/src/fed_header.h" -#include "DataFormats/FEDRawData/src/fed_trailer.h" #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDBuffer.h" #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDChannel.h" diff --git a/EventFilter/SiStripRawToDigi/plugins/ExcludedFEDListProducer.cc b/EventFilter/SiStripRawToDigi/plugins/ExcludedFEDListProducer.cc index ed12b042f4fed..be22bc76f12fd 100644 --- a/EventFilter/SiStripRawToDigi/plugins/ExcludedFEDListProducer.cc +++ b/EventFilter/SiStripRawToDigi/plugins/ExcludedFEDListProducer.cc @@ -1,8 +1,6 @@ #include "EventFilter/SiStripRawToDigi/plugins/ExcludedFEDListProducer.h" #include "DataFormats/Common/interface/DetSet.h" #include "DataFormats/FEDRawData/interface/FEDNumbering.h" -#include "DataFormats/FEDRawData/src/fed_header.h" -#include "DataFormats/FEDRawData/src/fed_trailer.h" #include "DataFormats/SiStripCommon/interface/SiStripConstants.h" #include "DataFormats/SiStripCommon/interface/SiStripEventSummary.h" #include "DataFormats/SiStripDigi/interface/SiStripDigi.h" From 9bc2c16fb6f1758e1a9e794033a40bdae1415633 Mon Sep 17 00:00:00 2001 From: iarspider Date: Wed, 4 Aug 2021 14:55:58 +0200 Subject: [PATCH 24/27] [GCC 11] Fix error: 'this' pointer is null Log file: https://cmssdt.cern.ch/SDT/cgi-bin/buildlogs/slc7_amd64_gcc11/CMSSW_12_1_X_2021-08-02-1100/Fireworks/Geometry Error message: ``` /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/e3e3f354f3bbc00899d20eeb240b2272/opt/cmssw/slc7_amd64_gcc11/cms/cmssw/CMSSW_12_1_X_2021-08-02-1100/src/Fireworks/Geometry/plugins/DisplayGeom.cc: In member function 'virtual void DisplayGeom::analyze(const edm::Event&, const edm::EventSetup&)': /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/e3e3f354f3bbc00899d20eeb240b2272/opt/cmssw/slc7_amd64_gcc11/cms/cmssw/CMSSW_12_1_X_2021-08-02-1100/src/Fireworks/Geometry/plugins/DisplayGeom.cc:185:25: error: 'this' pointer is null [-Werror=nonnull] 185 | ls->SetLineColor(kGreen); | ~~~~~~~~~~~~~~~~^~~~~~~~ ``` --- Fireworks/Geometry/plugins/DisplayGeom.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fireworks/Geometry/plugins/DisplayGeom.cc b/Fireworks/Geometry/plugins/DisplayGeom.cc index ebbd32a787295..6e803f603d759 100644 --- a/Fireworks/Geometry/plugins/DisplayGeom.cc +++ b/Fireworks/Geometry/plugins/DisplayGeom.cc @@ -180,7 +180,7 @@ void DisplayGeom::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu TEveStraightLineSet* ls = nullptr; if (m_MF_plane_draw_dir) { - new TEveStraightLineSet("MF_line_direction"); + ls = new TEveStraightLineSet("MF_line_direction"); ls->SetPickable(false); ls->SetLineColor(kGreen); ls->SetMarkerColor(kGreen); From d91fc4c3306f269a9fe892a6febce2fcf2e12782 Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Wed, 4 Aug 2021 15:11:50 +0200 Subject: [PATCH 25/27] Fix crash of ECAL GPU reco when ECAL is out of the run. --- EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc | 4 ++++ .../EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc b/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc index 4dcb1bd0e26e1..b8cca380499d8 100644 --- a/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc +++ b/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc @@ -138,6 +138,10 @@ void EcalRawToDigiGPU::acquire(edm::Event const& event, if (counter > 0) { ecal::raw::entryPoint( inputCPU, inputGPU, outputGPU_, scratchGPU, outputCPU_, conditions, ctx.stream(), counter, currentCummOffset); + } else { + // reset the number of channels + outputCPU_.nchannels[0] = 0; + outputCPU_.nchannels[1] = 0; } } diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc index c87ea1082b673..9f0c35cfcdc41 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc +++ b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc @@ -213,7 +213,9 @@ void EcalUncalibRecHitProducerGPU::acquire(edm::Event const& event, if ((neb_ > configParameters_.maxNumberHitsEB) || (nee_ > configParameters_.maxNumberHitsEE)) { edm::LogError("EcalUncalibRecHitProducerGPU") - << "max number of channels exceeded. See options 'maxNumberHitsEB and maxNumberHitsEE' "; + << "Max number of channels exceeded in barrel or endcap. Number of barrel channels: " << neb_ + << " with maxNumberHitsEB=" << configParameters_.maxNumberHitsEB << ", number of endcap channels: " << nee_ + << " with maxNumberHitsEE=" << configParameters_.maxNumberHitsEE; } // conditions From 2245ffbff61c3303ca9d3f8e7ef7acd479398857 Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Wed, 4 Aug 2021 16:08:16 +0200 Subject: [PATCH 26/27] Initialize the number of channels unconditionally. --- EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc b/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc index b8cca380499d8..75fa5e1656eb9 100644 --- a/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc +++ b/EventFilter/EcalRawToDigi/plugins/EcalRawToDigiGPU.cc @@ -103,6 +103,9 @@ void EcalRawToDigiGPU::acquire(edm::Event const& event, // output cpu outputCPU_ = {cms::cuda::make_host_unique(2, ctx.stream())}; + // initialize the number of channels + outputCPU_.nchannels[0] = 0; + outputCPU_.nchannels[1] = 0; // output gpu outputGPU_.allocate(config_, ctx.stream()); @@ -138,10 +141,6 @@ void EcalRawToDigiGPU::acquire(edm::Event const& event, if (counter > 0) { ecal::raw::entryPoint( inputCPU, inputGPU, outputGPU_, scratchGPU, outputCPU_, conditions, ctx.stream(), counter, currentCummOffset); - } else { - // reset the number of channels - outputCPU_.nchannels[0] = 0; - outputCPU_.nchannels[1] = 0; } } From 5c584d2b091defa692a934e4254660502f4045c6 Mon Sep 17 00:00:00 2001 From: iarspider Date: Wed, 4 Aug 2021 16:37:40 +0200 Subject: [PATCH 27/27] [GCC 11] Fix "this pointer is null" in RecoJets/JetProducers Log file: https://cmssdt.cern.ch/SDT/cgi-bin/buildlogs/slc7_amd64_gcc11/CMSSW_12_1_X_2021-08-02-1100/RecoJets/JetProducers Error message: ``` In function 'constexpr decltype (t1.eta()) reco::deltaR2(const T1&, const T2&) [with T1 = reco::Jet; T2 = reco::Candidate]', inlined from 'constexpr decltype (t1.eta()) reco::deltaR(const T1&, const T2&) [with T1 = reco::Jet; T2 = reco::Candidate]' at /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/e3e3f354f3bbc00899d20eeb240b2272/opt/cmssw/slc7_amd64_gcc11/cms/cmssw/CMSSW_12_1_X_2021-08-02-1100/src/DataFormats/Math/interface/deltaR.h:31:21, inlined from 'PileupJetIdentifier PileupJetIdAlgo::computeIdVariables(const reco::Jet*, float, const reco::Vertex*, const VertexCollection&, double, bool)' at /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/e3e3f354f3bbc00899d20eeb240b2272/opt/cmssw/slc7_amd64_gcc11/cms/cmssw/CMSSW_12_1_X_2021-08-02-1100/src/RecoJets/JetProducers/src/PileupJetIdAlgo.cc:668:42: /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/e3e3f354f3bbc00899d20eeb240b2272/opt/cmssw/slc7_amd64_gcc11/cms/cmssw/CMSSW_12_1_X_2021-08-02-1100/src/DataFormats/Math/interface/deltaR.h:19:22: error: 'this' pointer is null [-Werror=nonnull] 19 | Float p2 = t2.phi(); | ~~~~~~^~ /data/cmsbld/jenkins/workspace/build-any-ib/w/tmp/BUILDROOT/e3e3f354f3bbc00899d20eeb240b2272/opt/cmssw/slc7_amd64_gcc11/cms/cmssw/CMSSW_12_1_X_2021-08-02-1100/src/DataFormats/Math/interface/deltaR.h:21:22: error: 'this' pointer is null [-Werror=nonnull] 21 | Float e2 = t2.eta(); | ~~~~~~^~ ``` --- RecoJets/JetProducers/src/PileupJetIdAlgo.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoJets/JetProducers/src/PileupJetIdAlgo.cc b/RecoJets/JetProducers/src/PileupJetIdAlgo.cc index d2920772711e1..a5994a7b67fb4 100644 --- a/RecoJets/JetProducers/src/PileupJetIdAlgo.cc +++ b/RecoJets/JetProducers/src/PileupJetIdAlgo.cc @@ -664,7 +664,7 @@ PileupJetIdentifier PileupJetIdAlgo::computeIdVariables(const reco::Jet* jet, } internalId_.dRLeadCent_ = reco::deltaR(*jet, *lLead); - if (lSecond == nullptr) { + if (lSecond != nullptr) { internalId_.dRLead2nd_ = reco::deltaR(*jet, *lSecond); } internalId_.dRMean_ /= jetPt;