diff --git a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h index a1b34c9fc732c..2d8ac29879405 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h @@ -13,7 +13,7 @@ #include "FWCore/PluginManager/interface/PluginFactory.h" #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h" -typedef edmplugin::PluginFactory +typedef edmplugin::PluginFactory IntegratedCalibrationPluginFactory; #endif diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc index 29fdfb5304c32..aa30f3e2ac925 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc @@ -23,7 +23,6 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/Framework/interface/Run.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" @@ -37,6 +36,7 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" #include "TTree.h" #include "TFile.h" @@ -54,7 +54,7 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase { public: /// Constructor - explicit SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg); + explicit SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC); /// Destructor ~SiPixelLorentzAngleCalibration() override = default; @@ -116,7 +116,8 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase { const std::string outFileName_; const std::vector mergeFileNames_; const std::string lorentzAngleLabel_; - + const edm::ESGetToken lorentzAngleToken_; + const edm::ESGetToken magFieldToken_; edm::ESWatcher watchLorentzAngleRcd_; // const AlignableTracker *alignableTracker_; @@ -134,13 +135,15 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase { //====================================================================== //====================================================================== -SiPixelLorentzAngleCalibration::SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg) +SiPixelLorentzAngleCalibration::SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) : IntegratedCalibrationBase(cfg), saveToDB_(cfg.getParameter("saveToDB")), recordNameDBwrite_(cfg.getParameter("recordNameDBwrite")), outFileName_(cfg.getParameter("treeFile")), mergeFileNames_(cfg.getParameter >("mergeTreeFiles")), lorentzAngleLabel_(cfg.getParameter("lorentzAngleLabel")), + lorentzAngleToken_(iC.esConsumes(edm::ESInputTag("", lorentzAngleLabel_))), + magFieldToken_(iC.esConsumes()), moduleGroupSelCfg_(cfg.getParameter("LorentzAngleModuleGroups")) {} //====================================================================== @@ -165,9 +168,9 @@ void SiPixelLorentzAngleCalibration::beginRun(const edm::Run &run, const edm::Ev } } - edm::ESHandle lorentzAngleHandle; + const SiPixelLorentzAngle *lorentzAngleHandle = &setup.getData(lorentzAngleToken_); const auto &lorentzAngleRcd = setup.get(); - lorentzAngleRcd.get(lorentzAngleLabel_, lorentzAngleHandle); + if (cachedLorentzAngleInputs_.find(firstRun) == cachedLorentzAngleInputs_.end()) { cachedLorentzAngleInputs_.emplace(firstRun, SiPixelLorentzAngle(*lorentzAngleHandle)); } else { @@ -202,8 +205,8 @@ unsigned int SiPixelLorentzAngleCalibration::derivatives(std::vectorgetParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run()); if (index >= 0) { // otherwise not treated - edm::ESHandle magneticField; - setup.get().get(magneticField); + + const MagneticField *magneticField = &setup.getData(magFieldToken_); const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position())); const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField)); const double dZ = hit.det()->surface().bounds().thickness(); // it is a float only... diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc index 795f70f9912d0..b3da1338201bd 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc @@ -29,7 +29,6 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ServiceRegistry/interface/Service.h" @@ -39,6 +38,7 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" #include "TTree.h" #include "TFile.h" @@ -54,7 +54,7 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase { public: /// Constructor - explicit SiStripBackplaneCalibration(const edm::ParameterSet &cfg); + explicit SiStripBackplaneCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC); /// Destructor ~SiStripBackplaneCalibration() override; @@ -135,13 +135,17 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase { TkModuleGroupSelector *moduleGroupSelector_; const edm::ParameterSet moduleGroupSelCfg_; + const edm::ESGetToken latencyToken_; + const edm::ESGetToken lorentzAngleToken_; + const edm::ESGetToken magFieldToken_; + const edm::ESGetToken backPlaneCorrToken_; }; //====================================================================== //====================================================================== //====================================================================== -SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet &cfg) +SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) : IntegratedCalibrationBase(cfg), readoutModeName_(cfg.getParameter("readoutMode")), saveToDB_(cfg.getParameter("saveToDB")), @@ -150,7 +154,11 @@ SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet mergeFileNames_(cfg.getParameter >("mergeTreeFiles")), siStripBackPlaneCorrInput_(nullptr), moduleGroupSelector_(nullptr), - moduleGroupSelCfg_(cfg.getParameter("BackplaneModuleGroups")) { + moduleGroupSelCfg_(cfg.getParameter("BackplaneModuleGroups")), + latencyToken_(iC.esConsumes()), + lorentzAngleToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))), + magFieldToken_(iC.esConsumes()), + backPlaneCorrToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))) { // SiStripLatency::singleReadOutMode() returns // 1: all in peak, 0: all in deco, -1: mixed state // (in principle one could treat even mixed state APV by APV...) @@ -187,8 +195,7 @@ unsigned int SiStripBackplaneCalibration::derivatives(std::vector latency; - setup.get().get(latency); + const SiStripLatency *latency = &setup.getData(latencyToken_); const int16_t mode = latency->singleReadOutMode(); if (mode == readoutMode_) { @@ -197,16 +204,14 @@ unsigned int SiStripBackplaneCalibration::derivatives(std::vectorgetParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run()); if (index >= 0) { // otherwise not treated - edm::ESHandle magneticField; - setup.get().get(magneticField); + const MagneticField *magneticField = &setup.getData(magFieldToken_); const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position())); const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField)); //std::cout << "SiStripBackplaneCalibration derivatives " << readoutModeName_ << std::endl; const double dZ = hit.det()->surface().bounds().thickness(); // it's a float only... const double tanPsi = tsos.localParameters().mixedFormatVector()[1]; //float... - edm::ESHandle lorentzAngleHandle; - setup.get().get(readoutModeName_, lorentzAngleHandle); + const SiStripLorentzAngle *lorentzAngleHandle = &setup.getData(lorentzAngleToken_); // Yes, mobility (= LA/By) stored in object called LA... const double mobility = lorentzAngleHandle->getLorentzAngle(hit.det()->geographicalId()); // shift due to dead back plane has two parts: @@ -393,16 +398,17 @@ void SiStripBackplaneCalibration::endOfJob() { //====================================================================== bool SiStripBackplaneCalibration::checkBackPlaneCorrectionInput(const edm::EventSetup &setup, const EventInfo &eventInfo) { - edm::ESHandle backPlaneCorrHandle; + const SiStripBackPlaneCorrection *backPlaneCorrHandle = nullptr; if (!siStripBackPlaneCorrInput_) { - setup.get().get(readoutModeName_, backPlaneCorrHandle); + backPlaneCorrHandle = &setup.getData(backPlaneCorrToken_); siStripBackPlaneCorrInput_ = new SiStripBackPlaneCorrection(*backPlaneCorrHandle); // FIXME: Should we call 'watchBackPlaneCorrRcd_.check(setup)' as well? // Otherwise could be that next check has to check via following 'else', though // no new IOV has started... (to be checked) } else { if (watchBackPlaneCorrRcd_.check(setup)) { // new IOV of input - but how to check peak vs deco? - setup.get().get(readoutModeName_, backPlaneCorrHandle); + backPlaneCorrHandle = &setup.getData(backPlaneCorrToken_); + if (backPlaneCorrHandle->getBackPlaneCorrections() // but only bad if non-identical values != siStripBackPlaneCorrInput_->getBackPlaneCorrections()) { // (comparing maps) // Maps are containers sorted by key, but comparison problems may arise from diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc index 7f8fe989831a4..787e8982c8941 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc @@ -27,7 +27,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/Framework/interface/Run.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" @@ -53,7 +53,7 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase { public: /// Constructor - explicit SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg); + explicit SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC); /// Destructor ~SiStripLorentzAngleCalibration() override = default; @@ -130,20 +130,29 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase { std::unique_ptr moduleGroupSelector_; const edm::ParameterSet moduleGroupSelCfg_; + + const edm::ESGetToken latencyToken_; + const edm::ESGetToken lorentzAngleToken_; + const edm::ESGetToken magFieldToken_; + const edm::ESGetToken backPlaneCorrToken_; }; //====================================================================== //====================================================================== //====================================================================== -SiStripLorentzAngleCalibration::SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg) +SiStripLorentzAngleCalibration::SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) : IntegratedCalibrationBase(cfg), readoutModeName_(cfg.getParameter("readoutMode")), saveToDB_(cfg.getParameter("saveToDB")), recordNameDBwrite_(cfg.getParameter("recordNameDBwrite")), outFileName_(cfg.getParameter("treeFile")), mergeFileNames_(cfg.getParameter >("mergeTreeFiles")), - moduleGroupSelCfg_(cfg.getParameter("LorentzAngleModuleGroups")) { + moduleGroupSelCfg_(cfg.getParameter("LorentzAngleModuleGroups")), + latencyToken_(iC.esConsumes()), + lorentzAngleToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))), + magFieldToken_(iC.esConsumes()), + backPlaneCorrToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))) { // SiStripLatency::singleReadOutMode() returns // 1: all in peak, 0: all in deco, -1: mixed state // (in principle one could treat even mixed state APV by APV...) @@ -180,9 +189,8 @@ void SiStripLorentzAngleCalibration::beginRun(const edm::Run &run, const edm::Ev } } - edm::ESHandle lorentzAngleHandle; + const SiStripLorentzAngle *lorentzAngleHandle = &setup.getData(lorentzAngleToken_); const auto &lorentzAngleRcd = setup.get(); - lorentzAngleRcd.get(readoutModeName_, lorentzAngleHandle); if (cachedLorentzAngleInputs_.find(firstRun) == cachedLorentzAngleInputs_.end()) { cachedLorentzAngleInputs_.emplace(firstRun, SiStripLorentzAngle(*lorentzAngleHandle)); } else { @@ -212,8 +220,7 @@ unsigned int SiStripLorentzAngleCalibration::derivatives(std::vector latency; - setup.get().get(latency); + const SiStripLatency *latency = &setup.getData(latencyToken_); const int16_t mode = latency->singleReadOutMode(); if (mode == readoutMode_) { if (hit.det()) { // otherwise 'constraint hit' or whatever @@ -221,8 +228,7 @@ unsigned int SiStripLorentzAngleCalibration::derivatives(std::vectorgetParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run()); if (index >= 0) { // otherwise not treated - edm::ESHandle magneticField; - setup.get().get(magneticField); + const MagneticField *magneticField = &setup.getData(magFieldToken_); const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position())); const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField)); const double dZ = this->effectiveThickness(hit.det(), mode, setup); @@ -394,10 +400,9 @@ double SiStripLorentzAngleCalibration::effectiveThickness(const GeomDet *det, return 0.; double dZ = det->surface().bounds().thickness(); // it is a float only... const SiStripDetId id(det->geographicalId()); - edm::ESHandle backPlaneHandle; + const SiStripBackPlaneCorrection *backPlaneHandle = &setup.getData(backPlaneCorrToken_); // FIXME: which one? DepRcd->get(handle) or Rcd->get(readoutModeName_, handle)?? // setup.get().get(backPlaneHandle); // get correct mode - setup.get().get(readoutModeName_, backPlaneHandle); const double bpCor = backPlaneHandle->getBackPlaneCorrection(id); // it's a float... // std::cout << "bpCor " << bpCor << " in subdet " << id.subdetId() << std::endl; dZ *= (1. - bpCor); diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h index 60816aea033d6..1d9783b1cfe81 100644 --- a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h +++ b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h @@ -143,7 +143,7 @@ class AlignmentProducerBase { void createMonitors(edm::ConsumesCollector&); /// Creates the calibrations - void createCalibrations(); + void createCalibrations(edm::ConsumesCollector&); /// Checks if one of the EventSetup-Records has changed bool setupChanged(const edm::EventSetup&); diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc index 1a8681b8ff496..efc0861f0c36d 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc @@ -93,7 +93,7 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config, ed createAlignmentAlgorithm(iC); createMonitors(iC); - createCalibrations(); + createCalibrations(iC); } //------------------------------------------------------------------------------ @@ -297,11 +297,11 @@ void AlignmentProducerBase::createMonitors(edm::ConsumesCollector& iC) { } //------------------------------------------------------------------------------ -void AlignmentProducerBase::createCalibrations() { +void AlignmentProducerBase::createCalibrations(edm::ConsumesCollector& iC) { const auto& calibrations = config_.getParameter("calibrations"); for (const auto& iCalib : calibrations) { - calibrations_.emplace_back( - IntegratedCalibrationPluginFactory::get()->create(iCalib.getParameter("calibrationName"), iCalib)); + calibrations_.emplace_back(IntegratedCalibrationPluginFactory::get()->create( + iCalib.getParameter("calibrationName"), iCalib, iC)); } } diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h b/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h index cf48a1dd9adb2..fe0f900cb1ee0 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h @@ -2,11 +2,7 @@ #define HcalLedAnalysis_H #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/ServiceRegistry/interface/Service.h" #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h" diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h b/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h index 12fb1b29495c3..6556b2ef0454a 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h @@ -2,11 +2,7 @@ #define HcalPedestalAnalysis_H #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/ServiceRegistry/interface/Service.h" #include "DataFormats/HcalDetId/interface/HcalDetId.h" #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h" diff --git a/CalibCalorimetry/HcalAlgos/test/MapTester.cc b/CalibCalorimetry/HcalAlgos/test/MapTester.cc index 3ae98d8ead613..16da3a4ee1051 100644 --- a/CalibCalorimetry/HcalAlgos/test/MapTester.cc +++ b/CalibCalorimetry/HcalAlgos/test/MapTester.cc @@ -25,7 +25,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -40,17 +40,17 @@ // class decleration // -class MapTester : public edm::EDAnalyzer { +class MapTester : public edm::one::EDAnalyzer<> { public: explicit MapTester(const edm::ParameterSet&); - ~MapTester(); + ~MapTester() override = default; private: unsigned int mapIOV_; //1 for first set, 2 for second, ... bool generateTextfiles_; bool generateEmap_; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; // ----------member data --------------------------- const edm::ESGetToken tok_topo_; @@ -62,8 +62,6 @@ MapTester::MapTester(const edm::ParameterSet& iConfig) : tok_topo_(esConsumes("generateEmap"); } -MapTester::~MapTester() {} - // ------------ method called to for each event ------------ void MapTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { char tempbuff[128]; diff --git a/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentHarvester.cc b/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentHarvester.cc index 1abb7cdd09ecf..d8b52504193be 100644 --- a/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentHarvester.cc +++ b/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentHarvester.cc @@ -192,7 +192,7 @@ PPSAlignmentHarvester::~PPSAlignmentHarvester() { void PPSAlignmentHarvester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("folder", "CalibPPS/Common"); + desc.add("folder", "AlCaReco/PPSAlignment"); desc.add>("sequence", {"x_alignment", "x_alignment_relative", "y_alignment"}); desc.add("overwrite_sh_x", true); desc.add("text_results_path", "./alignment_results.txt"); diff --git a/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentWorker.cc b/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentWorker.cc index 0c4c29f063091..a8f200e7fd073 100644 --- a/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentWorker.cc +++ b/CalibPPS/AlignmentGlobal/plugins/PPSAlignmentWorker.cc @@ -142,7 +142,7 @@ void PPSAlignmentWorker::fillDescriptions(edm::ConfigurationDescriptions& descri desc.add("label", ""); desc.add("tagTracks", edm::InputTag("ctppsLocalTrackLiteProducer")); - desc.add("folder", "CalibPPS/Common"); + desc.add("folder", "AlCaReco/PPSAlignment"); desc.add("debug", false); descriptions.addWithDefaultLabel(desc); diff --git a/CalibPPS/AlignmentGlobal/python/PPSAlignmentHarvester_cff.py b/CalibPPS/AlignmentGlobal/python/PPSAlignmentHarvester_cff.py index 8a18d949c8b1d..91eb94a8e40e8 100644 --- a/CalibPPS/AlignmentGlobal/python/PPSAlignmentHarvester_cff.py +++ b/CalibPPS/AlignmentGlobal/python/PPSAlignmentHarvester_cff.py @@ -1,6 +1,25 @@ -from CalibPPS.AlignmentGlobal.ppsAlignmentHarvester_cfi import * +import FWCore.ParameterSet.Config as cms +from DQMServices.Components.EDMtoMEConverter_cfi import EDMtoMEConverter +from CalibPPS.AlignmentGlobal.ppsAlignmentHarvester_cfi import ppsAlignmentHarvester as ppsAlignmentHarvester_ + +EDMtoMEConvertPPSAlignment = EDMtoMEConverter.clone() +EDMtoMEConvertPPSAlignment.lumiInputTag = cms.InputTag("MEtoEDMConvertPPSAlignment", "MEtoEDMConverterLumi") +EDMtoMEConvertPPSAlignment.runInputTag = cms.InputTag("MEtoEDMConvertPPSAlignment", "MEtoEDMConverterRun") + +from DQMServices.Core.DQMEDHarvester import DQMEDHarvester +DQMInfoPPSAlignment = DQMEDHarvester('DQMHarvestingMetadata', + subSystemFolder=cms.untracked.string('AlCaReco') + ) + +ppsAlignmentHarvester = ppsAlignmentHarvester_.clone() ppsAlignmentHarvester.text_results_path = cms.string("") ppsAlignmentHarvester.write_sqlite_results = cms.bool(True) ppsAlignmentHarvester.x_ali_rel_final_slope_fixed = cms.bool(False) ppsAlignmentHarvester.y_ali_final_slope_fixed = cms.bool(False) + +ALCAHARVESTPPSAlignment = cms.Task( + EDMtoMEConvertPPSAlignment, + DQMInfoPPSAlignment, + ppsAlignmentHarvester +) diff --git a/Calibration/HcalCalibAlgos/interface/CommonUsefulStuff.h b/Calibration/HcalCalibAlgos/interface/CommonUsefulStuff.h index c26f54556e5fa..67194f6e318d9 100644 --- a/Calibration/HcalCalibAlgos/interface/CommonUsefulStuff.h +++ b/Calibration/HcalCalibAlgos/interface/CommonUsefulStuff.h @@ -1,21 +1,11 @@ #ifndef Calibration_HcalCalibALgos_CommonUsefulStuff_h #define Calibration_HcalCalibALgos_CommonUsefulStuff_h -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" - #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/HcalDetId/interface/HcalDetId.h" #include "DataFormats/EcalDetId/interface/EEDetId.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" -#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/Records/interface/CaloGeometryRecord.h" #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h" #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" @@ -24,16 +14,7 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalVector.h" - -#include "FWCore/ServiceRegistry/interface/Service.h" #include "CommonTools/UtilAlgos/interface/DeltaR.h" -#include "CommonTools/UtilAlgos/interface/TFileService.h" - -#include "TROOT.h" -#include "TFile.h" -#include "TTree.h" -#include "TH1F.h" -#include "TString.h" /* getDist functions by Jim: /uscms/home/jhirsch/IsoTracks_314/CMSSW_3_1_4/src/JetMETCorrections/IsolatedParticles/interface/FindCaloHit.icc diff --git a/Calibration/HcalCalibAlgos/macros/CalibCorr.C b/Calibration/HcalCalibAlgos/macros/CalibCorr.C index e56367ab46951..98c60921e3cd8 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibCorr.C +++ b/Calibration/HcalCalibAlgos/macros/CalibCorr.C @@ -213,7 +213,41 @@ double puFactor(int type, int ieta, double pmom, double eHcal, double ediff, boo if (debug) std::cout << " d2p " << d2p << ":" << DELTA_CUT << " coeff " << icor << ":" << CONST_COR_COEF[icor] << ":" << LINEAR_COR_COEF[icor] << ":" << SQUARE_COR_COEF[icor] << " Fac " << fac; - } else if (type == 99) { // dlphin + } else if (type == 97) { // dlphin Try 3 + const double CONST_COR_COEF[6] = {0.987617, 0.983421, 0.938622, 0.806662, 0.738354, 0.574195}; + const double LINEAR_COR_COEF[6] = {-0.07018610, -0.2494880, -0.1997290, -0.1769320, -0.2427950, -0.1230480}; + const double SQUARE_COR_COEF[6] = {0, 0, 0.0263541, 0.0257008, 0.0426584, 0.0200361}; + const int PU_IETA_1 = 7; + const int PU_IETA_2 = 16; + const int PU_IETA_3 = 25; + const int PU_IETA_4 = 26; + const int PU_IETA_5 = 27; + unsigned icor = (unsigned(jeta >= PU_IETA_1) + unsigned(jeta >= PU_IETA_2) + unsigned(jeta >= PU_IETA_3) + + unsigned(jeta >= PU_IETA_4) + unsigned(jeta >= PU_IETA_5)); + double deltaCut = (icor > 2) ? 1.0 : DELTA_CUT; + if (d2p > deltaCut) + fac = (CONST_COR_COEF[icor] + LINEAR_COR_COEF[icor] * d2p + SQUARE_COR_COEF[icor] * d2p * d2p); + if (debug) + std::cout << " d2p " << d2p << ":" << DELTA_CUT << " coeff " << icor << ":" << CONST_COR_COEF[icor] << ":" + << LINEAR_COR_COEF[icor] << ":" << SQUARE_COR_COEF[icor] << " Fac " << fac; + } else if (type == 98) { // dlphin Try 2 + const double CONST_COR_COEF[6] = {0.987665, 0.983468, 0.938628, 0.807241, 0.739132, 0.529059}; + const double LINEAR_COR_COEF[6] = {-0.0708906, -0.249995, -0.199683, -0.177692, -0.243436, -0.0668783}; + const double SQUARE_COR_COEF[6] = {0, 0, 0.0263163, 0.0260158, 0.0426864, 0.00398778}; + const int PU_IETA_1 = 7; + const int PU_IETA_2 = 16; + const int PU_IETA_3 = 25; + const int PU_IETA_4 = 26; + const int PU_IETA_5 = 27; + unsigned icor = (unsigned(jeta >= PU_IETA_1) + unsigned(jeta >= PU_IETA_2) + unsigned(jeta >= PU_IETA_3) + + unsigned(jeta >= PU_IETA_4) + unsigned(jeta >= PU_IETA_5)); + double deltaCut = (icor > 2) ? 1.0 : DELTA_CUT; + if (d2p > deltaCut) + fac = (CONST_COR_COEF[icor] + LINEAR_COR_COEF[icor] * d2p + SQUARE_COR_COEF[icor] * d2p * d2p); + if (debug) + std::cout << " d2p " << d2p << ":" << DELTA_CUT << " coeff " << icor << ":" << CONST_COR_COEF[icor] << ":" + << LINEAR_COR_COEF[icor] << ":" << SQUARE_COR_COEF[icor] << " Fac " << fac; + } else if (type == 99) { // dlphin Try 1 const double CONST_COR_COEF[6] = {0.98312, 0.978532, 0.972211, 0.756004, 0.638075, 0.547192}; const double LINEAR_COR_COEF[6] = {-0.0472436, -0.186206, -0.247339, -0.166062, -0.159781, -0.118747}; const double SQUARE_COR_COEF[6] = {0, 0, 0.0356827, 0.0202461, 0.01785078, 0.0123003}; diff --git a/Calibration/HcalCalibAlgos/macros/CalibFitPlots.C b/Calibration/HcalCalibAlgos/macros/CalibFitPlots.C index 542bd9f93a7e3..978e23e765615 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibFitPlots.C +++ b/Calibration/HcalCalibAlgos/macros/CalibFitPlots.C @@ -779,7 +779,7 @@ void FitHistExtended(const char* infile, TH1D* hist2 = (TH1D*)hist1->Clone(name); fitOneGauss(hist2, true, debug); hists.push_back(hist2); - results meaner = fitTwoGauss(hist, debug); + results meaner = fitOneGauss(hist, true, debug); value = meaner.mean; error = meaner.errmean; width = meaner.width; @@ -872,7 +872,8 @@ void FitHistExtended(const char* infile, fitLanGau(hist3, debug); hists.push_back(hist3); } - results meaner0 = fitTwoGauss(hist, debug); + // results meaner0 = fitTwoGauss(hist, debug); + results meaner0 = fitOneGauss(hist, true, debug); value = meaner0.mean; error = meaner0.errmean; double rms; @@ -2197,7 +2198,7 @@ void PlotHistCorrFactors(char* infile1, } } - if (nfile > 1) { + if (nfile > 0) { gStyle->SetCanvasBorderMode(0); gStyle->SetCanvasColor(kWhite); gStyle->SetPadColor(kWhite); diff --git a/Calibration/HcalCalibAlgos/macros/CalibMonitor.C b/Calibration/HcalCalibAlgos/macros/CalibMonitor.C index 4f02bdee4df30..b0b195de9c0cb 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibMonitor.C +++ b/Calibration/HcalCalibAlgos/macros/CalibMonitor.C @@ -1634,19 +1634,21 @@ void GetEntries::Init(TTree *tree, const char *dupFileName) { fChain->SetBranchAddress("t_trackType", &t_trackType, &b_t_trackType); Notify(); - ifstream infile(dupFileName); - if (!infile.is_open()) { - std::cout << "Cannot open " << dupFileName << std::endl; - } else { - while (1) { - Long64_t jentry; - infile >> jentry; - if (!infile.good()) - break; - entries_.push_back(jentry); + if (std::string(dupFileName) != "") { + ifstream infile(dupFileName); + if (!infile.is_open()) { + std::cout << "Cannot open " << dupFileName << std::endl; + } else { + while (1) { + Long64_t jentry; + infile >> jentry; + if (!infile.good()) + break; + entries_.push_back(jentry); + } + infile.close(); + std::cout << "Reads a list of " << entries_.size() << " events from " << dupFileName << std::endl; } - infile.close(); - std::cout << "Reads a list of " << entries_.size() << " events from " << dupFileName << std::endl; } h_tk[0] = new TH1I("Track0", "# of tracks produced", 2000, 0, 2000); diff --git a/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C b/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C index 54cd9e38388ad..7bd998ac64ecb 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C +++ b/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C @@ -487,19 +487,21 @@ void CalibPlotProperties::Init(TChain *tree, const char *dupFileName) { fChain->SetBranchAddress("t_HitEnergies3", &t_HitEnergies3, &b_t_HitEnergies3); Notify(); - ifstream infil1(dupFileName); - if (!infil1.is_open()) { - std::cout << "Cannot open duplicate file " << dupFileName << std::endl; - } else { - while (1) { - Long64_t jentry; - infil1 >> jentry; - if (!infil1.good()) - break; - entries_.push_back(jentry); + if (std::string(dupFileName) != "") { + ifstream infil1(dupFileName); + if (!infil1.is_open()) { + std::cout << "Cannot open duplicate file " << dupFileName << std::endl; + } else { + while (1) { + Long64_t jentry; + infil1 >> jentry; + if (!infil1.good()) + break; + entries_.push_back(jentry); + } + infil1.close(); + std::cout << "Reads a list of " << entries_.size() << " events from " << dupFileName << std::endl; } - infil1.close(); - std::cout << "Reads a list of " << entries_.size() << " events from " << dupFileName << std::endl; } char name[20], title[200]; diff --git a/Calibration/HcalCalibAlgos/macros/CalibRho.C b/Calibration/HcalCalibAlgos/macros/CalibRho.C index fe6745d33161e..dff047355ca98 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibRho.C +++ b/Calibration/HcalCalibAlgos/macros/CalibRho.C @@ -3,7 +3,7 @@ // Usage: // .L CalibRho.C+g // -// EHcalVsRho c1(inpFilName, dupFileName); +// EHcalVsRho c1(inpFilName, dupFileName); // c1.LoopFill(maxEta, outFile1, logFile); Fills E vs rho plots // FitEvsRho(logFile, parameterFile, outFile2); Fits the area vs iEta // c1.LoopTest(maxEta, parameterFile, rootFile); Makes the corrected histos @@ -13,7 +13,7 @@ // inpFileName (const char*) File name of the input ROOT tree // or name of the file containing a list of // file names of input ROOT trees -// dupFileName (const char*) Name of the file containing list of entries +// dupFileName (const char*) Name of the file containing list of entries // of duplicate events // maxEta (int) Maximum value of |iEta| // outFile1 (const char*) Output ROOT file name which will contain the @@ -21,7 +21,7 @@ // will provide the estimate of "effective area" // logFile (const char*) Name of the text file which will contain the // effective area for each ieta value -// parameterFile (const char*) Name of the text file with values of the +// parameterFile (const char*) Name of the text file with values of the // fitted parameter set // outFile2 (const char*) Name of the ROOT file with the results of // the fit @@ -60,139 +60,140 @@ #include "CalibCorr.C" class EHcalVsRho { -public : - TChain *fChain; //!pointer to the analyzed TTree or TChain - Int_t fCurrent; //!current Tree number in a TChain - +public: + TChain *fChain; //!pointer to the analyzed TTree or TChain + Int_t fCurrent; //!current Tree number in a TChain + EHcalVsRho(const char *inFile, const char *dupFile); virtual ~EHcalVsRho(); - virtual Int_t Cut(Long64_t entry); - virtual Int_t GetEntry(Long64_t entry); + virtual Int_t Cut(Long64_t entry); + virtual Int_t GetEntry(Long64_t entry); virtual Long64_t LoadTree(Long64_t entry); - virtual void Init(TChain *tree, const char* dupFile); - virtual Bool_t Notify(); - virtual void Show(Long64_t entry = -1); - void LoopFill(int maxEta, const char *outFile, const char *logFile); - void LoopTest(int maxEta, const char *inFile, const char *outFile); - double EffCalc(TH1D*, double, double&, double&); - double getEA(const int ieta, const double* par); + virtual void Init(TChain *tree, const char *dupFile); + virtual Bool_t Notify(); + virtual void Show(Long64_t entry = -1); + void LoopFill(int maxEta, const char *outFile, const char *logFile); + void LoopTest(int maxEta, const char *inFile, const char *outFile); + double EffCalc(TH1D *, double, double &, double &); + double getEA(const int ieta, const double *par); private: - // Declaration of leaf types - Int_t t_Run; - Int_t t_Event; - Int_t t_DataType; - Int_t t_ieta; - Int_t t_iphi; - Double_t t_EventWeight; - Int_t t_nVtx; - Int_t t_nTrk; - Int_t t_goodPV; - Double_t t_l1pt; - Double_t t_l1eta; - Double_t t_l1phi; - Double_t t_l3pt; - Double_t t_l3eta; - Double_t t_l3phi; - Double_t t_p; - Double_t t_pt; - Double_t t_phi; - Double_t t_mindR1; - Double_t t_mindR2; - Double_t t_eMipDR; - Double_t t_eHcal; - Double_t t_eHcal10; - Double_t t_eHcal30; - Double_t t_hmaxNearP; - Double_t t_rhoh; - Bool_t t_selectTk; - Bool_t t_qltyFlag; - Bool_t t_qltyMissFlag; - Bool_t t_qltyPVFlag; - Double_t t_gentrackP; + Int_t t_Run; + Int_t t_Event; + Int_t t_DataType; + Int_t t_ieta; + Int_t t_iphi; + Double_t t_EventWeight; + Int_t t_nVtx; + Int_t t_nTrk; + Int_t t_goodPV; + Double_t t_l1pt; + Double_t t_l1eta; + Double_t t_l1phi; + Double_t t_l3pt; + Double_t t_l3eta; + Double_t t_l3phi; + Double_t t_p; + Double_t t_pt; + Double_t t_phi; + Double_t t_mindR1; + Double_t t_mindR2; + Double_t t_eMipDR; + Double_t t_eHcal; + Double_t t_eHcal10; + Double_t t_eHcal30; + Double_t t_hmaxNearP; + Double_t t_rhoh; + Bool_t t_selectTk; + Bool_t t_qltyFlag; + Bool_t t_qltyMissFlag; + Bool_t t_qltyPVFlag; + Double_t t_gentrackP; std::vector *t_DetIds; - std::vector *t_HitEnergies; - std::vector *t_trgbits; + std::vector *t_HitEnergies; + std::vector *t_trgbits; std::vector *t_DetIds1; std::vector *t_DetIds3; - std::vector *t_HitEnergies1; - std::vector *t_HitEnergies3; - + std::vector *t_HitEnergies1; + std::vector *t_HitEnergies3; + // List of branches - TBranch *b_t_Run; //! - TBranch *b_t_Event; //! - TBranch *b_t_DataType; //! - TBranch *b_t_ieta; //! - TBranch *b_t_iphi; //! - TBranch *b_t_EventWeight; //! - TBranch *b_t_nVtx; //! - TBranch *b_t_nTrk; //! - TBranch *b_t_goodPV; //! - TBranch *b_t_l1pt; //! - TBranch *b_t_l1eta; //! - TBranch *b_t_l1phi; //! - TBranch *b_t_l3pt; //! - TBranch *b_t_l3eta; //! - TBranch *b_t_l3phi; //! - TBranch *b_t_p; //! - TBranch *b_t_pt; //! - TBranch *b_t_phi; //! - TBranch *b_t_mindR1; //! - TBranch *b_t_mindR2; //! - TBranch *b_t_eMipDR; //! - TBranch *b_t_eHcal; //! - TBranch *b_t_eHcal10; //! - TBranch *b_t_eHcal30; //! - TBranch *b_t_hmaxNearP; //! - TBranch *b_t_rhoh; //! - TBranch *b_t_selectTk; //! - TBranch *b_t_qltyFlag; //! - TBranch *b_t_qltyMissFlag; //! - TBranch *b_t_qltyPVFlag; //! - TBranch *b_t_gentrackP; //! - TBranch *b_t_DetIds; //! - TBranch *b_t_HitEnergies; //! - TBranch *b_t_trgbits; //! - TBranch *b_t_DetIds1; //! - TBranch *b_t_DetIds3; //! - TBranch *b_t_HitEnergies1; //! - TBranch *b_t_HitEnergies3; //! - - std::vector entries_; + TBranch *b_t_Run; //! + TBranch *b_t_Event; //! + TBranch *b_t_DataType; //! + TBranch *b_t_ieta; //! + TBranch *b_t_iphi; //! + TBranch *b_t_EventWeight; //! + TBranch *b_t_nVtx; //! + TBranch *b_t_nTrk; //! + TBranch *b_t_goodPV; //! + TBranch *b_t_l1pt; //! + TBranch *b_t_l1eta; //! + TBranch *b_t_l1phi; //! + TBranch *b_t_l3pt; //! + TBranch *b_t_l3eta; //! + TBranch *b_t_l3phi; //! + TBranch *b_t_p; //! + TBranch *b_t_pt; //! + TBranch *b_t_phi; //! + TBranch *b_t_mindR1; //! + TBranch *b_t_mindR2; //! + TBranch *b_t_eMipDR; //! + TBranch *b_t_eHcal; //! + TBranch *b_t_eHcal10; //! + TBranch *b_t_eHcal30; //! + TBranch *b_t_hmaxNearP; //! + TBranch *b_t_rhoh; //! + TBranch *b_t_selectTk; //! + TBranch *b_t_qltyFlag; //! + TBranch *b_t_qltyMissFlag; //! + TBranch *b_t_qltyPVFlag; //! + TBranch *b_t_gentrackP; //! + TBranch *b_t_DetIds; //! + TBranch *b_t_HitEnergies; //! + TBranch *b_t_trgbits; //! + TBranch *b_t_DetIds1; //! + TBranch *b_t_DetIds3; //! + TBranch *b_t_HitEnergies1; //! + TBranch *b_t_HitEnergies3; //! + + std::vector entries_; }; EHcalVsRho::EHcalVsRho(const char *inFile, const char *dupFile) : fChain(0) { char treeName[400]; - sprintf (treeName, "HcalIsoTrkAnalyzer/CalibTree"); - TChain *chain = new TChain(treeName); - std::cout << "Create a chain for " << treeName << " from " << inFile - << std::endl; - if (!fillChain(chain,inFile)) { + sprintf(treeName, "HcalIsoTrkAnalyzer/CalibTree"); + TChain *chain = new TChain(treeName); + std::cout << "Create a chain for " << treeName << " from " << inFile << std::endl; + if (!fillChain(chain, inFile)) { std::cout << "*****No valid tree chain can be obtained*****" << std::endl; } else { - std::cout << "Proceed with a tree chain with " << chain->GetEntries() - << " entries" << std::endl; + std::cout << "Proceed with a tree chain with " << chain->GetEntries() << " entries" << std::endl; Init(chain, dupFile); } } EHcalVsRho::~EHcalVsRho() { - if (!fChain) return; + if (!fChain) + return; delete fChain->GetCurrentFile(); } Int_t EHcalVsRho::GetEntry(Long64_t entry) { // Read contents of entry. - if (!fChain) return 0; + if (!fChain) + return 0; return fChain->GetEntry(entry); } Long64_t EHcalVsRho::LoadTree(Long64_t entry) { // Set the environment to read one entry - if (!fChain) return -5; + if (!fChain) + return -5; Long64_t centry = fChain->LoadTree(entry); - if (centry < 0) return centry; + if (centry < 0) + return centry; if (fChain->GetTreeNumber() != fCurrent) { fCurrent = fChain->GetTreeNumber(); Notify(); @@ -200,7 +201,7 @@ Long64_t EHcalVsRho::LoadTree(Long64_t entry) { return centry; } -void EHcalVsRho::Init(TChain *tree, const char* dupFile) { +void EHcalVsRho::Init(TChain *tree, const char *dupFile) { // The Init() function is called when the selector needs to initialize // a new tree or chain. Typically here the branch addresses and branch // pointers of the tree will be set. @@ -208,7 +209,7 @@ void EHcalVsRho::Init(TChain *tree, const char* dupFile) { // code, but the routine can be extended by the user if needed. // Init() will be called many times when running on PROOF // (once per file to be processed). - + // Set object pointer t_DetIds = 0; t_HitEnergies = 0; @@ -218,7 +219,8 @@ void EHcalVsRho::Init(TChain *tree, const char* dupFile) { t_HitEnergies1 = 0; t_HitEnergies3 = 0; // Set branch addresses and branch pointers - if (!tree) return; + if (!tree) + return; fChain = tree; fCurrent = -1; fChain->SetMakeClass(1); @@ -263,19 +265,21 @@ void EHcalVsRho::Init(TChain *tree, const char* dupFile) { fChain->SetBranchAddress("t_HitEnergies3", &t_HitEnergies3, &b_t_HitEnergies3); Notify(); - ifstream infile(dupFile); - if (!infile.is_open()) { - std::cout << "Cannot open " << dupFile << std::endl; - } else { - while (1) { - Long64_t jentry; - infile >> jentry; - if (!infile.good()) break; - entries_.push_back(jentry); + if (std::string(dupFileName) != "") { + ifstream infile(dupFile); + if (!infile.is_open()) { + std::cout << "Cannot open " << dupFile << std::endl; + } else { + while (1) { + Long64_t jentry; + infile >> jentry; + if (!infile.good()) + break; + entries_.push_back(jentry); + } + infile.close(); + std::cout << "Reads a list of " << entries_.size() << " events from " << dupFile << std::endl; } - infile.close(); - std::cout << "Reads a list of " << entries_.size() << " events from " - << dupFile << std::endl; } } @@ -292,7 +296,8 @@ Bool_t EHcalVsRho::Notify() { void EHcalVsRho::Show(Long64_t entry) { // Print contents of entry. // If entry is not specified, print current entry - if (!fChain) return; + if (!fChain) + return; fChain->Show(entry); } @@ -303,172 +308,183 @@ Int_t EHcalVsRho::Cut(Long64_t) { return 1; } -void EHcalVsRho::LoopFill(int maxEta, const char *outFile, const char *logFile){ - if (fChain == 0) return; - TFile *f1 = new TFile(outFile,"RECREATE"); +void EHcalVsRho::LoopFill(int maxEta, const char *outFile, const char *logFile) { + if (fChain == 0) + return; + TFile *f1 = new TFile(outFile, "RECREATE"); char name[100], Title[100], graph[100], proji[100]; - - std::vector VIsoRho; - std::vector Hcal_corr; - for (int ieta = 0; ieta VIsoRho; + std::vector Hcal_corr; + for (int ieta = 0; ieta < maxEta; ieta++) { + sprintf(name, "IsoRho2d%d", ieta + 1); + sprintf(Title, "Iso vs Rho %d", ieta + 1); + VIsoRho.push_back(new TH2D(name, Title, 30, 0, 30, 25000, 0, 250)); + sprintf(name, "IsoRhoProfile%d", ieta + 1); + Hcal_corr.push_back(new TProfile(name, Title, 30, 0, 30)); } Long64_t nentries = fChain->GetEntriesFast(); std::cout << "Total # of entries: " << nentries << std::endl; Long64_t nbytes = 0, nb = 0; Long64_t kount(0), duplicate(0), good(0); - for (Long64_t jentry=0; jentryGetEntry(jentry); nbytes += nb; + if (ientry < 0) + break; + nb = fChain->GetEntry(jentry); + nbytes += nb; ++kount; - if (kount%100000 == 0) std::cout << "Processing Entry " << kount<=40) && (t_p<=60)) { - VIsoRho[absIeta-1]->Fill(t_rhoh,t_eHcal); - Hcal_corr[absIeta-1]->Fill(t_rhoh,t_eHcal); + if ((absIeta <= maxEta) && (t_p >= 40) && (t_p <= 60)) { + VIsoRho[absIeta - 1]->Fill(t_rhoh, t_eHcal); + Hcal_corr[absIeta - 1]->Fill(t_rhoh, t_eHcal); ++good; } } - std::cout << "Uses " << good << " events out of " << kount << " excluding " - << duplicate << " duplicate events" << std::endl; - - gStyle->SetCanvasBorderMode(0); gStyle->SetCanvasColor(kWhite); - gStyle->SetPadColor(kWhite); gStyle->SetFillColor(kWhite); - gStyle->SetOptTitle(0); gStyle->SetOptFit(1); + std::cout << "Uses " << good << " events out of " << kount << " excluding " << duplicate << " duplicate events" + << std::endl; + + gStyle->SetCanvasBorderMode(0); + gStyle->SetCanvasColor(kWhite); + gStyle->SetPadColor(kWhite); + gStyle->SetFillColor(kWhite); + gStyle->SetOptTitle(0); + gStyle->SetOptFit(1); std::ofstream myfile; myfile.open(logFile); - for (int ieta=0; ietaWrite(); Hcal_corr[ieta]->Write(); - TH2D *his_i = dynamic_cast(VIsoRho[ieta]->Clone()); - his_i ->GetEntries(); + TH2D *his_i = dynamic_cast(VIsoRho[ieta]->Clone()); + his_i->GetEntries(); int dim = his_i->GetXaxis()->GetNbins(); double *xcut, *binc, *errXL, *errXH, *errYL, *errYH; double *errX, *errY; - double errX1, errX2, xmax(0); - - xcut = new double[dim]; - binc = new double[dim]; - errX = new double[dim]; - errY = new double[dim]; - errXL = new double[dim]; - errXH = new double[dim]; - errYL = new double[dim]; - errYH = new double[dim]; - - for (int j= 0; j < dim; j++) { - sprintf (proji,"proj%d-%d",ieta+1,j); - TH1D* h_proj = dynamic_cast(his_i->ProjectionY(proji,j,j+1," ")); - binc[j] = his_i->GetXaxis()->GetBinCenter(j+1); - xcut[j] = EffCalc(h_proj,0.90,errX1,errX2); - - errXL[j]=0.0; - errXH[j]=0.0; - errYL[j]=errX1; - errYH[j]=errX2; - - errX[j]=0.0; - errY[j]=0.0; + double errX1, errX2, xmax(0); + + xcut = new double[dim]; + binc = new double[dim]; + errX = new double[dim]; + errY = new double[dim]; + errXL = new double[dim]; + errXH = new double[dim]; + errYL = new double[dim]; + errYH = new double[dim]; + + for (int j = 0; j < dim; j++) { + sprintf(proji, "proj%d-%d", ieta + 1, j); + TH1D *h_proj = dynamic_cast(his_i->ProjectionY(proji, j, j + 1, " ")); + binc[j] = his_i->GetXaxis()->GetBinCenter(j + 1); + xcut[j] = EffCalc(h_proj, 0.90, errX1, errX2); + + errXL[j] = 0.0; + errXH[j] = 0.0; + errYL[j] = errX1; + errYH[j] = errX2; + + errX[j] = 0.0; + errY[j] = 0.0; h_proj->Write(); - if (xcut[j] > xmax) xmax = xcut[j]; + if (xcut[j] > xmax) + xmax = xcut[j]; } - TGraphAsymmErrors * Isovsrho = new TGraphAsymmErrors(dim,binc,xcut,errXL,errXH,errYL,errYH); - sprintf(graph,"IsovsRho%d",ieta+1); - sprintf(name,"EvsRho%d",ieta+1); + TGraphAsymmErrors *Isovsrho = new TGraphAsymmErrors(dim, binc, xcut, errXL, errXH, errYL, errYH); + sprintf(graph, "IsovsRho%d", ieta + 1); + sprintf(name, "EvsRho%d", ieta + 1); - TF1 *fnc = new TF1("fnc","[1]*x + [0]",4,13); - TFitResultPtr fitI = Isovsrho->Fit("fnc","+QSR"); + TF1 *fnc = new TF1("fnc", "[1]*x + [0]", 4, 13); + TFitResultPtr fitI = Isovsrho->Fit("fnc", "+QSR"); double ic = fnc->GetParameter(1); double err = fitI->FitResult::Error(1); - myfile << ieta+1 << " " << ic << " " << err << std::endl; - std::cout << "Fit " << ieta+1 << " " << fnc->GetParameter(0) << " " - << fitI->FitResult::Error(0) << " " << ic << " " << err << "\n"; + myfile << ieta + 1 << " " << ic << " " << err << std::endl; + std::cout << "Fit " << ieta + 1 << " " << fnc->GetParameter(0) << " " << fitI->FitResult::Error(0) << " " << ic + << " " << err << "\n"; gStyle->SetOptFit(1); - TCanvas *pad = new TCanvas(graph,name,0,10,1200,400); + TCanvas *pad = new TCanvas(graph, name, 0, 10, 1200, 400); pad->SetRightMargin(0.10); pad->SetTopMargin(0.10); Isovsrho->SetMarkerStyle(24); Isovsrho->SetMarkerSize(0.4); - Isovsrho->GetXaxis()->SetRangeUser(0,15); + Isovsrho->GetXaxis()->SetRangeUser(0, 15); Isovsrho->GetXaxis()->SetTitle("#rho"); Isovsrho->GetXaxis()->SetLabelSize(0.04); Isovsrho->GetXaxis()->SetTitleSize(0.06); Isovsrho->GetXaxis()->SetTitleOffset(0.8); - Isovsrho->GetYaxis()->SetRangeUser(0,1.25*xmax); + Isovsrho->GetYaxis()->SetRangeUser(0, 1.25 * xmax); Isovsrho->GetYaxis()->SetTitle("Energy (GeV)"); Isovsrho->GetYaxis()->SetLabelSize(0.04); Isovsrho->GetYaxis()->SetTitleSize(0.06); Isovsrho->GetYaxis()->SetTitleOffset(0.6); Isovsrho->Draw("AP"); pad->Update(); - TPaveStats* st1 = (TPaveStats*)Isovsrho->GetListOfFunctions()->FindObject("stats"); + TPaveStats *st1 = (TPaveStats *)Isovsrho->GetListOfFunctions()->FindObject("stats"); if (st1 != nullptr) { - st1->SetY1NDC(0.78); st1->SetY2NDC(0.90); - st1->SetX1NDC(0.65); st1->SetX2NDC(0.90); + st1->SetY1NDC(0.78); + st1->SetY2NDC(0.90); + st1->SetX1NDC(0.65); + st1->SetX2NDC(0.90); } pad->Write(); } myfile.close(); f1->Close(); -} - -double EHcalVsRho::EffCalc(TH1D* h, double perc, double & errXL, - double & errXH) { - double eff, eff_err=0.0, xCut=0.0; +} + +double EHcalVsRho::EffCalc(TH1D *h, double perc, double &errXL, double &errXH) { + double eff, eff_err = 0.0, xCut = 0.0; int tot = h->GetEntries(); int integ = 0; errXL = 0.0; errXH = 0.0; - for(int i = 0; i < (h->GetXaxis()->GetNbins()+1 ); i++) { + for (int i = 0; i < (h->GetXaxis()->GetNbins() + 1); i++) { xCut = h->GetXaxis()->GetBinLowEdge(i); integ += h->GetBinContent(i); - - if (integ != 0 && tot != 0 ) { - eff = (integ*1.0/tot); - eff_err = sqrt ( eff * ( 1 - eff ) / tot ) ; + + if (integ != 0 && tot != 0) { + eff = (integ * 1.0 / tot); + eff_err = sqrt(eff * (1 - eff) / tot); } else { eff = 0.0; } - if (eff > perc) break; + if (eff > perc) + break; } - if (eff == 0.0) xCut = 0.0; + if (eff == 0.0) + xCut = 0.0; errXL = eff_err; errXH = eff_err; return xCut; } void EHcalVsRho::LoopTest(int maxEta, const char *inFile, const char *outFile) { + if (fChain == 0) + return; - if (fChain == 0) return; - - TFile *f1 = new TFile(outFile,"RECREATE"); - std::map histo, histo_uncorr; + TFile *f1 = new TFile(outFile, "RECREATE"); + std::map histo, histo_uncorr; char name[100], title[100]; - for (int ieta =-maxEta; ieta<=maxEta; ieta++) { - sprintf(name, "MPV%d",ieta); - sprintf(title, "Corrected Response (i#eta = %d)", ieta-30); - histo[ieta] = new TH1D(name, title, 100, 0, 2); - sprintf(name, "MPVUn%d",ieta); - sprintf(title, "Uncorrected Response (i#eta = %d)", ieta-30); + for (int ieta = -maxEta; ieta <= maxEta; ieta++) { + sprintf(name, "MPV%d", ieta); + sprintf(title, "Corrected Response (i#eta = %d)", ieta - 30); + histo[ieta] = new TH1D(name, title, 100, 0, 2); + sprintf(name, "MPVUn%d", ieta); + sprintf(title, "Uncorrected Response (i#eta = %d)", ieta - 30); histo_uncorr[ieta] = new TH1D(name, title, 100, 0, 2); } - std::cout << "Initialized histograms from " << -maxEta << ":" << maxEta<<"\n"; - + std::cout << "Initialized histograms from " << -maxEta << ":" << maxEta << "\n"; + double par[10]; ifstream myReadFile; myReadFile.open(inFile); @@ -481,64 +497,66 @@ void EHcalVsRho::LoopTest(int maxEta, const char *inFile, const char *outFile) { } myReadFile.close(); std::cout << "Reads " << npar << " parameters:"; - for (int k=0; k 40) && (t_p < 60.0)); - if (select) { + + select = ((t_qltyFlag) && (t_selectTk) && (t_hmaxNearP < 10.0) && (t_eMipDR < 1.0) && (t_p > 40) && (t_p < 60.0)); + if (select) { double corr_eHcal = 0.0; int absIeta = abs(t_ieta); ++good; if (absIeta <= maxEta) { - corr_eHcal = t_eHcal - t_rhoh*getEA(absIeta,par); - double myEovP = corr_eHcal/(t_p-t_eMipDR); - double myEovP_uncorr = t_eHcal/(t_p-t_eMipDR); - histo[t_ieta]->Fill(myEovP); - histo_uncorr[t_ieta]->Fill(myEovP_uncorr); + corr_eHcal = t_eHcal - t_rhoh * getEA(absIeta, par); + double myEovP = corr_eHcal / (t_p - t_eMipDR); + double myEovP_uncorr = t_eHcal / (t_p - t_eMipDR); + histo[t_ieta]->Fill(myEovP); + histo_uncorr[t_ieta]->Fill(myEovP_uncorr); } } } - for (std::map::iterator itr=histo.begin(); - itr != histo.end(); ++itr) itr->second->Write(); - for (std::map::iterator itr=histo_uncorr.begin(); - itr != histo_uncorr.end(); ++itr) itr->second->Write(); + for (std::map::iterator itr = histo.begin(); itr != histo.end(); ++itr) + itr->second->Write(); + for (std::map::iterator itr = histo_uncorr.begin(); itr != histo_uncorr.end(); ++itr) + itr->second->Write(); f1->Close(); - std::cout << "Processes " << good << " out of " << kount << " events with " - << duplicate << " duplicate entries" << std::endl; + std::cout << "Processes " << good << " out of " << kount << " events with " << duplicate << " duplicate entries" + << std::endl; } -double EHcalVsRho::getEA(const int eta, const double* par) { +double EHcalVsRho::getEA(const int eta, const double *par) { double eA; - if (eta<20) + if (eta < 20) eA = par[0]; - else - eA = (((par[5]*eta+par[4])*eta+par[3])*eta+par[2])*eta+par[1]; + else + eA = (((par[5] * eta + par[4]) * eta + par[3]) * eta + par[2]) * eta + par[1]; return eA; } void FitEvsRho(const char *inFile, const char *outFile, const char *rootFile) { - - const int ndim=30; + const int ndim = 30; double EA[ndim] = {0.0}; - double errEA[ndim]={0.0}; - double ietaEA[ndim]={0.0}; + double errEA[ndim] = {0.0}; + double ietaEA[ndim] = {0.0}; ifstream myReadFile; myReadFile.open(inFile); @@ -546,20 +564,25 @@ void FitEvsRho(const char *inFile, const char *outFile, const char *rootFile) { if (myReadFile.is_open()) { while (!myReadFile.eof()) { myReadFile >> ietaEA[ii] >> EA[ii] >> errEA[ii]; - if (EA[ii] < 0) EA[ii] = 0; + if (EA[ii] < 0) + EA[ii] = 0; ii++; } } myReadFile.close(); std::cout << "Reads " << ii << " points from " << inFile << std::endl; - gStyle->SetCanvasBorderMode(0); gStyle->SetCanvasColor(kWhite); - gStyle->SetPadColor(kWhite); gStyle->SetFillColor(kWhite); - gStyle->SetOptTitle(0); gStyle->SetOptStat(0); + gStyle->SetCanvasBorderMode(0); + gStyle->SetCanvasColor(kWhite); + gStyle->SetPadColor(kWhite); + gStyle->SetFillColor(kWhite); + gStyle->SetOptTitle(0); + gStyle->SetOptStat(0); gStyle->SetOptFit(0); - TFile *f1 = new TFile(rootFile,"RECREATE"); - TGraphErrors * eA = new TGraphErrors(ii,ietaEA,EA,errEA,errEA); - eA->SetMarkerStyle(20); eA->SetMarkerColor(4); + TFile *f1 = new TFile(rootFile, "RECREATE"); + TGraphErrors *eA = new TGraphErrors(ii, ietaEA, EA, errEA, errEA); + eA->SetMarkerStyle(20); + eA->SetMarkerColor(4); eA->SetLineColor(2); eA->GetXaxis()->SetTitle("i#eta"); eA->GetXaxis()->SetTitleOffset(0.6); @@ -568,24 +591,24 @@ void FitEvsRho(const char *inFile, const char *outFile, const char *rootFile) { eA->GetYaxis()->SetTitleOffset(0.6); eA->GetYaxis()->SetTitleSize(0.06); - Double_t par[6]; - const int nmid=19; - TF1 *g1 = new TF1("g1","pol0",1,nmid); - TF1 *g2 = new TF1("g2","pol4",nmid,ii); + Double_t par[6]; + const int nmid = 19; + TF1 *g1 = new TF1("g1", "pol0", 1, nmid); + TF1 *g2 = new TF1("g2", "pol4", nmid, ii); - eA->Fit(g1,"R"); - eA->Fit(g2,"R+"); + eA->Fit(g1, "R"); + eA->Fit(g2, "R+"); g1->GetParameters(&par[0]); g2->GetParameters(&par[1]); - TCanvas *c2 = new TCanvas("EA vs #eta","EA vs ieta",0,10,1200,400); + TCanvas *c2 = new TCanvas("EA vs #eta", "EA vs ieta", 0, 10, 1200, 400); eA->Draw("AP"); c2->Write(); f1->Close(); - + ofstream params; params.open(outFile); - for (int i=0; i<6; i++) { + for (int i = 0; i < 6; i++) { params << par[i] << std::endl; std::cout << "Parameter[" << i << "] = " << par[i] << std::endl; } @@ -593,89 +616,96 @@ void FitEvsRho(const char *inFile, const char *outFile, const char *rootFile) { } void FitEovPwithRho(int maxEta, const char *inFile, const char *outFile) { - TFile *file = new TFile(inFile); - std::map histo, histo_uncorr; + std::map histo, histo_uncorr; char name[100]; - for (int ieta =-maxEta; ieta<=maxEta; ieta++) { - sprintf(name, "MPV%d",ieta); - TH1D* h0 = (TH1D*)file->FindObjectAny(name); - histo[ieta] = (h0 != 0) ? (TH1D*)(h0->Clone()) : 0; - sprintf(name, "MPVUn%d",ieta); - TH1D* h1 = (TH1D*)file->FindObjectAny(name); - histo_uncorr[ieta] = (h1 != 0) ? (TH1D*)(h1->Clone()) : 0; + for (int ieta = -maxEta; ieta <= maxEta; ieta++) { + sprintf(name, "MPV%d", ieta); + TH1D *h0 = (TH1D *)file->FindObjectAny(name); + histo[ieta] = (h0 != 0) ? (TH1D *)(h0->Clone()) : 0; + sprintf(name, "MPVUn%d", ieta); + TH1D *h1 = (TH1D *)file->FindObjectAny(name); + histo_uncorr[ieta] = (h1 != 0) ? (TH1D *)(h1->Clone()) : 0; } - -//TFile *f1 = - new TFile(outFile,"RECREATE"); + + //TFile *f1 = + new TFile(outFile, "RECREATE"); double xlim = maxEta + 0.5; - TH1D* EovPvsieta = new TH1D("Corrected","Corrected",2*maxEta+1,-xlim,xlim); - TH1D* EovPvsieta_uncorr = new TH1D("Uncorrect","Uncorrect",2*maxEta+1,-xlim,xlim); + TH1D *EovPvsieta = new TH1D("Corrected", "Corrected", 2 * maxEta + 1, -xlim, xlim); + TH1D *EovPvsieta_uncorr = new TH1D("Uncorrect", "Uncorrect", 2 * maxEta + 1, -xlim, xlim); - TF1* fnc = new TF1("fnc","gaus"); + TF1 *fnc = new TF1("fnc", "gaus"); unsigned int k1(0), k2(0); - for (int ieta=-maxEta; ieta<=maxEta; ieta++) { - if (ieta == 0) continue; + for (int ieta = -maxEta; ieta <= maxEta; ieta++) { + if (ieta == 0) + continue; if (histo[ieta] != 0) { double mean = histo[ieta]->GetMean(); - double rms = histo[ieta]->GetRMS(); - TFitResultPtr FitG = histo[ieta]->Fit("fnc","QRWLS","",mean-rms,mean+rms); - double a = fnc->GetParameter(1); + double rms = histo[ieta]->GetRMS(); + TFitResultPtr FitG = histo[ieta]->Fit("fnc", "QRWLS", "", mean - rms, mean + rms); + double a = fnc->GetParameter(1); double err = FitG->FitResult::Error(1); histo[ieta]->Write(); ++k1; - int ibin = ieta+maxEta+1; - EovPvsieta->SetBinContent(ibin,a); - EovPvsieta->SetBinError(ibin,err); - std::cout << "Correct[" << k1 << "] " << ieta << " a " << a << " +- " - << err << std::endl; + int ibin = ieta + maxEta + 1; + EovPvsieta->SetBinContent(ibin, a); + EovPvsieta->SetBinError(ibin, err); + std::cout << "Correct[" << k1 << "] " << ieta << " a " << a << " +- " << err << std::endl; } - + if (histo_uncorr[ieta] != 0) { double mean = histo_uncorr[ieta]->GetMean(); - double rms = histo_uncorr[ieta]->GetRMS(); - TFitResultPtr FitG = histo_uncorr[ieta]->Fit("fnc","QRWLS","",mean-rms,mean+rms); - double a = fnc->GetParameter(1); + double rms = histo_uncorr[ieta]->GetRMS(); + TFitResultPtr FitG = histo_uncorr[ieta]->Fit("fnc", "QRWLS", "", mean - rms, mean + rms); + double a = fnc->GetParameter(1); double err = FitG->FitResult::Error(1); histo_uncorr[ieta]->Write(); ++k2; - int ibin = ieta+maxEta+1; - EovPvsieta_uncorr->SetBinContent(ibin,a); - EovPvsieta_uncorr->SetBinError(ibin,err); - std::cout << "Correct[" << k2 << "] " << ieta << " a " << a << " +- " - << err << std::endl; + int ibin = ieta + maxEta + 1; + EovPvsieta_uncorr->SetBinContent(ibin, a); + EovPvsieta_uncorr->SetBinError(ibin, err); + std::cout << "Correct[" << k2 << "] " << ieta << " a " << a << " +- " << err << std::endl; } } - gStyle->SetCanvasBorderMode(0); gStyle->SetCanvasColor(kWhite); - gStyle->SetPadColor(kWhite); gStyle->SetFillColor(kWhite); + gStyle->SetCanvasBorderMode(0); + gStyle->SetCanvasColor(kWhite); + gStyle->SetPadColor(kWhite); + gStyle->SetFillColor(kWhite); gStyle->SetOptTitle(0); - gStyle->SetOptStat(10); gStyle->SetOptFit(1); - TCanvas *c3 = new TCanvas("E/P vs ieta","E/P vs ieta",0,10,1200,400); + gStyle->SetOptStat(10); + gStyle->SetOptFit(1); + TCanvas *c3 = new TCanvas("E/P vs ieta", "E/P vs ieta", 0, 10, 1200, 400); EovPvsieta->GetXaxis()->SetTitle("i#eta"); EovPvsieta->GetYaxis()->SetTitle("MPV[E_{Hcal}/(p_{Track}-E_{Ecal})]"); - EovPvsieta->SetMarkerStyle(20); EovPvsieta->SetMarkerColor(2); + EovPvsieta->SetMarkerStyle(20); + EovPvsieta->SetMarkerColor(2); EovPvsieta->SetMarkerSize(1.0); - EovPvsieta->Fit("pol0","+QRWLS","",-maxEta,maxEta); + EovPvsieta->Fit("pol0", "+QRWLS", "", -maxEta, maxEta); - EovPvsieta_uncorr->SetMarkerStyle(24); EovPvsieta_uncorr->SetMarkerColor(4); + EovPvsieta_uncorr->SetMarkerStyle(24); + EovPvsieta_uncorr->SetMarkerColor(4); EovPvsieta_uncorr->SetMarkerSize(1.0); - EovPvsieta->GetYaxis()->SetRangeUser(0.5,2.0); + EovPvsieta->GetYaxis()->SetRangeUser(0.5, 2.0); EovPvsieta->Draw(); c3->Update(); - TPaveStats* st1 = (TPaveStats*)EovPvsieta->GetListOfFunctions()->FindObject("stats"); + TPaveStats *st1 = (TPaveStats *)EovPvsieta->GetListOfFunctions()->FindObject("stats"); if (st1 != nullptr) { - st1->SetY1NDC(0.81); st1->SetY2NDC(0.90); - st1->SetX1NDC(0.65); st1->SetX2NDC(0.90); + st1->SetY1NDC(0.81); + st1->SetY2NDC(0.90); + st1->SetX1NDC(0.65); + st1->SetX2NDC(0.90); } EovPvsieta_uncorr->Draw("sames"); c3->Update(); - st1 = (TPaveStats*)EovPvsieta_uncorr->GetListOfFunctions()->FindObject("stats"); + st1 = (TPaveStats *)EovPvsieta_uncorr->GetListOfFunctions()->FindObject("stats"); std::cout << st1 << std::endl; if (st1 != nullptr) { - st1->SetY1NDC(0.78); st1->SetY2NDC(0.81); - st1->SetX1NDC(0.65); st1->SetX2NDC(0.90); + st1->SetY1NDC(0.78); + st1->SetY2NDC(0.81); + st1->SetX1NDC(0.65); + st1->SetX2NDC(0.90); } c3->Modified(); c3->Update(); @@ -683,67 +713,85 @@ void FitEovPwithRho(int maxEta, const char *inFile, const char *outFile) { EovPvsieta_uncorr->Write(); } -void PlotEvsRho(const char* inFile, int eta=0, int type=0, bool save=false) { - - gStyle->SetCanvasBorderMode(0); gStyle->SetCanvasColor(kWhite); - gStyle->SetPadColor(kWhite); gStyle->SetFillColor(kWhite); +void PlotEvsRho(const char *inFile, int eta = 0, int type = 0, bool save = false) { + gStyle->SetCanvasBorderMode(0); + gStyle->SetCanvasColor(kWhite); + gStyle->SetPadColor(kWhite); + gStyle->SetFillColor(kWhite); gStyle->SetOptTitle(0); - gStyle->SetOptStat(1110); gStyle->SetOptFit(10); - + gStyle->SetOptStat(1110); + gStyle->SetOptFit(10); + TFile *file = new TFile(inFile); int etamin = (eta == 0) ? ((type == 0) ? 1 : 25) : eta; int etamax = (eta == 0) ? 25 : eta; for (int it = etamin; it <= etamax; ++it) { char name[50]; - sprintf (name, "IsovsRho%d", it); - TCanvas* pad; + sprintf(name, "IsovsRho%d", it); + TCanvas *pad; if (type == 0) { - pad = (TCanvas*)(file->FindObjectAny(name)); + pad = (TCanvas *)(file->FindObjectAny(name)); pad->Draw(); } else { - sprintf (name, "MPV%d", it); - pad = new TCanvas(name,name,0,10,800,500); + sprintf(name, "MPV%d", it); + pad = new TCanvas(name, name, 0, 10, 800, 500); pad->SetRightMargin(0.10); pad->SetTopMargin(0.10); - TH1D* h1 = (TH1D*)(file->FindObjectAny(name)); - sprintf (name, "MPVUn%d", it); - TH1D* h2 = (TH1D*)(file->FindObjectAny(name)); + TH1D *h1 = (TH1D *)(file->FindObjectAny(name)); + sprintf(name, "MPVUn%d", it); + TH1D *h2 = (TH1D *)(file->FindObjectAny(name)); double ymx1 = h1->GetMaximum(); double ymx2 = h2->GetMaximum(); double ymax = (ymx1 > ymx2) ? ymx1 : ymx2; - h1->GetXaxis()->SetRangeUser(0.5,2.0); - h2->GetXaxis()->SetRangeUser(0.5,2.0); - h1->GetYaxis()->SetRangeUser(0,1.25*ymax); - h2->GetYaxis()->SetRangeUser(0,1.25*ymax); - h1->GetXaxis()->SetTitleSize(0.048); h1->GetXaxis()->SetTitleOffset(0.8); + h1->GetXaxis()->SetRangeUser(0.5, 2.0); + h2->GetXaxis()->SetRangeUser(0.5, 2.0); + h1->GetYaxis()->SetRangeUser(0, 1.25 * ymax); + h2->GetYaxis()->SetRangeUser(0, 1.25 * ymax); + h1->GetXaxis()->SetTitleSize(0.048); + h1->GetXaxis()->SetTitleOffset(0.8); h1->GetXaxis()->SetTitle("E_{Hcal}/(p-E_{Ecal})"); - h1->GetYaxis()->SetTitleSize(0.048); h1->GetYaxis()->SetTitleOffset(0.8); + h1->GetYaxis()->SetTitleSize(0.048); + h1->GetYaxis()->SetTitleOffset(0.8); h1->GetYaxis()->SetTitle("Tracks"); - h1->SetLineColor(2); h1->Draw(); - pad->Modified(); pad->Update(); - TPaveStats* st1 = (TPaveStats*)h1->GetListOfFunctions()->FindObject("stats"); + h1->SetLineColor(2); + h1->Draw(); + pad->Modified(); + pad->Update(); + TPaveStats *st1 = (TPaveStats *)h1->GetListOfFunctions()->FindObject("stats"); if (st1 != nullptr) { - st1->SetLineColor(2); st1->SetTextColor(2); - st1->SetY1NDC(0.75); st1->SetY2NDC(0.90); - st1->SetX1NDC(0.65); st1->SetX2NDC(0.90); + st1->SetLineColor(2); + st1->SetTextColor(2); + st1->SetY1NDC(0.75); + st1->SetY2NDC(0.90); + st1->SetX1NDC(0.65); + st1->SetX2NDC(0.90); } - h2->SetLineColor(4); h2->Draw("sames"); - pad->Modified(); pad->Update(); - TPaveStats* st2 = (TPaveStats*)h2->GetListOfFunctions()->FindObject("stats"); + h2->SetLineColor(4); + h2->Draw("sames"); + pad->Modified(); + pad->Update(); + TPaveStats *st2 = (TPaveStats *)h2->GetListOfFunctions()->FindObject("stats"); if (st2 != nullptr) { - st2->SetLineColor(4); st2->SetTextColor(4); - st2->SetY1NDC(0.60); st2->SetY2NDC(0.75); - st2->SetX1NDC(0.65); st2->SetX2NDC(0.90); + st2->SetLineColor(4); + st2->SetTextColor(4); + st2->SetY1NDC(0.60); + st2->SetY2NDC(0.75); + st2->SetX1NDC(0.65); + st2->SetX2NDC(0.90); } - pad->Modified(); pad->Update(); - TF1* f1 = (TF1*)h1->GetListOfFunctions()->FindObject("fnc"); - if (f1 != nullptr) f1->SetLineColor(2); - TF1* f2 = (TF1*)h2->GetListOfFunctions()->FindObject("fnc"); - if (f2 != nullptr) f2->SetLineColor(4); - pad->Modified(); pad->Update(); + pad->Modified(); + pad->Update(); + TF1 *f1 = (TF1 *)h1->GetListOfFunctions()->FindObject("fnc"); + if (f1 != nullptr) + f1->SetLineColor(2); + TF1 *f2 = (TF1 *)h2->GetListOfFunctions()->FindObject("fnc"); + if (f2 != nullptr) + f2->SetLineColor(4); + pad->Modified(); + pad->Update(); } if (save) { - sprintf (name, "%s.pdf", pad->GetName()); + sprintf(name, "%s.pdf", pad->GetName()); pad->Print(name); } } diff --git a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc index dffecbb577041..ace99c9b1d445 100644 --- a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc +++ b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc @@ -24,10 +24,11 @@ See the twiki page for details: // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/one/EDAnalyzer.h" - -//#include "FWCore/Framework/interface/Event.h" -//#include "FWCore/Framework/interface/MakerMacros.h" -//#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ServiceRegistry/interface/Service.h" +#include "CommonTools/UtilAlgos/interface/TFileService.h" #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h" #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" diff --git a/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.cc b/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.cc index 7ad3da9edb3e5..217f4403135fa 100644 --- a/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.cc +++ b/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.cc @@ -5,8 +5,10 @@ // #include "DiJetAnalyzer.h" +#include "FWCore/ServiceRegistry/interface/Service.h" DiJetAnalyzer::DiJetAnalyzer(const edm::ParameterSet& iConfig) { + usesResource(TFileService::kSharedResource); // set parameters pfJetCollName_ = iConfig.getParameter("pfJetCollName"); pfJetCorrName_ = iConfig.getParameter("pfJetCorrName"); @@ -32,8 +34,6 @@ DiJetAnalyzer::DiJetAnalyzer(const edm::ParameterSet& iConfig) { tok_geom_ = esConsumes(); } -DiJetAnalyzer::~DiJetAnalyzer() {} - // // member functions // @@ -1131,11 +1131,11 @@ void DiJetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& evS // ------------ method called once each job just before starting event loop ------------ void DiJetAnalyzer::beginJob() { // book histograms - rootfile_ = new TFile(rootHistFilename_.c_str(), "RECREATE"); - h_PassSelPF_ = new TH1D("h_PassSelectionPF", "Selection Pass Failures PFJets", 200, -0.5, 199.5); + edm::Service fs; + h_PassSelPF_ = fs->make("h_PassSelectionPF", "Selection Pass Failures PFJets", 200, -0.5, 199.5); - tree_ = new TTree("dijettree", "tree for dijet balancing"); + tree_ = fs->make("dijettree", "tree for dijet balancing"); tree_->Branch("tpfjet_pt", &tpfjet_pt_, "tpfjet_pt/F"); tree_->Branch("tpfjet_p", &tpfjet_p_, "tpfjet_p/F"); @@ -1286,15 +1286,7 @@ void DiJetAnalyzer::beginJob() { } // ------------ method called once each job just after ending the event loop ------------ -void DiJetAnalyzer::endJob() { - // write histograms - rootfile_->cd(); - - h_PassSelPF_->Write(); - tree_->Write(); - - rootfile_->Close(); -} +void DiJetAnalyzer::endJob() {} // helper function diff --git a/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.h b/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.h index e27e1596d4c5b..2d502a0107abf 100644 --- a/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.h +++ b/Calibration/HcalCalibAlgos/test/DiJetAnalyzer.h @@ -15,8 +15,9 @@ #include "TClonesArray.h" // user include files +#include "CommonTools/UtilAlgos/interface/TFileService.h" #include "FWCore/Framework/interface/Frameworkfwd.h" -#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 "FWCore/Framework/interface/MakerMacros.h" @@ -50,7 +51,6 @@ // forward declarations class TH1D; class TH2D; -class TFile; class TTree; // @@ -83,15 +83,15 @@ class JetCorretPair : protected std::pair { private: }; -class DiJetAnalyzer : public edm::EDAnalyzer { +class DiJetAnalyzer : public edm::one::EDAnalyzer { public: explicit DiJetAnalyzer(const edm::ParameterSet&); - ~DiJetAnalyzer(); + ~DiJetAnalyzer() override = default; private: - virtual void beginJob(); //(const edm::EventSetup&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endJob(); + void beginJob() override; //(const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; + void endJob() override; // parameters bool debug_; // print debug statements @@ -118,8 +118,6 @@ class DiJetAnalyzer : public edm::EDAnalyzer { edm::ESGetToken tok_geom_; // root file/histograms - TFile* rootfile_; - TH1D* h_PassSelPF_; TTree* tree_; diff --git a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc index 809c249e53167..ed5c83cd2ad92 100644 --- a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc +++ b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc @@ -136,6 +136,7 @@ inline unsigned int helper_findTrigger(const std::vector& list, con GammaJetAnalysis::GammaJetAnalysis(const edm::ParameterSet& iConfig) : hltPrescaleProvider_(iConfig, consumesCollector(), *this) { + usesResource(TFileService::kSharedResource); // set parameters debug_ = iConfig.getUntrackedParameter("debug", 0); debugHLTTrigNames = iConfig.getUntrackedParameter("debugHLTTrigNames", 1); @@ -1405,10 +1406,9 @@ void GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& // ------------ method called once each job just before starting event loop ------------ void GammaJetAnalysis::beginJob() { - rootfile_ = new TFile(rootHistFilename_.c_str(), "RECREATE"); + edm::Service fs; if (doPFJets_) { - pf_tree_ = new TTree("pf_gammajettree", "tree for gamma+jet balancing using PFJets"); - assert(pf_tree_); + pf_tree_ = fs->make("pf_gammajettree", "tree for gamma+jet balancing using PFJets"); } for (int iJet = 0; iJet < 2; iJet++) { @@ -1660,18 +1660,14 @@ void GammaJetAnalysis::beginJob() { // ------------ method called once each job just after ending the event loop ------------ void GammaJetAnalysis::endJob() { - rootfile_->cd(); - if (doPFJets_) { pf_tree_->Write(); } // write miscItems // Save info about the triggers and other misc items { - rootfile_->cd(); - rootfile_->mkdir("miscItems"); - rootfile_->cd("miscItems"); - misc_tree_ = new TTree("misc_tree", "tree for misc.info"); + edm::Service fs; + misc_tree_ = fs->make("misc_tree", "tree for misc.info"); misc_tree_->Branch("ignoreHLT", &ignoreHLT_, "ignoreHLT/O"); misc_tree_->Branch("doPFJets", &doPFJets_, "doPFJets/O"); misc_tree_->Branch("doGenJets", &doGenJets_, "doGenJets/O"); @@ -1689,10 +1685,7 @@ void GammaJetAnalysis::endJob() { date.Write(str.Data()); misc_tree_->Fill(); misc_tree_->Write(); - rootfile_->cd(); } - - rootfile_->Close(); } // --------------------------------------------------------------------- diff --git a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.h b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.h index 09d5d43f0906f..b91ddf9b3d0e1 100644 --- a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.h +++ b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.h @@ -7,12 +7,14 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#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 "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ServiceRegistry/interface/Service.h" +#include "CommonTools/UtilAlgos/interface/TFileService.h" #include "DataFormats/EgammaCandidates/interface/PhotonFwd.h" #include "DataFormats/EgammaCandidates/interface/Photon.h" #include "DataFormats/JetReco/interface/CaloJetCollection.h" @@ -125,10 +127,10 @@ class PFJetCorretPair : protected std::pair { // Main class // -------------------------------------------- -class GammaJetAnalysis : public edm::EDAnalyzer { +class GammaJetAnalysis : public edm::one::EDAnalyzer { public: explicit GammaJetAnalysis(const edm::ParameterSet&); - ~GammaJetAnalysis(); + ~GammaJetAnalysis() override; float pfEcalIso(const reco::Photon* localPho1, edm::Handle pfHandle, @@ -159,10 +161,11 @@ class GammaJetAnalysis : public edm::EDAnalyzer { reco::PFCandidate::ParticleType pfToUse); private: - virtual void beginJob(); //(const edm::EventSetup&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endJob(); - void beginRun(const edm::Run&, const edm::EventSetup&); + void beginJob() override; //(const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; + void endJob() override; + void beginRun(const edm::Run&, const edm::EventSetup&) override; + void endRun(edm::Run const&, edm::EventSetup const&) override {} // parameters int debug_; // print debug statements @@ -225,8 +228,6 @@ class GammaJetAnalysis : public edm::EDAnalyzer { bool ignoreHLT_; // root file/histograms - TFile* rootfile_; - TTree* misc_tree_; // misc.information. Will be filled only once TTree* calo_tree_; TTree* pf_tree_; diff --git a/Calibration/HcalCalibAlgos/test/HcalConstantsASCIIWriter.h b/Calibration/HcalCalibAlgos/test/HcalConstantsASCIIWriter.h index 65e91836e9f90..890660cbbce53 100644 --- a/Calibration/HcalCalibAlgos/test/HcalConstantsASCIIWriter.h +++ b/Calibration/HcalCalibAlgos/test/HcalConstantsASCIIWriter.h @@ -8,7 +8,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/EDProducer.h" @@ -32,23 +32,18 @@ #include "CondFormats/HcalObjects/interface/HcalRespCorrs.h" #include "CondFormats/DataRecord/interface/HcalRespCorrsRcd.h" -#include "TFile.h" -#include "TH1.h" -#include "TH2.h" -#include "TTree.h" -#include #include - #include #include #include #include +#include // // class decleration // namespace cms { - class HcalConstantsASCIIWriter : public edm::EDAnalyzer { + class HcalConstantsASCIIWriter : public edm::one::EDAnalyzer<> { public: explicit HcalConstantsASCIIWriter(const edm::ParameterSet &); ~HcalConstantsASCIIWriter(); diff --git a/Calibration/HcalCalibAlgos/test/HcalCorrPFCalculation.cc b/Calibration/HcalCalibAlgos/test/HcalCorrPFCalculation.cc index 62873ec5f6b9e..5bf0e07a470d8 100644 --- a/Calibration/HcalCalibAlgos/test/HcalCorrPFCalculation.cc +++ b/Calibration/HcalCalibAlgos/test/HcalCorrPFCalculation.cc @@ -1,13 +1,19 @@ +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "FWCore/ServiceRegistry/interface/Service.h" +#include "CommonTools/UtilAlgos/interface/TFileService.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h" #include "DataFormats/HcalRecHit/interface/HcalSourcePositionData.h" -#include -#include +#include "DataFormats/EcalDetId/interface/EBDetId.h" +#include "DataFormats/EcalDetId/interface/EEDetId.h" #include "DataFormats/HcalDetId/interface/HcalElectronicsId.h" #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h" @@ -31,6 +37,7 @@ #include #include "TProfile.h" +#include "TTree.h" //#define EDM_ML_DEBUG diff --git a/Calibration/HcalCalibAlgos/test/ValidationHcalIsoTrackAlCaReco.cc b/Calibration/HcalCalibAlgos/test/ValidationHcalIsoTrackAlCaReco.cc index 73abf2037a0e5..ebab93b180026 100644 --- a/Calibration/HcalCalibAlgos/test/ValidationHcalIsoTrackAlCaReco.cc +++ b/Calibration/HcalCalibAlgos/test/ValidationHcalIsoTrackAlCaReco.cc @@ -22,8 +22,6 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/Calibration/HcalCalibAlgos/test/python/dijetanalysis_cfg.py b/Calibration/HcalCalibAlgos/test/python/dijetanalysis_cfg.py index cb5c545a18c74..138cdb1a0344d 100644 --- a/Calibration/HcalCalibAlgos/test/python/dijetanalysis_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/dijetanalysis_cfg.py @@ -58,6 +58,10 @@ jetsInput = cms.InputTag("iterativeCone5CaloJets") ) +process.TFileService = cms.Service("TFileService", + fileName = cms.string('hi.root') +) + #process.DiJetsRecoPool = cms.OutputModule("PoolOutputModule", # outputCommands = cms.untracked.vstring('drop *', # 'keep *_DiJetsReco_*_*'), diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py index abb00f559b1b2..e6656f3e2721a 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py @@ -22,6 +22,8 @@ process.GammaJetAnalysis.rootHistFilename = cms.string('PhoJet_tree_CHS.root') process.GammaJetAnalysis.doPFJets = cms.bool(True) process.GammaJetAnalysis.doGenJets = cms.bool(False) +process.TFileService = cms.Service("TFileService", + fileName = cms.string('PhoJet_tree_CHS.root')) # trigger names should not end with '_' process.GammaJetAnalysis.photonTriggers = cms.vstring( diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py index 313525051b162..d4f1283a12cb8 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py @@ -23,6 +23,8 @@ process.GammaJetAnalysis.rootHistFilename = cms.string('PhoJet_tree_CHS_data2012.root') process.GammaJetAnalysis.doPFJets = cms.bool(True) process.GammaJetAnalysis.doGenJets = cms.bool(False) +process.TFileService = cms.Service("TFileService", + fileName = cms.string('PhoJet_tree_CHS_data2012.root')) # trigger names should not end with '_' process.GammaJetAnalysis.photonTriggers = cms.vstring( diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py index c84036ad68d58..031381aba4c94 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py @@ -22,6 +22,8 @@ process.GammaJetAnalysis.rootHistFilename = cms.string('PhoJet_tree_CHS_data2012_noGJetProd.root') process.GammaJetAnalysis.doPFJets = cms.bool(True) process.GammaJetAnalysis.doGenJets = cms.bool(False) +process.TFileService = cms.Service("TFileService", + fileName = cms.string('PhoJet_tree_CHS_data2012_noGJetProd.root')) # trigger names should not end with '_' process.GammaJetAnalysis.photonTriggers = cms.vstring( diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py index 47608413db77c..9d7cf10bbb316 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py @@ -23,6 +23,8 @@ process.GammaJetAnalysis.rootHistFilename = cms.string('PhoJet_tree_CHS_noGJetProd.root') process.GammaJetAnalysis.doPFJets = cms.bool(True) process.GammaJetAnalysis.doGenJets = cms.bool(True) +process.TFileService = cms.Service("TFileService", + fileName = cms.string('PhoJet_tree_CHS_noGJetProd.root')) # trigger names should not end with '_' process.GammaJetAnalysis.photonTriggers = cms.vstring( diff --git a/CondTools/Hcal/interface/BoostIODBReader.h b/CondTools/Hcal/interface/BoostIODBReader.h index 95fc36c19357e..2c9d24448c2f9 100644 --- a/CondTools/Hcal/interface/BoostIODBReader.h +++ b/CondTools/Hcal/interface/BoostIODBReader.h @@ -26,7 +26,7 @@ #include "CondFormats/Serialization/interface/eos/portable_oarchive.hpp" #include "FWCore/Framework/interface/Frameworkfwd.h" -#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" @@ -39,7 +39,7 @@ // class declaration // template -class BoostIODBReader : public edm::EDAnalyzer { +class BoostIODBReader : public edm::one::EDAnalyzer<> { public: typedef DataType data_type; typedef RecordType record_type; diff --git a/CondTools/Hcal/interface/BoostIODBWriter.h b/CondTools/Hcal/interface/BoostIODBWriter.h index 0f661e72e3394..e3669ac3deb4a 100644 --- a/CondTools/Hcal/interface/BoostIODBWriter.h +++ b/CondTools/Hcal/interface/BoostIODBWriter.h @@ -27,7 +27,7 @@ #include "CondFormats/Serialization/interface/eos/portable_iarchive.hpp" #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Utilities/interface/Exception.h" @@ -41,7 +41,7 @@ // class declaration // template -class BoostIODBWriter : public edm::EDAnalyzer { +class BoostIODBWriter : public edm::one::EDAnalyzer<> { public: typedef DataType data_type; diff --git a/CondTools/Hcal/interface/HcalAutoPedestalValidator.h b/CondTools/Hcal/interface/HcalAutoPedestalValidator.h index a90a0f725d15b..6098d63d3f777 100644 --- a/CondTools/Hcal/interface/HcalAutoPedestalValidator.h +++ b/CondTools/Hcal/interface/HcalAutoPedestalValidator.h @@ -12,7 +12,7 @@ #include #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -37,7 +37,7 @@ #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h" #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h" -class HcalAutoPedestalValidator : public edm::EDAnalyzer { +class HcalAutoPedestalValidator : public edm::one::EDAnalyzer<> { public: HcalAutoPedestalValidator(edm::ParameterSet const& ps); diff --git a/CondTools/Hcal/interface/HcalGainsCheck.h b/CondTools/Hcal/interface/HcalGainsCheck.h index 6a39c30475d95..5a2e9e029d83e 100644 --- a/CondTools/Hcal/interface/HcalGainsCheck.h +++ b/CondTools/Hcal/interface/HcalGainsCheck.h @@ -14,7 +14,7 @@ #include #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -43,7 +43,7 @@ #include "TH1.h" #include "TH2.h" -class HcalGainsCheck : public edm::EDAnalyzer { +class HcalGainsCheck : public edm::one::EDAnalyzer<> { public: HcalGainsCheck(edm::ParameterSet const& ps); diff --git a/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h b/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h index d96c775bb88fe..a9a80c4e190b8 100644 --- a/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h +++ b/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h @@ -14,7 +14,7 @@ #include #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -39,7 +39,7 @@ #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h" #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h" -class HcalPedestalWidthsCheck : public edm::EDAnalyzer { +class HcalPedestalWidthsCheck : public edm::one::EDAnalyzer<> { public: HcalPedestalWidthsCheck(edm::ParameterSet const& ps); diff --git a/CondTools/Hcal/interface/HcalPedestalsCheck.h b/CondTools/Hcal/interface/HcalPedestalsCheck.h index 3112ee24c211f..173b1b5f39b43 100644 --- a/CondTools/Hcal/interface/HcalPedestalsCheck.h +++ b/CondTools/Hcal/interface/HcalPedestalsCheck.h @@ -14,7 +14,7 @@ #include #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -39,7 +39,7 @@ #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h" #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h" -class HcalPedestalsCheck : public edm::EDAnalyzer { +class HcalPedestalsCheck : public edm::one::EDAnalyzer<> { public: HcalPedestalsCheck(edm::ParameterSet const& ps); diff --git a/CondTools/Hcal/interface/HcalQIEDataCheck.h b/CondTools/Hcal/interface/HcalQIEDataCheck.h index 3ea71c0b1b3ae..b2e0ed06b9aab 100644 --- a/CondTools/Hcal/interface/HcalQIEDataCheck.h +++ b/CondTools/Hcal/interface/HcalQIEDataCheck.h @@ -13,7 +13,7 @@ #include #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -34,7 +34,7 @@ #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h" #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h" -class HcalQIEDataCheck : public edm::EDAnalyzer { +class HcalQIEDataCheck : public edm::one::EDAnalyzer<> { public: HcalQIEDataCheck(edm::ParameterSet const& ps); diff --git a/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc b/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc index 1c2517d0d0331..cbda375679554 100644 --- a/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc +++ b/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc @@ -7,7 +7,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -20,7 +20,7 @@ // // class declaration // -class BufferedBoostIODBWriter : public edm::EDAnalyzer { +class BufferedBoostIODBWriter : public edm::one::EDAnalyzer<> { public: explicit BufferedBoostIODBWriter(const edm::ParameterSet&); ~BufferedBoostIODBWriter() override {} diff --git a/CondTools/Hcal/plugins/HcalDumpConditions.cc b/CondTools/Hcal/plugins/HcalDumpConditions.cc index 4061182459d49..a1e783cb9f3c1 100644 --- a/CondTools/Hcal/plugins/HcalDumpConditions.cc +++ b/CondTools/Hcal/plugins/HcalDumpConditions.cc @@ -16,7 +16,7 @@ September 21, 2009 Added HcalLutMetadata - Gena Kukartsev #include #include #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -35,7 +35,7 @@ September 21, 2009 Added HcalLutMetadata - Gena Kukartsev #include "CondFormats/HcalObjects/interface/AllObjects.h" namespace edmtest { - class HcalDumpConditions : public edm::EDAnalyzer { + class HcalDumpConditions : public edm::one::EDAnalyzer<> { public: explicit HcalDumpConditions(edm::ParameterSet const& p) { front = p.getUntrackedParameter("outFilePrefix", "Dump"); diff --git a/CondTools/Hcal/test/HcalConditionsTest.cc b/CondTools/Hcal/test/HcalConditionsTest.cc index 32fab2ee0e87a..ebb7430515534 100644 --- a/CondTools/Hcal/test/HcalConditionsTest.cc +++ b/CondTools/Hcal/test/HcalConditionsTest.cc @@ -14,7 +14,7 @@ R.Ofierzynski - 2.Oct. 2007 #include #include #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -41,7 +41,7 @@ R.Ofierzynski - 2.Oct. 2007 #include "FWCore/Framework/interface/IOVSyncValue.h" namespace edmtest { - class HcalConditionsTest : public edm::EDAnalyzer { + class HcalConditionsTest : public edm::one::EDAnalyzer<> { public: explicit HcalConditionsTest(edm::ParameterSet const& p) { front = p.getUntrackedParameter("outFilePrefix", "Dump"); diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index a414733119547..42c06fcec35be 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -8,75 +8,75 @@ # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1 'run1_mc_hi' : '121X_mcRun1_HeavyIon_v7', # GlobalTag for MC production with pessimistic alignment and calibrations for Run2 - 'run2_mc_50ns' : '121X_mcRun2_startup_v7', + 'run2_mc_50ns' : '121X_mcRun2_startup_v8', # GlobalTag for MC production (2015 L1 Trigger Stage1) with startup-like alignment and calibrations for Run2, L1 trigger in Stage1 mode - 'run2_mc_l1stage1' : '121X_mcRun2_asymptotic_l1stage1_v7', + 'run2_mc_l1stage1' : '121X_mcRun2_asymptotic_l1stage1_v8', # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2 - 'run2_design' : '121X_mcRun2_design_v7', + 'run2_design' : '121X_mcRun2_design_v8', #GlobalTag for MC production with optimistic alignment and calibrations for 2016, prior to VFP change - 'run2_mc_pre_vfp' : '121X_mcRun2_asymptotic_preVFP_v7', + 'run2_mc_pre_vfp' : '121X_mcRun2_asymptotic_preVFP_v8', #GlobalTag for MC production with optimistic alignment and calibrations for 2016, after VFP change - 'run2_mc' : '121X_mcRun2_asymptotic_v7', + 'run2_mc' : '121X_mcRun2_asymptotic_v8', # GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode - 'run2_mc_cosmics' : '121X_mcRun2cosmics_asymptotic_deco_v7', + 'run2_mc_cosmics' : '121X_mcRun2cosmics_asymptotic_deco_v8', # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2 - 'run2_mc_hi' : '121X_mcRun2_HeavyIon_v7', + 'run2_mc_hi' : '121X_mcRun2_HeavyIon_v8', # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2 - 'run2_mc_pa' : '121X_mcRun2_pA_v7', + 'run2_mc_pa' : '121X_mcRun2_pA_v8', # GlobalTag for Run2 data reprocessing - 'run2_data' : '121X_dataRun2_v10', + 'run2_data' : '121X_dataRun2_v11', # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail - 'run2_data_HEfail' : '121X_dataRun2_HEfail_v10', + 'run2_data_HEfail' : '121X_dataRun2_HEfail_v11', # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu - 'run2_data_relval' : '121X_dataRun2_relval_v10', + 'run2_data_relval' : '121X_dataRun2_relval_v11', # GlobalTag for Run2 HI data - 'run2_data_promptlike_hi' : '121X_dataRun2_PromptLike_HI_v9', + 'run2_data_promptlike_hi' : '121X_dataRun2_PromptLike_HI_v10', # GlobalTag for Run3 HLT: it points to the online GT - 'run3_hlt' : '121X_dataRun3_HLT_v9', + 'run3_hlt' : '121X_dataRun3_HLT_v11', # GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu - 'run2_hlt_relval' : '121X_dataRun2_HLT_relval_v9', + 'run2_hlt_relval' : '121X_dataRun2_HLT_relval_v11', # GlobalTag for Run3 data relvals (express GT) - 'run3_data_express' : '121X_dataRun3_Express_v10', + 'run3_data_express' : '121X_dataRun3_Express_v11', # GlobalTag for Run3 data relvals - 'run3_data_prompt' : '121X_dataRun3_Prompt_v9', + 'run3_data_prompt' : '121X_dataRun3_Prompt_v10', # GlobalTag for Run3 offline data reprocessing - 'run3_data' : '121X_dataRun3_v8', + 'run3_data' : '121X_dataRun3_v10', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot) - 'phase1_2017_design' : '121X_mc2017_design_v7', + 'phase1_2017_design' : '121X_mc2017_design_v9', # GlobalTag for MC production with realistic conditions for Phase1 2017 detector - 'phase1_2017_realistic' : '121X_mc2017_realistic_v7', + 'phase1_2017_realistic' : '121X_mc2017_realistic_v9', # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode - 'phase1_2017_cosmics' : '121X_mc2017cosmics_realistic_deco_v7', + 'phase1_2017_cosmics' : '121X_mc2017cosmics_realistic_deco_v9', # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in PEAK mode - 'phase1_2017_cosmics_peak' : '121X_mc2017cosmics_realistic_peak_v7', + 'phase1_2017_cosmics_peak' : '121X_mc2017cosmics_realistic_peak_v9', # GlobalTag for MC production with perfectly aligned and calibrated detector for full Phase1 2018 (and 0,0,0-centred beamspot) - 'phase1_2018_design' : '121X_upgrade2018_design_v7', + 'phase1_2018_design' : '121X_upgrade2018_design_v8', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector - 'phase1_2018_realistic' : '121X_upgrade2018_realistic_v7', + 'phase1_2018_realistic' : '121X_upgrade2018_realistic_v8', # GlobalTag for MC production with realistic run-dependent (RD) conditions for full Phase1 2018 detector - 'phase1_2018_realistic_rd' : '121X_upgrade2018_realistic_RD_v7', + 'phase1_2018_realistic_rd' : '121X_upgrade2018_realistic_RD_v8', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector for Heavy Ion - 'phase1_2018_realistic_hi' : '121X_upgrade2018_realistic_HI_v7', + 'phase1_2018_realistic_hi' : '121X_upgrade2018_realistic_HI_v8', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector: HEM-15-16 fail - 'phase1_2018_realistic_HEfail' : '121X_upgrade2018_realistic_HEfail_v7', + 'phase1_2018_realistic_HEfail' : '121X_upgrade2018_realistic_HEfail_v8', # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in DECO mode - 'phase1_2018_cosmics' : '121X_upgrade2018cosmics_realistic_deco_v9', + 'phase1_2018_cosmics' : '121X_upgrade2018cosmics_realistic_deco_v10', # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode - 'phase1_2018_cosmics_peak' : '121X_upgrade2018cosmics_realistic_peak_v7', + 'phase1_2018_cosmics_peak' : '121X_upgrade2018cosmics_realistic_peak_v8', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021 - 'phase1_2021_design' : '121X_mcRun3_2021_design_v13', + 'phase1_2021_design' : '121X_mcRun3_2021_design_v15', # GlobalTag for MC production with realistic conditions for Phase1 2021 - 'phase1_2021_realistic' : '121X_mcRun3_2021_realistic_v15', + 'phase1_2021_realistic' : '121X_mcRun3_2021_realistic_v17', # GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2021, Strip tracker in DECO mode - 'phase1_2021_cosmics' : '121X_mcRun3_2021cosmics_realistic_deco_v15', + 'phase1_2021_cosmics' : '121X_mcRun3_2021cosmics_realistic_deco_v17', # GlobalTag for MC production with realistic conditions for Phase1 2021 detector for Heavy Ion - 'phase1_2021_realistic_hi' : '121X_mcRun3_2021_realistic_HI_v15', + 'phase1_2021_realistic_hi' : '121X_mcRun3_2021_realistic_HI_v17', # GlobalTag for MC production with realistic conditions for Phase1 2023 - 'phase1_2023_realistic' : '121X_mcRun3_2023_realistic_v14', + 'phase1_2023_realistic' : '121X_mcRun3_2023_realistic_v16', # GlobalTag for MC production with realistic conditions for Phase1 2024 - 'phase1_2024_realistic' : '121X_mcRun3_2024_realistic_v14', + 'phase1_2024_realistic' : '121X_mcRun3_2024_realistic_v16', # GlobalTag for MC production with realistic conditions for Phase2 - 'phase2_realistic' : '121X_mcRun4_realistic_v7' + 'phase2_realistic' : '121X_mcRun4_realistic_v8' } aliases = { diff --git a/Configuration/PyReleaseValidation/python/relval_production.py b/Configuration/PyReleaseValidation/python/relval_production.py index 0dd840730b0f2..452907378db3c 100644 --- a/Configuration/PyReleaseValidation/python/relval_production.py +++ b/Configuration/PyReleaseValidation/python/relval_production.py @@ -26,7 +26,7 @@ workflows[1040.1] = ['',['RunExpressPhy2017F','TIER0EXPSIPIXELCAL','ALCASPLITSIPIXELCAL','ALCAHARVDSIPIXELCAL']] workflows[1041] = ['',['RunExpressPhy2017F','TIER0EXPPPSCAL','ALCASPLITPPSCAL','ALCAHARVDPPSCAL']] -workflows[1042] = ['',['RunExpressPhy2017F','TIER0EXPPPSCAL','ALCASPLITPPSALIG','ALCAHARVDPPSALIG']] +workflows[1042] = ['',['RunExpressPhy2017F','TIER0EXPPPSCALALIG','ALCASPLITPPSALIG','ALCAHARVDPPSALIG']] ## MC production test #workflows[1100] = [ '',[]] diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 750bf14d59c92..5761360b5c565 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -437,7 +437,7 @@ workflows[138.1] = ['',['RunCosmics2021','RECOCOSDPROMPTRUN3','ALCACOSDPROMPTRUN3','HARVESTDCPROMPTRUN3']] workflows[138.2] = ['',['RunCosmics2021','RECOCOSDEXPRUN3','ALCACOSDEXPRUN3','HARVESTDCEXPRUN3']] ### 2021 Splash events -workflows[138.3] = ['',['RunMinimumBias2021Splash','RECODR3Splash','HARVESTDR3']] +workflows[138.3] = ['',['RunMinimumBias2021Splash','COPYPASTER3', 'RECODR3Splash','HARVESTDR3']] #### Test of lumi section boundary crossing with run2 2018D #### workflows[136.8861] = ['',['RunEGamma2018Dml1','HLTDR2_2018ml','RECODR2_2018reHLT_skimEGamma_Prompt_L1TEgDQM','HARVEST2018_L1TEgDQM_Prompt']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 9bf9d39181406..eb7b5dca9529e 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2103,6 +2103,17 @@ def lhegensim2018ml(fragment,howMuch): '--eventcontent':'ALCARECO', } +steps['TIER0EXPPPSCALALIG']={'-s':'RAW2DIGI,L1Reco,ALCAPRODUCER:PPSCalTrackBasedSel,ENDJOB', + '-n':1000, + '--process':'ALCARECO', + '--scenario': 'pp', + '--era':'Run2_2017', + '--conditions':'auto:run2_data', + '--data': '', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + } + steps['ALCASPLITHPBS']={'-s':'ALCAOUTPUT:TkAlMinBias,ALCA:PromptCalibProdBeamSpotHP+PromptCalibProdBeamSpotHPLowPU', '--scenario':'pp', '--data':'', @@ -2135,6 +2146,7 @@ def lhegensim2018ml(fragment,howMuch): } steps['ALCASPLITPPSALIG']={'-s':'ALCAOUTPUT:PPSCalTrackBasedSel,ALCA:PPSAlignment', + '-n':1000, '--scenario':'pp', '--data':'', '--era':'Run2_2017', @@ -3125,6 +3137,7 @@ def gen2021HiMix(fragment,howMuch): '--conditions':'auto:run1_mc', '--output':'\'[{"t":"RAW","e":"ALL"}]\'', '--customise_commands':'"process.ALLRAWoutput.fastCloning=cms.untracked.bool(False)"'} +steps['COPYPASTER3'] = merge([{'--era' : 'Run3'}, steps['COPYPASTE']]) #miniaod stepMiniAODDefaults = { '-s' : 'PAT', diff --git a/Configuration/StandardSequences/python/AlCaHarvesting_cff.py b/Configuration/StandardSequences/python/AlCaHarvesting_cff.py index 0050299b593dc..88b0b11b71024 100644 --- a/Configuration/StandardSequences/python/AlCaHarvesting_cff.py +++ b/Configuration/StandardSequences/python/AlCaHarvesting_cff.py @@ -240,7 +240,6 @@ tag = cms.string('DiamondSampicCalibration'), timetype = cms.untracked.string('runnumber')) -ALCAHARVESTPPSAlignment = ppsAlignmentHarvester.clone() ALCAHARVESTPPSAlignment_metadata = cms.PSet(record = cms.untracked.string('CTPPSRPAlignmentCorrectionsDataRcd')) ALCAHARVESTPPSAlignment_dbOutput = cms.PSet(record = cms.string('CTPPSRPAlignmentCorrectionsDataRcd'), tag = cms.string('CTPPSRPAlignment_real_pcl'), diff --git a/DPGAnalysis/Skims/python/runonSM.py b/DPGAnalysis/Skims/python/runonSM.py index e5a48accc2f7a..45e5c1fbe2f38 100755 --- a/DPGAnalysis/Skims/python/runonSM.py +++ b/DPGAnalysis/Skims/python/runonSM.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -import os,string,sys,commands,time +import os,string,sys,time # template file to be used MODFILE="reco_skim_cfg_mod.py" diff --git a/DPGAnalysis/Skims/python/runonSM_350.py b/DPGAnalysis/Skims/python/runonSM_350.py index 7bdc76ef9cf7c..0b4b65fe9a839 100755 --- a/DPGAnalysis/Skims/python/runonSM_350.py +++ b/DPGAnalysis/Skims/python/runonSM_350.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -import os,string,sys,commands,time +import os,string,sys,time # template file to be used MODFILE="reco_skim_cfg_mod_350.py" diff --git a/DPGAnalysis/Skims/python/runonSMtunnel.py b/DPGAnalysis/Skims/python/runonSMtunnel.py index b135de34fdf8d..70fa5816ab06a 100755 --- a/DPGAnalysis/Skims/python/runonSMtunnel.py +++ b/DPGAnalysis/Skims/python/runonSMtunnel.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -import os,string,sys,commands,time +import os,string,sys,time # template file to be used MODFILE="reco_skim_cfg_mod.py" diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py index e5dab578f1b0e..826ac8cb8d5d0 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -107,7 +107,7 @@ #---------------------------- if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1 or - process.runType.getRunType() == process.runType.hpu_run): + process.runType.getRunType() == process.runType.hpu_run or process.runType.getRunType() == process.runType.commissioning_run ): print("[beampixel_dqm_sourceclient-live_cfg]::running pp") diff --git a/DataFormats/CSCDigi/interface/CSCCLCTDigi.h b/DataFormats/CSCDigi/interface/CSCCLCTDigi.h index d2e1cb6c67030..b095210fe1650 100644 --- a/DataFormats/CSCDigi/interface/CSCCLCTDigi.h +++ b/DataFormats/CSCDigi/interface/CSCCLCTDigi.h @@ -173,7 +173,7 @@ class CSCCLCTDigi { void setCompCode(const int16_t code) { compCode_ = code; } // comparator hits in this CLCT - const ComparatorContainer& getHits() const { return hits_; } + const ComparatorContainer& getHits() const { return hits_.empty() ? emptyContainer() : hits_; } void setHits(const ComparatorContainer& hits) { hits_ = hits; } @@ -197,6 +197,7 @@ class CSCCLCTDigi { void setRun3(bool isRun3); private: + static const ComparatorContainer& emptyContainer(); uint16_t valid_; uint16_t quality_; // Run-1/2 pattern number. @@ -232,7 +233,6 @@ class CSCCLCTDigi { // which hits are in this CLCT? ComparatorContainer hits_; - Version version_; }; diff --git a/DataFormats/CSCDigi/src/CSCCLCTDigi.cc b/DataFormats/CSCDigi/src/CSCCLCTDigi.cc index 1004f8f6da3a2..3edc6dfbabada 100644 --- a/DataFormats/CSCDigi/src/CSCCLCTDigi.cc +++ b/DataFormats/CSCDigi/src/CSCCLCTDigi.cc @@ -13,6 +13,22 @@ enum Pattern_Info { NUM_LAYERS = 6, CLCT_PATTERN_WIDTH = 11 }; +namespace { + CSCCLCTDigi::ComparatorContainer makeEmptyContainer() { + CSCCLCTDigi::ComparatorContainer ret; + ret.resize(NUM_LAYERS); + for (auto& p : ret) { + p.resize(CLCT_PATTERN_WIDTH); + } + return ret; + } +} // namespace + +CSCCLCTDigi::ComparatorContainer const& CSCCLCTDigi::emptyContainer() { + static ComparatorContainer const s_container = makeEmptyContainer(); + return s_container; +} + /// Constructors CSCCLCTDigi::CSCCLCTDigi(const uint16_t valid, const uint16_t quality, @@ -45,12 +61,8 @@ CSCCLCTDigi::CSCCLCTDigi(const uint16_t valid, run3_eighth_strip_bit_(run3_eighth_strip_bit), run3_pattern_(run3_pattern), run3_slope_(run3_slope), - version_(version) { - hits_.resize(NUM_LAYERS); - for (auto& p : hits_) { - p.resize(CLCT_PATTERN_WIDTH); - } -} + hits_(), + version_(version) {} /// Default CSCCLCTDigi::CSCCLCTDigi() { @@ -77,10 +89,6 @@ void CSCCLCTDigi::clear() { run3_slope_ = 0; version_ = Version::Legacy; hits_.clear(); - hits_.resize(NUM_LAYERS); - for (auto& p : hits_) { - p.resize(CLCT_PATTERN_WIDTH); - } } // slope in number of half-strips/layer diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v15/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v15/hgcalCons.xml index a4c8033593f32..7adf1194c1ea1 100644 --- a/Geometry/HGCalCommonData/data/hgcalCons/v15/hgcalCons.xml +++ b/Geometry/HGCalCommonData/data/hgcalCons/v15/hgcalCons.xml @@ -26,7 +26,7 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml index 1751223328d0e..cafd31e166b37 100644 --- a/Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml +++ b/Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml @@ -27,7 +27,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml b/Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml index 0a38adcf89a0d..1b1da5bc6c21d 100644 --- a/Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml +++ b/Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml @@ -21,27 +21,27 @@ - + HGCalEECellTrunc01Fine, HGCalEECellTrunc02Fine, HGCalEECellTrunc03Fine - HGCalEESensitiveTrunc01Fine, HGCalEESensitiveTrunc02Fine, - HGCalEESensitiveTrunc03Fine + HGCalEECellSensitiveTrunc01Fine, HGCalEECellSensitiveTrunc02Fine, + HGCalEECellSensitiveTrunc03Fine HGCalEECellExten01Fine, HGCalEECellExten02Fine, HGCalEECellExten03Fine - HGCalEESensitiveExten01Fine, HGCalEESensitiveExten02Fine, - HGCalEESensitiveExten03Fine + HGCalEECellSensitiveExten01Fine, HGCalEECellSensitiveExten02Fine, + HGCalEECellSensitiveExten03Fine HGCalEECellCorner01Fine, HGCalEECellCorner02Fine, HGCalEECellCorner03Fine, HGCalEECellCorner04Fine, HGCalEECellCorner05Fine, HGCalEECellCorner06Fine - HGCalEESensitiveCorner01Fine, HGCalEESensitiveCorner02Fine, - HGCalEESensitiveCorner03Fine, HGCalEESensitiveCorner04Fine, - HGCalEESensitiveCorner05Fine, HGCalEESensitiveCorner06Fine + HGCalEECellSensitiveCorner01Fine, HGCalEECellSensitiveCorner02Fine, + HGCalEECellSensitiveCorner03Fine, HGCalEECellSensitiveCorner04Fine, + HGCalEECellSensitiveCorner05Fine, HGCalEECellSensitiveCorner06Fine @@ -52,27 +52,27 @@ - + HGCalEECellTrunc11Fine, HGCalEECellTrunc12Fine, HGCalEECellTrunc13Fine - HGCalEESensitiveTrunc11Fine, HGCalEESensitiveTrunc12Fine, - HGCalEESensitiveTrunc13Fine + HGCalEECellSensitiveTrunc11Fine, HGCalEECellSensitiveTrunc12Fine, + HGCalEECellSensitiveTrunc13Fine HGCalEECellExten11Fine, HGCalEECellExten12Fine, HGCalEECellExten13Fine - HGCalEESensitiveExten11Fine, HGCalEESensitiveExten12Fine, - HGCalEESensitiveExten13Fine + HGCalEECellSensitiveExten11Fine, HGCalEECellSensitiveExten12Fine, + HGCalEECellSensitiveExten13Fine HGCalEECellCorner11Fine, HGCalEECellCorner12Fine, HGCalEECellCorner13Fine, HGCalEECellCorner14Fine, HGCalEECellCorner15Fine, HGCalEECellCorner16Fine - HGCalEESensitiveCorner11Fine, HGCalEESensitiveCorner12Fine, - HGCalEESensitiveCorner13Fine, HGCalEESensitiveCorner14Fine, - HGCalEESensitiveCorner15Fine, HGCalEESensitiveCorner16Fine + HGCalEECellSensitiveCorner11Fine, HGCalEECellSensitiveCorner12Fine, + HGCalEECellSensitiveCorner13Fine, HGCalEECellSensitiveCorner14Fine, + HGCalEECellSensitiveCorner15Fine, HGCalEECellSensitiveCorner16Fine @@ -83,27 +83,27 @@ - + HGCalEECellTrunc01Coarse1, HGCalEECellTrunc02Coarse1, HGCalEECellTrunc03Coarse1 - HGCalEESensitiveTrunc01Coarse1, HGCalEESensitiveTrunc02Coarse1, - HGCalEESensitiveTrunc03Coarse1 + HGCalEECellSensitiveTrunc01Coarse1, HGCalEECellSensitiveTrunc02Coarse1, + HGCalEECellSensitiveTrunc03Coarse1 HGCalEECellExten01Coarse1, HGCalEECellExten02Coarse1, HGCalEECellExten03Coarse1 - HGCalEESensitiveExten01Coarse1, HGCalEESensitiveExten02Coarse1, - HGCalEESensitiveExten03Coarse1 + HGCalEECellSensitiveExten01Coarse1, HGCalEECellSensitiveExten02Coarse1, + HGCalEECellSensitiveExten03Coarse1 HGCalEECellCorner01Coarse1, HGCalEECellCorner02Coarse1, HGCalEECellCorner03Coarse1, HGCalEECellCorner04Coarse1, HGCalEECellCorner05Coarse1, HGCalEECellCorner06Coarse1 - HGCalEESensitiveCorner01Coarse1, HGCalEESensitiveCorner02Coarse1, - HGCalEESensitiveCorner03Coarse1, HGCalEESensitiveCorner04Coarse1, - HGCalEESensitiveCorner05Coarse1, HGCalEESensitiveCorner06Coarse1 + HGCalEECellSensitiveCorner01Coarse1, HGCalEECellSensitiveCorner02Coarse1, + HGCalEECellSensitiveCorner03Coarse1, HGCalEECellSensitiveCorner04Coarse1, + HGCalEECellSensitiveCorner05Coarse1, HGCalEECellSensitiveCorner06Coarse1 @@ -114,27 +114,27 @@ - + HGCalEECellTrunc11Coarse1, HGCalEECellTrunc12Coarse1, HGCalEECellTrunc13Coarse1 - HGCalEESensitiveTrunc11Coarse1, HGCalEESensitiveTrunc12Coarse1, - HGCalEESensitiveTrunc13Coarse1 + HGCalEECellSensitiveTrunc11Coarse1, HGCalEECellSensitiveTrunc12Coarse1, + HGCalEECellSensitiveTrunc13Coarse1 HGCalEECellExten11Coarse1, HGCalEECellExten12Coarse1, HGCalEECellExten13Coarse1 - HGCalEESensitiveExten11Coarse1, HGCalEESensitiveExten12Coarse1, - HGCalEESensitiveExten13Coarse1 + HGCalEECellSensitiveExten11Coarse1, HGCalEECellSensitiveExten12Coarse1, + HGCalEECellSensitiveExten13Coarse1 HGCalEECellCorner11Coarse1, HGCalEECellCorner12Coarse1, HGCalEECellCorner13Coarse1, HGCalEECellCorner14Coarse1, HGCalEECellCorner15Coarse1, HGCalEECellCorner16Coarse1 - HGCalEESensitiveCorner11Coarse1, HGCalEESensitiveCorner12Coarse1, - HGCalEESensitiveCorner13Coarse1, HGCalEESensitiveCorner14Coarse1, - HGCalEESensitiveCorner15Coarse1, HGCalEESensitiveCorner16Coarse1 + HGCalEECellSensitiveCorner11Coarse1, HGCalEECellSensitiveCorner12Coarse1, + HGCalEECellSensitiveCorner13Coarse1, HGCalEECellSensitiveCorner14Coarse1, + HGCalEECellSensitiveCorner15Coarse1, HGCalEECellSensitiveCorner16Coarse1 @@ -145,27 +145,27 @@ - + HGCalEECellTrunc01Coarse2, HGCalEECellTrunc02Coarse2, HGCalEECellTrunc03Coarse2 - HGCalEESensitiveTrunc01Coarse2, HGCalEESensitiveTrunc02Coarse2, - HGCalEESensitiveTrunc03Coarse2 + HGCalEECellSensitiveTrunc01Coarse2, HGCalEECellSensitiveTrunc02Coarse2, + HGCalEECellSensitiveTrunc03Coarse2 HGCalEECellExten01Coarse2, HGCalEECellExten02Coarse2, HGCalEECellExten03Coarse2 - HGCalEESensitiveExten01Coarse2, HGCalEESensitiveExten02Coarse2, - HGCalEESensitiveExten03Coarse2 + HGCalEECellSensitiveExten01Coarse2, HGCalEECellSensitiveExten02Coarse2, + HGCalEECellSensitiveExten03Coarse2 HGCalEECellCorner01Coarse2, HGCalEECellCorner02Coarse2, HGCalEECellCorner03Coarse2, HGCalEECellCorner04Coarse2, HGCalEECellCorner05Coarse2, HGCalEECellCorner06Coarse2 - HGCalEESensitiveCorner01Coarse2, HGCalEESensitiveCorner02Coarse2, - HGCalEESensitiveCorner03Coarse2, HGCalEESensitiveCorner04Coarse2, - HGCalEESensitiveCorner05Coarse2, HGCalEESensitiveCorner06Coarse2 + HGCalEECellSensitiveCorner01Coarse2, HGCalEECellSensitiveCorner02Coarse2, + HGCalEECellSensitiveCorner03Coarse2, HGCalEECellSensitiveCorner04Coarse2, + HGCalEECellSensitiveCorner05Coarse2, HGCalEECellSensitiveCorner06Coarse2 @@ -176,27 +176,27 @@ - + HGCalEECellTrunc11Coarse2, HGCalEECellTrunc12Coarse2, HGCalEECellTrunc13Coarse2 - HGCalEESensitiveTrunc11Coarse2, HGCalEESensitiveTrunc12Coarse2, - HGCalEESensitiveTrunc13Coarse2 + HGCalEECellSensitiveTrunc11Coarse2, HGCalEECellSensitiveTrunc12Coarse2, + HGCalEECellSensitiveTrunc13Coarse2 HGCalEECellExten11Coarse2, HGCalEECellExten12Coarse2, HGCalEECellExten13Coarse2 - HGCalEESensitiveExten11Coarse2, HGCalEESensitiveExten12Coarse2, - HGCalEESensitiveExten13Coarse2 + HGCalEECellSensitiveExten11Coarse2, HGCalEECellSensitiveExten12Coarse2, + HGCalEECellSensitiveExten13Coarse2 HGCalEECellCorner11Coarse2, HGCalEECellCorner12Coarse2, HGCalEECellCorner13Coarse2, HGCalEECellCorner14Coarse2, HGCalEECellCorner15Coarse2, HGCalEECellCorner16Coarse2 - HGCalEESensitiveCorner11Coarse2, HGCalEESensitiveCorner12Coarse2, - HGCalEESensitiveCorner13Coarse2, HGCalEESensitiveCorner14Coarse2, - HGCalEESensitiveCorner15Coarse2, HGCalEESensitiveCorner16Coarse2 + HGCalEECellSensitiveCorner11Coarse2, HGCalEECellSensitiveCorner12Coarse2, + HGCalEECellSensitiveCorner13Coarse2, HGCalEECellSensitiveCorner14Coarse2, + HGCalEECellSensitiveCorner15Coarse2, HGCalEECellSensitiveCorner16Coarse2 @@ -207,27 +207,27 @@ - + HGCalHECellTrunc01Fine, HGCalHECellTrunc02Fine, HGCalHECellTrunc03Fine - HGCalHESiliconSensitiveTrunc01Fine, HGCalHESiliconSensitiveTrunc02Fine, - HGCalHESiliconSensitiveTrunc03Fine + HGCalHESiliconCellSensitiveTrunc01Fine, HGCalHESiliconCellSensitiveTrunc02Fine, + HGCalHESiliconCellSensitiveTrunc03Fine HGCalHECellExten01Fine, HGCalHECellExten02Fine, HGCalHECellExten03Fine - HGCalHESiliconSensitiveExten01Fine, HGCalHESiliconSensitiveExten02Fine, - HGCalHESiliconSensitiveExten03Fine + HGCalHESiliconCellSensitiveExten01Fine, HGCalHESiliconCellSensitiveExten02Fine, + HGCalHESiliconCellSensitiveExten03Fine HGCalHECellCorner01Fine, HGCalHECellCorner02Fine, HGCalHECellCorner03Fine, HGCalHECellCorner04Fine, HGCalHECellCorner05Fine, HGCalHECellCorner06Fine - HGCalHESiliconSensitiveCorner01Fine, HGCalHESiliconSensitiveCorner02Fine, - HGCalHESiliconSensitiveCorner03Fine, HGCalHESiliconSensitiveCorner04Fine, - HGCalHESiliconSensitiveCorner05Fine, HGCalHESiliconSensitiveCorner06Fine + HGCalHESiliconCellSensitiveCorner01Fine, HGCalHESiliconCellSensitiveCorner02Fine, + HGCalHESiliconCellSensitiveCorner03Fine, HGCalHESiliconCellSensitiveCorner04Fine, + HGCalHESiliconCellSensitiveCorner05Fine, HGCalHESiliconCellSensitiveCorner06Fine @@ -238,27 +238,27 @@ - + HGCalHECellTrunc01Coarse1, HGCalHECellTrunc02Coarse1, HGCalHECellTrunc03Coarse1 - HGCalHESiliconSensitiveTrunc01Coarse1, HGCalHESiliconSensitiveTrunc02Coarse1, - HGCalHESiliconSensitiveTrunc03Coarse1 + HGCalHESiliconCellSensitiveTrunc01Coarse1, HGCalHESiliconCellSensitiveTrunc02Coarse1, + HGCalHESiliconCellSensitiveTrunc03Coarse1 HGCalHECellExten01Coarse1, HGCalHECellExten02Coarse1, HGCalHECellExten03Coarse1 - HGCalHESiliconSensitiveExten01Coarse1, HGCalHESiliconSensitiveExten02Coarse1, - HGCalHESiliconSensitiveExten03Coarse1 + HGCalHESiliconCellSensitiveExten01Coarse1, HGCalHESiliconCellSensitiveExten02Coarse1, + HGCalHESiliconCellSensitiveExten03Coarse1 HGCalHECellCorner01Coarse1, HGCalHECellCorner02Coarse1, HGCalHECellCorner03Coarse1, HGCalHECellCorner04Coarse1, HGCalHECellCorner05Coarse1, HGCalHECellCorner06Coarse1 - HGCalHESiliconSensitiveCorner01Coarse1, HGCalHESiliconSensitiveCorner02Coarse1, - HGCalHESiliconSensitiveCorner03Coarse1, HGCalHESiliconSensitiveCorner04Coarse1, - HGCalHESiliconSensitiveCorner05Coarse1, HGCalHESiliconSensitiveCorner06Coarse1 + HGCalHESiliconCellSensitiveCorner01Coarse1, HGCalHESiliconCellSensitiveCorner02Coarse1, + HGCalHESiliconCellSensitiveCorner03Coarse1, HGCalHESiliconCellSensitiveCorner04Coarse1, + HGCalHESiliconCellSensitiveCorner05Coarse1, HGCalHESiliconCellSensitiveCorner06Coarse1 @@ -269,27 +269,27 @@ - + HGCalHECellTrunc01Coarse2, HGCalHECellTrunc02Coarse2, HGCalHECellTrunc03Coarse2 - HGCalHESiliconSensitiveTrunc01Coarse2, HGCalHESiliconSensitiveTrunc02Coarse2, - HGCalHESiliconSensitiveTrunc03Coarse2 + HGCalHESiliconCellSensitiveTrunc01Coarse2, HGCalHESiliconCellSensitiveTrunc02Coarse2, + HGCalHESiliconCellSensitiveTrunc03Coarse2 HGCalHECellExten01Coarse2, HGCalHECellExten02Coarse2, HGCalHECellExten03Coarse2 - HGCalHESiliconSensitiveExten01Coarse2, HGCalHESiliconSensitiveExten02Coarse2, - HGCalHESiliconSensitiveExten03Coarse2 + HGCalHESiliconCellSensitiveExten01Coarse2, HGCalHESiliconCellSensitiveExten02Coarse2, + HGCalHESiliconCellSensitiveExten03Coarse2 HGCalHECellCorner01Coarse2, HGCalHECellCorner02Coarse2, HGCalHECellCorner03Coarse2, HGCalHECellCorner04Coarse2, HGCalHECellCorner05Coarse2, HGCalHECellCorner06Coarse2 - HGCalHESiliconSensitiveCorner01Coarse2, HGCalHESiliconSensitiveCorner02Coarse2, - HGCalHESiliconSensitiveCorner03Coarse2, HGCalHESiliconSensitiveCorner04Coarse2, - HGCalHESiliconSensitiveCorner05Coarse2, HGCalHESiliconSensitiveCorner06Coarse2 + HGCalHESiliconCellSensitiveCorner01Coarse2, HGCalHESiliconCellSensitiveCorner02Coarse2, + HGCalHESiliconCellSensitiveCorner03Coarse2, HGCalHESiliconCellSensitiveCorner04Coarse2, + HGCalHESiliconCellSensitiveCorner05Coarse2, HGCalHESiliconCellSensitiveCorner06Coarse2 diff --git a/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml b/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml index 58b1a35ba3c09..6dec8c727c801 100644 --- a/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml +++ b/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml @@ -23,27 +23,27 @@ - + HGCalEECellTrunc01Fine, HGCalEECellTrunc02Fine, HGCalEECellTrunc03Fine - HGCalEESensitiveTrunc01Fine, HGCalEESensitiveTrunc02Fine, - HGCalEESensitiveTrunc03Fine + HGCalEECellSensitiveTrunc01Fine, HGCalEECellSensitiveTrunc02Fine, + HGCalEECellSensitiveTrunc03Fine HGCalEECellExten01Fine, HGCalEECellExten02Fine, HGCalEECellExten03Fine - HGCalEESensitiveExten01Fine, HGCalEESensitiveExten02Fine, - HGCalEESensitiveExten03Fine + HGCalEECellSensitiveExten01Fine, HGCalEECellSensitiveExten02Fine, + HGCalEECellSensitiveExten03Fine HGCalEECellCorner01Fine, HGCalEECellCorner02Fine, HGCalEECellCorner03Fine, HGCalEECellCorner04Fine, HGCalEECellCorner05Fine, HGCalEECellCorner06Fine - HGCalEESensitiveCorner01Fine, HGCalEESensitiveCorner02Fine, - HGCalEESensitiveCorner03Fine, HGCalEESensitiveCorner04Fine, - HGCalEESensitiveCorner05Fine, HGCalEESensitiveCorner06Fine + HGCalEECellSensitiveCorner01Fine, HGCalEECellSensitiveCorner02Fine, + HGCalEECellSensitiveCorner03Fine, HGCalEECellSensitiveCorner04Fine, + HGCalEECellSensitiveCorner05Fine, HGCalEECellSensitiveCorner06Fine @@ -54,27 +54,27 @@ - + HGCalEECellTrunc11Fine, HGCalEECellTrunc12Fine, HGCalEECellTrunc13Fine - HGCalEESensitiveTrunc11Fine, HGCalEESensitiveTrunc12Fine, - HGCalEESensitiveTrunc13Fine + HGCalEECellSensitiveTrunc11Fine, HGCalEECellSensitiveTrunc12Fine, + HGCalEECellSensitiveTrunc13Fine HGCalEECellExten11Fine, HGCalEECellExten12Fine, HGCalEECellExten13Fine - HGCalEESensitiveExten11Fine, HGCalEESensitiveExten12Fine, - HGCalEESensitiveExten13Fine + HGCalEECellSensitiveExten11Fine, HGCalEECellSensitiveExten12Fine, + HGCalEECellSensitiveExten13Fine HGCalEECellCorner11Fine, HGCalEECellCorner12Fine, HGCalEECellCorner13Fine, HGCalEECellCorner14Fine, HGCalEECellCorner15Fine, HGCalEECellCorner16Fine - HGCalEESensitiveCorner11Fine, HGCalEESensitiveCorner12Fine, - HGCalEESensitiveCorner13Fine, HGCalEESensitiveCorner14Fine, - HGCalEESensitiveCorner15Fine, HGCalEESensitiveCorner16Fine + HGCalEECellSensitiveCorner11Fine, HGCalEECellSensitiveCorner12Fine, + HGCalEECellSensitiveCorner13Fine, HGCalEECellSensitiveCorner14Fine, + HGCalEECellSensitiveCorner15Fine, HGCalEECellSensitiveCorner16Fine @@ -85,27 +85,27 @@ - + HGCalEECellTrunc01Coarse1, HGCalEECellTrunc02Coarse1, HGCalEECellTrunc03Coarse1 - HGCalEESensitiveTrunc01Coarse1, HGCalEESensitiveTrunc02Coarse1, - HGCalEESensitiveTrunc03Coarse1 + HGCalEECellSensitiveTrunc01Coarse1, HGCalEECellSensitiveTrunc02Coarse1, + HGCalEECellSensitiveTrunc03Coarse1 HGCalEECellExten01Coarse1, HGCalEECellExten02Coarse1, HGCalEECellExten03Coarse1 - HGCalEESensitiveExten01Coarse1, HGCalEESensitiveExten02Coarse1, - HGCalEESensitiveExten03Coarse1 + HGCalEECellSensitiveExten01Coarse1, HGCalEECellSensitiveExten02Coarse1, + HGCalEECellSensitiveExten03Coarse1 HGCalEECellCorner01Coarse1, HGCalEECellCorner02Coarse1, HGCalEECellCorner03Coarse1, HGCalEECellCorner04Coarse1, HGCalEECellCorner05Coarse1, HGCalEECellCorner06Coarse1 - HGCalEESensitiveCorner01Coarse1, HGCalEESensitiveCorner02Coarse1, - HGCalEESensitiveCorner03Coarse1, HGCalEESensitiveCorner04Coarse1, - HGCalEESensitiveCorner05Coarse1, HGCalEESensitiveCorner06Coarse1 + HGCalEECellSensitiveCorner01Coarse1, HGCalEECellSensitiveCorner02Coarse1, + HGCalEECellSensitiveCorner03Coarse1, HGCalEECellSensitiveCorner04Coarse1, + HGCalEECellSensitiveCorner05Coarse1, HGCalEECellSensitiveCorner06Coarse1 @@ -116,27 +116,27 @@ - + HGCalEECellTrunc11Coarse1, HGCalEECellTrunc12Coarse1, HGCalEECellTrunc13Coarse1 - HGCalEESensitiveTrunc11Coarse1, HGCalEESensitiveTrunc12Coarse1, - HGCalEESensitiveTrunc13Coarse1 + HGCalEECellSensitiveTrunc11Coarse1, HGCalEECellSensitiveTrunc12Coarse1, + HGCalEECellSensitiveTrunc13Coarse1 HGCalEECellExten11Coarse1, HGCalEECellExten12Coarse1, HGCalEECellExten13Coarse1 - HGCalEESensitiveExten11Coarse1, HGCalEESensitiveExten12Coarse1, - HGCalEESensitiveExten13Coarse1 + HGCalEECellSensitiveExten11Coarse1, HGCalEECellSensitiveExten12Coarse1, + HGCalEECellSensitiveExten13Coarse1 HGCalEECellCorner11Coarse1, HGCalEECellCorner12Coarse1, HGCalEECellCorner13Coarse1, HGCalEECellCorner14Coarse1, HGCalEECellCorner15Coarse1, HGCalEECellCorner16Coarse1 - HGCalEESensitiveCorner11Coarse1, HGCalEESensitiveCorner12Coarse1, - HGCalEESensitiveCorner13Coarse1, HGCalEESensitiveCorner14Coarse1, - HGCalEESensitiveCorner15Coarse1, HGCalEESensitiveCorner16Coarse1 + HGCalEECellSensitiveCorner11Coarse1, HGCalEECellSensitiveCorner12Coarse1, + HGCalEECellSensitiveCorner13Coarse1, HGCalEECellSensitiveCorner14Coarse1, + HGCalEECellSensitiveCorner15Coarse1, HGCalEECellSensitiveCorner16Coarse1 @@ -147,27 +147,27 @@ - + HGCalEECellTrunc01Coarse2, HGCalEECellTrunc02Coarse2, HGCalEECellTrunc03Coarse2 - HGCalEESensitiveTrunc01Coarse2, HGCalEESensitiveTrunc02Coarse2, - HGCalEESensitiveTrunc03Coarse2 + HGCalEECellSensitiveTrunc01Coarse2, HGCalEECellSensitiveTrunc02Coarse2, + HGCalEECellSensitiveTrunc03Coarse2 HGCalEECellExten01Coarse2, HGCalEECellExten02Coarse2, HGCalEECellExten03Coarse2 - HGCalEESensitiveExten01Coarse2, HGCalEESensitiveExten02Coarse2, - HGCalEESensitiveExten03Coarse2 + HGCalEECellSensitiveExten01Coarse2, HGCalEECellSensitiveExten02Coarse2, + HGCalEECellSensitiveExten03Coarse2 HGCalEECellCorner01Coarse2, HGCalEECellCorner02Coarse2, HGCalEECellCorner03Coarse2, HGCalEECellCorner04Coarse2, HGCalEECellCorner05Coarse2, HGCalEECellCorner06Coarse2 - HGCalEESensitiveCorner01Coarse2, HGCalEESensitiveCorner02Coarse2, - HGCalEESensitiveCorner03Coarse2, HGCalEESensitiveCorner04Coarse2, - HGCalEESensitiveCorner05Coarse2, HGCalEESensitiveCorner06Coarse2 + HGCalEECellSensitiveCorner01Coarse2, HGCalEECellSensitiveCorner02Coarse2, + HGCalEECellSensitiveCorner03Coarse2, HGCalEECellSensitiveCorner04Coarse2, + HGCalEECellSensitiveCorner05Coarse2, HGCalEECellSensitiveCorner06Coarse2 @@ -178,27 +178,27 @@ - + HGCalEECellTrunc11Coarse2, HGCalEECellTrunc12Coarse2, HGCalEECellTrunc13Coarse2 - HGCalEESensitiveTrunc11Coarse2, HGCalEESensitiveTrunc12Coarse2, - HGCalEESensitiveTrunc13Coarse2 + HGCalEECellSensitiveTrunc11Coarse2, HGCalEECellSensitiveTrunc12Coarse2, + HGCalEECellSensitiveTrunc13Coarse2 HGCalEECellExten11Coarse2, HGCalEECellExten12Coarse2, HGCalEECellExten13Coarse2 - HGCalEESensitiveExten11Coarse2, HGCalEESensitiveExten12Coarse2, - HGCalEESensitiveExten13Coarse2 + HGCalEECellSensitiveExten11Coarse2, HGCalEECellSensitiveExten12Coarse2, + HGCalEECellSensitiveExten13Coarse2 HGCalEECellCorner11Coarse2, HGCalEECellCorner12Coarse2, HGCalEECellCorner13Coarse2, HGCalEECellCorner14Coarse2, HGCalEECellCorner15Coarse2, HGCalEECellCorner16Coarse2 - HGCalEESensitiveCorner11Coarse2, HGCalEESensitiveCorner12Coarse2, - HGCalEESensitiveCorner13Coarse2, HGCalEESensitiveCorner14Coarse2, - HGCalEESensitiveCorner15Coarse2, HGCalEESensitiveCorner16Coarse2 + HGCalEECellSensitiveCorner11Coarse2, HGCalEECellSensitiveCorner12Coarse2, + HGCalEECellSensitiveCorner13Coarse2, HGCalEECellSensitiveCorner14Coarse2, + HGCalEECellSensitiveCorner15Coarse2, HGCalEECellSensitiveCorner16Coarse2 @@ -209,27 +209,27 @@ - + HGCalHECellTrunc01Fine, HGCalHECellTrunc02Fine, HGCalHECellTrunc03Fine - HGCalHESiliconSensitiveTrunc01Fine, HGCalHESiliconSensitiveTrunc02Fine, - HGCalHESiliconSensitiveTrunc03Fine + HGCalHESiliconCellSensitiveTrunc01Fine, HGCalHESiliconCellSensitiveTrunc02Fine, + HGCalHESiliconCellSensitiveTrunc03Fine HGCalHECellExten01Fine, HGCalHECellExten02Fine, HGCalHECellExten03Fine - HGCalHESiliconSensitiveExten01Fine, HGCalHESiliconSensitiveExten02Fine, - HGCalHESiliconSensitiveExten03Fine + HGCalHESiliconCellSensitiveExten01Fine, HGCalHESiliconCellSensitiveExten02Fine, + HGCalHESiliconCellSensitiveExten03Fine HGCalHECellCorner01Fine, HGCalHECellCorner02Fine, HGCalHECellCorner03Fine, HGCalHECellCorner04Fine, HGCalHECellCorner05Fine, HGCalHECellCorner06Fine - HGCalHESiliconSensitiveCorner01Fine, HGCalHESiliconSensitiveCorner02Fine, - HGCalHESiliconSensitiveCorner03Fine, HGCalHESiliconSensitiveCorner04Fine, - HGCalHESiliconSensitiveCorner05Fine, HGCalHESiliconSensitiveCorner06Fine + HGCalHESiliconCellSensitiveCorner01Fine, HGCalHESiliconCellSensitiveCorner02Fine, + HGCalHESiliconCellSensitiveCorner03Fine, HGCalHESiliconCellSensitiveCorner04Fine, + HGCalHESiliconCellSensitiveCorner05Fine, HGCalHESiliconCellSensitiveCorner06Fine @@ -240,27 +240,27 @@ - + HGCalHECellTrunc01Coarse1, HGCalHECellTrunc02Coarse1, HGCalHECellTrunc03Coarse1 - HGCalHESiliconSensitiveTrunc01Coarse1, HGCalHESiliconSensitiveTrunc02Coarse1, - HGCalHESiliconSensitiveTrunc03Coarse1 + HGCalHESiliconCellSensitiveTrunc01Coarse1, HGCalHESiliconCellSensitiveTrunc02Coarse1, + HGCalHESiliconCellSensitiveTrunc03Coarse1 HGCalHECellExten01Coarse1, HGCalHECellExten02Coarse1, HGCalHECellExten03Coarse1 - HGCalHESiliconSensitiveExten01Coarse1, HGCalHESiliconSensitiveExten02Coarse1, - HGCalHESiliconSensitiveExten03Coarse1 + HGCalHESiliconCellSensitiveExten01Coarse1, HGCalHESiliconCellSensitiveExten02Coarse1, + HGCalHESiliconCellSensitiveExten03Coarse1 HGCalHECellCorner01Coarse1, HGCalHECellCorner02Coarse1, HGCalHECellCorner03Coarse1, HGCalHECellCorner04Coarse1, HGCalHECellCorner05Coarse1, HGCalHECellCorner06Coarse1 - HGCalHESiliconSensitiveCorner01Coarse1, HGCalHESiliconSensitiveCorner02Coarse1, - HGCalHESiliconSensitiveCorner03Coarse1, HGCalHESiliconSensitiveCorner04Coarse1, - HGCalHESiliconSensitiveCorner05Coarse1, HGCalHESiliconSensitiveCorner06Coarse1 + HGCalHESiliconCellSensitiveCorner01Coarse1, HGCalHESiliconCellSensitiveCorner02Coarse1, + HGCalHESiliconCellSensitiveCorner03Coarse1, HGCalHESiliconCellSensitiveCorner04Coarse1, + HGCalHESiliconCellSensitiveCorner05Coarse1, HGCalHESiliconCellSensitiveCorner06Coarse1 @@ -271,27 +271,27 @@ - + HGCalHECellTrunc01Coarse2, HGCalHECellTrunc02Coarse2, HGCalHECellTrunc03Coarse2 - HGCalHESiliconSensitiveTrunc01Coarse2, HGCalHESiliconSensitiveTrunc02Coarse2, - HGCalHESiliconSensitiveTrunc03Coarse2 + HGCalHESiliconCellSensitiveTrunc01Coarse2, HGCalHESiliconCellSensitiveTrunc02Coarse2, + HGCalHESiliconCellSensitiveTrunc03Coarse2 HGCalHECellExten01Coarse2, HGCalHECellExten02Coarse2, HGCalHECellExten03Coarse2 - HGCalHESiliconSensitiveExten01Coarse2, HGCalHESiliconSensitiveExten02Coarse2, - HGCalHESiliconSensitiveExten03Coarse2 + HGCalHESiliconCellSensitiveExten01Coarse2, HGCalHESiliconCellSensitiveExten02Coarse2, + HGCalHESiliconCellSensitiveExten03Coarse2 HGCalHECellCorner01Coarse2, HGCalHECellCorner02Coarse2, HGCalHECellCorner03Coarse2, HGCalHECellCorner04Coarse2, HGCalHECellCorner05Coarse2, HGCalHECellCorner06Coarse2 - HGCalHESiliconSensitiveCorner01Coarse2, HGCalHESiliconSensitiveCorner02Coarse2, - HGCalHESiliconSensitiveCorner03Coarse2, HGCalHESiliconSensitiveCorner04Coarse2, - HGCalHESiliconSensitiveCorner05Coarse2, HGCalHESiliconSensitiveCorner06Coarse2 + HGCalHESiliconCellSensitiveCorner01Coarse2, HGCalHESiliconCellSensitiveCorner02Coarse2, + HGCalHESiliconCellSensitiveCorner03Coarse2, HGCalHESiliconCellSensitiveCorner04Coarse2, + HGCalHESiliconCellSensitiveCorner05Coarse2, HGCalHESiliconCellSensitiveCorner06Coarse2 diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcalwafer.xml index 743fc9f173cf3..856173a576b9d 100644 --- a/Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcalwafer.xml +++ b/Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcalwafer.xml @@ -566,7 +566,7 @@ 0, 0, 0, 0, 0, 1, 0 0, 1, 2, 3, 5, 3, 4, 3, 6 - + @@ -603,7 +603,7 @@ 0, 0, 0, 0, 0, 1, 0 0, 1, 2, 3, 5, 3, 4, 3, 6 - + @@ -640,7 +640,7 @@ 0, 0, 0, 0, 0, 1, 0 0, 1, 2, 3, 5, 3, 4, 3, 6 - + diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml index 6d8d7b6d0d640..ee61f492c561a 100644 --- a/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml +++ b/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml @@ -562,7 +562,7 @@ 0, 0, 0, 0, 0, 1, 0 0, 1, 2, 3, 5, 3, 4, 3, 6 - + @@ -598,7 +598,7 @@ 0, 0, 0, 0, 0, 1, 0 0, 1, 2, 3, 5, 3, 4, 3, 6 - + @@ -634,7 +634,7 @@ 0, 0, 0, 0, 0, 1, 0 0, 1, 2, 3, 5, 3, 4, 3, 6 - + diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc index d6b39b1a547ef..cae33e9237633 100644 --- a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc +++ b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc @@ -1226,7 +1226,9 @@ void HGCalDDDConstants::waferFromPosition(const double x, } if ((std::abs(waferU) <= hgpar_->waferUVMax_) && (celltype >= 0)) { cellHex(xx, yy, celltype, cellU, cellV, extend, debug); - wt = ((celltype < 2) ? (hgpar_->cellThickness_[celltype] / hgpar_->waferThick_) : 1.0); + wt = (((celltype < 2) && (mode_ != HGCalGeometryMode::Hexagon8Module)) + ? (hgpar_->cellThickness_[celltype] / hgpar_->waferThick_) + : 1.0); } else { cellU = cellV = 2 * hgpar_->nCellsFine_; wt = 1.0; diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalV16_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalV16_cfg.py index bf818693b51e2..3e462dea17493 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalV16_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalV16_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("DUMP") -process.load("Geometry.HGCalCommonData.testHGCV16XML_cfi") +process.load("Geometry.HGCalCommonData.testHGCalV16XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') if 'MessageLogger' in process.__dict__: diff --git a/Geometry/HGCalGeometry/test/HGCalGeometryRotTest.cc b/Geometry/HGCalGeometry/test/HGCalGeometryRotTest.cc index b1d30be6a6233..5e8ca9a465b36 100644 --- a/Geometry/HGCalGeometry/test/HGCalGeometryRotTest.cc +++ b/Geometry/HGCalGeometry/test/HGCalGeometryRotTest.cc @@ -15,8 +15,11 @@ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/HGCalGeometry/interface/HGCalGeometry.h" +#include "DataFormats/Math/interface/angle_units.h" #include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h" +using namespace angle_units::operators; + class HGCalGeometryRotTest : public edm::one::EDAnalyzer { public: explicit HGCalGeometryRotTest(const edm::ParameterSet&); @@ -77,10 +80,12 @@ void HGCalGeometryRotTest::beginRun(const edm::Run&, const edm::EventSetup& iSet for (auto lay : layers_) { HGCSiliconDetId detId(det, 1, types_[k], lay - layerOff, waferU_[k], waferV_[k], cellU_[k], cellV_[k]); GlobalPoint global = geom->getPosition(DetId(detId)); + double phi2 = global.phi(); auto xy = geom->topology().dddConstants().waferPosition(lay - layerOff, waferU_[k], waferV_[k], true); + double phi1 = std::atan2(xy.second, xy.first); edm::LogVerbatim("HGCalGeom") << "Layer: " << lay << " U " << waferU_[k] << " V " << waferV_[k] << " Position (" - << xy.first << ", " << xy.second << ")"; - edm::LogVerbatim("HGCalGeom") << detId << " Position " << global; + << xy.first << ", " << xy.second << ") phi " << convertRadToDeg(phi1); + edm::LogVerbatim("HGCalGeom") << detId << " Position " << global << " phi " << convertRadToDeg(phi2); } } } diff --git a/Geometry/HGCalSimData/data/hgcsensv15.xml b/Geometry/HGCalSimData/data/hgcsensv15.xml index d6d11ff3f11c1..78d0d06cecd9c 100644 --- a/Geometry/HGCalSimData/data/hgcsensv15.xml +++ b/Geometry/HGCalSimData/data/hgcsensv15.xml @@ -3,12 +3,12 @@ - + - + diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 31d0c848c7f95..4da78c927423c 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_1_0/HLT --type FULL +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/HLT --type FULL -# /dev/CMSSW_12_1_0/HLT/V23 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/HLT/V2 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HLT/V23') + tableName = cms.string('/dev/CMSSW_12_2_0/HLT/V2') ) fragment.transferSystem = cms.PSet( @@ -6759,11 +6759,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -6783,8 +6778,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -33318,7 +33313,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33357,14 +33354,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) fragment.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -34115,7 +34114,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34384,7 +34385,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34653,7 +34656,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34816,7 +34821,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34886,7 +34893,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34956,7 +34965,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35906,7 +35917,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36032,7 +36045,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36114,7 +36129,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36196,7 +36213,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36269,7 +36288,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36342,7 +36363,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36415,7 +36438,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39119,7 +39144,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39283,7 +39310,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39540,7 +39569,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39611,7 +39642,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40403,7 +40436,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40769,7 +40804,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40840,7 +40877,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40895,7 +40934,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41097,7 +41138,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -81085,6 +81128,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +fragment.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) fragment.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -91614,7 +91673,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91646,7 +91707,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91722,7 +91785,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92027,7 +92092,9 @@ fragment.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92060,7 +92127,9 @@ fragment.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92923,7 +92992,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92965,7 +93036,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93007,7 +93080,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93049,7 +93124,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93126,7 +93203,9 @@ fragment.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93192,7 +93271,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93234,7 +93315,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93276,7 +93359,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93318,7 +93403,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -123036,7 +123123,7 @@ fedList = cms.vuint32( 1404 ) ) fragment.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -123046,20 +123133,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) fragment.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -123075,7 +123162,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -123596,7 +123683,9 @@ fragment.HLTAK4PixelOnlyPFCorrectorProducersSequence = cms.Sequence( fragment.hltAK4PixelOnlyPFFastJetCorrector + fragment.hltAK4PixelOnlyPFRelativeCorrector + fragment.hltAK4PixelOnlyPFAbsoluteCorrector + fragment.hltAK4PixelOnlyPFResidualCorrector + fragment.hltAK4PixelOnlyPFCorrector ) fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( fragment.hltFixedGridRhoFastjetPixelOnlyAll + fragment.HLTAK4PixelOnlyPFCorrectorProducersSequence + fragment.hltAK4PixelOnlyPFJetsCorrected + fragment.hltAK4PixelOnlyPFJetsLooseIDCorrected + fragment.hltAK4PixelOnlyPFJetsTightIDCorrected ) fragment.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTAK4PixelOnlyPFJetsReconstructionSequence + fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence ) -fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronIter02 + fragment.hltEgammaEleGsfTrackIso ) +fragment.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence ) +fragment.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTTrackReconstructionForPixelOnlyPFNoMu + fragment.hltPixelTracksZetaClean ) +fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronPixelOnly + fragment.hltEgammaEleGsfTrackIsoPixelOnly ) fragment.HLTRecopixelvertexingForHighMultSequence = cms.Sequence( fragment.hltPixelTracksForHighMultFilter + fragment.hltPixelTracksForHighMultFitter + fragment.hltPixelTracksTrackingRegionsForHighMult + fragment.hltPixelLayerQuadruplets + fragment.hltPixelTracksHitDoubletsForHighMult + fragment.hltPixelTracksHitQuadrupletsForHighMult + fragment.hltPixelTracksForHighMult + fragment.hltPixelVerticesForHighMult ) fragment.HLTDoHIEcalClusWithCleaningSequence = cms.Sequence( fragment.hltIslandBasicClustersHI + fragment.hltHiIslandSuperClustersHI + fragment.hltHiCorrectedIslandBarrelSuperClustersHI + fragment.hltHiCorrectedIslandEndcapSuperClustersHI + fragment.hltCleanedHiCorrectedIslandBarrelSuperClustersHI + fragment.hltRecoHIEcalWithCleaningCandidate ) fragment.HLTPhoton20SequenceLooseHOverE = cms.Sequence( fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEGL1SingleEG10Filter + fragment.hltEG20EtFilterLooseHoverE + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEG20HEFilterLooseHoverE ) diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py index 6da376fae6bc5..6fa2e379b4bf0 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_1_0/Fake1 --type Fake1 +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/Fake1 --type Fake1 -# /dev/CMSSW_12_1_0/Fake1/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/Fake1/V3 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake1/V4') + tableName = cms.string('/dev/CMSSW_12_2_0/Fake1/V3') ) 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 b6cb1c3b2b978..331c3166b185b 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_1_0/Fake2 --type Fake2 +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/Fake2 --type Fake2 -# /dev/CMSSW_12_1_0/Fake2/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/Fake2/V3 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake2/V4') + tableName = cms.string('/dev/CMSSW_12_2_0/Fake2/V3') ) 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 7bc3ab76ae254..127a48040d9ed 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_1_0/Fake --type Fake +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/Fake --type Fake -# /dev/CMSSW_12_1_0/Fake/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/Fake/V3 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake/V4') + tableName = cms.string('/dev/CMSSW_12_2_0/Fake/V3') ) 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 c37e913dcf891..b9323cf161ba4 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_1_0/GRun --type GRun +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/GRun --type GRun -# /dev/CMSSW_12_1_0/GRun/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/GRun/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/GRun/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/GRun/V1') ) fragment.transferSystem = cms.PSet( @@ -5396,11 +5396,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -5420,8 +5415,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -31907,7 +31902,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -31946,14 +31943,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) fragment.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -32704,7 +32703,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -32973,7 +32974,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33242,7 +33245,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33405,7 +33410,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33475,7 +33482,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33545,7 +33554,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34471,7 +34482,9 @@ fragment.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34597,7 +34610,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34679,7 +34694,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34761,7 +34778,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34834,7 +34853,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34907,7 +34928,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34980,7 +35003,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -37684,7 +37709,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -37848,7 +37875,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38105,7 +38134,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38176,7 +38207,9 @@ fragment.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38968,7 +39001,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39334,7 +39369,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39405,7 +39442,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39460,7 +39499,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39662,7 +39703,9 @@ fragment.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -77275,6 +77318,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +fragment.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) fragment.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -81970,7 +82029,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82002,7 +82063,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82078,7 +82141,9 @@ fragment.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82383,7 +82448,9 @@ fragment.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82416,7 +82483,9 @@ fragment.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83264,7 +83333,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83306,7 +83377,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83348,7 +83421,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83390,7 +83465,9 @@ fragment.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83467,7 +83544,9 @@ fragment.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83533,7 +83612,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83575,7 +83656,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83617,7 +83700,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83659,7 +83744,9 @@ fragment.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) fragment.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -88386,7 +88473,7 @@ fedList = cms.vuint32( 1404 ) ) fragment.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -88396,20 +88483,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) fragment.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -88425,7 +88512,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -88893,7 +88980,9 @@ fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( fragment.hltFixedGridRhoFastjetPixelOnlyAll + fragment.HLTAK4PixelOnlyPFCorrectorProducersSequence + fragment.hltAK4PixelOnlyPFJetsCorrected + fragment.hltAK4PixelOnlyPFJetsLooseIDCorrected + fragment.hltAK4PixelOnlyPFJetsTightIDCorrected ) fragment.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTAK4PixelOnlyPFJetsReconstructionSequence + fragment.HLTAK4PixelOnlyPFJetsCorrectionSequence ) fragment.HLTMuIsolationSequence = cms.Sequence( fragment.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuons + fragment.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuons + fragment.HLTTrackReconstructionForIsoL3MuonIter02 + fragment.hltMuonTkRelIsolationCut0p07Map ) -fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronIter02 + fragment.hltEgammaEleGsfTrackIso ) +fragment.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence ) +fragment.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( fragment.HLTPreAK4PFJetsRecoSequence + fragment.HLTTrackReconstructionForPixelOnlyPFNoMu + fragment.hltPixelTracksZetaClean ) +fragment.HLTPixelOnlyPFScoutingSequence = cms.Sequence( fragment.HLTAK4PixelOnlyPFJetsSequence + fragment.hltPixelOnlyPFMETProducer + fragment.HLTMuIsolationSequence + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.HLTPFClusteringForEgamma + fragment.hltEgammaCandidates + fragment.hltEgammaClusterShape + fragment.HLTDoLocalHcalSequence + fragment.HLTFastJetForEgamma + fragment.hltEgammaHoverE + fragment.hltEgammaEcalPFClusterIso + fragment.HLTPFHcalClustering + fragment.hltEgammaHcalPFClusterIso + fragment.HLTElePixelMatchSequence + fragment.HLTGsfElectronSequence + fragment.HLTTrackReconstructionForIsoElectronPixelOnly + fragment.hltEgammaEleGsfTrackIsoPixelOnly ) fragment.HLTPFClusteringEcalMFForMuonsNoVtx = cms.Sequence( fragment.hltRecHitInRegionForMuonsMFnoVtx + fragment.hltRecHitInRegionForMuonsESNoVtx + fragment.hltParticleFlowRecHitECALForMuonsMFNoVtx + fragment.hltParticleFlowRecHitPSForMuonsNoVtx + fragment.hltParticleFlowClusterECALUncorrectedForMuonsMFNoVtx + fragment.hltParticleFlowClusterPSForMuonsNoVtx + fragment.hltParticleFlowClusterECALForMuonsMFNoVtx ) fragment.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( fragment.HLTDoFullUnpackingEgammaEcalMFSequence + fragment.HLTDoLocalHcalSequence + fragment.hltTowerMakerForECALMF + fragment.hltTowerMakerForHCAL + fragment.hltFixedGridRhoFastjetECALMFForMuons + fragment.hltFixedGridRhoFastjetHCAL + fragment.HLTPFClusteringEcalMFForMuonsNoVtx + fragment.hltMuonEcalMFPFClusterIsoForMuonsNoVtx ) fragment.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( fragment.HLTPFHcalClustering + fragment.hltMuonHcalPFClusterIsoForMuonsNoVtx ) diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index b21eef695836d..230ee979d1a74 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_1_0/HIon --type HIon +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/HIon --type HIon -# /dev/CMSSW_12_1_0/HIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/HIon/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HIon/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/HIon/V1') ) fragment.transferSystem = cms.PSet( @@ -4559,11 +4559,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -4583,8 +4578,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 71ac16dfbdaa3..b15caffb7240b 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_1_0/PIon --type PIon +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/PIon --type PIon -# /dev/CMSSW_12_1_0/PIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/PIon/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PIon/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/PIon/V1') ) fragment.transferSystem = cms.PSet( @@ -4030,11 +4030,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -4054,8 +4049,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 11bf0680bceea..fd5c287cb36d9 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_1_0/PRef --type PRef +# hltGetConfiguration --cff --data /dev/CMSSW_12_2_0/PRef --type PRef -# /dev/CMSSW_12_1_0/PRef/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/PRef/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PRef/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/PRef/V1') ) fragment.transferSystem = cms.PSet( @@ -4109,11 +4109,6 @@ fragment.TransientTrackBuilderESProducer = cms.ESProducer( "TransientTrackBuilderESProducer", ComponentName = cms.string( "TransientTrackBuilder" ) ) -fragment.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) fragment.caloDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer", ComponentName = cms.string( "CaloDetIdAssociator" ), etaBinSize = cms.double( 0.087 ), @@ -4133,8 +4128,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -11069,9 +11064,10 @@ SelectQualities = cms.vint32( ) ) fragment.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) fragment.hltPreAlCaLumiPixelsCountsRandom = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py index 7776918bce6e6..f882d959cd3e6 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_12_1_0/GRun +# /dev/CMSSW_12_2_0/GRun import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py index b5e5eb442cd73..a8034a646096d 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_12_1_0/HIon +# /dev/CMSSW_12_2_0/HIon import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py index 6bee3e95ed259..5ebb446fb4419 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_12_1_0/PIon +# /dev/CMSSW_12_2_0/PIon import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py index fd219e6504c17..73578eb660610 100644 --- a/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py @@ -1,4 +1,4 @@ -# /dev/CMSSW_12_1_0/PRef +# /dev/CMSSW_12_2_0/PRef import FWCore.ParameterSet.Config as cms diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 09e123bdbe85a..642a204369443 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -129,6 +129,9 @@ def customisePixelL1ClusterThresholdForRun2Input(process): for producer in producers_by_type(process, "SiPixelClusterProducer"): if hasattr(producer,"ClusterThreshold_L1"): producer.ClusterThreshold_L1 = 2000 + for producer in producers_by_type(process, "SiPixelRawToClusterCUDA"): + if hasattr(producer,"clusterThreshold_layer1"): + producer.clusterThreshold_layer1 = 2000 return process diff --git a/HLTrigger/Configuration/tables/makeSubTables b/HLTrigger/Configuration/tables/makeSubTables index dc101eee33546..dc26ceae0b03e 100755 --- a/HLTrigger/Configuration/tables/makeSubTables +++ b/HLTrigger/Configuration/tables/makeSubTables @@ -3,8 +3,8 @@ # generate HLT tables from master table in ConfDB # -MASTER="/dev/CMSSW_12_1_0/HLT" # no version, take the latest one -TARGET="/dev/CMSSW_12_1_0/TABLE" # directory where to store the sub-tables +MASTER="/dev/CMSSW_12_2_0/HLT" # no version, take the latest one +TARGET="/dev/CMSSW_12_2_0/TABLE" # directory where to store the sub-tables TABLES="GRun HIon PIon PRef" # which sub-tables to create source subtables.sh diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 91677624de40d..bbe8219082362 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_1_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_12_1_0/HLT/V23 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/HLT/V2 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFULL" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HLT/V23') + tableName = cms.string('/dev/CMSSW_12_2_0/HLT/V2') ) process.transferSystem = cms.PSet( @@ -6923,11 +6923,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -6950,8 +6945,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -33575,7 +33570,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33614,14 +33611,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) process.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -34372,7 +34371,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34641,7 +34642,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34910,7 +34913,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35073,7 +35078,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35143,7 +35150,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35213,7 +35222,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36163,7 +36174,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36289,7 +36302,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36371,7 +36386,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36453,7 +36470,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36526,7 +36545,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36599,7 +36620,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -36672,7 +36695,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39376,7 +39401,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39540,7 +39567,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39797,7 +39826,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39868,7 +39899,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -40660,7 +40693,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41026,7 +41061,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41097,7 +41134,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41152,7 +41191,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -41354,7 +41395,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -81342,6 +81385,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +process.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) process.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -91871,7 +91930,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91903,7 +91964,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -91979,7 +92042,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92284,7 +92349,9 @@ process.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -92317,7 +92384,9 @@ process.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93180,7 +93249,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93222,7 +93293,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93264,7 +93337,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93306,7 +93381,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93383,7 +93460,9 @@ process.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93449,7 +93528,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93491,7 +93572,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93533,7 +93616,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -93575,7 +93660,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -124774,7 +124861,7 @@ fedList = cms.vuint32( 1404 ) ) process.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -124784,20 +124871,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) process.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -124813,7 +124900,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -130318,7 +130405,9 @@ process.HLTAK4PixelOnlyPFCorrectorProducersSequence = cms.Sequence( process.hltAK4PixelOnlyPFFastJetCorrector + process.hltAK4PixelOnlyPFRelativeCorrector + process.hltAK4PixelOnlyPFAbsoluteCorrector + process.hltAK4PixelOnlyPFResidualCorrector + process.hltAK4PixelOnlyPFCorrector ) process.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetPixelOnlyAll + process.HLTAK4PixelOnlyPFCorrectorProducersSequence + process.hltAK4PixelOnlyPFJetsCorrected + process.hltAK4PixelOnlyPFJetsLooseIDCorrected + process.hltAK4PixelOnlyPFJetsTightIDCorrected ) process.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PixelOnlyPFJetsReconstructionSequence + process.HLTAK4PixelOnlyPFJetsCorrectionSequence ) -process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso ) +process.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence ) +process.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTTrackReconstructionForPixelOnlyPFNoMu + process.hltPixelTracksZetaClean ) +process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronPixelOnly + process.hltEgammaEleGsfTrackIsoPixelOnly ) process.HLTRecopixelvertexingForHighMultSequence = cms.Sequence( process.hltPixelTracksForHighMultFilter + process.hltPixelTracksForHighMultFitter + process.hltPixelTracksTrackingRegionsForHighMult + process.hltPixelLayerQuadruplets + process.hltPixelTracksHitDoubletsForHighMult + process.hltPixelTracksHitQuadrupletsForHighMult + process.hltPixelTracksForHighMult + process.hltPixelVerticesForHighMult ) process.HLTDoHIEcalClusWithCleaningSequence = cms.Sequence( process.hltIslandBasicClustersHI + process.hltHiIslandSuperClustersHI + process.hltHiCorrectedIslandBarrelSuperClustersHI + process.hltHiCorrectedIslandEndcapSuperClustersHI + process.hltCleanedHiCorrectedIslandBarrelSuperClustersHI + process.hltRecoHIEcalWithCleaningCandidate ) process.HLTPhoton20SequenceLooseHOverE = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1SingleEG10Filter + process.hltEG20EtFilterLooseHoverE + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEG20HEFilterLooseHoverE ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index cc9717422c4e7..740d1fdcd3c2e 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_1_0/Fake --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/Fake --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root -# /dev/CMSSW_12_1_0/Fake/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/Fake/V3 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake/V4') + tableName = cms.string('/dev/CMSSW_12_2_0/Fake/V3') ) 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 518d4f3c76642..21283cc3f4203 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_1_0/Fake1 --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/Fake1 --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root -# /dev/CMSSW_12_1_0/Fake1/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/Fake1/V3 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake1" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake1/V4') + tableName = cms.string('/dev/CMSSW_12_2_0/Fake1/V3') ) 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 c394be6ebba57..c089cbeea90e2 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_1_0/Fake2 --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/Fake2 --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root -# /dev/CMSSW_12_1_0/Fake2/V4 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/Fake2/V3 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake2" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/Fake2/V4') + tableName = cms.string('/dev/CMSSW_12_2_0/Fake2/V3') ) 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 2a43f131d5f6a..af740b6510c96 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_1_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_12_1_0/GRun/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/GRun/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTGRun" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/GRun/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/GRun/V1') ) process.transferSystem = cms.PSet( @@ -5560,11 +5560,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -5587,8 +5582,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -32164,7 +32159,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -32203,14 +32200,16 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ) ) process.hltStripTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "sistrip" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "sistrip" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltHpsTauPFJetsRecoTauChargedHadronsWithNeutrals = cms.EDProducer( "PFRecoTauChargedHadronProducer", ranking = cms.VPSet( @@ -32961,7 +32960,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33230,7 +33231,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33499,7 +33502,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33662,7 +33667,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30LooseChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33732,7 +33739,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30MediumChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -33802,7 +33811,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORLooseIsoEGXXerIsoTauYYerdRMin0p3" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotons" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TightChargedIsolationTightOOSCPhotonsL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34728,7 +34739,9 @@ process.hltL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34854,7 +34867,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -34936,7 +34951,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35018,7 +35035,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35091,7 +35110,9 @@ process.hltHpsL1JetsHLTPFTauTrackLooseChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingLooseChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27LooseChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35164,7 +35185,9 @@ process.hltHpsL1JetsHLTPFTauTrackMediumChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingMediumChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27MediumChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -35237,7 +35260,9 @@ process.hltHpsL1JetsHLTPFTauTrackTightChargedIsolationTightOOSCPhotonsAgainstMuonMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackFindingTightChargedIsolationTightOOSCPhotonsAgainstMuon" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau27TightChargedIsolationTightOOSCPhotonsAgainstMuonL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -37941,7 +37966,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38105,7 +38132,9 @@ process.hltL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38362,7 +38391,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -38433,7 +38464,9 @@ process.hltL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39225,7 +39258,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39591,7 +39626,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39662,7 +39699,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39717,7 +39756,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -39919,7 +39960,9 @@ process.hltHpsL1JetsHLTPFTauTrackPt1MediumChargedIsolationMatchForMu22Tau28Reg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau28er" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsSelectedPFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -77532,6 +77575,22 @@ applyWeight = cms.bool( False ), srcWeights = cms.InputTag( "" ) ) +process.hltEgammaEleGsfTrackIsoPixelOnly = cms.EDProducer( "EgammaHLTElectronTrackIsolationProducers", + electronProducer = cms.InputTag( "hltEgammaGsfElectrons" ), + trackProducer = cms.InputTag( "hltPixelTracksZetaClean" ), + recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ), + beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ), + egTrkIsoPtMin = cms.double( 1.0 ), + egTrkIsoConeSize = cms.double( 0.2 ), + egTrkIsoZSpan = cms.double( 0.15 ), + egTrkIsoRSpan = cms.double( 999999.0 ), + egTrkIsoVetoConeSizeBarrel = cms.double( 0.03 ), + egTrkIsoVetoConeSizeEndcap = cms.double( 0.03 ), + egTrkIsoStripBarrel = cms.double( 0.01 ), + egTrkIsoStripEndcap = cms.double( 0.01 ), + useGsfTrack = cms.bool( True ), + useSCRefs = cms.bool( True ) +) process.hltDisplacedmumuVtxNoMatchingProducer = cms.EDProducer( "HLTDisplacedmumuVtxProducer", Src = cms.InputTag( "hltIterL3MuonCandidatesNoVtx" ), PreviousCandTag = cms.InputTag( "hltDoubleMu3L3FilteredNoVtx" ), @@ -82227,7 +82286,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchMu22IsoTau40 = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sMu22erIsoTau40er" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedMu22IsoTau40 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82259,7 +82320,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sIsoTau40erETMHF90To120" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82335,7 +82398,9 @@ process.hltL1JetsHLTPFTau50Track30MediumChargedIsolationMatchQuadJetIsoTau = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sQuadJet36IsoTau52" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt30MediumAbsOrRelIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau50MediumChargedIsolationL1HLTMatchedQuadIsoTau = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82640,7 +82705,9 @@ process.hltL1JetsHLTPFTauTrackMediumChargedIsolationMatch1Prong = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation1Prong" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched1Prong = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -82673,7 +82740,9 @@ process.hltL1JetsHLTSinglePFTauTrackMediumChargedIsolationMatch = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sSingleTau" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt50AbsOrRelMediumHighPtRelaxedIsoIsolation" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltSelectedPFTau180MediumChargedIsolationL1HLTMatched = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83521,7 +83590,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83563,7 +83634,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83605,7 +83678,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83647,7 +83722,9 @@ process.hltL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83724,7 +83801,9 @@ process.hltHpsL1JetsHLTDoublePFTau30TrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauMaxMass" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau30TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83790,7 +83869,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83832,7 +83913,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83874,7 +83957,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1MediumChargedIsolationMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1MediumChargedIsolationReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1MediumChargedIsolationL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -83916,7 +84001,9 @@ process.hltHpsL1JetsHLTDoublePFTauTrackPt1TightChargedIsolationAndTightOOSCPhotonsMatchReg = cms.EDProducer( "L1THLTTauMatching", L1TauTrigger = cms.InputTag( "hltL1sDoubleTauBigOR" ), JetSrc = cms.InputTag( "hltHpsSelectedPFTausTrackPt1TightChargedIsolationAndTightOOSCPhotonsReg" ), - EtMin = cms.double( 0.0 ) + EtMin = cms.double( 0.0 ), + ReduceTauContent = cms.bool( True ), + KeepOriginalVertex = cms.bool( False ) ) process.hltHpsDoublePFTau35TrackPt1TightChargedIsolationAndTightOOSCPhotonsL1HLTMatchedReg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -89398,7 +89485,7 @@ fedList = cms.vuint32( 1404 ) ) process.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", - pfJetCollection = cms.InputTag( "hltAK4PixelOnlyPFJets" ), + pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), pfJetTagCollection = cms.InputTag( 'hltCombinedSecondaryVertexBJetTagsPF','','@currentProcess' ), pfCandidateCollection = cms.InputTag( 'hltPixelOnlyParticleFlow','','@currentProcess' ), vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), @@ -89408,20 +89495,20 @@ pfJetEtaCut = cms.double( 3.0 ), pfCandidatePtCut = cms.double( 0.6 ), pfCandidateEtaCut = cms.double( 3.0 ), - mantissaPrecision = cms.int32( 23 ), + mantissaPrecision = cms.int32( 10 ), doJetTags = cms.bool( True ), doCandidates = cms.bool( True ), doMet = cms.bool( True ) ) process.hltScoutingMuonPacker = cms.EDProducer( "HLTScoutingMuonProducer", - ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesScoutingNoVtx','','@currentProcess' ), + ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ), displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxNoMatchingProducer','','@currentProcess' ), - InputMuons = cms.InputTag( "hltIterL3MuonsScoutingNoVtx" ), - InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksScoutingNoVtx','','@currentProcess' ), - Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedScoutingNoVtx" ), - EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsScoutingNoVtx','','@currentProcess' ), - TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapScoutingNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), + InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ), + InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ), + Tracks = cms.InputTag( "hltIterL3MuonAndMuonFromL1MergedNoVtx" ), + EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalMFPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuonsNoVtx','','@currentProcess' ), + TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ), muonPtCut = cms.double( 0.0 ), muonEtaCut = cms.double( 2.4 ), minVtxProbCut = cms.double( 0.001 ) @@ -89437,7 +89524,7 @@ MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ), OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ), EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ), - EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ), + EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIsoPixelOnly','','@currentProcess' ), HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ), egammaPtCut = cms.double( 2.0 ), egammaEtaCut = cms.double( 2.5 ), @@ -91853,7 +91940,9 @@ process.HLTAK4PixelOnlyPFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetPixelOnlyAll + process.HLTAK4PixelOnlyPFCorrectorProducersSequence + process.hltAK4PixelOnlyPFJetsCorrected + process.hltAK4PixelOnlyPFJetsLooseIDCorrected + process.hltAK4PixelOnlyPFJetsTightIDCorrected ) process.HLTAK4PixelOnlyPFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PixelOnlyPFJetsReconstructionSequence + process.HLTAK4PixelOnlyPFJetsCorrectionSequence ) process.HLTMuIsolationSequence = cms.Sequence( process.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuons + process.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuons + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltMuonTkRelIsolationCut0p07Map ) -process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso ) +process.HLTTrackReconstructionForPixelOnlyPFNoMu = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence ) +process.HLTTrackReconstructionForIsoElectronPixelOnly = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTTrackReconstructionForPixelOnlyPFNoMu + process.hltPixelTracksZetaClean ) +process.HLTPixelOnlyPFScoutingSequence = cms.Sequence( process.HLTAK4PixelOnlyPFJetsSequence + process.hltPixelOnlyPFMETProducer + process.HLTMuIsolationSequence + process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEgammaClusterShape + process.HLTDoLocalHcalSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEgammaEcalPFClusterIso + process.HLTPFHcalClustering + process.hltEgammaHcalPFClusterIso + process.HLTElePixelMatchSequence + process.HLTGsfElectronSequence + process.HLTTrackReconstructionForIsoElectronPixelOnly + process.hltEgammaEleGsfTrackIsoPixelOnly ) process.HLTPFClusteringEcalMFForMuonsNoVtx = cms.Sequence( process.hltRecHitInRegionForMuonsMFnoVtx + process.hltRecHitInRegionForMuonsESNoVtx + process.hltParticleFlowRecHitECALForMuonsMFNoVtx + process.hltParticleFlowRecHitPSForMuonsNoVtx + process.hltParticleFlowClusterECALUncorrectedForMuonsMFNoVtx + process.hltParticleFlowClusterPSForMuonsNoVtx + process.hltParticleFlowClusterECALForMuonsMFNoVtx ) process.HLTL3muonEcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalMFSequence + process.HLTDoLocalHcalSequence + process.hltTowerMakerForECALMF + process.hltTowerMakerForHCAL + process.hltFixedGridRhoFastjetECALMFForMuons + process.hltFixedGridRhoFastjetHCAL + process.HLTPFClusteringEcalMFForMuonsNoVtx + process.hltMuonEcalMFPFClusterIsoForMuonsNoVtx ) process.HLTL3muonHcalPFisorecoSequenceNoBoolsForMuonsNoVtx = cms.Sequence( process.HLTPFHcalClustering + process.hltMuonHcalPFClusterIsoForMuonsNoVtx ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index 820395d30c370..c8900c6a4240a 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_1_0/HIon --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/HIon --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_12_1_0/HIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/HIon/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTHIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/HIon/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/HIon/V1') ) process.transferSystem = cms.PSet( @@ -4723,11 +4723,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -4750,8 +4745,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index fff98dfde3a4e..8b02e2ee46c08 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_1_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_12_1_0/PIon/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/PIon/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PIon/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/PIon/V1') ) process.transferSystem = cms.PSet( @@ -4194,11 +4194,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -4221,8 +4216,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index 8bf6784d45186..dc3fc10336ef6 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_1_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root +# hltGetConfiguration --full --data /dev/CMSSW_12_2_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_12_1_0/PRef/V10 (CMSSW_12_1_0_pre4) +# /dev/CMSSW_12_2_0/PRef/V1 (CMSSW_12_2_0_pre1) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPRef" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_1_0/PRef/V10') + tableName = cms.string('/dev/CMSSW_12_2_0/PRef/V1') ) process.transferSystem = cms.PSet( @@ -4273,11 +4273,6 @@ debugBuilder = cms.untracked.bool( False ), valueOverride = cms.int32( -1 ) ) -process.XMLIdealGeometryESSource_CTPPS = cms.ESProducer( "XMLIdealGeometryESProducer", - rootDDName = cms.string( "cms:CMSE" ), - label = cms.string( "CTPPS" ), - appendToDataLabel = cms.string( "XMLIdealGeometryESSource_CTPPS" ) -) process.ZdcGeometryFromDBEP = cms.ESProducer( "ZdcGeometryFromDBEP", applyAlignment = cms.bool( False ) ) @@ -4300,8 +4295,8 @@ buildMisalignedGeometry = cms.bool( False ), isRun2 = cms.bool( False ), dbTag = cms.string( "" ), - compactViewTag = cms.string( "XMLIdealGeometryESSource_CTPPS" ), - fromPreprocessedDB = cms.untracked.bool( False ), + compactViewTag = cms.string( "" ), + fromPreprocessedDB = cms.untracked.bool( True ), fromDD4hep = cms.untracked.bool( False ), appendToDataLabel = cms.string( "" ) ) @@ -11326,9 +11321,10 @@ SelectQualities = cms.vint32( ) ) process.hltPixelTrackerHVOn = cms.EDFilter( "DetectorStateFilter", - DetectorType = cms.untracked.string( "pixel" ), DebugOn = cms.untracked.bool( False ), - DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ) + DetectorType = cms.untracked.string( "pixel" ), + DcsStatusLabel = cms.untracked.InputTag( "hltScalersRawToDigi" ), + DCSRecordLabel = cms.untracked.InputTag( "onlineMetaDataDigis" ) ) process.hltPreAlCaLumiPixelsCountsRandom = cms.EDFilter( "HLTPrescaler", offset = cms.uint32( 0 ), diff --git a/HLTrigger/Configuration/test/getFrozenHLT.sh b/HLTrigger/Configuration/test/getFrozenHLT.sh index ae051b4a15328..f3f28b930b09a 100755 --- a/HLTrigger/Configuration/test/getFrozenHLT.sh +++ b/HLTrigger/Configuration/test/getFrozenHLT.sh @@ -2,9 +2,9 @@ # ConfDB configurations to use TABLES="Fake Fake1 Fake2" -HLT_Fake="/dev/CMSSW_12_1_0/Fake" -HLT_Fake1="/dev/CMSSW_12_1_0/Fake1" -HLT_Fake2="/dev/CMSSW_12_1_0/Fake2" +HLT_Fake="/dev/CMSSW_12_2_0/Fake" +HLT_Fake1="/dev/CMSSW_12_2_0/Fake1" +HLT_Fake2="/dev/CMSSW_12_2_0/Fake2" # print extra messages ? VERBOSE=false diff --git a/HLTrigger/Configuration/test/getHLT.sh b/HLTrigger/Configuration/test/getHLT.sh index 5e7e8e4f6c2b4..fcb575e162092 100755 --- a/HLTrigger/Configuration/test/getHLT.sh +++ b/HLTrigger/Configuration/test/getHLT.sh @@ -1,8 +1,8 @@ #! /bin/bash # ConfDB configurations to use -MASTER="/dev/CMSSW_12_1_0/HLT" # no explicit version, take the most recent -TARGET="/dev/CMSSW_12_1_0/\$TABLE" # no explicit version, take the most recent +MASTER="/dev/CMSSW_12_2_0/HLT" # no explicit version, take the most recent +TARGET="/dev/CMSSW_12_2_0/\$TABLE" # no explicit version, take the most recent TABLES="GRun HIon PIon PRef" # $TABLE in the above variable will be expanded to these TABLES diff --git a/HLTrigger/JetMET/plugins/HLTScoutingPFProducer.cc b/HLTrigger/JetMET/plugins/HLTScoutingPFProducer.cc index 51575ae169b54..874122026fe2d 100644 --- a/HLTrigger/JetMET/plugins/HLTScoutingPFProducer.cc +++ b/HLTrigger/JetMET/plugins/HLTScoutingPFProducer.cc @@ -196,6 +196,10 @@ void HLTScoutingPFProducer::produce(edm::StreamID sid, edm::Event &iEvent, edm:: std::vector candIndices; if (doCandidates) { for (auto &cand : jet.getPFConstituents()) { + if (not(cand.isNonnull() and cand.isAvailable())) { + throw cms::Exception("HLTScoutingPFProducer") + << "invalid reference to reco::PFCandidate from reco::PFJet::getPFConstituents()"; + } if (cand->pt() > pfCandidatePtCut && std::abs(cand->eta()) < pfCandidateEtaCut) { //search for the candidate in the collection float minDR2 = 0.0001; diff --git a/RecoHI/HiJetAlgos/plugins/HiPuRhoProducer.cc b/RecoHI/HiJetAlgos/plugins/HiPuRhoProducer.cc index b6d2e3fccec71..190bc65570a94 100644 --- a/RecoHI/HiJetAlgos/plugins/HiPuRhoProducer.cc +++ b/RecoHI/HiJetAlgos/plugins/HiPuRhoProducer.cc @@ -85,7 +85,7 @@ class HiPuRhoProducer : public edm::stream::EDProducer<> { // This checks if the tower is anomalous (if a calo tower). virtual void inputTowers(); - bool postOrphan_; + bool postOrphan_ = false; bool setInitialValue_; const bool dropZeroTowers_; diff --git a/SimG4CMS/Calo/plugins/HGCalSensitiveDetectorBuilder.cc b/SimG4CMS/Calo/plugins/HGCalSensitiveDetectorBuilder.cc index ea1e0547d7be2..a9d7e33e332af 100644 --- a/SimG4CMS/Calo/plugins/HGCalSensitiveDetectorBuilder.cc +++ b/SimG4CMS/Calo/plugins/HGCalSensitiveDetectorBuilder.cc @@ -19,6 +19,8 @@ #include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +//#define EDM_ML_DEBUG + class HGCalSensitiveDetectorBuilder : public SensitiveDetectorMakerBase { public: explicit HGCalSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) @@ -49,6 +51,13 @@ class HGCalSensitiveDetectorBuilder : public SensitiveDetectorMakerBase { : nullptr)); auto sd = std::make_unique(iname, hgc, clg, p, man); SimActivityRegistryEnroller::enroll(reg, sd.get()); +#ifdef EDM_ML_DEBUG + const auto& dets = clg.logicalNames(iname); + edm::LogVerbatim("HGCSim") << "HGCalSensitiveDetectorBuilder for " << iname << " utilizes " << dets.size() + << " detectors"; + for (unsigned int k = 0; k < dets.size(); ++k) + edm::LogVerbatim("HGCSim") << "Detector [" << k << "] " << dets[k]; +#endif return sd; } diff --git a/SimG4CMS/Calo/src/HGCalNumberingScheme.cc b/SimG4CMS/Calo/src/HGCalNumberingScheme.cc index 467173775eb78..05e68ae924c05 100644 --- a/SimG4CMS/Calo/src/HGCalNumberingScheme.cc +++ b/SimG4CMS/Calo/src/HGCalNumberingScheme.cc @@ -68,7 +68,7 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz index = HGCSiliconDetId(det_, iz, waferType, layer, waferU, waferV, cellU, cellV).rawId(); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCSim") << "OK WaferType " << waferType << " Wafer " << waferU << ":" << waferV << " Cell " - << cellU << ":" << cellV; + << cellU << ":" << cellV << " input " << cell << " wt " << wt << " Mode " << mode_; } else { edm::LogVerbatim("HGCSim") << "Bad WaferType " << waferType << " for Layer:u:v " << layer << ":" << waferU << ":" << waferV; @@ -96,11 +96,12 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz } } #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme::i/p " << det_ << ":" << layer << ":" << module << ":" << cell - << ":" << iz << ":" << pos.x() << ":" << pos.y() << ":" << pos.z() << " ID " << std::hex - << index << std::dec << " wt " << wt; - bool matchOnly = (mode_ == HGCalGeometryMode::Hexagon8Module) ? true : false; - bool debug = (mode_ == HGCalGeometryMode::Hexagon8Module) ? true : false; + bool matchOnly = (mode_ == HGCalGeometryMode::Hexagon8Module); + bool debug = (mode_ == HGCalGeometryMode::Hexagon8Module); + if (debug) + edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme::i/p " << det_ << ":" << layer << ":" << module << ":" << cell + << ":" << iz << ":" << pos.x() << ":" << pos.y() << ":" << pos.z() << " ID " << std::hex + << index << std::dec << " wt " << wt; checkPosition(index, pos, matchOnly, debug); #endif return index; @@ -109,7 +110,7 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz void HGCalNumberingScheme::checkPosition(uint32_t index, const G4ThreeVector& pos, bool matchOnly, bool debug) const { std::pair xy; bool ok(false); - double z1(0), tolR(12.0), tolZ(1.0); + double z1(0), tolR(14.0), tolZ(1.0); int lay(-1); if (index == 0) { } else if (DetId(index).det() == DetId::HGCalHSi) { @@ -118,7 +119,7 @@ void HGCalNumberingScheme::checkPosition(uint32_t index, const G4ThreeVector& po xy = hgcons_.locateCell(lay, id.waferU(), id.waferV(), id.cellU(), id.cellV(), false, true); z1 = hgcons_.waferZ(lay, false); ok = true; - tolR = 12.0; + tolR = 14.0; tolZ = 1.0; } else if (DetId(index).det() == DetId::HGCalHSc) { HGCScintillatorDetId id = HGCScintillatorDetId(index); @@ -151,13 +152,18 @@ void HGCalNumberingScheme::checkPosition(uint32_t index, const G4ThreeVector& po << outok << " " << ck; edm::LogVerbatim("HGCSim") << "Original " << pos.x() << ":" << pos.y() << " return " << xy.first << ":" << xy.second; - if (DetId(index).det() == DetId::HGCalHSi) { + if ((DetId(index).det() == DetId::HGCalEE) || (DetId(index).det() == DetId::HGCalHSi)) { double wt = 0, xx = ((pos.z() > 0) ? pos.x() : -pos.x()); int waferU, waferV, cellU, cellV, waferType; hgcons_.waferFromPosition(xx, pos.y(), lay, waferU, waferV, cellU, cellV, waferType, wt, false, true); xy = hgcons_.locateCell(lay, waferU, waferV, cellU, cellV, false, true, true); - edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme " << HGCSiliconDetId(index) << " position " << xy.first - << ":" << xy.second; + double dx = (xx - xy.first); + double dy = (pos.y() - xy.second); + double dR = std::sqrt(dx * dx + dy * dy); + ck = (dR > tolR) ? " ***** ERROR *****" : ""; + edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme " << HGCSiliconDetId(index) << " original position " << xx + << ":" << pos.y() << " derived " << xy.first << ":" << xy.second << " Difference " + << dR << ck; } } } diff --git a/SimG4CMS/Calo/src/HGCalSD.cc b/SimG4CMS/Calo/src/HGCalSD.cc index 2ab8c17b921d1..b77ab48043fd1 100644 --- a/SimG4CMS/Calo/src/HGCalSD.cc +++ b/SimG4CMS/Calo/src/HGCalSD.cc @@ -141,9 +141,15 @@ uint32_t HGCalSD::setDetUnitId(const G4Step* aStep) { module = touch->GetReplicaNumber(3); cell = touch->GetReplicaNumber(1); } else { - layer = touch->GetReplicaNumber(2); - module = touch->GetReplicaNumber(1); + layer = touch->GetReplicaNumber(3); + module = touch->GetReplicaNumber(2); } +#ifdef EDM_ML_DEBUG + edm::LogVerbatim("HGCSim") << "DepthsTop: " << touch->GetHistoryDepth() << ":" << levelT1_ << ":" << levelT2_ + << " name " << touch->GetVolume(0)->GetName() << " layer:module:cell " << layer << ":" + << module << ":" << cell; + printDetectorLevels(touch); +#endif } else if ((touch->GetHistoryDepth() == levelT1_) || (touch->GetHistoryDepth() == levelT2_)) { layer = touch->GetReplicaNumber(0); #ifdef EDM_ML_DEBUG diff --git a/SimG4CMS/Calo/test/python/runHGC5_cfg.py b/SimG4CMS/Calo/test/python/runHGC5_cfg.py index 1e886b8ea6d8e..780612ecf69cf 100644 --- a/SimG4CMS/Calo/test/python/runHGC5_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC5_cfg.py @@ -5,7 +5,7 @@ process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D84Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') @@ -28,7 +28,7 @@ process.Timing = cms.Service("Timing") process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(10) + input = cms.untracked.int32(100) ) process.source = cms.Source("EmptySource", @@ -39,8 +39,8 @@ process.generator = cms.EDProducer("FlatRandomEGunProducer", PGunParameters = cms.PSet( PartID = cms.vint32(211), - MinEta = cms.double(1.75), - MaxEta = cms.double(2.50), + MinEta = cms.double(1.52), + MaxEta = cms.double(3.00), MinPhi = cms.double(-3.1415926), MaxPhi = cms.double(3.1415926), MinE = cms.double(100.00), diff --git a/SimG4CMS/Calo/test/python/runHGC6_cfg.py b/SimG4CMS/Calo/test/python/runHGC6_cfg.py index d03b80d055ce0..6f910e2c685ab 100644 --- a/SimG4CMS/Calo/test/python/runHGC6_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC6_cfg.py @@ -28,7 +28,7 @@ process.Timing = cms.Service("Timing") process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(10) + input = cms.untracked.int32(100) ) process.source = cms.Source("EmptySource", @@ -39,8 +39,8 @@ process.generator = cms.EDProducer("FlatRandomEGunProducer", PGunParameters = cms.PSet( PartID = cms.vint32(13), - MinEta = cms.double(1.75), - MaxEta = cms.double(2.50), + MinEta = cms.double(1.52), + MaxEta = cms.double(3.00), MinPhi = cms.double(-3.1415926), MaxPhi = cms.double(3.1415926), MinE = cms.double(100.00), diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026_cfg.py index e543c1dce58e0..9d800933b6750 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026_cfg.py @@ -3,8 +3,8 @@ from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 process = cms.Process('SIM',Phase2C11) -#process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +#process.load('Configuration.Geometry.GeometryExtended2026D77_cff') +process.load('Configuration.Geometry.GeometryExtended2026D86_cff') process.load('FWCore.MessageService.MessageLogger_cfi') @@ -18,9 +18,9 @@ process.g4SimHits.CheckGeometry = True # Geant4 geometry check -process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("cms2026D83") +process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("cms2026D86") process.g4SimHits.G4CheckOverlap.OverlapFlag = cms.bool(True) -process.g4SimHits.G4CheckOverlap.Tolerance = cms.double(0.1) +process.g4SimHits.G4CheckOverlap.Tolerance = cms.double(0.01) process.g4SimHits.G4CheckOverlap.Resolution = cms.int32(10000) process.g4SimHits.G4CheckOverlap.Depth = cms.int32(-1) # tells if NodeName is G4Region or G4PhysicalVolume diff --git a/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py b/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py index 6098af81665b0..9ed91097befdd 100644 --- a/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py @@ -1,29 +1,76 @@ +############################################################################### +# Way to use this: +# cmsRun protoHGCGeomCheck_cfg.py geometry=D77 +# +# Options for geometry D49, D68, D77, D83, D84, D86 +# +############################################################################### import FWCore.ParameterSet.Config as cms +import os, sys, imp, re +import FWCore.ParameterSet.VarParsing as VarParsing -#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 -#process = cms.Process('HGCGeomAnalysis',Phase2C9) -#process.load('Configuration.Geometry.GeometryExtended2026D49_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +#################################################################### +### SETUP OPTIONS +options = VarParsing.VarParsing('standard') +options.register('geometry', + "D86", + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "geometry of operations: D49, D68, D84, D77, D83, D86") -#from Configuration.Eras.Era_Phase2C12_cff import Phase2C11 -#process = cms.Process('HGCGeomAnalysis',Phase2C11) -#process.load('Configuration.Geometry.GeometryExtended2026D68_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D68Reco_cff') +### get and parse the command line arguments +options.parseArguments() -#from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 -#process = cms.Process('HGCGeomAnalysis',Phase2C11) -#process.load('Configuration.Geometry.GeometryExtended2026D70_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D70Reco_cff') +print(options) -#from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 -#process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9) -#process.load('Configuration.Geometry.GeometryExtended2026D77_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') +#################################################################### +# Use the options -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 -process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9) -process.load('Configuration.Geometry.GeometryExtended2026D83_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +if (options.geometry == "D49"): + from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 + process = cms.Process('PROD',Phase2C9) + process.load('Configuration.Geometry.GeometryExtended2026D49_cff') + process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') + inFile = 'file:testHGCalSimWatcherV11.root' + outFile = 'hgcGeomCheckD49.root' +elif (options.geometry == "D68"): + from Configuration.Eras.Era_Phase2C12_cff import Phase2C12 + process = cms.Process('PROD',Phase2C12) + process.load('Configuration.Geometry.GeometryExtended2026D68_cff') + process.load('Configuration.Geometry.GeometryExtended2026D68Reco_cff') + inFile = 'file:testHGCalSimWatcherV12.root' + outFile = 'hgcGeomCheckD68.root' +elif (options.geometry == "D83"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D83_cff') + process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') + inFile = 'file:testHGCalSimWatcherV15.root' + outFile = 'hgcGeomCheckD83.root' +elif (options.geometry == "D84"): + from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 + process = cms.Process('PROD',Phase2C11) + process.load('Configuration.Geometry.GeometryExtended2026D84_cff') + process.load('Configuration.Geometry.GeometryExtended2026D84Reco_cff') + inFile = 'file:testHGCalSimWatcherV13.root' + outFile = 'hgcGeomCheckD84.root' +elif (options.geometry == "D86"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D86_cff') + process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') + inFile = 'file:testHGCalSimWatcherV16.root' + outFile = 'hgcGeomCheckD86.root' +else: + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D77_cff') + process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') + inFile = 'file:testHGCalSimWatcherV14.root' + outFile = 'hgcGeomCheckD77.root' + +print("Input file: ", inFile) +print("Output file: ", outFile) process.load('Configuration.StandardSequences.Services_cff') process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') @@ -41,17 +88,15 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 100 process.source = cms.Source("PoolSource", - fileNames = cms.untracked.vstring( - 'file:testHGCalSimWatcherV15.root', - ) - ) + fileNames = cms.untracked.vstring(inFile) +) process.load('Validation.HGCalValidation.hgcGeomCheck_cff') process.TFileService = cms.Service("TFileService", - fileName = cms.string('hgcGeomCheckD83.root'), - closeFileFast = cms.untracked.bool(True) - ) + fileName = cms.string(outFile), + closeFileFast = cms.untracked.bool(True) +) SimpleMemoryCheck = cms.Service("SimpleMemoryCheck",ignoreTotal = cms.untracked.int32(1) ) diff --git a/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py index 78ce0d1f58365..a6bcd0a923e12 100644 --- a/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py @@ -1,11 +1,51 @@ +############################################################################### +# Way to use this: +# cmsRun runHGCalDigiStudy_cfg.py geometry=D86 +# +# Options for geometry D77, D83, D86 +# +############################################################################### import FWCore.ParameterSet.Config as cms +import os, sys, imp, re +import FWCore.ParameterSet.VarParsing as VarParsing -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 -process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9) -#process.load('Configuration.Geometry.GeometryExtended2026D77_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +#################################################################### +### SETUP OPTIONS +options = VarParsing.VarParsing('standard') +options.register('geometry', + "D86", + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "geometry of operations: D77, D83, D86") + +### get and parse the command line arguments +options.parseArguments() + +print(options) + +#################################################################### +# Use the options + +if (options.geometry == "D83"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D83_cff') + process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') + fileName = 'hgcDigiD83tt.root' +elif (options.geometry == "D86"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D86_cff') + process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') + fileName = 'hgcDigiD86tt.root' +else: + from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 + process = cms.Process('PROD',Phase2C11) + process.load('Configuration.Geometry.GeometryExtended2026D77_cff') + process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') + fileName = 'hgcDigiD77tt.root' + +print("Output file: ", fileName) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("Configuration.StandardSequences.MagneticField_cff") @@ -27,7 +67,7 @@ ) process.TFileService = cms.Service("TFileService", - fileName = cms.string('hgcDigiD83tt.root'), + fileName = cms.string(fileName), closeFileFast = cms.untracked.bool(True) ) diff --git a/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py index a56310ebb5397..461d7eb3f23f1 100644 --- a/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py @@ -1,12 +1,51 @@ +############################################################################### +# Way to use this: +# cmsRun runHGCalRecHitStudy_cfg.py geometry=D86 +# +# Options for geometry D77, D83, D86 +# +############################################################################### import FWCore.ParameterSet.Config as cms -import FWCore.Utilities.FileUtils as FileUtils +import os, sys, imp, re +import FWCore.ParameterSet.VarParsing as VarParsing -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 -process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9) -#process.load('Configuration.Geometry.GeometryExtended2026D77_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +#################################################################### +### SETUP OPTIONS +options = VarParsing.VarParsing('standard') +options.register('geometry', + "D86", + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "geometry of operations: D77, D83, D86") + +### get and parse the command line arguments +options.parseArguments() + +print(options) + +#################################################################### +# Use the options + +if (options.geometry == "D83"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D83_cff') + process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') + fileName = 'hgcRecHitD83tt.root' +elif (options.geometry == "D86"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D86_cff') + process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') + fileName = 'hgcRecHitD86tt.root' +else: + from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 + process = cms.Process('PROD',Phase2C11) + process.load('Configuration.Geometry.GeometryExtended2026D77_cff') + process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') + fileName = 'hgcRecHitD77tt.root' + +print("Output file: ", fileName) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load('Configuration.StandardSequences.MagneticField_cff') @@ -30,7 +69,7 @@ process.load('Validation.HGCalValidation.hgcalRecHitStudy_cff') process.TFileService = cms.Service("TFileService", - fileName = cms.string('hgcRecHitD83tt.root'), + fileName = cms.string(fileName), closeFileFast = cms.untracked.bool(True) ) diff --git a/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py index fdcf651431cec..4ee22773769c0 100644 --- a/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py @@ -1,11 +1,51 @@ +############################################################################### +# Way to use this: +# cmsRun runHGCalSimHitStudy_cfg.py geometry=D86 +# +# Options for geometry D77, D83, D86 +# +############################################################################### import FWCore.ParameterSet.Config as cms +import os, sys, imp, re +import FWCore.ParameterSet.VarParsing as VarParsing -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 -process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9) -#process.load('Configuration.Geometry.GeometryExtended2026D77_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83_cff') -process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +#################################################################### +### SETUP OPTIONS +options = VarParsing.VarParsing('standard') +options.register('geometry', + "D86", + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "geometry of operations: D77, D83, D86") + +### get and parse the command line arguments +options.parseArguments() + +print(options) + +#################################################################### +# Use the options + +if (options.geometry == "D83"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D83_cff') + process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') + fileName = 'hgcSimHitD83tt.root' +elif (options.geometry == "D86"): + from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process('PROD',Phase2C11M9) + process.load('Configuration.Geometry.GeometryExtended2026D86_cff') + process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') + fileName = 'hgcSimHitD86tt.root' +else: + from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 + process = cms.Process('PROD',Phase2C11) + process.load('Configuration.Geometry.GeometryExtended2026D77_cff') + process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') + fileName = 'hgcSimHitD77tt.root' + +print("Output file: ", fileName) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("Configuration.StandardSequences.MagneticField_cff") @@ -25,7 +65,7 @@ ) process.TFileService = cms.Service("TFileService", - fileName = cms.string('hgcSimHitD83tt.root'), + fileName = cms.string(fileName), closeFileFast = cms.untracked.bool(True) ) diff --git a/Validation/RecoTrack/python/plotting/plotting.py b/Validation/RecoTrack/python/plotting/plotting.py index 0a1c886e5270a..24e5c51258d14 100644 --- a/Validation/RecoTrack/python/plotting/plotting.py +++ b/Validation/RecoTrack/python/plotting/plotting.py @@ -49,7 +49,8 @@ def _setStyle(): def _getObject(tdirectory, name): obj = tdirectory.Get(name) if not obj: - print("Did not find {obj} from {dir}".format(obj=name, dir=tdirectory.GetPath())) + if verbose: + print("Did not find {obj} from {dir}".format(obj=name, dir=tdirectory.GetPath())) return None return obj diff --git a/Validation/RecoTrack/python/plotting/validation.py b/Validation/RecoTrack/python/plotting/validation.py index 73f98013209f0..e4c06aadbb0fb 100644 --- a/Validation/RecoTrack/python/plotting/validation.py +++ b/Validation/RecoTrack/python/plotting/validation.py @@ -1201,6 +1201,7 @@ def _doPlotsForPlotter(self, plotter, sample, limitSubFoldersOnlyTo=None): if not os.path.exists(newdir): os.makedirs(newdir, exist_ok=True) + plotterFolder.create(self._openFiles, self._labels, dqmSubFolder) p = multiprocessing.Process(target=self._doPlots, args=(plotterFolder, dqmSubFolder, newsubdir, newdir, iProc, return_dict)) proc.append((plotterFolder, dqmSubFolder, p)) p.start() @@ -1294,7 +1295,6 @@ def doPlots(self, plotters, plotterDrawArgs={}, **kwargs): self._openFiles = [] def _doPlots(self, plotterFolder, dqmSubFolder, newsubdir, newdir, iProc, return_dict): - plotterFolder.create(self._openFiles, self._labels, dqmSubFolder) fileList = plotterFolder.draw(directory=newdir, **self._plotterDrawArgs) if len(fileList) == 0: @@ -1362,7 +1362,6 @@ def doPlots(self, plotters, plotterDrawArgs={}, **kwargs): self._openFiles = [] def _doPlots(self, plotterFolder, dqmSubFolder, newsubdir, newdir, iProc, return_dict): - plotterFolder.create(self._openFiles, self._labels, dqmSubFolder) fileList = plotterFolder.draw(directory=newdir, **self._plotterDrawArgs) # check if plots are produced