diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml b/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml index b5cf58f8993be..a6d954d927ad8 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml +++ b/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml @@ -5,3 +5,8 @@ + + + + + diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/TestDriver.cpp b/Alignment/MillePedeAlignmentAlgorithm/test/TestDriver.cpp new file mode 100644 index 0000000000000..2f0e0c40064da --- /dev/null +++ b/Alignment/MillePedeAlignmentAlgorithm/test/TestDriver.cpp @@ -0,0 +1,2 @@ +#include "FWCore/Utilities/interface/TestHelper.h" +RUNTEST() diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.py b/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.py new file mode 100644 index 0000000000000..262094bf569a5 --- /dev/null +++ b/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.py @@ -0,0 +1,100 @@ +import FWCore.ParameterSet.Config as cms +process = cms.Process("Alignment") + +process.Tracer = cms.Service("Tracer") + +setupGlobaltag = "121X_mcRun3_2021_realistic_forpp900GeV_v6" +setupCollection = "ALCARECOTkAlCosmicsCosmicTF0T" +setupCosmicsDecoMode = True +setupCosmicsZeroTesla = False +setupPrimaryWidth = -1.0 +setupJson = "placeholder_json" +setupRunStartGeometry = 1 +setupAlgoMode = "pede" +setupMonitorFile = "millePedeMonitorISN.root" +setupBinaryFile = "milleBinaryISN.dat" +readFiles = cms.untracked.vstring() + +import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.GeneralSetup as generalSetup +generalSetup.setup(process, setupGlobaltag, setupCosmicsZeroTesla) + + +################################################################################ +# setup alignment producer +################################################################################ +import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.ConfigureAlignmentProducer as confAliProducer + +confAliProducer.setConfiguration(process, + collection = setupCollection, + mode = setupAlgoMode, + monitorFile = setupMonitorFile, + binaryFile = setupBinaryFile, + primaryWidth = setupPrimaryWidth, + cosmicsZeroTesla = setupCosmicsZeroTesla) + + +################################################################################ +# Overwrite some conditions in global tag +################################################################################ +import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.SetCondition as tagwriter + +################################################################################ +# insert Startgeometry +################################################################################ +# You can use tagwriter.setCondition() to overwrite conditions in globaltag + +################################################################################ +# insert Alignables +################################################################################ +process.AlignmentProducer.ParameterBuilder.parameterTypes = ["SelectorRigid,RigidBody"] + +################################################################################ +# Define the high-level structure alignables +################################################################################ +process.AlignmentProducer.ParameterBuilder.SelectorRigid = cms.PSet( + alignParams = cms.vstring( + "TrackerP1PXBHalfBarrel,111111", + "TrackerP1PXECHalfCylinder,111111", + "TrackerTIBHalfBarrel,111111", + "TrackerTOBHalfBarrel,rrrrrr", + "TrackerTIDEndcap,111111", + "TrackerTECEndcap,111111", + ) +) + +################################################################################ +# insert Pedesettings +################################################################################ +import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.helper as helper +helper.set_pede_option(process, "skipemptycons") + +################################################################################ +# Mille-procedure +################################################################################ +if setupAlgoMode == "mille": + import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.MilleSetup as mille + mille.setup(process, + input_files = readFiles, + collection = setupCollection, + json_file = setupJson, + cosmics_zero_tesla = setupCosmicsZeroTesla, + cosmics_deco_mode = setupCosmicsDecoMode) + +################################################################################ +# Pede-procedure +################################################################################ +else: + merge_binary_files = [ + 'milleBinary001.dat', + 'milleBinary002.dat', + 'milleBinary003.dat'] + merge_tree_files = [ + 'treeFile001.root', + 'treeFile002.root', + 'treeFile003.root'] + + import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.PedeSetup as pede + pede.setup(process, + binary_files = merge_binary_files, + tree_files = merge_tree_files, + run_start_geometry = setupRunStartGeometry) diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.sh b/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.sh new file mode 100755 index 0000000000000..3683ba50ce54e --- /dev/null +++ b/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.sh @@ -0,0 +1,32 @@ +#!/bin/bash +function die { echo $1: status $2; exit $2; } + +if [ "${SCRAM_TEST_NAME}" != "" ] ; then + mkdir ${SCRAM_TEST_NAME} + cd ${SCRAM_TEST_NAME} +fi + +if test -f "milleBinary00*"; then + echo "cleaning the local test area" + rm -fr milleBinary00* + rm -fr pedeSteer* +fi + +pwd +echo " testing Aligment/MillePedeAlignmentAlgorithm" + +REMOTE="/store/group/alca_global/tkal_millepede_tests/" +TESTPACKAGE="test_pede_package.tar" +COMMMAND=`xrdfs cms-xrd-global.cern.ch locate ${REMOTE}${TESTPACKAGE}` +STATUS=$? +echo "xrdfs command status = "$STATUS +if [ $STATUS -eq 0 ]; then + echo "Using file ${TESTPACKAGE}. Running in ${LOCAL_TEST_DIR}." + xrdcp root://cms-xrd-global.cern.ch/${REMOTE}${TESTPACKAGE} ${LOCAL_TEST_DIR} + tar -xvf ${LOCAL_TEST_DIR}/${TESTPACKAGE} + gunzip milleBinary00* + (cmsRun ${LOCAL_TEST_DIR}/test_pede.py) || die 'failed running test_pede.py' $? + echo -e "\n MillePede Exit Status: "`cat millepede.end` +else + die "SKIPPING test, file ${TESTPACKAGE} not found" 0 +fi diff --git a/CondTools/SiStrip/scripts/o2oRun_SiStripDAQ.py b/CondTools/SiStrip/scripts/o2oRun_SiStripDAQ.py index 5f27fe812f36d..a85a758e4f21c 100755 --- a/CondTools/SiStrip/scripts/o2oRun_SiStripDAQ.py +++ b/CondTools/SiStrip/scripts/o2oRun_SiStripDAQ.py @@ -50,7 +50,7 @@ def run(args): for jobname in processes: status[jobname] = {'job':None, 'upload':None, 'fast':None, 'changed':None} p = processes[jobname] - log = p.communicate()[0] + log = p.communicate()[0].decode() logging.debug('=== log from o2o run ===\n%s' % log) if p.returncode == 0: logging.info('Job for %s finished successfully!' % jobname) @@ -86,7 +86,7 @@ def summary(args, is_ok, status, logfile): send_to=args.mail_to, send_from=args.mail_from) # send the detailed log - with open(logfile, 'rb') as log: + with open(logfile, 'r') as log: helper.send_mail(subject='%sNew O2O Log, IOV: %s' % (debugLabel, args.since), message=log.read(), send_to=args.mail_log_to, diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 115c6b54a79da..c6e9035e7610a 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1905,7 +1905,7 @@ def lhegensim2018ml(fragment,howMuch): steps['HLTDR2_2018']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2018,},{'--conditions':'auto:run2_hlt_relval'},{'--era' : 'Run2_2018'},steps['HLTD'] ] ) hltKey2021='relval2021' -steps['HLTDR3_2021']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2021,},{'--conditions':'auto:run3_hlt'},{'--era':'Run3'},steps['HLTD'] ] ) +steps['HLTDR3_2021']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2021,},{'--conditions':'auto:run3_hlt_relval'},{'--era':'Run3'},steps['HLTD'] ] ) # special setting for lumi section boundary crossing in RunEGamma2018Dml steps['HLTDR2_2018ml']=merge( [ {'--customise_commands':'"process.source.skipEvents=cms.untracked.uint32(7000)"'},steps['HLTDR2_2018'] ] ) @@ -2241,7 +2241,7 @@ def lhegensim2018ml(fragment,howMuch): #Run 3 steps['RECODR3']=merge([{'--scenario':'pp', '-s':'RAW2DIGI,L1Reco,RECO,DQM', - '--conditions':'auto:run3_data', + '--conditions':'auto:run3_data_relval', '--era':'Run3', '--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco]) @@ -2535,7 +2535,7 @@ def gen2021HiMix(fragment,howMuch): steps['RECOUP15_PU25HS']=merge([PU25HS,step3Up2015Defaults]) #Run3 reco -steps['RECODR3_2021']=merge([{'--scenario':'pp','--conditions':'auto:run3_data','--era':'Run3','--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco]) +steps['RECODR3_2021']=merge([{'--scenario':'pp','--conditions':'auto:run3_data_relval','--era':'Run3','--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco]) steps['RECODR3_MinBiasOffline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonSiStripZeroBias+@ExtraHLT+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) steps['RECODR3_ZBOffline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign+HcalCalIsoTrkProducerFilter,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) steps['RECODR3_HLTPhysics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:TkAlMinBias+HcalCalIterativePhiSym+HcalCalIsoTrkProducerFilter+HcalCalHO+HcalCalHBHEMuonProducerFilter,DQM:@commonReduced+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) @@ -2976,7 +2976,7 @@ def gen2021HiMix(fragment,howMuch): steps['HARVESTDCRUN2']=merge([{'--conditions':'auto:run2_data','--era':'Run2_2016'},steps['HARVESTDC']]) -steps['HARVESTDR3'] = merge([{'--conditions':'auto:run3_data','--era':'Run3'}, steps['HARVESTD']]) +steps['HARVESTDR3'] = merge([{'--conditions':'auto:run3_data_relval','--era':'Run3'}, steps['HARVESTD']]) steps['HARVESTD2021MB'] = merge([{'-s':'HARVESTING:@commonSiStripZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3'] ]) steps['HARVESTD2021ZB'] = merge([{'-s':'HARVESTING:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3'] ]) steps['HARVESTD2021HLTPhy'] = merge([{'-s':'HARVESTING:@commonReduced+@miniAODDQM'}, steps['HARVESTDR3'] ]) diff --git a/DQM/GEM/interface/GEMDAQStatusSource.h b/DQM/GEM/interface/GEMDAQStatusSource.h index 2b448ba1acd20..9a3ac39bcab4b 100644 --- a/DQM/GEM/interface/GEMDAQStatusSource.h +++ b/DQM/GEM/interface/GEMDAQStatusSource.h @@ -16,6 +16,9 @@ #include "Validation/MuonGEMHits/interface/GEMValidationUtils.h" +#include "CondFormats/DataRecord/interface/GEMeMapRcd.h" +#include "CondFormats/GEMObjects/interface/GEMeMap.h" +#include "CondFormats/GEMObjects/interface/GEMROMapping.h" #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h" #include "DataFormats/GEMDigi/interface/GEMVFATStatusCollection.h" #include "DataFormats/GEMDigi/interface/GEMOHStatusCollection.h" @@ -35,6 +38,8 @@ class GEMDAQStatusSource : public GEMDQMBase { static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); protected: + void LoadROMap(edm::EventSetup const &iSetup); + void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override{}; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; @@ -44,6 +49,18 @@ class GEMDAQStatusSource : public GEMDQMBase { bErr = true; }; + void FillStatusSummaryPlot(std::map &mapChamber, + MonitorElement *h2Plot, + std::map *pmapSummary = nullptr) { + for (auto const &[key4, bFlag] : mapChamber) { // bFlag is not used + ME3IdsKey key3 = key4Tokey3(key4); + Int_t nChamber = keyToChamber(key4); + h2Plot->Fill(nChamber, mapStationToIdx_[key3]); + if (pmapSummary != nullptr) + (*pmapSummary)[key4] = true; + } + }; + private: int ProcessWithMEMap3(BookingHelper &bh, ME3IdsKey key) override; int ProcessWithMEMap3WithChamber(BookingHelper &bh, ME4IdsKey key) override; @@ -53,6 +70,10 @@ class GEMDAQStatusSource : public GEMDQMBase { void SetLabelOHStatus(MonitorElement *h2Status); void SetLabelVFATStatus(MonitorElement *h2Status); + edm::ESGetToken gemEMapToken_; + //std::shared_ptr gemROMap_; + const GEMeMap *gemEMap_; + edm::EDGetToken tagVFAT_; edm::EDGetToken tagOH_; edm::EDGetToken tagAMC_; @@ -72,10 +93,19 @@ class GEMDAQStatusSource : public GEMDQMBase { MonitorElement *h2SummaryStatusAll; MonitorElement *h2SummaryStatusWarning; MonitorElement *h2SummaryStatusError; + MonitorElement *h2SummaryStatusVFATWarning; + MonitorElement *h2SummaryStatusVFATError; + MonitorElement *h2SummaryStatusOHWarning; + MonitorElement *h2SummaryStatusOHError; + MonitorElement *h2SummaryStatusAMCWarning; + MonitorElement *h2SummaryStatusAMCError; + MonitorElement *h2SummaryStatusAMC13Error; Int_t nBXMin_, nBXMax_; std::map mapFEDIdToRe_; + std::map> mapAMC13ToListChamber_; + std::map, std::vector> mapAMCToListChamber_; Int_t nAMCSlots_; int nBitAMC13_ = 10; diff --git a/DQM/GEM/plugins/BuildFile.xml b/DQM/GEM/plugins/BuildFile.xml index 1ce54a225d40d..fef6cc0724a03 100644 --- a/DQM/GEM/plugins/BuildFile.xml +++ b/DQM/GEM/plugins/BuildFile.xml @@ -5,6 +5,8 @@ + + diff --git a/DQM/GEM/plugins/GEMDAQStatusSource.cc b/DQM/GEM/plugins/GEMDAQStatusSource.cc index e20cf95c57bc0..dc702557bb2cf 100644 --- a/DQM/GEM/plugins/GEMDAQStatusSource.cc +++ b/DQM/GEM/plugins/GEMDAQStatusSource.cc @@ -10,6 +10,7 @@ GEMDAQStatusSource::GEMDAQStatusSource(const edm::ParameterSet &cfg) : GEMDQMBas tagAMC13_ = consumes(cfg.getParameter("AMC13InputLabel")); nAMCSlots_ = cfg.getParameter("AMCSlots"); + gemEMapToken_ = esConsumes(); } void GEMDAQStatusSource::fillDescriptions(edm::ConfigurationDescriptions &descriptions) { @@ -25,6 +26,40 @@ void GEMDAQStatusSource::fillDescriptions(edm::ConfigurationDescriptions &descri descriptions.add("GEMDAQStatusSource", desc); } +void GEMDAQStatusSource::LoadROMap(edm::EventSetup const &iSetup) { + auto gemROMap = std::make_shared(); + //if (useDBEMap_) + if (true) { + const auto &eMap = iSetup.getData(gemEMapToken_); + auto gemEMap = std::make_unique(eMap); + gemEMap->convert(*gemROMap); + + for (auto imap : gemEMap->theChamberMap_) { + int nNumChamber = (int)imap.fedId.size(); + for (int i = 0; i < nNumChamber; i++) { + unsigned int fedId = imap.fedId[i]; + uint8_t amcNum = imap.amcNum[i]; + uint8_t gebId = imap.gebId[i]; + GEMROMapping::chamEC geb_ec{fedId, amcNum, gebId}; + GEMROMapping::chamDC geb_dc = gemROMap->chamberPos(geb_ec); + GEMDetId gemChId = geb_dc.detId; + + mapFEDIdToRe_[fedId] = gemChId.region(); + mapAMC13ToListChamber_[fedId].push_back(gemChId); + mapAMCToListChamber_[{fedId, amcNum}].push_back(gemChId); + } + } + + gemEMap.reset(); + } else { + // no EMap in DB, using dummy + // FIXME: How to add mapFEDIdToRe_ and mapDetIdToAMC_?? + auto gemEMap = std::make_unique(); + gemEMap->convertDummy(*gemROMap); + gemEMap.reset(); + } +} + void GEMDAQStatusSource::SetLabelAMC13Status(MonitorElement *h2Status) { unsigned int unBinPos = 1; h2Status->setBinLabel(unBinPos++, "Good", 2); @@ -91,6 +126,9 @@ void GEMDAQStatusSource::SetLabelVFATStatus(MonitorElement *h2Status) { } void GEMDAQStatusSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &iSetup) { + LoadROMap(iSetup); + if (mapAMC13ToListChamber_.empty() || mapAMCToListChamber_.empty()) + return; initGeometry(iSetup); if (GEMGeometry_ == nullptr) return; @@ -145,10 +183,24 @@ void GEMDAQStatusSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run con h2SummaryStatusAll = CreateSummaryHist(ibooker, "chamberAllStatus"); h2SummaryStatusWarning = CreateSummaryHist(ibooker, "chamberWarnings"); h2SummaryStatusError = CreateSummaryHist(ibooker, "chamberErrors"); + h2SummaryStatusVFATWarning = CreateSummaryHist(ibooker, "chamberVFATWarnings"); + h2SummaryStatusVFATError = CreateSummaryHist(ibooker, "chamberVFATErrors"); + h2SummaryStatusOHWarning = CreateSummaryHist(ibooker, "chamberOHWarnings"); + h2SummaryStatusOHError = CreateSummaryHist(ibooker, "chamberOHErrors"); + h2SummaryStatusAMCWarning = CreateSummaryHist(ibooker, "chamberAMCWarnings"); + h2SummaryStatusAMCError = CreateSummaryHist(ibooker, "chamberAMCErrors"); + h2SummaryStatusAMC13Error = CreateSummaryHist(ibooker, "chamberAMC13Errors"); h2SummaryStatusAll->setTitle("Summary of all number of OH or VFAT status of each chambers"); - h2SummaryStatusWarning->setTitle("Summary of OH or VFAT warnings of each chambers"); - h2SummaryStatusError->setTitle("Summary of OH or VFAT errors of each chambers"); + h2SummaryStatusWarning->setTitle("Summary of all warnings of each chambers"); + h2SummaryStatusError->setTitle("Summary of all errors of each chambers"); + h2SummaryStatusVFATWarning->setTitle("Summary of VFAT warnings of each chambers"); + h2SummaryStatusVFATError->setTitle("Summary of VFAT errors of each chambers"); + h2SummaryStatusOHWarning->setTitle("Summary of OH warnings of each chambers"); + h2SummaryStatusOHError->setTitle("Summary of OH errors of each chambers"); + h2SummaryStatusAMCWarning->setTitle("Summary of AMC warnings of each chambers"); + h2SummaryStatusAMCError->setTitle("Summary of AMC errors of each chambers"); + h2SummaryStatusAMC13Error->setTitle("Summary of AMC13 errors of each chambers"); } int GEMDAQStatusSource::ProcessWithMEMap3(BookingHelper &bh, ME3IdsKey key) { @@ -204,6 +256,17 @@ void GEMDAQStatusSource::analyze(edm::Event const &event, edm::EventSetup const event.getByToken(tagAMC_, gemAMC); event.getByToken(tagAMC13_, gemAMC13); + std::map mapChamberAll; + std::map mapChamberWarning; + std::map mapChamberError; + std::map mapChamberVFATWarning; + std::map mapChamberVFATError; + std::map mapChamberOHWarning; + std::map mapChamberOHError; + std::map mapChamberAMCWarning; + std::map mapChamberAMCError; + std::map mapChamberAMC13Error; + for (auto amc13It = gemAMC13->begin(); amc13It != gemAMC13->end(); ++amc13It) { int fedId = (*amc13It).first; if (mapFEDIdToRe_.find(fedId) == mapFEDIdToRe_.end()) @@ -245,8 +308,16 @@ void GEMDAQStatusSource::analyze(edm::Event const &event, edm::EventSetup const if (errors.wrongFedId) FillWithRiseErr(h2AMC13Status_, nXBin, 10, bErr); - if (!bWarn && !bErr) + if (!bWarn && !bErr) { h2AMC13Status_->Fill(nXBin, 1); + } else { + auto &listChamber = mapAMC13ToListChamber_[fedId]; + for (auto gid : listChamber) { + ME4IdsKey key4Ch{gid.region(), gid.station(), gid.layer(), gid.chamber()}; + if (bErr) + mapChamberAMC13Error[key4Ch] = false; + } + } } } @@ -298,16 +369,21 @@ void GEMDAQStatusSource::analyze(edm::Event const &event, edm::EventSetup const if (errors.BC0locked) FillWithRiseErr(h2AMCStatus, nAMCNum, 12, bErr); - if (!bWarn && !bErr) + if (!bWarn && !bErr) { h2AMCStatus->Fill(nAMCNum, 1); + } else { + auto &listChamber = mapAMCToListChamber_[{fedId, nAMCNum}]; + for (auto gid : listChamber) { + ME4IdsKey key4Ch{gid.region(), gid.station(), gid.layer(), gid.chamber()}; + if (bErr) + mapChamberAMCError[key4Ch] = false; + if (bWarn) + mapChamberAMCWarning[key4Ch] = false; + } + } } } - // WARNING: ME4IdsKey for region, station, layer, chamber (not iEta) - std::map mapChamberAll; - std::map mapChamberWarning; - std::map mapChamberError; - for (auto ohIt = gemOH->begin(); ohIt != gemOH->end(); ++ohIt) { GEMDetId gid = (*ohIt).first; ME3IdsKey key3{gid.region(), gid.station(), gid.layer()}; @@ -356,9 +432,9 @@ void GEMDAQStatusSource::analyze(edm::Event const &event, edm::EventSetup const if (!bWarn && !bErr) mapStatusOH_.Fill(key3, gid.chamber(), 1); if (bWarn) - mapChamberWarning[key4] = false; + mapChamberOHWarning[key4] = false; if (bErr) - mapChamberError[key4] = false; + mapChamberOHError[key4] = false; mapChamberAll[key4] = true; } } @@ -407,9 +483,9 @@ void GEMDAQStatusSource::analyze(edm::Event const &event, edm::EventSetup const if (!bWarn && !bErr) mapStatusVFATPerCh_.Fill(key4Ch, nIdxVFAT, 1); if (bWarn) - mapChamberWarning[key4Ch] = false; + mapChamberVFATWarning[key4Ch] = false; if (bErr) - mapChamberError[key4Ch] = false; + mapChamberVFATError[key4Ch] = false; if (bWarn) mapStatusWarnVFATPerLayer_.Fill(key3, gid.chamber(), nIdxVFAT); if (bErr) @@ -425,21 +501,19 @@ void GEMDAQStatusSource::analyze(edm::Event const &event, edm::EventSetup const h2SummaryStatusAll->Fill(nChamber, mapStationToIdx_[key3]); } - // Summarizing the warning occupancy - for (auto const &[key4, bWarning] : mapChamberWarning) { - if (mapChamberError.find(key4) != mapChamberError.end()) // Avoiding any double-counting - continue; - ME3IdsKey key3 = key4Tokey3(key4); - Int_t nChamber = keyToChamber(key4); - h2SummaryStatusWarning->Fill(nChamber, mapStationToIdx_[key3]); - } - - // Summarizing the error occupancy - for (auto const &[key4, bErr] : mapChamberError) { - ME3IdsKey key3 = key4Tokey3(key4); - Int_t nChamber = keyToChamber(key4); - h2SummaryStatusError->Fill(nChamber, mapStationToIdx_[key3]); - } + // Summarizing all presence of status of each chamber + FillStatusSummaryPlot(mapChamberAll, h2SummaryStatusAll); + // Summarizing all the error and warning occupancy + FillStatusSummaryPlot(mapChamberVFATWarning, h2SummaryStatusVFATWarning, &mapChamberWarning); + FillStatusSummaryPlot(mapChamberVFATError, h2SummaryStatusVFATError, &mapChamberError); + FillStatusSummaryPlot(mapChamberOHWarning, h2SummaryStatusOHWarning, &mapChamberWarning); + FillStatusSummaryPlot(mapChamberOHError, h2SummaryStatusOHError, &mapChamberError); + FillStatusSummaryPlot(mapChamberAMCWarning, h2SummaryStatusAMCWarning, &mapChamberWarning); + FillStatusSummaryPlot(mapChamberAMCError, h2SummaryStatusAMCError, &mapChamberError); + FillStatusSummaryPlot(mapChamberAMC13Error, h2SummaryStatusAMC13Error, &mapChamberError); + + FillStatusSummaryPlot(mapChamberWarning, h2SummaryStatusWarning); + FillStatusSummaryPlot(mapChamberError, h2SummaryStatusError); } DEFINE_FWK_MODULE(GEMDAQStatusSource); diff --git a/DQM/GEM/plugins/GEMDQMHarvester.cc b/DQM/GEM/plugins/GEMDQMHarvester.cc index 43cba47203f89..d728fe1ad4fbe 100644 --- a/DQM/GEM/plugins/GEMDQMHarvester.cc +++ b/DQM/GEM/plugins/GEMDQMHarvester.cc @@ -27,19 +27,61 @@ class GEMDQMHarvester : public DQMEDHarvester { ~GEMDQMHarvester() override{}; static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); + typedef std::tuple IdChamber; + typedef std::tuple IdVFAT; + typedef struct PreStatusInfo { + int nLumiStart; + int nLumiEnd; + int nStatus; + } StatusInfo; + + class NumStatus { + public: + NumStatus(Float_t fNumTotal = 0, + Float_t fNumOcc = 0, + Float_t fNumErrVFAT = 0, + Float_t fNumWarnVFAT = 0, + Float_t fNumErrOH = 0, + Float_t fNumWarnOH = 0, + Float_t fNumErrAMC = 0, + Float_t fNumWarnAMC = 0, + Float_t fNumErrAMC13 = 0) + : fNumTotal_(fNumTotal), + fNumOcc_(fNumOcc), + fNumErrVFAT_(fNumErrVFAT), + fNumWarnVFAT_(fNumWarnVFAT), + fNumErrOH_(fNumErrOH), + fNumWarnOH_(fNumWarnOH), + fNumErrAMC_(fNumErrAMC), + fNumWarnAMC_(fNumWarnAMC), + fNumErrAMC13_(fNumErrAMC13) {} + float fNumTotal_; + float fNumOcc_; + float fNumErrVFAT_; + float fNumWarnVFAT_; + float fNumErrOH_; + float fNumWarnOH_; + float fNumErrAMC_; + float fNumWarnAMC_; + float fNumErrAMC13_; + }; + protected: void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, - edm::LuminosityBlock const &, + edm::LuminosityBlock const &iLumi, edm::EventSetup const &) override; void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override{}; // Cannot use; it is called after dqmSaver - void drawSummaryHistogram(edm::Service &store); + void drawSummaryHistogram(edm::Service &store, Int_t nLumiCurr); + void createTableWatchingSummary(); void copyLabels(MonitorElement *h2Src, MonitorElement *h2Dst); void createSummaryHist(edm::Service &store, MonitorElement *h2Src, MonitorElement *&h2Sum, - std::vector &listLayers); + std::vector &listLayers, + std::map &mapIdxLayer, + std::map &mapNumChPerChamber); void createSummaryVFAT(edm::Service &store, MonitorElement *h2Src, std::string strSuffix, @@ -47,16 +89,34 @@ class GEMDQMHarvester : public DQMEDHarvester { Float_t refineSummaryHistogram(std::string strName, MonitorElement *h2Sum, MonitorElement *h2SrcOcc, - MonitorElement *h2SrcAllNum, + MonitorElement *h2SrcStatusA, MonitorElement *h2SrcStatusE, - MonitorElement *h2SrcStatusW); + MonitorElement *h2SrcStatusW, + MonitorElement *h2SrcStatusEVFAT, + MonitorElement *h2SrcStatusWVFAT, + MonitorElement *h2SrcStatusEOH, + MonitorElement *h2SrcStatusWOH, + MonitorElement *h2SrcStatusEAMC, + MonitorElement *h2SrcStatusWAMC, + MonitorElement *h2SrcStatusEAMC13, + Int_t nLumiCurr); Int_t refineSummaryVFAT(std::string strName, MonitorElement *h2Sum, MonitorElement *h2SrcOcc, MonitorElement *h2SrcStatusE, - MonitorElement *h2SrcStatusW); + MonitorElement *h2SrcStatusW, + Int_t nLumiCurr, + Int_t nIdxLayer); Int_t assessOneBin( - std::string strName, Int_t nIdxX, Int_t nIdxY, Float_t fAll, Float_t fNumOcc, Float_t fNumWarn, Float_t fNumErr); + std::string strName, Int_t nIdxX, Int_t nIdxY, Float_t fAll, Float_t fNumOcc, Float_t fNumErr, Float_t fNumWarn); + + Int_t UpdateStatusChamber(Int_t nIdxLayer, Int_t nIdxCh, Int_t nLumiCurr, NumStatus numStatus); + Int_t UpdateStatusChamber(Int_t nIdxLayer, Int_t nIdxCh, Int_t nIdxVFAT, Int_t nLumiCurr, NumStatus numStatus); + Int_t UpdateStatusChamber(std::vector &listStatus, + NumStatus &numStatus, + Int_t nLumiCurr, + NumStatus numStatusNew); + void createLumiFuncHist(edm::Service &store, std::string strSuffix, Int_t nIdxLayer, Int_t nLumiCurr); Float_t fCutErr_, fCutLowErr_, fCutWarn_; @@ -64,16 +124,47 @@ class GEMDQMHarvester : public DQMEDHarvester { const std::string strDirRecHit_ = "GEM/RecHits"; const std::string strDirStatus_ = "GEM/DAQStatus"; + const Int_t nCodeFine_ = 1; + const Int_t nCodeError_ = 2; + const Int_t nCodeWarning_ = 3; + const Int_t nCodeLowError_ = 4; + + const Int_t nBitWarnVFAT_ = 7; + const Int_t nBitErrVFAT_ = 6; + const Int_t nBitWarnOH_ = 5; + const Int_t nBitErrOH_ = 4; + const Int_t nBitWarnAMC_ = 3; + const Int_t nBitErrAMC_ = 2; + const Int_t nBitErrAMC13_ = 1; + const Int_t nBitOcc_ = 0; + + const Int_t nNumVFATs_ = 24; + + const Int_t nMaxLumi_ = 6000; // From DQMServices/Components/plugins/DQMProvInfo.h + //const Int_t nResolutionLumi_ = 5; + Int_t nResolutionLumi_; + typedef std::vector> TableStatusOcc; typedef std::vector> TableStatusNum; + std::map> mapStatusChambersSummary_; + std::map> mapStatusVFATsSummary_; + std::map mapNumStatusChambersSummary_; + std::map mapNumStatusVFATsSummary_; + std::vector listLayer_; + std::map mapIdxLayer_; // All indices in the following objects start at 1 + std::map mapNumChPerChamber_; + std::map mapHistLumiFunc_; + Bool_t bIsStatusChambersInit_; }; GEMDQMHarvester::GEMDQMHarvester(const edm::ParameterSet &cfg) { fCutErr_ = cfg.getParameter("cutErr"); fCutLowErr_ = cfg.getParameter("cutLowErr"); fCutWarn_ = cfg.getParameter("cutWarn"); + nResolutionLumi_ = cfg.getParameter("resolutionLumi"); + bIsStatusChambersInit_ = false; } void GEMDQMHarvester::fillDescriptions(edm::ConfigurationDescriptions &descriptions) { @@ -81,24 +172,33 @@ void GEMDQMHarvester::fillDescriptions(edm::ConfigurationDescriptions &descripti desc.add("cutErr", 0.05); desc.add("cutLowErr", 0.00); desc.add("cutWarn", 0.05); + desc.add("resolutionLumi", 1); descriptions.add("GEMDQMHarvester", desc); } void GEMDQMHarvester::dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, - edm::LuminosityBlock const &, + edm::LuminosityBlock const &iLumi, edm::EventSetup const &) { edm::Service store; - drawSummaryHistogram(store); + Int_t nLumiCurr = iLumi.id().luminosityBlock(); + drawSummaryHistogram(store, nLumiCurr); } -void GEMDQMHarvester::drawSummaryHistogram(edm::Service &store) { +void GEMDQMHarvester::drawSummaryHistogram(edm::Service &store, Int_t nLumiCurr) { Float_t fReportSummary = -1.0; std::string strSrcDigiOcc = "GEM/Digis/summaryOccDigi"; std::string strSrcStatusA = "GEM/DAQStatus/chamberAllStatus"; - std::string strSrcStatusW = "GEM/DAQStatus/chamberWarnings"; std::string strSrcStatusE = "GEM/DAQStatus/chamberErrors"; + std::string strSrcStatusW = "GEM/DAQStatus/chamberWarnings"; + std::string strSrcStatusEVFAT = "GEM/DAQStatus/chamberVFATErrors"; + std::string strSrcStatusWVFAT = "GEM/DAQStatus/chamberVFATWarnings"; + std::string strSrcStatusEOH = "GEM/DAQStatus/chamberOHErrors"; + std::string strSrcStatusWOH = "GEM/DAQStatus/chamberOHWarnings"; + std::string strSrcStatusEAMC = "GEM/DAQStatus/chamberAMCErrors"; + std::string strSrcStatusWAMC = "GEM/DAQStatus/chamberAMCWarnings"; + std::string strSrcStatusEAMC13 = "GEM/DAQStatus/chamberAMC13Errors"; std::string strSrcVFATOcc = "GEM/Digis/det"; std::string strSrcVFATStatusW = "GEM/DAQStatus/vfat_statusWarnSum"; @@ -108,18 +208,42 @@ void GEMDQMHarvester::drawSummaryHistogram(edm::Service &store) { MonitorElement *h2SrcDigiOcc = store->get(strSrcDigiOcc); MonitorElement *h2SrcStatusA = store->get(strSrcStatusA); - MonitorElement *h2SrcStatusW = store->get(strSrcStatusW); MonitorElement *h2SrcStatusE = store->get(strSrcStatusE); + MonitorElement *h2SrcStatusW = store->get(strSrcStatusW); + MonitorElement *h2SrcStatusEVFAT = store->get(strSrcStatusEVFAT); + MonitorElement *h2SrcStatusWVFAT = store->get(strSrcStatusWVFAT); + MonitorElement *h2SrcStatusEOH = store->get(strSrcStatusEOH); + MonitorElement *h2SrcStatusWOH = store->get(strSrcStatusWOH); + MonitorElement *h2SrcStatusEAMC = store->get(strSrcStatusEAMC); + MonitorElement *h2SrcStatusWAMC = store->get(strSrcStatusWAMC); + MonitorElement *h2SrcStatusEAMC13 = store->get(strSrcStatusEAMC13); std::string strTitleSummary = "summary"; - if (h2SrcDigiOcc != nullptr && h2SrcStatusA != nullptr && h2SrcStatusW != nullptr && h2SrcStatusE != nullptr) { + if (h2SrcDigiOcc != nullptr && h2SrcStatusA != nullptr && h2SrcStatusE != nullptr && h2SrcStatusW != nullptr && + h2SrcStatusEVFAT != nullptr && h2SrcStatusWVFAT != nullptr && h2SrcStatusEOH != nullptr && + h2SrcStatusWOH != nullptr && h2SrcStatusEAMC != nullptr && h2SrcStatusWAMC != nullptr && + h2SrcStatusEAMC13 != nullptr) { MonitorElement *h2Sum = nullptr; - createSummaryHist(store, h2SrcStatusE, h2Sum, listLayer_); - fReportSummary = - refineSummaryHistogram(strTitleSummary, h2Sum, h2SrcDigiOcc, h2SrcStatusA, h2SrcStatusE, h2SrcStatusW); + createSummaryHist(store, h2SrcStatusEOH, h2Sum, listLayer_, mapIdxLayer_, mapNumChPerChamber_); + createTableWatchingSummary(); + fReportSummary = refineSummaryHistogram(strTitleSummary, + h2Sum, + h2SrcDigiOcc, + h2SrcStatusA, + h2SrcStatusE, + h2SrcStatusW, + h2SrcStatusEVFAT, + h2SrcStatusWVFAT, + h2SrcStatusEOH, + h2SrcStatusWOH, + h2SrcStatusEAMC, + h2SrcStatusWAMC, + h2SrcStatusEAMC13, + nLumiCurr); for (const auto &strSuffix : listLayer_) { + auto nIdxLayer = mapIdxLayer_[strSuffix]; MonitorElement *h2SrcVFATOcc = store->get(strSrcVFATOcc + strSuffix); MonitorElement *h2SrcVFATStatusW = store->get(strSrcVFATStatusW + strSuffix); MonitorElement *h2SrcVFATStatusE = store->get(strSrcVFATStatusE + strSuffix); @@ -128,17 +252,37 @@ void GEMDQMHarvester::drawSummaryHistogram(edm::Service &store) { MonitorElement *h2SumVFAT = nullptr; createSummaryVFAT(store, h2SrcVFATStatusE, strSuffix, h2SumVFAT); - refineSummaryVFAT(strSuffix, h2SumVFAT, h2SrcVFATOcc, h2SrcVFATStatusE, h2SrcVFATStatusW); + refineSummaryVFAT(strSuffix, h2SumVFAT, h2SrcVFATOcc, h2SrcVFATStatusE, h2SrcVFATStatusW, nLumiCurr, nIdxLayer); TString strNewTitle = h2SrcVFATStatusE->getTitle(); h2SumVFAT->setTitle((const char *)strNewTitle.ReplaceAll("errors", "errors/warnings")); h2SumVFAT->setXTitle(h2SrcVFATStatusE->getAxisTitle(1)); h2SumVFAT->setYTitle(h2SrcVFATStatusE->getAxisTitle(2)); + + createLumiFuncHist(store, strSuffix, nIdxLayer, nLumiCurr); } } store->bookFloat("reportSummary")->Fill(fReportSummary); } +void GEMDQMHarvester::createTableWatchingSummary() { + if (bIsStatusChambersInit_) + return; + + for (const auto &[nIdxLayer, nNumCh] : mapNumChPerChamber_) { + for (Int_t i = 1; i <= nNumCh; i++) { + mapStatusChambersSummary_[{nIdxLayer, i}] = std::vector(); + mapNumStatusChambersSummary_[{nIdxLayer, i}] = NumStatus(); + for (Int_t j = 1; j <= nNumVFATs_; j++) { + mapStatusVFATsSummary_[{nIdxLayer, i, j}] = std::vector(); + mapNumStatusVFATsSummary_[{nIdxLayer, i, j}] = NumStatus(); + } + } + } + + bIsStatusChambersInit_ = true; +} + void GEMDQMHarvester::copyLabels(MonitorElement *h2Src, MonitorElement *h2Dst) { Int_t nBinX = h2Src->getNbinsX(), nBinY = h2Src->getNbinsY(); @@ -156,7 +300,9 @@ void GEMDQMHarvester::copyLabels(MonitorElement *h2Src, MonitorElement *h2Dst) { void GEMDQMHarvester::createSummaryHist(edm::Service &store, MonitorElement *h2Src, MonitorElement *&h2Sum, - std::vector &listLayers) { + std::vector &listLayers, + std::map &mapIdxLayer, + std::map &mapNumChPerChamber) { //store->setCurrentFolder(strDirSummary_); Int_t nBinX = h2Src->getNbinsX(), nBinY = h2Src->getNbinsY(); @@ -166,14 +312,21 @@ void GEMDQMHarvester::createSummaryHist(edm::Service &store, h2Sum->setYTitle("Layer"); listLayers.clear(); + mapIdxLayer.clear(); + mapNumChPerChamber.clear(); + for (Int_t i = 1; i <= nBinX; i++) h2Sum->setBinLabel(i, h2Src->getTH2F()->GetXaxis()->GetBinLabel(i), 1); for (Int_t i = 1; i <= nBinY; i++) { std::string strLabelFull = h2Src->getTH2F()->GetYaxis()->GetBinLabel(i); + Int_t nBinXActual = (Int_t)(h2Src->getBinContent(0, i) + 0.5); auto nPos = strLabelFull.find(';'); auto strLabel = strLabelFull.substr(0, nPos); + auto strLayer = strLabelFull.substr(nPos + 1); listLayers.push_back(strLabelFull.substr(nPos + 1)); h2Sum->setBinLabel(i, strLabel, 2); + mapIdxLayer[strLayer] = i; + mapNumChPerChamber[i] = nBinXActual; } } @@ -190,15 +343,15 @@ void GEMDQMHarvester::createSummaryVFAT(edm::Service &store, } Int_t GEMDQMHarvester::assessOneBin( - std::string strName, Int_t nIdxX, Int_t nIdxY, Float_t fAll, Float_t fNumOcc, Float_t fNumWarn, Float_t fNumErr) { + std::string strName, Int_t nIdxX, Int_t nIdxY, Float_t fAll, Float_t fNumOcc, Float_t fNumErr, Float_t fNumWarn) { if (fNumErr > fCutErr_ * fAll) // The error status criterion - return 2; + return nCodeError_; else if (fNumErr > fCutLowErr_ * fAll) // The low-error status criterion - return 4; + return nCodeLowError_; else if (fNumWarn > fCutWarn_ * fAll) // The warning status criterion - return 3; + return nCodeWarning_; else if (fNumOcc > 0) - return 1; + return nCodeFine_; return 0; } @@ -209,7 +362,15 @@ Float_t GEMDQMHarvester::refineSummaryHistogram(std::string strName, MonitorElement *h2SrcOcc, MonitorElement *h2SrcStatusA, MonitorElement *h2SrcStatusE, - MonitorElement *h2SrcStatusW) { + MonitorElement *h2SrcStatusW, + MonitorElement *h2SrcStatusEVFAT, + MonitorElement *h2SrcStatusWVFAT, + MonitorElement *h2SrcStatusEOH, + MonitorElement *h2SrcStatusWOH, + MonitorElement *h2SrcStatusEAMC, + MonitorElement *h2SrcStatusWAMC, + MonitorElement *h2SrcStatusEAMC13, + Int_t nLumiCurr) { Int_t nBinY = h2Sum->getNbinsY(); Int_t nAllBin = 0, nFineBin = 0; for (Int_t j = 1; j <= nBinY; j++) { @@ -218,10 +379,27 @@ Float_t GEMDQMHarvester::refineSummaryHistogram(std::string strName, for (Int_t i = 1; i <= nBinX; i++) { Float_t fOcc = h2SrcOcc->getBinContent(i, j); Float_t fStatusAll = h2SrcStatusA->getBinContent(i, j); - Float_t fStatusWarn = h2SrcStatusW->getBinContent(i, j); Float_t fStatusErr = h2SrcStatusE->getBinContent(i, j); - - Int_t nRes = assessOneBin(strName, i, j, fStatusAll, fOcc, fStatusWarn, fStatusErr); + Float_t fStatusWarn = h2SrcStatusW->getBinContent(i, j); + Float_t fStatusErrVFAT = h2SrcStatusEVFAT->getBinContent(i, j); + Float_t fStatusWarnVFAT = h2SrcStatusWVFAT->getBinContent(i, j); + Float_t fStatusErrOH = h2SrcStatusEOH->getBinContent(i, j); + Float_t fStatusWarnOH = h2SrcStatusWOH->getBinContent(i, j); + Float_t fStatusErrAMC = h2SrcStatusEAMC->getBinContent(i, j); + Float_t fStatusWarnAMC = h2SrcStatusWAMC->getBinContent(i, j); + Float_t fStatusErrAMC13 = h2SrcStatusEAMC13->getBinContent(i, j); + NumStatus numStatus(fStatusAll, + fOcc, + fStatusErrVFAT, + fStatusWarnVFAT, + fStatusErrOH, + fStatusWarnOH, + fStatusErrAMC, + fStatusWarnAMC, + fStatusErrAMC13); + UpdateStatusChamber(j, i, nLumiCurr, numStatus); + + Int_t nRes = assessOneBin(strName, i, j, fStatusAll, fOcc, fStatusErr, fStatusWarn); if (nRes == 1) nFineBin++; @@ -237,17 +415,21 @@ Int_t GEMDQMHarvester::refineSummaryVFAT(std::string strName, MonitorElement *h2Sum, MonitorElement *h2SrcOcc, MonitorElement *h2SrcStatusE, - MonitorElement *h2SrcStatusW) { + MonitorElement *h2SrcStatusW, + Int_t nLumiCurr, + Int_t nIdxLayer) { Int_t nBinY = h2Sum->getNbinsY(); for (Int_t j = 1; j <= nBinY; j++) { Int_t nBinX = h2Sum->getNbinsX(); for (Int_t i = 1; i <= nBinX; i++) { Float_t fOcc = h2SrcOcc->getBinContent(i, j); - Float_t fStatusWarn = h2SrcStatusW->getBinContent(i, j); Float_t fStatusErr = h2SrcStatusE->getBinContent(i, j); - Float_t fStatusAll = fOcc + fStatusWarn + fStatusErr; + Float_t fStatusWarn = h2SrcStatusW->getBinContent(i, j); + Float_t fStatusAll = fOcc + fStatusErr + fStatusWarn; + NumStatus numStatus(fStatusAll, fOcc, fStatusErr, fStatusWarn, 0, 0, 0, 0, 0); + UpdateStatusChamber(nIdxLayer, i, j, nLumiCurr, numStatus); - Int_t nRes = assessOneBin(strName, i, j, fStatusAll, fOcc, fStatusWarn, fStatusErr); + Int_t nRes = assessOneBin(strName, i, j, fStatusAll, fOcc, fStatusErr, fStatusWarn); h2Sum->setBinContent(i, j, (Float_t)nRes); } } @@ -255,4 +437,159 @@ Int_t GEMDQMHarvester::refineSummaryVFAT(std::string strName, return 0; } +Int_t GEMDQMHarvester::UpdateStatusChamber(Int_t nIdxLayer, Int_t nIdxCh, Int_t nLumiCurr, NumStatus numStatus) { + if (!bIsStatusChambersInit_) + return 0; + if (0 >= nIdxCh || nIdxCh > mapNumChPerChamber_[nIdxLayer]) + return 0; + auto &listStatus = mapStatusChambersSummary_[{nIdxLayer, nIdxCh}]; + auto &numStatusPrev = mapNumStatusChambersSummary_[{nIdxLayer, nIdxCh}]; + return UpdateStatusChamber(listStatus, numStatusPrev, nLumiCurr, numStatus); +} + +Int_t GEMDQMHarvester::UpdateStatusChamber( + Int_t nIdxLayer, Int_t nIdxCh, Int_t nIdxVFAT, Int_t nLumiCurr, NumStatus numStatus) { + if (!bIsStatusChambersInit_) + return 0; + if (0 >= nIdxCh || nIdxCh > mapNumChPerChamber_[nIdxLayer]) + return 0; + if (0 >= nIdxVFAT || nIdxVFAT > nNumVFATs_) + return 0; + auto &listStatus = mapStatusVFATsSummary_[{nIdxLayer, nIdxCh, nIdxVFAT}]; + auto &numStatusPrev = mapNumStatusVFATsSummary_[{nIdxLayer, nIdxCh, nIdxVFAT}]; + return UpdateStatusChamber(listStatus, numStatusPrev, nLumiCurr, numStatus); +} + +Int_t GEMDQMHarvester::UpdateStatusChamber(std::vector &listStatus, + NumStatus &numStatus, + Int_t nLumiCurr, + NumStatus numStatusNew) { + // First of all, the current lumi section will be assessed, of which the result will be stored in nStatus + Int_t nStatus = 0; + + Float_t fNumAddErrVFAT = numStatusNew.fNumErrVFAT_ - numStatus.fNumErrVFAT_; + Float_t fNumAddWarnVFAT = numStatusNew.fNumWarnVFAT_ - numStatus.fNumWarnVFAT_; + Float_t fNumAddErrOH = numStatusNew.fNumErrOH_ - numStatus.fNumErrOH_; + Float_t fNumAddWarnOH = numStatusNew.fNumWarnOH_ - numStatus.fNumWarnOH_; + Float_t fNumAddErrAMC = numStatusNew.fNumErrAMC_ - numStatus.fNumErrAMC_; + Float_t fNumAddWarnAMC = numStatusNew.fNumWarnAMC_ - numStatus.fNumWarnAMC_; + Float_t fNumAddErrAMC13 = numStatusNew.fNumErrAMC13_ - numStatus.fNumErrAMC13_; + + numStatus.fNumTotal_ = numStatusNew.fNumTotal_; + numStatus.fNumOcc_ = numStatusNew.fNumOcc_; + numStatus.fNumErrVFAT_ = numStatusNew.fNumErrVFAT_; + numStatus.fNumWarnVFAT_ = numStatusNew.fNumWarnVFAT_; + numStatus.fNumErrOH_ = numStatusNew.fNumErrOH_; + numStatus.fNumWarnOH_ = numStatusNew.fNumWarnOH_; + numStatus.fNumErrAMC_ = numStatusNew.fNumErrAMC_; + numStatus.fNumWarnAMC_ = numStatusNew.fNumWarnAMC_; + numStatus.fNumErrAMC13_ = numStatusNew.fNumErrAMC13_; + + nStatus = (numStatusNew.fNumOcc_ > 0 ? 1 << nBitOcc_ : 0) | (fNumAddErrAMC13 > 0 ? 1 << nBitErrAMC13_ : 0) | + (fNumAddErrAMC > 0 ? 1 << nBitErrAMC_ : 0) | (fNumAddWarnAMC > 0 ? 1 << nBitWarnAMC_ : 0) | + (fNumAddErrOH > 0 ? 1 << nBitErrOH_ : 0) | (fNumAddWarnOH > 0 ? 1 << nBitWarnOH_ : 0) | + (fNumAddErrVFAT > 0 ? 1 << nBitErrVFAT_ : 0) | (fNumAddWarnVFAT > 0 ? 1 << nBitWarnVFAT_ : 0); + + // Only used in the next if statement; See statusLast + StatusInfo statusNew; + statusNew.nLumiStart = nLumiCurr; + statusNew.nLumiEnd = nLumiCurr; + statusNew.nStatus = nStatus; + + if (listStatus.empty()) { + listStatus.push_back(statusNew); + } else { + auto &statusLastPre = listStatus.back(); + if (statusLastPre.nStatus == nStatus) { + statusLastPre.nLumiEnd = nLumiCurr; + } else { + listStatus.push_back(statusNew); + } + } + + return 0; +} + +void GEMDQMHarvester::createLumiFuncHist(edm::Service &store, + std::string strSuffix, + Int_t nIdxLayer, + Int_t nLumiCurr) { + auto &nNumCh = mapNumChPerChamber_[nIdxLayer]; + + MonitorElement *h2Summary; + + //Int_t nLumiCurrLowRes = ( ( nLumiCurr - 1 ) / nResolutionLumi_ ) * nResolutionLumi_; + Int_t nNumBinLumi = ((nLumiCurr - 1) / nResolutionLumi_) + 1; + Int_t nMaxBin = 0; + + // Creating or Summoning the corresponding histogram + if (mapHistLumiFunc_.find(nIdxLayer) == mapHistLumiFunc_.end()) { + store->setCurrentFolder(strDirSummary_); + h2Summary = store->book2S("chamberStatus_inLumi" + strSuffix, + "Chamber status on lumi-block " + strSuffix.substr(1), + nMaxLumi_ / nResolutionLumi_, + 1.0, + (Float_t)(nMaxLumi_ + 1), + //nNumBinLumi, 1.0, (Float_t)( nLumiCurr + 1 ), + nNumCh, + 0.5, + nNumCh + 0.5); + mapHistLumiFunc_[nIdxLayer] = h2Summary; + + h2Summary->setXTitle("Luminosity block"); + h2Summary->setYTitle("Chamber"); + for (Int_t i = 1; i <= nNumCh; i++) { + h2Summary->setBinLabel(i, Form("%i", i), 2); + } + } else { + h2Summary = mapHistLumiFunc_[nIdxLayer]; + } + + for (Int_t nIdxCh = 1; nIdxCh <= nNumCh; nIdxCh++) { + auto &listStatus = mapStatusChambersSummary_[{nIdxLayer, nIdxCh}]; + + Int_t nIdxStatus = 0; + for (Int_t nIdxLumi = 0; nIdxLumi < nNumBinLumi; nIdxLumi++) { + // Lumis covered by these values (nLumiStart <=, <= nLumiEnd) are counted for the current bin + Int_t nLumiStart = 1 + nIdxLumi * nResolutionLumi_; + Int_t nLumiEnd = (1 + nIdxLumi) * nResolutionLumi_; + if (nLumiEnd > nLumiCurr) + nLumiEnd = nLumiCurr; + + Int_t nStatusSum = 0; + while (true) { // No worries, nIdxStatus must increase and reach at listStatus.size() + // True: It was too past so that + // the lumi range of listStatus[ nIdxStatus ] is out of the coverage of the current bin + if (listStatus[nIdxStatus].nLumiEnd < nLumiStart) { + nIdxStatus++; + if (nIdxStatus >= (int)listStatus.size()) { + break; // For safety + } + continue; + } + + nStatusSum = listStatus[nIdxStatus].nStatus; + + // True: This is the last item of listStatus which is covered by the current bin + if (nIdxStatus + 1 >= (int)listStatus.size() || listStatus[nIdxStatus].nLumiEnd >= nLumiEnd) { + break; + } + + nIdxStatus++; + if (nIdxStatus >= (int)listStatus.size()) { + break; // For safety + } + } + + h2Summary->setBinContent(nIdxLumi + 1, nIdxCh, nStatusSum); + if (nMaxBin < nIdxLumi + 1) + nMaxBin = nIdxLumi + 1; + } + } + + for (Int_t nX = 1; nX <= nMaxBin; nX++) { + h2Summary->setBinContent(nX, 0, 1); + } +} + DEFINE_FWK_MODULE(GEMDQMHarvester); diff --git a/DQM/GEM/test/decomposeStatus.py b/DQM/GEM/test/decomposeStatus.py new file mode 100644 index 0000000000000..43a31755fcebb --- /dev/null +++ b/DQM/GEM/test/decomposeStatus.py @@ -0,0 +1,102 @@ +import ROOT +import os, sys +import argparse +import array + + +bitDigiOcc = 0 + +listBitConfFilter = [ + { "name": "AMC13", "error": 1, "warning": -1 }, + { "name": "AMC", "error": 2, "warning": 3 }, + { "name": "OH", "error": 4, "warning": 5 }, + { "name": "VFAT", "error": 6, "warning": 7 }, +] + + +parser = argparse.ArgumentParser() + +parser.add_argument("src", default="", help="") +parser.add_argument("dst", default="", help="") + +opts = parser.parse_args() + +fDQM = ROOT.TFile.Open(opts.src) +dirMain = None + +for k1 in fDQM.GetListOfKeys(): + d1 = fDQM.Get(k1.GetName()) + if not isinstance(d1, ROOT.TDirectoryFile): + continue + + for k2 in d1.GetListOfKeys(): + d2 = d1.Get(k2.GetName()) + if not isinstance(d1, ROOT.TDirectoryFile): + continue + + dirMain = d2 + break + + if dirMain: + break + +dirEventInfo = dirMain.Get("GEM/Run summary/EventInfo") +listHistLumi = [ k.GetName() for k in dirEventInfo.GetListOfKeys() ] +listHistLumi = [ s for s in listHistLumi if s.startswith("chamberStatus_inLumi") ] + +fOut = ROOT.TFile.Open(opts.dst, "RECREATE") + +for name in listHistLumi: + histCurr = dirEventInfo.Get(name) + + listFillLumi = [ histCurr.GetBinContent(i + 1, 0) for i in range(histCurr.GetNbinsX()) ] + numLumi = max([ i for i, x in enumerate(listFillLumi) if abs(x) > 0 ]) + 1 + + listBinLumi = [ histCurr.GetXaxis().GetBinLowEdge(i + 1) for i in range(numLumi + 1) ] + listBinY = [ histCurr.GetYaxis().GetBinLowEdge(i + 1) for i in range(histCurr.GetNbinsY() + 1) ] + + for dicConf in listBitConfFilter: + fOut.cd() + + numBinY = len(listBinY) - 1 + + histNew = ROOT.TH2S( + dicConf[ "name" ] + "_" + name, + histCurr.GetTitle() + " ({})".format(dicConf[ "name" ]), + numLumi, + array.array("d", listBinLumi), + numBinY, + array.array("d", listBinY), + ) + + histNew.GetXaxis().SetTitle(histCurr.GetXaxis().GetTitle()) + histNew.GetYaxis().SetTitle(histCurr.GetYaxis().GetTitle()) + + for i in range(len(listBinY) - 1): + histNew.GetYaxis().SetBinLabel(i + 1, histCurr.GetYaxis().GetBinLabel(i + 1)) + + for j in range(numBinY): + for i in range(numLumi): + val = int(histCurr.GetBinContent(i + 1, j + 1)) + occ = val & ( 1 << bitDigiOcc ) != 0 + err = val & ( 1 << dicConf[ "error" ] ) != 0 if dicConf[ "error" ] >= 0 else False + warn = val & ( 1 << dicConf[ "warning" ] ) != 0 if dicConf[ "warning" ] >= 0 else False + print(dicConf[ "name" ], val, occ, err, warn) + + out = 0 + if err: + out = 2 + elif warn: + out = 3 + elif occ: + out = 1 + + histNew.SetBinContent(i + 1, j + 1, out) + + histNew.Write() + +fOut.Write() +fOut.Close() +fDQM.Close() + + diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 280373c1944f9..eed73e9e778e8 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/HLT --type FULL -# /dev/CMSSW_12_3_0/HLT/V67 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/HLT/V68 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/HLT/V67') + tableName = cms.string('/dev/CMSSW_12_3_0/HLT/V68') ) fragment.transferSystem = cms.PSet( @@ -5437,10 +5437,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.DTObjectMapESProducer = cms.ESProducer( "DTObjectMapESProducer", appendToDataLabel = cms.string( "" ) @@ -6649,10 +6653,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -6759,10 +6767,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -6914,32 +6926,40 @@ ) ) fragment.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -6954,10 +6974,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -7252,8 +7276,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) fragment.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) @@ -11490,6 +11513,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5DoubleEG3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11521,6 +11545,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu5Ele3CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -12609,6 +12634,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3DoubleEG7p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -12640,6 +12666,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu3DiEle7p5CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -12857,6 +12884,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuV1OSM5to17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -12888,6 +12916,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonV2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -13071,6 +13100,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuOpen53p52UpsilonMuon" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -14198,6 +14228,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMuOpen53p52UpsilonMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16270,6 +16301,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16450,6 +16482,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16905,6 +16938,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorDoubleMu0er1p4SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16936,6 +16970,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17082,6 +17117,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorTripleMu530DoubleMu53OSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17113,6 +17149,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuorTripleMuL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17731,6 +17768,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3SQHTT200" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17762,6 +17800,7 @@ PreviousCandTag = cms.InputTag( "hltDoubleMuon4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17870,6 +17909,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5OSIorDoubleMu0er1p4OSIorDoubleMu4OSIorDoubleMu4p5OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17901,6 +17941,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0er15OSIorDoubleMu0er14OSIorDoubleMu4OSIorDoubleMu4p5OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18173,6 +18214,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18216,6 +18258,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet30L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18290,6 +18333,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18321,6 +18365,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18422,6 +18467,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18453,6 +18499,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu7p5TrackFiltered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -19421,6 +19468,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -19452,6 +19500,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sEmuMu3L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25620,6 +25669,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25651,6 +25701,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigORMu18erTauXXer2p1L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26568,6 +26619,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26599,6 +26651,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22or25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29322,6 +29375,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29353,6 +29407,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29464,6 +29519,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29495,6 +29551,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29594,6 +29651,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29625,6 +29683,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30092,6 +30151,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpen" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30106,6 +30166,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpen" ), MaxEta = cms.double( 1.25 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30132,6 +30193,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuCosmics" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30158,6 +30220,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30184,6 +30247,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30210,6 +30274,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30236,6 +30301,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30486,6 +30552,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu114IorDoubleMu125" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30561,6 +30628,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenEr1p4NotBptxOR3BXORL1sSingleMuOpenEr1p1NotBptxOR3BX" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30815,6 +30883,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenNotBptxOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31056,6 +31125,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31128,6 +31198,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31252,6 +31323,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu155SQOR157ORTripleMu444ORDoubleMuScORupt" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31299,6 +31371,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444ORSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31606,6 +31679,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31658,6 +31732,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu155L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32079,6 +32154,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu20or22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32110,6 +32186,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orMu20erorMu25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32315,6 +32392,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu16IorSingleMu18IorSingleMu20IorSingleMu16erlorSingleMu18erlorSingleMu20erlorSingleMu22erlorSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32346,6 +32424,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu16orMu18erorMu20erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32512,6 +32591,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu15DQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32543,6 +32623,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu15DQlqL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38169,6 +38250,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC16dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38212,6 +38294,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet16L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38353,6 +38436,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38412,6 +38496,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38473,6 +38558,7 @@ PreviousCandTag = cms.InputTag( "hltL2fL1sMu3Jet30er2p5L1f0L2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38879,6 +38965,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC60dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38922,6 +39009,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet60L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38981,6 +39069,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC120dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39024,6 +39113,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet120L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39099,6 +39189,7 @@ PreviousCandTag = cms.InputTag( "hltL1Mu12er2p3Jet40er2p3dRMax0p4DoubleJet40er2p3dEtaMax1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39159,6 +39250,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu12Dijet40Deta1p6L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39618,6 +39710,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39649,6 +39742,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3or5or7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39716,6 +39810,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39747,6 +39842,7 @@ PreviousCandTag = cms.InputTag( "hltMu8DiEle12CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39998,6 +40094,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6HTT240" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40029,6 +40126,7 @@ PreviousCandTag = cms.InputTag( "hltMuon8L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40260,6 +40358,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40291,6 +40390,7 @@ PreviousCandTag = cms.InputTag( "hltMu8TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41354,6 +41454,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0Jet90er2p5dRMax0p8dRMu1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -42505,6 +42606,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu23EG10IorMu20EG17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -42536,6 +42638,7 @@ PreviousCandTag = cms.InputTag( "hltMu23TrkIsoVVLEle12CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -42846,6 +42949,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22IorSingleMu25IorMu23EG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -42877,6 +42981,7 @@ PreviousCandTag = cms.InputTag( "hltMu23TrkIsoVVLEle8CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43183,6 +43288,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43214,6 +43320,7 @@ PreviousCandTag = cms.InputTag( "hltMu12TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43524,6 +43631,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG17OrDoubleEGOrSingleEG" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43555,6 +43663,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu12Diphoton20L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46880,6 +46989,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46911,6 +47021,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47065,6 +47176,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu5SQ3SQ0OQDoubleMu53SQOSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47096,6 +47208,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47225,6 +47338,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47256,6 +47370,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47352,6 +47467,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47383,6 +47499,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47467,6 +47584,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47498,6 +47616,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47594,6 +47713,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5er2p0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47625,6 +47745,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47709,6 +47830,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5er2p0SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47740,6 +47862,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47828,6 +47951,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47859,6 +47983,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47943,6 +48068,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5dR1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47974,6 +48100,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5dR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48070,6 +48197,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0er1p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48101,6 +48229,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48259,6 +48388,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48290,6 +48420,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48374,6 +48505,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4dR1p2" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48405,6 +48537,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4dR1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48489,6 +48622,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu530NoMass" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48520,6 +48654,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1TripleMuNoMassL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48604,6 +48739,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu53p52p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48635,6 +48771,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon53p52p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48752,6 +48889,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48783,6 +48921,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48995,6 +49134,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0IorTripleMu553" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49026,6 +49166,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu553L1TriMuFiltered3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49321,6 +49462,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu157IorDoubleMu4p5SQOSdR1p2IorSingleMu25IorSingleMu22erIorTripleMuMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49533,6 +49675,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0ETM40IorDoubleMu0ETM55IorDoubleMu0ETM60IorDoubleMu0ETM65IorDoubleMu0ETM70" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49564,6 +49707,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0ETM40lorDoubleMu0ETM55" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -50243,6 +50387,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51119,6 +51264,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu7EG23IorMu20EG17IorMu23EG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51520,6 +51666,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51551,6 +51698,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51612,6 +51760,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OSEG12ORDoubleMu5OSEG12" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51643,6 +51792,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSEG12ORDoubleMu5OSEG12L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55213,6 +55363,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenObjectMap" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55244,6 +55395,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenCandidateL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55904,6 +56056,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55935,6 +56088,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdRMax1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56081,6 +56235,7 @@ PreviousCandTag = cms.InputTag( "hltL1s12DoubleMu4p5er2p0SQOSMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56112,6 +56267,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1s12DoubleMu4p5er2p0SQOSMass7to18L1v2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56258,6 +56414,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4SQOSdRMax1p2DoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56289,6 +56446,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu4SQOSdRMax1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56435,6 +56593,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu9SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56466,6 +56625,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu9SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56736,6 +56896,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4EG9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56767,6 +56928,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu4Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57048,6 +57210,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu7EG7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57079,6 +57242,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu9Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57329,6 +57493,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu18er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57360,6 +57525,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu18erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -59100,6 +59266,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -59131,6 +59298,7 @@ PreviousCandTag = cms.InputTag( "hltMu17Photon30IsoCaloIdMuonlegL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -64010,7 +64178,8 @@ ptMin = cms.double( 0.3 ) ) fragment.hltScoutingPrimaryVertexPacker = cms.EDProducer( "HLTScoutingPrimaryVertexProducer", - vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ) + vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), + mantissaPrecision = cms.int32( 10 ) ) fragment.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), @@ -65456,6 +65625,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -65551,6 +65721,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -65577,6 +65748,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 10.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66269,6 +66441,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66353,6 +66526,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66437,6 +66611,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu12BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66542,6 +66717,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu16BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70117,6 +70293,7 @@ PreviousCandTag = cms.InputTag( "hltL1sCDC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -70516,6 +70693,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu14erIorSingleMu16er" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70542,6 +70720,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7to30" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -73416,6 +73595,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -73447,6 +73627,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0HighQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -76064,6 +76245,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -76116,6 +76298,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78134,6 +78317,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22orParking" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78165,6 +78349,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orParkingL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78709,6 +78894,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78793,6 +78979,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78861,6 +79048,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80046,6 +80234,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu22erIsoTau40er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80077,6 +80266,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erIsoTau40erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80312,6 +80502,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80343,6 +80534,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigOrMuXXerIsoTauYYerL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -85873,6 +86065,7 @@ PreviousCandTag = cms.InputTag( "hltL1sRPCMuonNormalisationForHI" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95409,6 +95602,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95431,6 +95625,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95461,6 +95656,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95475,6 +95671,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95493,6 +95690,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -99952,6 +100150,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -99978,6 +100177,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100004,6 +100204,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100030,6 +100231,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality50100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100044,6 +100246,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100070,6 +100273,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100096,6 +100300,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100122,6 +100327,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100136,6 +100342,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100162,6 +100369,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu10BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100228,6 +100436,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu10L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100329,6 +100538,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100516,6 +100726,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100650,6 +100861,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality70100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100676,6 +100888,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality80100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100690,6 +100903,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100787,6 +101001,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100893,6 +101108,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100940,6 +101156,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100971,6 +101188,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101039,6 +101257,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101086,6 +101305,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101117,6 +101337,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1FilteredN3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101164,6 +101385,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101195,6 +101417,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101316,6 +101539,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101347,6 +101571,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101468,6 +101693,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101499,6 +101725,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenMinimumBiasL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101632,6 +101859,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenMAXdR3p5BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101663,6 +101891,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenMAXdR3p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105125,6 +105354,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu0NotMBHF2ANDforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105177,6 +105407,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPCNotMBHF2AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105269,6 +105500,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105321,6 +105553,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106212,6 +106445,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106243,6 +106477,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106434,6 +106669,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet28MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106465,6 +106701,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet28MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106524,6 +106761,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet44MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106555,6 +106793,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet44MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106614,6 +106853,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet56MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106645,6 +106885,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet56MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106704,6 +106945,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet64MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106735,6 +106977,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet64MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py index 4d16a1fb8d926..8d07ef541bcac 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_3_0/Fake1 --type Fake1 -# /dev/CMSSW_12_3_0/Fake1/V6 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/Fake1/V7 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/Fake1/V6') + tableName = cms.string('/dev/CMSSW_12_3_0/Fake1/V7') ) 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 6e53f8c1e4bc6..174fefc006190 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_3_0/Fake2 --type Fake2 -# /dev/CMSSW_12_3_0/Fake2/V6 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/Fake2/V7 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/Fake2/V6') + tableName = cms.string('/dev/CMSSW_12_3_0/Fake2/V7') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) @@ -116,8 +116,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) fragment.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py index 746a03417f494..7bae204dbd3a2 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_3_0/Fake --type Fake -# /dev/CMSSW_12_3_0/Fake/V6 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/Fake/V7 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/Fake/V6') + tableName = cms.string('/dev/CMSSW_12_3_0/Fake/V7') ) 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 1cb3d4f640c1b..efe9caba2a154 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/GRun --type GRun -# /dev/CMSSW_12_3_0/GRun/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/GRun/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/GRun/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/GRun/V52') ) fragment.transferSystem = cms.PSet( @@ -4118,10 +4118,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.DTObjectMapESProducer = cms.ESProducer( "DTObjectMapESProducer", appendToDataLabel = cms.string( "" ) @@ -5330,10 +5334,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -5440,10 +5448,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -5595,32 +5607,40 @@ ) ) fragment.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -5635,10 +5655,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -5933,8 +5957,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) fragment.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) @@ -10123,6 +10146,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5DoubleEG3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -10154,6 +10178,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu5Ele3CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11242,6 +11267,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3DoubleEG7p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11273,6 +11299,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu3DiEle7p5CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11490,6 +11517,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuV1OSM5to17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11521,6 +11549,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonV2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11704,6 +11733,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuOpen53p52UpsilonMuon" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -12831,6 +12861,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMuOpen53p52UpsilonMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -14903,6 +14934,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15083,6 +15115,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15538,6 +15571,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorDoubleMu0er1p4SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15569,6 +15603,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15715,6 +15750,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorTripleMu530DoubleMu53OSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15746,6 +15782,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuorTripleMuL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16364,6 +16401,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3SQHTT200" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16395,6 +16433,7 @@ PreviousCandTag = cms.InputTag( "hltDoubleMuon4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16503,6 +16542,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5OSIorDoubleMu0er1p4OSIorDoubleMu4OSIorDoubleMu4p5OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16534,6 +16574,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0er15OSIorDoubleMu0er14OSIorDoubleMu4OSIorDoubleMu4p5OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16806,6 +16847,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16849,6 +16891,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet30L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16923,6 +16966,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16954,6 +16998,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17055,6 +17100,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17086,6 +17132,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu7p5TrackFiltered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18054,6 +18101,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18085,6 +18133,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sEmuMu3L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -24228,6 +24277,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -24259,6 +24309,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigORMu18erTauXXer2p1L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25176,6 +25227,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25207,6 +25259,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22or25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27930,6 +27983,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27961,6 +28015,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28072,6 +28127,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28103,6 +28159,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28202,6 +28259,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28233,6 +28291,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28700,6 +28759,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuCosmics" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28751,6 +28811,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenEr1p4NotBptxOR3BXORL1sSingleMuOpenEr1p1NotBptxOR3BX" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29005,6 +29066,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenNotBptxOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29246,6 +29308,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29321,6 +29384,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29445,6 +29509,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu155SQOR157ORTripleMu444ORDoubleMuScORupt" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29492,6 +29557,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444ORSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29799,6 +29865,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29851,6 +29918,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu155L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30272,6 +30340,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu20or22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30303,6 +30372,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orMu20erorMu25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30508,6 +30578,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu16IorSingleMu18IorSingleMu20IorSingleMu16erlorSingleMu18erlorSingleMu20erlorSingleMu22erlorSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30539,6 +30610,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu16orMu18erorMu20erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30705,6 +30777,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu15DQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30736,6 +30809,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu15DQlqL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36374,6 +36448,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC16dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36417,6 +36492,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet16L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36549,6 +36625,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36580,6 +36657,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36639,6 +36717,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36700,6 +36779,7 @@ PreviousCandTag = cms.InputTag( "hltL2fL1sMu3Jet30er2p5L1f0L2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37106,6 +37186,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC60dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37149,6 +37230,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet60L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37208,6 +37290,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC120dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37251,6 +37334,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet120L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37326,6 +37410,7 @@ PreviousCandTag = cms.InputTag( "hltL1Mu12er2p3Jet40er2p3dRMax0p4DoubleJet40er2p3dEtaMax1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37386,6 +37471,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu12Dijet40Deta1p6L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37845,6 +37931,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37876,6 +37963,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3or5or7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37943,6 +38031,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37974,6 +38063,7 @@ PreviousCandTag = cms.InputTag( "hltMu8DiEle12CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38225,6 +38315,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6HTT240" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38256,6 +38347,7 @@ PreviousCandTag = cms.InputTag( "hltMuon8L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38487,6 +38579,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38518,6 +38611,7 @@ PreviousCandTag = cms.InputTag( "hltMu8TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39593,6 +39687,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0Jet90er2p5dRMax0p8dRMu1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -40744,6 +40839,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu23EG10IorMu20EG17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40775,6 +40871,7 @@ PreviousCandTag = cms.InputTag( "hltMu23TrkIsoVVLEle12CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41073,6 +41170,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41104,6 +41202,7 @@ PreviousCandTag = cms.InputTag( "hltMu12TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41414,6 +41513,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG17OrDoubleEGOrSingleEG" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41445,6 +41545,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu12Diphoton20L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -44697,6 +44798,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -44728,6 +44830,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -44882,6 +44985,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu5SQ3SQ0OQDoubleMu53SQOSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -44913,6 +45017,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45042,6 +45147,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45073,6 +45179,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45169,6 +45276,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45200,6 +45308,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45284,6 +45393,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45315,6 +45425,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45411,6 +45522,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5er2p0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45442,6 +45554,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45526,6 +45639,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5er2p0SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45557,6 +45671,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45645,6 +45760,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45676,6 +45792,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45760,6 +45877,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5dR1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45791,6 +45909,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5dR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45887,6 +46006,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0er1p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45918,6 +46038,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46076,6 +46197,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46107,6 +46229,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46191,6 +46314,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4dR1p2" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46222,6 +46346,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4dR1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46306,6 +46431,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu530NoMass" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46337,6 +46463,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1TripleMuNoMassL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46421,6 +46548,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46452,6 +46580,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46569,6 +46698,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu53p52p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46600,6 +46730,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon53p52p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46717,6 +46848,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0IorTripleMu553" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46748,6 +46880,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu553L1TriMuFiltered3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47043,6 +47176,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu157IorDoubleMu4p5SQOSdR1p2IorSingleMu25IorSingleMu22erIorTripleMuMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47255,6 +47389,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0ETM40IorDoubleMu0ETM55IorDoubleMu0ETM60IorDoubleMu0ETM65IorDoubleMu0ETM70" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47286,6 +47421,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0ETM40lorDoubleMu0ETM55" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47965,6 +48101,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48841,6 +48978,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu7EG23IorMu20EG17IorMu23EG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49242,6 +49380,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49273,6 +49412,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49334,6 +49474,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OSEG12ORDoubleMu5OSEG12" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49365,6 +49506,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSEG12ORDoubleMu5OSEG12L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -52976,6 +53118,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenObjectMap" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53007,6 +53150,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenCandidateL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53667,6 +53811,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53698,6 +53843,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdRMax1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53844,6 +53990,7 @@ PreviousCandTag = cms.InputTag( "hltL1s12DoubleMu4p5er2p0SQOSMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53875,6 +54022,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1s12DoubleMu4p5er2p0SQOSMass7to18L1v2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54021,6 +54169,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4SQOSdRMax1p2DoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54052,6 +54201,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu4SQOSdRMax1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54198,6 +54348,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu9SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54229,6 +54380,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu9SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54499,6 +54651,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4EG9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54530,6 +54683,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu4Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54811,6 +54965,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu7EG7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54842,6 +54997,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu9Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55092,6 +55248,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu18er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55123,6 +55280,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu18erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56863,6 +57021,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56894,6 +57053,7 @@ PreviousCandTag = cms.InputTag( "hltMu17Photon30IsoCaloIdMuonlegL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -61737,7 +61897,8 @@ ptMin = cms.double( 0.3 ) ) fragment.hltScoutingPrimaryVertexPacker = cms.EDProducer( "HLTScoutingPrimaryVertexProducer", - vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ) + vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), + mantissaPrecision = cms.int32( 10 ) ) fragment.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), @@ -62377,6 +62538,7 @@ PreviousCandTag = cms.InputTag( "hltL1sCDC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -62776,6 +62938,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu14erIorSingleMu16er" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -64491,6 +64654,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -64522,6 +64686,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0HighQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66661,6 +66826,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66713,6 +66879,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -68731,6 +68898,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22orParking" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -68762,6 +68930,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orParkingL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -69318,6 +69487,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -69402,6 +69572,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -69470,6 +69641,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70655,6 +70827,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu22erIsoTau40er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70686,6 +70859,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erIsoTau40erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70921,6 +71095,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70952,6 +71127,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigOrMuXXerIsoTauYYerL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index 8e64daafaa5c8..2c2b83bc2040f 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/HIon --type HIon -# /dev/CMSSW_12_3_0/HIon/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/HIon/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V52') ) fragment.transferSystem = cms.PSet( @@ -3231,10 +3231,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.DTObjectMapESProducer = cms.ESProducer( "DTObjectMapESProducer", appendToDataLabel = cms.string( "" ) @@ -4443,10 +4447,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -4553,10 +4561,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -4708,32 +4720,40 @@ ) ) fragment.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -4748,10 +4768,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -5046,8 +5070,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) fragment.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) @@ -5338,6 +5361,7 @@ PreviousCandTag = cms.InputTag( "hltL1sRPCMuonNormalisationForHI" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16598,6 +16622,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16620,6 +16645,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16650,6 +16676,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16664,6 +16691,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16682,6 +16710,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21153,6 +21182,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21179,6 +21209,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21205,6 +21236,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21231,6 +21263,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality50100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21245,6 +21278,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21271,6 +21305,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21297,6 +21332,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21323,6 +21359,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21349,6 +21386,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21375,6 +21413,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu10BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21441,6 +21480,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu10L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21542,6 +21582,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21729,6 +21770,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21863,6 +21905,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality70100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21889,6 +21932,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality80100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21903,6 +21947,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22000,6 +22045,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22106,6 +22152,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22153,6 +22200,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22184,6 +22232,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22252,6 +22301,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22299,6 +22349,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22330,6 +22381,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1FilteredN3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22377,6 +22429,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22408,6 +22461,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22529,6 +22583,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22560,6 +22615,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22681,6 +22737,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22712,6 +22769,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenMinimumBiasL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22845,6 +22903,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenMAXdR3p5BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22876,6 +22935,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenMAXdR3p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26338,6 +26398,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu0NotMBHF2ANDforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26390,6 +26451,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPCNotMBHF2AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26482,6 +26544,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26534,6 +26597,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27449,6 +27513,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27480,6 +27545,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27671,6 +27737,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet28MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27702,6 +27769,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet28MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27761,6 +27829,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet44MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27792,6 +27861,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet44MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27851,6 +27921,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet56MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27882,6 +27953,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet56MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27941,6 +28013,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet64MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27972,6 +28045,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet64MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index e3f5acbb12b16..c304fe46741a6 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PIon --type PIon -# /dev/CMSSW_12_3_0/PIon/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/PIon/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V52') ) fragment.transferSystem = cms.PSet( @@ -2703,10 +2703,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.DTObjectMapESProducer = cms.ESProducer( "DTObjectMapESProducer", appendToDataLabel = cms.string( "" ) @@ -3915,10 +3919,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -4025,10 +4033,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -4180,32 +4192,40 @@ ) ) fragment.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -4220,10 +4240,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -4525,8 +4549,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) fragment.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 4518f496e47e4..cb0304ba67cd3 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PRef --type PRef -# /dev/CMSSW_12_3_0/PRef/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/PRef/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V52') ) fragment.transferSystem = cms.PSet( @@ -2781,10 +2781,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.DTObjectMapESProducer = cms.ESProducer( "DTObjectMapESProducer", appendToDataLabel = cms.string( "" ) @@ -3993,10 +3997,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -4103,10 +4111,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -4258,32 +4270,40 @@ ) ) fragment.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -4298,10 +4318,14 @@ appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) fragment.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -4596,8 +4620,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) fragment.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) @@ -7835,6 +7858,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7to30" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/HLTrigger/Configuration/python/Tools/options.py b/HLTrigger/Configuration/python/Tools/options.py index a051724466ba4..c78f173d3d586 100644 --- a/HLTrigger/Configuration/python/Tools/options.py +++ b/HLTrigger/Configuration/python/Tools/options.py @@ -8,7 +8,7 @@ 'HIon' : 'auto:run3_mc_HIon', 'PIon' : 'auto:run3_mc_PIon', 'PRef' : 'auto:run3_mc_PRef', - 'data' : 'auto:run3_hlt', + 'data' : 'auto:run3_hlt_relval', } diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 5fff8ba91499a..ce1a6ae2b1bf8 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -145,17 +145,6 @@ def customiseFor2018Input(process): return process - -def customiseFor37046(process): - """ Customisation to remove the PrescaleCSVFile parameter from the ParametersetDescription of the L1TGlobalProducer - in PR 37046 (https://github.com/cms-sw/cmssw/pull/37046) - """ - for prod in producers_by_type(process, 'L1TGlobalProducer'): - if hasattr(prod, 'PrescaleCSVFile'): - delattr(prod, 'PrescaleCSVFile') - return process - - # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -166,6 +155,4 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) - process = customiseFor37046(process) - return process diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 38d9eb14c925c..9909a4a4dfb76 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,6 +1,6 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_3_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_12_3_0/HLT/V67 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/HLT/V68 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process = cms.Process( "HLTFULL" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/HLT/V67') + tableName = cms.string('/dev/CMSSW_12_3_0/HLT/V68') ) process.transferSystem = cms.PSet( @@ -5496,10 +5496,14 @@ appendToDataLabel = cms.string( "" ) ) process.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) process.DTGeometryESModule = cms.ESProducer( "DTGeometryESModule", fromDDD = cms.bool( False ), @@ -6828,10 +6832,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -6939,10 +6947,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -7094,32 +7106,40 @@ ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -7134,10 +7154,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -7516,8 +7540,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) process.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) @@ -11754,6 +11777,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5DoubleEG3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11785,6 +11809,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu5Ele3CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -12873,6 +12898,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3DoubleEG7p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -12904,6 +12930,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu3DiEle7p5CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -13121,6 +13148,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuV1OSM5to17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -13152,6 +13180,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonV2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -13335,6 +13364,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuOpen53p52UpsilonMuon" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -14462,6 +14492,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMuOpen53p52UpsilonMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16534,6 +16565,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16714,6 +16746,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17169,6 +17202,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorDoubleMu0er1p4SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17200,6 +17234,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17346,6 +17381,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorTripleMu530DoubleMu53OSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17377,6 +17413,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuorTripleMuL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17995,6 +18032,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3SQHTT200" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18026,6 +18064,7 @@ PreviousCandTag = cms.InputTag( "hltDoubleMuon4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18134,6 +18173,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5OSIorDoubleMu0er1p4OSIorDoubleMu4OSIorDoubleMu4p5OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18165,6 +18205,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0er15OSIorDoubleMu0er14OSIorDoubleMu4OSIorDoubleMu4p5OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18437,6 +18478,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18480,6 +18522,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet30L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18554,6 +18597,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18585,6 +18629,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18686,6 +18731,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18717,6 +18763,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu7p5TrackFiltered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -19685,6 +19732,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -19716,6 +19764,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sEmuMu3L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25884,6 +25933,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25915,6 +25965,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigORMu18erTauXXer2p1L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26832,6 +26883,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26863,6 +26915,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22or25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29586,6 +29639,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29617,6 +29671,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29728,6 +29783,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29759,6 +29815,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29858,6 +29915,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29889,6 +29947,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30356,6 +30415,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpen" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30370,6 +30430,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpen" ), MaxEta = cms.double( 1.25 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30396,6 +30457,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuCosmics" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30422,6 +30484,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30448,6 +30511,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30474,6 +30538,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30500,6 +30565,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30750,6 +30816,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu114IorDoubleMu125" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30825,6 +30892,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenEr1p4NotBptxOR3BXORL1sSingleMuOpenEr1p1NotBptxOR3BX" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31079,6 +31147,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenNotBptxOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31320,6 +31389,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31392,6 +31462,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31516,6 +31587,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu155SQOR157ORTripleMu444ORDoubleMuScORupt" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31563,6 +31635,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444ORSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31870,6 +31943,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31922,6 +31996,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu155L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32343,6 +32418,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu20or22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32374,6 +32450,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orMu20erorMu25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32579,6 +32656,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu16IorSingleMu18IorSingleMu20IorSingleMu16erlorSingleMu18erlorSingleMu20erlorSingleMu22erlorSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32610,6 +32688,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu16orMu18erorMu20erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32776,6 +32855,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu15DQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -32807,6 +32887,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu15DQlqL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38433,6 +38514,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC16dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38476,6 +38558,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet16L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38617,6 +38700,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38676,6 +38760,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38737,6 +38822,7 @@ PreviousCandTag = cms.InputTag( "hltL2fL1sMu3Jet30er2p5L1f0L2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39143,6 +39229,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC60dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39186,6 +39273,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet60L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39245,6 +39333,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC120dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39288,6 +39377,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet120L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39363,6 +39453,7 @@ PreviousCandTag = cms.InputTag( "hltL1Mu12er2p3Jet40er2p3dRMax0p4DoubleJet40er2p3dEtaMax1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39423,6 +39514,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu12Dijet40Deta1p6L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39882,6 +39974,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39913,6 +40006,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3or5or7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39980,6 +40074,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40011,6 +40106,7 @@ PreviousCandTag = cms.InputTag( "hltMu8DiEle12CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40262,6 +40358,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6HTT240" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40293,6 +40390,7 @@ PreviousCandTag = cms.InputTag( "hltMuon8L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40524,6 +40622,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -40555,6 +40654,7 @@ PreviousCandTag = cms.InputTag( "hltMu8TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41618,6 +41718,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0Jet90er2p5dRMax0p8dRMu1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -42769,6 +42870,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu23EG10IorMu20EG17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -42800,6 +42902,7 @@ PreviousCandTag = cms.InputTag( "hltMu23TrkIsoVVLEle12CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43110,6 +43213,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22IorSingleMu25IorMu23EG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43141,6 +43245,7 @@ PreviousCandTag = cms.InputTag( "hltMu23TrkIsoVVLEle8CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43447,6 +43552,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43478,6 +43584,7 @@ PreviousCandTag = cms.InputTag( "hltMu12TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43788,6 +43895,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG17OrDoubleEGOrSingleEG" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -43819,6 +43927,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu12Diphoton20L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47144,6 +47253,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47175,6 +47285,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47329,6 +47440,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu5SQ3SQ0OQDoubleMu53SQOSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47360,6 +47472,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47489,6 +47602,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47520,6 +47634,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47616,6 +47731,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47647,6 +47763,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47731,6 +47848,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47762,6 +47880,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47858,6 +47977,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5er2p0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47889,6 +48009,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47973,6 +48094,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5er2p0SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48004,6 +48126,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48092,6 +48215,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48123,6 +48247,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48207,6 +48332,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5dR1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48238,6 +48364,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5dR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48334,6 +48461,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0er1p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48365,6 +48493,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48523,6 +48652,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48554,6 +48684,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48638,6 +48769,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4dR1p2" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48669,6 +48801,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4dR1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48753,6 +48886,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu530NoMass" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48784,6 +48918,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1TripleMuNoMassL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48868,6 +49003,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu53p52p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48899,6 +49035,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon53p52p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49016,6 +49153,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49047,6 +49185,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49259,6 +49398,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0IorTripleMu553" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49290,6 +49430,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu553L1TriMuFiltered3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49585,6 +49726,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu157IorDoubleMu4p5SQOSdR1p2IorSingleMu25IorSingleMu22erIorTripleMuMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49797,6 +49939,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0ETM40IorDoubleMu0ETM55IorDoubleMu0ETM60IorDoubleMu0ETM65IorDoubleMu0ETM70" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49828,6 +49971,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0ETM40lorDoubleMu0ETM55" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -50507,6 +50651,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51383,6 +51528,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu7EG23IorMu20EG17IorMu23EG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51784,6 +51930,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51815,6 +51962,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51876,6 +52024,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OSEG12ORDoubleMu5OSEG12" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -51907,6 +52056,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSEG12ORDoubleMu5OSEG12L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55477,6 +55627,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenObjectMap" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55508,6 +55659,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenCandidateL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56168,6 +56320,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56199,6 +56352,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdRMax1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56345,6 +56499,7 @@ PreviousCandTag = cms.InputTag( "hltL1s12DoubleMu4p5er2p0SQOSMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56376,6 +56531,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1s12DoubleMu4p5er2p0SQOSMass7to18L1v2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56522,6 +56678,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4SQOSdRMax1p2DoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56553,6 +56710,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu4SQOSdRMax1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56699,6 +56857,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu9SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -56730,6 +56889,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu9SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57000,6 +57160,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4EG9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57031,6 +57192,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu4Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57312,6 +57474,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu7EG7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57343,6 +57506,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu9Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57593,6 +57757,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu18er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57624,6 +57789,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu18erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -59364,6 +59530,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -59395,6 +59562,7 @@ PreviousCandTag = cms.InputTag( "hltMu17Photon30IsoCaloIdMuonlegL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -64274,7 +64442,8 @@ ptMin = cms.double( 0.3 ) ) process.hltScoutingPrimaryVertexPacker = cms.EDProducer( "HLTScoutingPrimaryVertexProducer", - vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ) + vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), + mantissaPrecision = cms.int32( 10 ) ) process.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), @@ -65720,6 +65889,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -65815,6 +65985,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -65841,6 +66012,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 10.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66533,6 +66705,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66617,6 +66790,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66701,6 +66875,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu12BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66806,6 +66981,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu16BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70381,6 +70557,7 @@ PreviousCandTag = cms.InputTag( "hltL1sCDC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -70780,6 +70957,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu14erIorSingleMu16er" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70806,6 +70984,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7to30" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -73680,6 +73859,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -73711,6 +73891,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0HighQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -76328,6 +76509,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -76380,6 +76562,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78398,6 +78581,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22orParking" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78429,6 +78613,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orParkingL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -78973,6 +79158,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -79057,6 +79243,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -79125,6 +79312,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80310,6 +80498,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu22erIsoTau40er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80341,6 +80530,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erIsoTau40erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80576,6 +80766,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -80607,6 +80798,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigOrMuXXerIsoTauYYerL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -86137,6 +86329,7 @@ PreviousCandTag = cms.InputTag( "hltL1sRPCMuonNormalisationForHI" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95673,6 +95866,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95695,6 +95889,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95725,6 +95920,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95739,6 +95935,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -95757,6 +95954,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100216,6 +100414,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100242,6 +100441,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100268,6 +100468,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100294,6 +100495,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality50100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100308,6 +100510,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100334,6 +100537,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100360,6 +100564,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100386,6 +100591,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100400,6 +100606,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100426,6 +100633,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu10BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100492,6 +100700,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu10L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100593,6 +100802,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100780,6 +100990,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100914,6 +101125,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality70100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100940,6 +101152,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality80100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -100954,6 +101167,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101051,6 +101265,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101157,6 +101372,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101204,6 +101420,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101235,6 +101452,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101303,6 +101521,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101350,6 +101569,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101381,6 +101601,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1FilteredN3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101428,6 +101649,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101459,6 +101681,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101580,6 +101803,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101611,6 +101835,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101732,6 +101957,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101763,6 +101989,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenMinimumBiasL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101896,6 +102123,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenMAXdR3p5BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -101927,6 +102155,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenMAXdR3p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105389,6 +105618,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu0NotMBHF2ANDforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105441,6 +105671,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPCNotMBHF2AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105533,6 +105764,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -105585,6 +105817,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106476,6 +106709,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106507,6 +106741,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106698,6 +106933,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet28MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106729,6 +106965,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet28MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106788,6 +107025,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet44MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106819,6 +107057,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet44MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106878,6 +107117,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet56MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106909,6 +107149,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet56MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106968,6 +107209,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet64MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -106999,6 +107241,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet64MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index b3f95fdaf49c5..7687e01d8aa95 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_3_0/Fake --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root -# /dev/CMSSW_12_3_0/Fake/V6 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/Fake/V7 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/Fake/V6') + tableName = cms.string('/dev/CMSSW_12_3_0/Fake/V7') ) 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 cd6c3eab176fc..7622fa663633e 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_3_0/Fake1 --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root -# /dev/CMSSW_12_3_0/Fake1/V6 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/Fake1/V7 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake1" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/Fake1/V6') + tableName = cms.string('/dev/CMSSW_12_3_0/Fake1/V7') ) 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 9afbe042c23ad..3934219ad0e52 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_3_0/Fake2 --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root -# /dev/CMSSW_12_3_0/Fake2/V6 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/Fake2/V7 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake2" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/Fake2/V6') + tableName = cms.string('/dev/CMSSW_12_3_0/Fake2/V7') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) @@ -220,8 +220,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) process.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index d117d48fa4f73..0e6b23c301b7d 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,6 +1,6 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_3_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_12_3_0/GRun/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/GRun/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process = cms.Process( "HLTGRun" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/GRun/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/GRun/V52') ) process.transferSystem = cms.PSet( @@ -4177,10 +4177,14 @@ appendToDataLabel = cms.string( "" ) ) process.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) process.DTGeometryESModule = cms.ESProducer( "DTGeometryESModule", fromDDD = cms.bool( False ), @@ -5509,10 +5513,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -5620,10 +5628,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -5775,32 +5787,40 @@ ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -5815,10 +5835,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -6197,8 +6221,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) process.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) @@ -10387,6 +10410,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5DoubleEG3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -10418,6 +10442,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu5Ele3CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11506,6 +11531,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3DoubleEG7p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11537,6 +11563,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu3DiEle7p5CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11754,6 +11781,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuV1OSM5to17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11785,6 +11813,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonV2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -11968,6 +11997,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMuOpen53p52UpsilonMuon" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -13095,6 +13125,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMuOpen53p52UpsilonMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15167,6 +15198,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15347,6 +15379,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15802,6 +15835,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorDoubleMu0er1p4SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15833,6 +15867,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -15979,6 +16014,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4IorTripleMu530DoubleMu53OSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16010,6 +16046,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuorTripleMuL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16628,6 +16665,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu3SQHTT200" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16659,6 +16697,7 @@ PreviousCandTag = cms.InputTag( "hltDoubleMuon4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16767,6 +16806,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5OSIorDoubleMu0er1p4OSIorDoubleMu4OSIorDoubleMu4p5OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16798,6 +16838,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0er15OSIorDoubleMu0er14OSIorDoubleMu4OSIorDoubleMu4p5OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17070,6 +17111,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17113,6 +17155,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet30L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17187,6 +17230,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17218,6 +17262,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17319,6 +17364,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -17350,6 +17396,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu7p5TrackFiltered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18318,6 +18365,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -18349,6 +18397,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sEmuMu3L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -24492,6 +24541,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigORMu18erTauXXer2p1" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -24523,6 +24573,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigORMu18erTauXXer2p1L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25440,6 +25491,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -25471,6 +25523,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22or25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28194,6 +28247,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28225,6 +28279,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28336,6 +28391,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28367,6 +28423,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28466,6 +28523,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28497,6 +28555,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28964,6 +29023,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuCosmics" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29015,6 +29075,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenEr1p4NotBptxOR3BXORL1sSingleMuOpenEr1p1NotBptxOR3BX" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29269,6 +29330,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenNotBptxOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29510,6 +29572,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOR" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29585,6 +29648,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29709,6 +29773,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu155SQOR157ORTripleMu444ORDoubleMuScORupt" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -29756,6 +29821,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157ORTripleMu444ORSingleMu22" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30063,6 +30129,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30115,6 +30182,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu155L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30536,6 +30604,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu20or22or25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30567,6 +30636,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orMu20erorMu25L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30772,6 +30842,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu16IorSingleMu18IorSingleMu20IorSingleMu16erlorSingleMu18erlorSingleMu20erlorSingleMu22erlorSingleMu25" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30803,6 +30874,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu16orMu18erorMu20erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -30969,6 +31041,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu15DQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -31000,6 +31073,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu15DQlqL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36638,6 +36712,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC16dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36681,6 +36756,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet16L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36813,6 +36889,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36844,6 +36921,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36903,6 +36981,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3Jet30er2p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -36964,6 +37043,7 @@ PreviousCandTag = cms.InputTag( "hltL2fL1sMu3Jet30er2p5L1f0L2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37370,6 +37450,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC60dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37413,6 +37494,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet60L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37472,6 +37554,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu3JetC120dRMax0p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37515,6 +37598,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3Jet120L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37590,6 +37674,7 @@ PreviousCandTag = cms.InputTag( "hltL1Mu12er2p3Jet40er2p3dRMax0p4DoubleJet40er2p3dEtaMax1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -37650,6 +37735,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu12Dijet40Deta1p6L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38109,6 +38195,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3IorSingleMu5IorSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38140,6 +38227,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu3or5or7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38207,6 +38295,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38238,6 +38327,7 @@ PreviousCandTag = cms.InputTag( "hltMu8DiEle12CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38489,6 +38579,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6HTT240" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38520,6 +38611,7 @@ PreviousCandTag = cms.InputTag( "hltMuon8L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38751,6 +38843,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -38782,6 +38875,7 @@ PreviousCandTag = cms.InputTag( "hltMu8TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -39857,6 +39951,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0Jet90er2p5dRMax0p8dRMu1p6" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -41008,6 +41103,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu23EG10IorMu20EG17" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41039,6 +41135,7 @@ PreviousCandTag = cms.InputTag( "hltMu23TrkIsoVVLEle12CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41337,6 +41434,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41368,6 +41466,7 @@ PreviousCandTag = cms.InputTag( "hltMu12TrkIsoVVLEle23CaloIdLTrackIdLIsoVLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41678,6 +41777,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu6DoubleEG17OrDoubleEGOrSingleEG" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -41709,6 +41809,7 @@ PreviousCandTag = cms.InputTag( "hltL1fMu12Diphoton20L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -44961,6 +45062,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -44992,6 +45094,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1DoubleMu0SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45146,6 +45249,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu5SQ3SQ0OQDoubleMu53SQOSMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45177,6 +45281,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuonL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45306,6 +45411,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45337,6 +45443,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45433,6 +45540,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu5SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45464,6 +45572,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45548,6 +45657,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45579,6 +45689,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45675,6 +45786,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4p5er2p0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45706,6 +45818,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45790,6 +45903,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4p5er2p0SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45821,6 +45935,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4p5er2p0SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45909,6 +46024,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu5SQMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -45940,6 +46056,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu5SQMass7to18L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46024,6 +46141,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5dR1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46055,6 +46173,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5dR1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46151,6 +46270,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu0er1p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46182,6 +46302,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46340,6 +46461,7 @@ PreviousCandTag = cms.InputTag( "hltL1sEmuDoubleMu4SQOS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46371,6 +46493,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4SQOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46455,6 +46578,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4dR1p2" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46486,6 +46610,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu4dR1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46570,6 +46695,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu530NoMass" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46601,6 +46727,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1TripleMuNoMassL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46685,6 +46812,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46716,6 +46844,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46833,6 +46962,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu53p52p5" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46864,6 +46994,7 @@ PreviousCandTag = cms.InputTag( "hltTripleMuon53p52p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -46981,6 +47112,7 @@ PreviousCandTag = cms.InputTag( "hltL1sTripleMu0IorTripleMu553" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47012,6 +47144,7 @@ PreviousCandTag = cms.InputTag( "hltL1TripleMu553L1TriMuFiltered3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47307,6 +47440,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu157IorDoubleMu4p5SQOSdR1p2IorSingleMu25IorSingleMu22erIorTripleMuMassMax9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47519,6 +47653,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0ETM40IorDoubleMu0ETM55IorDoubleMu0ETM60IorDoubleMu0ETM65IorDoubleMu0ETM70" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -47550,6 +47685,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0ETM40lorDoubleMu0ETM55" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -48229,6 +48365,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49105,6 +49242,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu7EG23IorMu20EG17IorMu23EG10" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49506,6 +49644,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OS" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49537,6 +49676,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49598,6 +49738,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4OSEG12ORDoubleMu5OSEG12" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -49629,6 +49770,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu4OSEG12ORDoubleMu5OSEG12L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53240,6 +53382,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenObjectMap" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53271,6 +53414,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenCandidateL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53931,6 +54075,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -53962,6 +54107,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0er1p5SQOSdRMax1p4L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54108,6 +54254,7 @@ PreviousCandTag = cms.InputTag( "hltL1s12DoubleMu4p5er2p0SQOSMass7to18" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54139,6 +54286,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1s12DoubleMu4p5er2p0SQOSMass7to18L1v2Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54285,6 +54433,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4SQOSdRMax1p2DoubleMu0er1p5SQOSdRMax1p4" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54316,6 +54465,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu4SQOSdRMax1p2L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54462,6 +54612,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu9SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54493,6 +54644,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1sDoubleMu9SQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54763,6 +54915,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu4EG9" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -54794,6 +54947,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu4Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55075,6 +55229,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu7EG7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55106,6 +55261,7 @@ PreviousCandTag = cms.InputTag( "hltDiMu9Ele9CaloIdLTrackIdLMuonlegL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55356,6 +55512,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu18er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -55387,6 +55544,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu18erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57127,6 +57285,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu5EG23IorMu5IsoEG20IorMu7EG23IorMu7IsoEG20IorMuIso7EG23" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -57158,6 +57317,7 @@ PreviousCandTag = cms.InputTag( "hltMu17Photon30IsoCaloIdMuonlegL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -62001,7 +62161,8 @@ ptMin = cms.double( 0.3 ) ) process.hltScoutingPrimaryVertexPacker = cms.EDProducer( "HLTScoutingPrimaryVertexProducer", - vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ) + vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' ), + mantissaPrecision = cms.int32( 10 ) ) process.hltScoutingPFPacker = cms.EDProducer( "HLTScoutingPFProducer", pfJetCollection = cms.InputTag( 'hltAK4PixelOnlyPFJets','','@currentProcess' ), @@ -62641,6 +62802,7 @@ PreviousCandTag = cms.InputTag( "hltL1sCDC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( False ), SelectQualities = cms.vint32( ) @@ -63040,6 +63202,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu5IorSingleMu14erIorSingleMu16er" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -64755,6 +64918,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -64786,6 +64950,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu0HighQL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66925,6 +67090,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu125to157" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -66977,6 +67143,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -68995,6 +69162,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu22orParking" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -69026,6 +69194,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22orParkingL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -69582,6 +69751,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -69666,6 +69836,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -69734,6 +69905,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0SQ" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70919,6 +71091,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMu22erIsoTau40er" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -70950,6 +71123,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sMu22erIsoTau40erL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -71185,6 +71359,7 @@ PreviousCandTag = cms.InputTag( "hltL1sBigOrMuXXerIsoTauYYer" ), MaxEta = cms.double( 2.1 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -71216,6 +71391,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sBigOrMuXXerIsoTauYYerL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index 6d86d80a859f3..e9ac176be2b26 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,6 +1,6 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_3_0/HIon --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_12_3_0/HIon/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/HIon/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process = cms.Process( "HLTHIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V52') ) process.transferSystem = cms.PSet( @@ -3290,10 +3290,14 @@ appendToDataLabel = cms.string( "" ) ) process.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) process.DTGeometryESModule = cms.ESProducer( "DTGeometryESModule", fromDDD = cms.bool( False ), @@ -4622,10 +4626,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -4733,10 +4741,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -4888,32 +4900,40 @@ ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -4928,10 +4948,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -5310,8 +5334,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) process.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataRepacker" ) @@ -5602,6 +5625,7 @@ PreviousCandTag = cms.InputTag( "hltL1sRPCMuonNormalisationForHI" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16862,6 +16886,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 3.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16884,6 +16909,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16914,6 +16940,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 5.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16928,6 +16955,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -16946,6 +16974,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21417,6 +21446,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21443,6 +21473,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21469,6 +21500,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21495,6 +21527,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality50100BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21509,6 +21542,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21535,6 +21569,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21561,6 +21596,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality30100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21587,6 +21623,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenCentrality40100BptxANDANDL1DoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21613,6 +21650,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu0BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21639,6 +21677,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMu10BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21705,6 +21744,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu10L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21806,6 +21846,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -21993,6 +22034,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22127,6 +22169,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality70100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22153,6 +22196,7 @@ PreviousCandTag = cms.InputTag( "hltL1sMuOpenCentrality80100MBHF1BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22167,6 +22211,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22264,6 +22309,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22370,6 +22416,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMu0L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22417,6 +22464,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenOSBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22448,6 +22496,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenOSL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22516,6 +22565,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22563,6 +22613,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 3 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22594,6 +22645,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenL1FilteredN3" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22641,6 +22693,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 7.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22672,6 +22725,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered7" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22793,6 +22847,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22824,6 +22879,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22945,6 +23001,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu3OpenBptxANDMinimumBiasHF1AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -22976,6 +23033,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMu3OpenMinimumBiasL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -23109,6 +23167,7 @@ PreviousCandTag = cms.InputTag( "hltL1sDoubleMuOpenMAXdR3p5BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -23140,6 +23199,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sL1DoubleMuOpenMAXdR3p5L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26602,6 +26662,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu0NotMBHF2ANDforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26654,6 +26715,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPCNotMBHF2AND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26746,6 +26808,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenforMu8Mu13" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 2 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -26798,6 +26861,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sDoubleMu157L1Filtered0forUPC" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27713,6 +27777,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenBptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27744,6 +27809,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenL1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27935,6 +28001,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet28MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -27966,6 +28033,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet28MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28025,6 +28093,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet44MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28056,6 +28125,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet44MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28115,6 +28185,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet56MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28146,6 +28217,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet56MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28205,6 +28277,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMuOpenSingleJet64MidEta2p7BptxAND" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) @@ -28236,6 +28309,7 @@ PreviousCandTag = cms.InputTag( "hltL1fL1sSingleMuOpenSingleJet64MidEta2p7L1Filtered0" ), MaxEta = cms.double( 2.5 ), MinPt = cms.double( 9999.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index 756375a2f8120..392f530479b5d 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,6 +1,6 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_3_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_12_3_0/PIon/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/PIon/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process = cms.Process( "HLTPIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V52') ) process.transferSystem = cms.PSet( @@ -2762,10 +2762,14 @@ appendToDataLabel = cms.string( "" ) ) process.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) process.DTGeometryESModule = cms.ESProducer( "DTGeometryESModule", fromDDD = cms.bool( False ), @@ -4094,10 +4098,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -4205,10 +4213,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -4360,32 +4372,40 @@ ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -4400,10 +4420,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -4789,8 +4813,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) process.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index 96f07b6761db3..488dc36c323ef 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -1,6 +1,6 @@ # hltGetConfiguration --full --data /dev/CMSSW_12_3_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_12_3_0/PRef/V51 (CMSSW_12_3_0_pre5) +# /dev/CMSSW_12_3_0/PRef/V52 (CMSSW_12_3_0_pre6) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process = cms.Process( "HLTPRef" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V51') + tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V52') ) process.transferSystem = cms.PSet( @@ -2840,10 +2840,14 @@ appendToDataLabel = cms.string( "" ) ) process.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "ClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ) + ComponentName = cms.string( "ClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutNone" ) ), + appendToDataLabel = cms.string( "" ) ) process.DTGeometryESModule = cms.ESProducer( "DTGeometryESModule", fromDDD = cms.bool( False ), @@ -4172,10 +4176,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPMixedStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPMixedStepTrajectoryCleanerBySharedHits" ), @@ -4283,10 +4291,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPPixelLessStepTrajectoryCleanerBySharedHits = cms.ESProducer( "TrajectoryCleanerESProducer", ComponentName = cms.string( "hltESPPixelLessStepTrajectoryCleanerBySharedHits" ), @@ -4438,32 +4450,40 @@ ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderAngleAndTemplate = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderPixelOnly = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderPixelOnly" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTTRHBuilderWithoutAngle4PixelTriplets = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", - StripCPE = cms.string( "Fake" ), ComponentName = cms.string( "hltESPTTRHBuilderWithoutAngle4PixelTriplets" ), + ComputeCoarseLocalPositionFromDisk = cms.bool( False ), + StripCPE = cms.string( "Fake" ), PixelCPE = cms.string( "hltESPPixelCPEGeneric" ), Matcher = cms.string( "StandardMatcher" ), - ComputeCoarseLocalPositionFromDisk = cms.bool( False ) + Phase2StripCPE = cms.string( "" ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepChi2ChargeMeasurementEstimator16 = cms.ESProducer( "Chi2ChargeMeasurementEstimatorESProducer", MaxChi2 = cms.double( 16.0 ), @@ -4478,10 +4498,14 @@ appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer", - ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ), PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ), - clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ) + ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ), + isPhase2 = cms.bool( False ), + doPixelShapeCut = cms.bool( True ), + doStripShapeCut = cms.bool( True ), + clusterChargeCut = cms.PSet( refToPSet_ = cms.string( "HLTSiStripClusterChargeCutTight" ) ), + appendToDataLabel = cms.string( "" ) ) process.hltESPTobTecStepFittingSmoother = cms.ESProducer( "KFFittingSmootherESProducer", ComponentName = cms.string( "hltESPTobTecStepFitterSmoother" ), @@ -4860,8 +4884,7 @@ PrescaleSet = cms.uint32( 1 ), Verbosity = cms.untracked.int32( 0 ), PrintL1Menu = cms.untracked.bool( False ), - TriggerMenuLuminosity = cms.string( "startup" ), - PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ) + TriggerMenuLuminosity = cms.string( "startup" ) ) process.hltScalersRawToDigi = cms.EDProducer( "ScalersRawToDigi", scalersInputTag = cms.InputTag( "rawDataCollector" ) @@ -8099,6 +8122,7 @@ PreviousCandTag = cms.InputTag( "hltL1sSingleMu7to30" ), MaxEta = cms.double( 1.6 ), MinPt = cms.double( 0.0 ), + MaxDeltaR = cms.double( 0.3 ), MinN = cms.int32( 1 ), CentralBxOnly = cms.bool( True ), SelectQualities = cms.vint32( ) diff --git a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py index 306efa71e690e..eb3c4932d67e6 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py @@ -92,6 +92,7 @@ from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X run2_miniAOD_pp_on_AA_103X.toReplaceWith(slimmingTask,cms.Task(primaryVertexAssociationCleaned,slimmingTask.copy())) run2_miniAOD_pp_on_AA_103X.toReplaceWith(slimmingTask,cms.Task(primaryVertexWithBSAssociationCleaned,slimmingTask.copy())) +run2_miniAOD_pp_on_AA_103X.toReplaceWith(slimmingTask,cms.Task(pfEGammaToCandidateRemapperCleaned,slimmingTask.copy())) from RecoHI.HiTracking.miniAODVertexRecovery_cff import offlinePrimaryVerticesRecovery, offlineSlimmedPrimaryVerticesRecovery pp_on_AA.toReplaceWith( diff --git a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py index 7c6964e437e9e..6a320d7815f65 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py @@ -104,3 +104,14 @@ hiPhotonIsolationMapInput = "photonIsolationHIProducerppGED", hiPhotonIsolationMapOutput = "photonIsolationHIProducerppGED" ) + +from RecoHI.HiJetAlgos.HiBadParticleCleaner_cfi import cleanedParticleFlow +from CommonTools.ParticleFlow.pfEGammaToCandidateRemapper_cfi import pfEGammaToCandidateRemapper as pfEGammaToCandidateRemapperCleaned +pfEGammaToCandidateRemapperCleaned.pf2pf = cms.InputTag("cleanedParticleFlow") + +from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X +run2_miniAOD_pp_on_AA_103X.toModify( + reducedEgamma, + photonsPFValMap = cms.InputTag("pfEGammaToCandidateRemapperCleaned:photons"), + gsfElectronsPFValMap = cms.InputTag("pfEGammaToCandidateRemapperCleaned:electrons") +) diff --git a/RecoHI/HiJetAlgos/plugins/HiBadParticleCleaner.cc b/RecoHI/HiJetAlgos/plugins/HiBadParticleCleaner.cc index 7b8cce25d0795..19c1c61706ae6 100644 --- a/RecoHI/HiJetAlgos/plugins/HiBadParticleCleaner.cc +++ b/RecoHI/HiJetAlgos/plugins/HiBadParticleCleaner.cc @@ -66,6 +66,7 @@ HiBadParticleCleaner::HiBadParticleCleaner(const edm::ParameterSet& iConfig) produces(); produces(); produces("removed"); + produces>(); } // @@ -91,7 +92,11 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: bool foundBadCandidate = false; + int n = pfCandidates->size(); + std::vector oldToNew(n); + int iPF = -1; for (const reco::PFCandidate& pfCandidate : *pfCandidates) { + iPF++; if (pfCandidate.particleId() == reco::PFCandidate::ParticleType::mu) // muon cleaning { if (pfCandidate.pt() > minMuonPt_) { @@ -128,6 +133,7 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: if (sig3d > maxSigLoose_) { pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); foundBadCandidate = true; continue; } @@ -135,12 +141,14 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: if (track->pt() < pfCandidate.pt() / 1.5 || track->pt() > pfCandidate.pt() * 1.5) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } if (track->originalAlgo() == reco::TrackBase::muonSeededStepOutIn && track->hitPattern().trackerLayersWithMeasurement() < minTrackerLayersForMuonTight_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } } @@ -156,6 +164,7 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: if ((nHits < minTrackNHits_ && nPixelHits < minPixelNHits_) || nHits == 3) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } @@ -176,12 +185,14 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: if (sig3d > maxSigLoose_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } if (sig3d > maxSigTight_ && nHits < minTrackNHits_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } @@ -192,12 +203,14 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: if (sig3d > maxSigLoose_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } if (nHits < minTrackNHits_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } } @@ -208,18 +221,21 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: if (sig3d > maxSigTight_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } if (nHits < minTrackNHits_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } if (nPixelHits < minPixelNHits_) { foundBadCandidate = true; pBadCandidateCollection->push_back(pfCandidate); + oldToNew[iPF] = -1*(pBadCandidateCollection->size()); continue; } } @@ -227,15 +243,34 @@ void HiBadParticleCleaner::produce(edm::StreamID, edm::Event& iEvent, const edm: } pOutputCandidateCollection->push_back(pfCandidate); - + oldToNew[iPF] = (pOutputCandidateCollection->size()); } // end loop over pf candidates bool pass = !foundBadCandidate; - iEvent.put(std::move(pOutputCandidateCollection)); - iEvent.put(std::move(pBadCandidateCollection), "removed"); + edm::OrphanHandle> newpf = iEvent.put(std::move(pOutputCandidateCollection)); + edm::OrphanHandle> badpf = iEvent.put(std::move(pBadCandidateCollection), "removed"); iEvent.put(std::make_unique(pass)); + + std::unique_ptr> pf2pf(new edm::ValueMap()); + edm::ValueMap::Filler filler(*pf2pf); + + std::vector refs; + refs.reserve(n); + + // old to new + for (iPF = 0; iPF < n; ++iPF) { + if (oldToNew[iPF] > 0) { + refs.push_back(reco::PFCandidateRef(newpf, oldToNew[iPF] - 1)); + } else { + refs.push_back(reco::PFCandidateRef(badpf, -oldToNew[iPF] - 1)); + } + } + filler.insert(pfCandidates, refs.begin(), refs.end()); + + filler.fill(); + iEvent.put(std::move(pf2pf)); } //define this as a plug-in diff --git a/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc index f470211970b2b..5fa066e5591ee 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc @@ -24,7 +24,9 @@ PSPDigitizerAlgorithm::PSPDigitizerAlgorithm(const edm::ParameterSet& conf, edm: : Phase2TrackerDigitizerAlgorithm(conf.getParameter("AlgorithmCommon"), conf.getParameter("PSPDigitizerAlgorithm"), iC), - geomToken_(iC.esConsumes()) { + geomToken_(iC.esConsumes()), + addBiasRailInefficiency_( + conf.getParameter("PSPDigitizerAlgorithm").getParameter("AddBiasRailInefficiency")) { if (use_LorentzAngle_DB_) siPhase2OTLorentzAngleToken_ = iC.esConsumes(); pixelFlag_ = false; @@ -34,13 +36,16 @@ PSPDigitizerAlgorithm::PSPDigitizerAlgorithm(const edm::ParameterSet& conf, edm: << "threshold in electron Endcap = " << theThresholdInE_Endcap_ << "threshold in electron Barrel = " << theThresholdInE_Barrel_ << " " << theElectronPerADC_ << " " << theAdcFullScale_ << " The delta cut-off is set to " - << tMax_ << " pix-inefficiency " << addPixelInefficiency_; + << tMax_ << " pix-inefficiency " << addPixelInefficiency_ + << "Bias Rail Inefficiency " << addBiasRailInefficiency_; } PSPDigitizerAlgorithm::~PSPDigitizerAlgorithm() { LogDebug("PSPDigitizerAlgorithm") << "Algorithm deleted"; } // // -- Select the Hit for Digitization (sigScale will be implemented in future) // bool PSPDigitizerAlgorithm::select_hit(const PSimHit& hit, double tCorr, double& sigScale) const { + if (addBiasRailInefficiency_ && isInBiasRailRegion(hit)) + return false; double toa = hit.tof() - tCorr; return (toa > theTofLowerCut_ && toa < theTofUpperCut_); } @@ -52,3 +57,19 @@ bool PSPDigitizerAlgorithm::isAboveThreshold(const DigitizerUtility::SimHitInfo* float thr) const { return (charge >= thr); } +// +// Check whether the Hit is in the Inefficient Bias Rail Region +// +bool PSPDigitizerAlgorithm::isInBiasRailRegion(const PSimHit& hit) const { + constexpr float implant = 0.1467; // Implant length (1.467 mm) + constexpr float bRail = 0.00375; // Bias Rail region which causes inefficiency (37.5micron) + // Do coordinate transformation of the local Y from module middle point considering 32 implants and 31 inter-impant regions with bias rail + constexpr float block_len = 16 * implant + 15.5 * bRail; + constexpr float block_unit = implant + bRail; + float yin = hit.entryPoint().y() + block_len; + float yout = hit.exitPoint().y() + block_len; + if (std::fmod(yin, block_unit) > implant || std::fmod(yout, block_unit) > implant) + return true; + else + return false; +} diff --git a/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.h b/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.h index d731a69826ebf..80ae13f6e82d7 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.h +++ b/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.h @@ -16,9 +16,11 @@ class PSPDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm { bool select_hit(const PSimHit& hit, double tCorr, double& sigScale) const override; bool isAboveThreshold(const DigitizerUtility::SimHitInfo* hitInfo, float charge, float thr) const override; + bool isInBiasRailRegion(const PSimHit& hit) const; private: edm::ESGetToken siPhase2OTLorentzAngleToken_; const edm::ESGetToken geomToken_; + bool addBiasRailInefficiency_{false}; }; #endif diff --git a/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py b/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py index e1a001ad74594..2d8a74c1da415 100644 --- a/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py +++ b/SimTracker/SiPhase2Digitizer/python/phase2TrackerDigitizer_cfi.py @@ -127,7 +127,8 @@ EfficiencyFactors_Barrel = cms.vdouble(0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999 ), EfficiencyFactors_Endcap = cms.vdouble(0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999, 0.999 ),#Efficiencies kept as Side2Disk1,Side1Disk1 and so on - CellsToKill = cms.VPSet() + CellsToKill = cms.VPSet(), + AddBiasRailInefficiency= cms.bool(False) ), #Strip in PS module PSSDigitizerAlgorithm = cms.PSet( diff --git a/Validation/EventGenerator/plugins/GenWeightValidation.cc b/Validation/EventGenerator/plugins/GenWeightValidation.cc index f864810f9372a..a753e8fc81df0 100644 --- a/Validation/EventGenerator/plugins/GenWeightValidation.cc +++ b/Validation/EventGenerator/plugins/GenWeightValidation.cc @@ -122,17 +122,18 @@ void GenWeightValidation::dqmBeginRun(const edm::Run&, const edm::EventSetup&) { void GenWeightValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { weights_ = wmanager_.weightsCollection(iEvent); - if (weights_.at(idxGenEvtInfo_).empty()) - return; // no weights in GenEventInfo + unsigned weightsSize = weights_.at(idxGenEvtInfo_).size(); + if (weightsSize < 2) + return; // no baseline weight in GenEventInfo weight_ = weights_.at(idxGenEvtInfo_)[0] / std::abs(weights_.at(idxGenEvtInfo_)[0]); nEvt_->Fill(0.5, weight_); - nlogWgt_->Fill(std::log10(weights_.at(idxGenEvtInfo_).size()), weight_); + nlogWgt_->Fill(std::log10(weightsSize), weight_); - for (unsigned idx = 0; idx < weights_.at(idxGenEvtInfo_).size(); idx++) + for (unsigned idx = 0; idx < weightsSize; idx++) wgtVal_->Fill(weights_.at(idxGenEvtInfo_)[idx] / weights_.at(idxGenEvtInfo_)[1], weight_); - if ((int)weights_.at(idxGenEvtInfo_).size() <= idxMax_) + if ((int)weightsSize <= idxMax_) return; // no PS weights in GenEventInfo edm::Handle ptcls; diff --git a/Validation/HcalHits/interface/HcalSimHitsClient.h b/Validation/HcalHits/interface/HcalSimHitsClient.h index a34ff96f57c27..3f6c461afcf14 100644 --- a/Validation/HcalHits/interface/HcalSimHitsClient.h +++ b/Validation/HcalHits/interface/HcalSimHitsClient.h @@ -36,9 +36,9 @@ class HcalSimHitsClient : public DQMEDHarvester { int SimHitsEndjob(const std::vector &hcalMEs); std::vector getHistogramTypes(); - std::string dirName_; - bool verbose_; - edm::ESGetToken tok_HRNDC_; + const std::string dirName_; + const bool verbose_; + const edm::ESGetToken tok_HRNDC_; static const int nTime = 4; static const int nType1 = 4; const HcalDDDRecConstants *hcons; @@ -46,7 +46,7 @@ class HcalSimHitsClient : public DQMEDHarvester { public: explicit HcalSimHitsClient(const edm::ParameterSet &); - ~HcalSimHitsClient() override; + ~HcalSimHitsClient() override = default; void beginRun(edm::Run const &run, edm::EventSetup const &c) override; virtual void runClient_(DQMStore::IBooker &, DQMStore::IGetter &); diff --git a/Validation/HcalHits/interface/HcalSimHitsValidation.h b/Validation/HcalHits/interface/HcalSimHitsValidation.h index aaeb6f843c39c..b284c57154535 100644 --- a/Validation/HcalHits/interface/HcalSimHitsValidation.h +++ b/Validation/HcalHits/interface/HcalSimHitsValidation.h @@ -42,7 +42,7 @@ class HcalSimHitsValidation : public DQMOneEDAnalyzer<> { public: HcalSimHitsValidation(edm::ParameterSet const &conf); - ~HcalSimHitsValidation() override; + ~HcalSimHitsValidation() override = default; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; @@ -54,24 +54,28 @@ class HcalSimHitsValidation : public DQMOneEDAnalyzer<> { double phi12(double phi1, double en1, double phi2, double en2); double dPhiWsign(double phi1, double phi2); - std::string outputFile_; - std::string g4Label_, hcalHits_, ebHits_, eeHits_; + const std::string g4Label_, hcalHits_, ebHits_, eeHits_; - edm::EDGetTokenT tok_evt_; - edm::EDGetTokenT tok_hcal_; - edm::EDGetTokenT tok_ecalEB_; - edm::EDGetTokenT tok_ecalEE_; - edm::ESGetToken tok_HRNDC_; - edm::ESGetToken tok_geom_; + // sampling factors + const double hf1_; + const double hf2_; + + const std::string outputFile_; + const bool testNumber_; + const bool auxPlots_; + + const edm::EDGetTokenT tok_evt_; + const edm::EDGetTokenT tok_hcal_; + const edm::EDGetTokenT tok_ecalEB_; + const edm::EDGetTokenT tok_ecalEE_; + const edm::ESGetToken tok_HRNDC_; + const edm::ESGetToken tok_geom_; const HcalDDDRecConstants *hcons_; const CaloGeometry *geometry_; int maxDepthHB_, maxDepthHE_; int maxDepthHO_, maxDepthHF_; - bool testNumber_; - bool auxPlots_; - // Hits counters std::vector Nhb; std::vector Nhe; @@ -106,10 +110,6 @@ class HcalSimHitsValidation : public DQMOneEDAnalyzer<> { // counter int nevtot; - - // sampling factors - double hf1_; - double hf2_; }; #endif diff --git a/Validation/HcalHits/interface/SimG4HcalHitCluster.h b/Validation/HcalHits/interface/SimG4HcalHitCluster.h index 3c0fb1bb356cd..d99cd85fc70cf 100644 --- a/Validation/HcalHits/interface/SimG4HcalHitCluster.h +++ b/Validation/HcalHits/interface/SimG4HcalHitCluster.h @@ -12,7 +12,7 @@ class SimG4HcalHitCluster { public: SimG4HcalHitCluster(); - virtual ~SimG4HcalHitCluster(); + ~SimG4HcalHitCluster() = default; double e() const { return ec; } double eta() const { return etac; } diff --git a/Validation/HcalHits/interface/SimHitsValidationHcal.h b/Validation/HcalHits/interface/SimHitsValidationHcal.h index 5f24e9913c3cc..527197425869d 100644 --- a/Validation/HcalHits/interface/SimHitsValidationHcal.h +++ b/Validation/HcalHits/interface/SimHitsValidationHcal.h @@ -29,7 +29,7 @@ class SimHitsValidationHcal : public DQMEDAnalyzer { public: SimHitsValidationHcal(const edm::ParameterSet &ps); - ~SimHitsValidationHcal() override; + ~SimHitsValidationHcal() override = default; static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); protected: @@ -78,12 +78,12 @@ class SimHitsValidationHcal : public DQMEDAnalyzer { std::pair histId(int subdet, int eta, int depth, unsigned int dep); bool initialized; - std::string g4Label_, hcalHits_; - edm::EDGetTokenT tok_hits_; - edm::ESGetToken tok_HRNDC_; + const std::string g4Label_, hcalHits_; + const bool verbose_, testNumber_; + const edm::EDGetTokenT tok_hits_; + const edm::ESGetToken tok_HRNDC_; const HcalDDDRecConstants *hcons; std::vector types; - bool verbose_, testNumber_; int maxDepthHB_, maxDepthHE_; int maxDepthHO_, maxDepthHF_; diff --git a/Validation/HcalHits/plugins/HcalGeomCheck.cc b/Validation/HcalHits/plugins/HcalGeomCheck.cc index 12d2eb54c8969..9da22e5774e29 100644 --- a/Validation/HcalHits/plugins/HcalGeomCheck.cc +++ b/Validation/HcalHits/plugins/HcalGeomCheck.cc @@ -45,7 +45,7 @@ class HcalGeomCheck : public edm::one::EDAnalyzer tok_hits_; + const edm::ESGetToken tok_HRNDC_; const HcalDDDRecConstants* hcons_; - edm::EDGetTokenT tok_hits_; - edm::ESGetToken tok_HRNDC_; //histogram related stuff TH2D* h_RZ_; @@ -74,9 +74,7 @@ class HcalGeomCheck : public edm::one::EDAnalyzer("caloHitSource")), + : caloHitSource_(iConfig.getParameter("caloHitSource")), ietaMin_(iConfig.getUntrackedParameter("ietaMin", -41)), ietaMax_(iConfig.getUntrackedParameter("ietaMax", 41)), depthMax_(iConfig.getUntrackedParameter("depthMax", 7)), @@ -86,10 +84,10 @@ HcalGeomCheck::HcalGeomCheck(const edm::ParameterSet& iConfig) zmax_(iConfig.getUntrackedParameter("zMax", 12500.0)), nbinR_(iConfig.getUntrackedParameter("nBinR", 550)), nbinZ_(iConfig.getUntrackedParameter("nBinZ", 2500)), - verbosity_(iConfig.getUntrackedParameter("verbosity", 0)) { + verbosity_(iConfig.getUntrackedParameter("verbosity", 0)), + tok_hits_(consumes(edm::InputTag("g4SimHits", caloHitSource_))), + tok_HRNDC_(esConsumes()) { usesResource(TFileService::kSharedResource); - tok_hits_ = consumes(edm::InputTag("g4SimHits", caloHitSource_)); - tok_HRNDC_ = esConsumes(); } void HcalGeomCheck::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { @@ -110,8 +108,7 @@ void HcalGeomCheck::fillDescriptions(edm::ConfigurationDescriptions& description void HcalGeomCheck::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Now the hits - edm::Handle theCaloHitContainer; - iEvent.getByToken(tok_hits_, theCaloHitContainer); + const edm::Handle& theCaloHitContainer = iEvent.getHandle(tok_hits_); if (theCaloHitContainer.isValid()) { if (verbosity_ > 0) edm::LogVerbatim("HcalValidation") << " PcalohitItr = " << theCaloHitContainer->size(); diff --git a/Validation/HcalHits/plugins/HcalHitValidation.cc b/Validation/HcalHits/plugins/HcalHitValidation.cc index 5cb4fb97101fe..f0e44726e3d50 100644 --- a/Validation/HcalHits/plugins/HcalHitValidation.cc +++ b/Validation/HcalHits/plugins/HcalHitValidation.cc @@ -26,26 +26,26 @@ class HcalHitValidation : public DQMEDAnalyzer { public: HcalHitValidation(const edm::ParameterSet &ps); - ~HcalHitValidation() override; + ~HcalHitValidation() override = default; protected: void analyze(const edm::Event &e, const edm::EventSetup &c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyzeHits(std::vector &); - void analyzeLayer(edm::Handle &); - void analyzeNxN(edm::Handle &); - void analyzeJets(edm::Handle &); + void analyzeLayer(const edm::Handle &); + void analyzeNxN(const edm::Handle &); + void analyzeJets(const edm::Handle &); private: - std::string g4Label, hcalHits, layerInfo, nxNInfo, jetsInfo; - edm::EDGetTokenT tok_hh_; - edm::EDGetTokenT tok_iL_; - edm::EDGetTokenT tok_iN_; - edm::EDGetTokenT tok_iJ_; - std::string outFile_; - bool verbose_, scheme_; - bool checkHit_, checkLay_, checkNxN_, checkJet_; + const std::string g4Label, hcalHits, layerInfo, nxNInfo, jetsInfo; + const std::string outFile_; + const bool verbose_, scheme_; + const bool checkHit_, checkLay_, checkNxN_, checkJet_; + const edm::EDGetTokenT tok_hh_; + const edm::EDGetTokenT tok_iL_; + const edm::EDGetTokenT tok_iN_; + const edm::EDGetTokenT tok_iJ_; MonitorElement *meAllNHit_, *meBadDetHit_, *meBadSubHit_, *meBadIdHit_; MonitorElement *meHBNHit_, *meHENHit_, *meHONHit_, *meHFNHit_; @@ -78,34 +78,29 @@ class HcalHitValidation : public DQMEDAnalyzer { MonitorElement *meEneJet_, *meEtaJet_, *mePhiJet_; }; -HcalHitValidation::HcalHitValidation(const edm::ParameterSet &ps) { - g4Label = ps.getUntrackedParameter("moduleLabel", "g4SimHits"); - hcalHits = ps.getUntrackedParameter("HitCollection", "HcalHits"); - layerInfo = ps.getUntrackedParameter("LayerInfo", "PHcalValidInfoLayer"); - nxNInfo = ps.getUntrackedParameter("NxNInfo", "PHcalValidInfoNxN"); - jetsInfo = ps.getUntrackedParameter("JetsInfo", "PHcalValidInfoJets"); - outFile_ = ps.getUntrackedParameter("outputFile", "hcValid.root"); - verbose_ = ps.getUntrackedParameter("Verbose", false); - scheme_ = ps.getUntrackedParameter("TestNumbering", true); - checkHit_ = ps.getUntrackedParameter("CheckHits", true); - checkLay_ = ps.getUntrackedParameter("CheckLayer", true); - checkNxN_ = ps.getUntrackedParameter("CheckNxN", true); - checkJet_ = ps.getUntrackedParameter("CheckJets", true); - - // register for data access - tok_hh_ = consumes(edm::InputTag(g4Label, hcalHits)); - tok_iL_ = consumes(edm::InputTag(g4Label, layerInfo)); - tok_iN_ = consumes(edm::InputTag(g4Label, nxNInfo)); - tok_iJ_ = consumes(edm::InputTag(g4Label, jetsInfo)); - - edm::LogInfo("HcalHitValid") << "Module Label: " << g4Label << " Hits: " << hcalHits << " / " << checkHit_ - << " LayerInfo: " << layerInfo << " / " << checkLay_ << " NxNInfo: " << nxNInfo - << " / " << checkNxN_ << " jetsInfo: " << jetsInfo << " / " << checkJet_ - << " Output: " << outFile_ << " Usage of TestNumberingScheme " << scheme_; +HcalHitValidation::HcalHitValidation(const edm::ParameterSet &ps) + : g4Label(ps.getUntrackedParameter("moduleLabel", "g4SimHits")), + hcalHits(ps.getUntrackedParameter("HitCollection", "HcalHits")), + layerInfo(ps.getUntrackedParameter("LayerInfo", "PHcalValidInfoLayer")), + nxNInfo(ps.getUntrackedParameter("NxNInfo", "PHcalValidInfoNxN")), + jetsInfo(ps.getUntrackedParameter("JetsInfo", "PHcalValidInfoJets")), + outFile_(ps.getUntrackedParameter("outputFile", "hcValid.root")), + verbose_(ps.getUntrackedParameter("Verbose", false)), + scheme_(ps.getUntrackedParameter("TestNumbering", true)), + checkHit_(ps.getUntrackedParameter("CheckHits", true)), + checkLay_(ps.getUntrackedParameter("CheckLayer", true)), + checkNxN_(ps.getUntrackedParameter("CheckNxN", true)), + checkJet_(ps.getUntrackedParameter("CheckJets", true)), + tok_hh_(consumes(edm::InputTag(g4Label, hcalHits))), + tok_iL_(consumes(edm::InputTag(g4Label, layerInfo))), + tok_iN_(consumes(edm::InputTag(g4Label, nxNInfo))), + tok_iJ_(consumes(edm::InputTag(g4Label, jetsInfo))) { + edm::LogVerbatim("HcalHitValid") << "Module Label: " << g4Label << " Hits: " << hcalHits << " / " << checkHit_ + << " LayerInfo: " << layerInfo << " / " << checkLay_ << " NxNInfo: " << nxNInfo + << " / " << checkNxN_ << " jetsInfo: " << jetsInfo << " / " << checkJet_ + << " Output: " << outFile_ << " Usage of TestNumberingScheme " << scheme_; } -HcalHitValidation::~HcalHitValidation() {} - void HcalHitValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) { ibooker.setCurrentFolder("HcalHitValidation"); @@ -237,55 +232,48 @@ void HcalHitValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run cons void HcalHitValidation::analyze(const edm::Event &e, const edm::EventSetup &) { edm::LogVerbatim("HcalHitValid") << "Run = " << e.id().run() << " Event = " << e.id().event(); - std::vector caloHits; - edm::Handle hitsHcal; - edm::Handle infoLayer; - edm::Handle infoNxN; - edm::Handle infoJets; - bool getHits = false; if (checkHit_) { - e.getByToken(tok_hh_, hitsHcal); + const edm::Handle &hitsHcal = e.getHandle(tok_hh_); if (hitsHcal.isValid()) getHits = true; + if (getHits) { + std::vector caloHits; + caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end()); + edm::LogVerbatim("HcalHitValid") << "HcalValidation: Hit buffer " << caloHits.size(); + analyzeHits(caloHits); + } } bool getLayer = false; if (checkLay_) { - e.getByToken(tok_iL_, infoLayer); - if (infoLayer.isValid()) + const edm::Handle &infoLayer = e.getHandle(tok_iL_); + if (infoLayer.isValid()) { getLayer = true; + analyzeLayer(infoLayer); + } } bool getNxN = false; if (checkNxN_) { - e.getByToken(tok_iN_, infoNxN); - if (infoNxN.isValid()) + const edm::Handle &infoNxN = e.getHandle(tok_iN_); + if (infoNxN.isValid()) { getNxN = true; + analyzeNxN(infoNxN); + } } bool getJets = false; if (checkJet_) { - e.getByToken(tok_iJ_, infoJets); - if (infoJets.isValid()) + const edm::Handle &infoJets = e.getHandle(tok_iJ_); + if (infoJets.isValid()) { getJets = true; + analyzeJets(infoJets); + } } edm::LogVerbatim("HcalHitValid") << "HcalValidation: Input flags Hits " << getHits << ", Layer " << getLayer << ", NxN " << getNxN << ", Jets " << getJets; - - if (getHits) { - caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end()); - edm::LogVerbatim("HcalHitValid") << "HcalValidation: Hit buffer " << caloHits.size(); - analyzeHits(caloHits); - } - - if (getLayer) - analyzeLayer(infoLayer); - if (getNxN) - analyzeNxN(infoNxN); - if (getJets) - analyzeJets(infoJets); } void HcalHitValidation::analyzeHits(std::vector &hits) { @@ -397,7 +385,7 @@ void HcalHitValidation::analyzeHits(std::vector &hits) { << " HF " << nHF << " PMT " << nPMT << " Bad " << nBad << " All " << nHit; } -void HcalHitValidation::analyzeLayer(edm::Handle &infoLayer) { +void HcalHitValidation::analyzeLayer(const edm::Handle &infoLayer) { // CaloHits from PHcalValidInfoLayer int nHits = infoLayer->nHit(); std::vector idHits = infoLayer->idHit(); @@ -474,7 +462,7 @@ void HcalHitValidation::analyzeLayer(edm::Handle &infoLayer << " eEcalHF = " << eEcalHF << " eHcalHF = " << eHcalHF; } -void HcalHitValidation::analyzeNxN(edm::Handle &infoNxN) { +void HcalHitValidation::analyzeNxN(const edm::Handle &infoNxN) { // NxN quantities double ecalNxNr = infoNxN->ecalnxnr(); double hcalNxNr = infoNxN->hcalnxnr(); @@ -512,7 +500,7 @@ void HcalHitValidation::analyzeNxN(edm::Handle &infoNxN) { << " hits in NxN analysis; Total Energy " << etotNxN << "/" << etotNxNr; } -void HcalHitValidation::analyzeJets(edm::Handle &infoJets) { +void HcalHitValidation::analyzeJets(const edm::Handle &infoJets) { // -- Leading Jet int nJetHits = infoJets->njethit(); diff --git a/Validation/HcalHits/plugins/HcalSimHitCheck.cc b/Validation/HcalHits/plugins/HcalSimHitCheck.cc index e3383ee3d0f2c..0ade1daf83ffd 100644 --- a/Validation/HcalHits/plugins/HcalSimHitCheck.cc +++ b/Validation/HcalHits/plugins/HcalSimHitCheck.cc @@ -49,7 +49,6 @@ class HcalSimHitCheck : public edm::one::EDAnalyzer tok_HRNDC_; int iphi_bins; float iphi_min, iphi_max; @@ -62,11 +61,12 @@ class HcalSimHitCheck : public edm::one::EDAnalyzer tok_hits_; + const edm::EDGetTokenT tok_hits_; + const edm::ESGetToken tok_HRNDC_; TH1D *meAllNHit_, *meBadDetHit_, *meBadSubHit_, *meBadIdHit_; TH1D *meHBNHit_, *meHENHit_, *meHONHit_, *meHFNHit_; @@ -88,18 +88,16 @@ class HcalSimHitCheck : public edm::one::EDAnalyzer("moduleLabel"); - hcalHits = ps.getParameter("HitCollection"); - outFile_ = ps.getParameter("outputFile"); - verbose_ = ps.getParameter("Verbose"); - testNumber_ = ps.getParameter("TestNumber"); - hep17_ = ps.getParameter("hep17"); - checkHit_ = true; - - tok_hits_ = consumes(edm::InputTag(g4Label, hcalHits)); - tok_HRNDC_ = esConsumes(); - +HcalSimHitCheck::HcalSimHitCheck(const edm::ParameterSet &ps) + : g4Label(ps.getParameter("moduleLabel")), + hcalHits(ps.getParameter("HitCollection")), + outFile_(ps.getParameter("outputFile")), + verbose_(ps.getParameter("Verbose")), + checkHit_(true), + testNumber_(ps.getParameter("TestNumber")), + hep17_(ps.getParameter("hep17")), + tok_hits_(consumes(edm::InputTag(g4Label, hcalHits))), + tok_HRNDC_(esConsumes()) { edm::LogVerbatim("HcalSim") << "Module Label: " << g4Label << " Hits: " << hcalHits << " / " << checkHit_ << " Output: " << outFile_; } @@ -306,23 +304,22 @@ void HcalSimHitCheck::analyze(const edm::Event &e, const edm::EventSetup &) { if (verbose_ > 0) edm::LogVerbatim("HcalSim") << "Run = " << e.id().run() << " Event = " << e.id().event(); - std::vector caloHits; - edm::Handle hitsHcal; - bool getHits = false; if (checkHit_) { - e.getByToken(tok_hits_, hitsHcal); - if (hitsHcal.isValid()) + const edm::Handle &hitsHcal = e.getHandle(tok_hits_); + if (hitsHcal.isValid()) { getHits = true; - } - if (verbose_ > 0) - edm::LogVerbatim("HcalSim") << "HcalValidation: Input flags Hits " << getHits; - - if (getHits) { - caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end()); - if (verbose_ > 0) - edm::LogVerbatim("HcalSim") << "HcalValidation: Hit buffer " << caloHits.size(); - analyzeHits(caloHits); + if (verbose_ > 0) + edm::LogVerbatim("HcalSim") << "HcalValidation: Input flags Hits " << getHits; + std::vector caloHits; + caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end()); + if (verbose_ > 0) + edm::LogVerbatim("HcalSim") << "HcalValidation: Hit buffer " << caloHits.size(); + analyzeHits(caloHits); + } else { + if (verbose_ > 0) + edm::LogVerbatim("HcalSim") << "HcalValidation: Input flags Hits " << getHits; + } } } diff --git a/Validation/HcalHits/plugins/HcalSimHitStudy.cc b/Validation/HcalHits/plugins/HcalSimHitStudy.cc index 16e098768b64d..18ef39596a86e 100644 --- a/Validation/HcalHits/plugins/HcalSimHitStudy.cc +++ b/Validation/HcalHits/plugins/HcalSimHitStudy.cc @@ -27,7 +27,7 @@ class HcalSimHitStudy : public DQMEDAnalyzer { public: HcalSimHitStudy(const edm::ParameterSet &ps); - ~HcalSimHitStudy() override; + ~HcalSimHitStudy() override = default; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; @@ -42,7 +42,6 @@ class HcalSimHitStudy : public DQMEDAnalyzer { int maxDepthHB_, maxDepthHE_; int maxDepthHO_, maxDepthHF_; int maxDepth_; - edm::ESGetToken tok_HRNDC_; int iphi_bins; float iphi_min, iphi_max; @@ -55,10 +54,10 @@ class HcalSimHitStudy : public DQMEDAnalyzer { int ieta_bins_HF; float ieta_min_HF, ieta_max_HF; - std::string g4Label, hcalHits, outFile_; - bool verbose_, checkHit_, testNumber_, hep17_; - - edm::EDGetTokenT tok_hits_; + const std::string g4Label, hcalHits, outFile_; + const bool verbose_, checkHit_, testNumber_, hep17_; + const edm::EDGetTokenT tok_hits_; + const edm::ESGetToken tok_HRNDC_; MonitorElement *meAllNHit_, *meBadDetHit_, *meBadSubHit_, *meBadIdHit_; MonitorElement *meHBNHit_, *meHENHit_, *meHONHit_, *meHFNHit_; @@ -79,24 +78,20 @@ class HcalSimHitStudy : public DQMEDAnalyzer { MonitorElement *meHEP17EneHit_, *meHEP17EneHit2_; }; -HcalSimHitStudy::HcalSimHitStudy(const edm::ParameterSet &ps) { - g4Label = ps.getUntrackedParameter("moduleLabel", "g4SimHits"); - hcalHits = ps.getUntrackedParameter("HitCollection", "HcalHits"); - outFile_ = ps.getUntrackedParameter("outputFile", "hcHit.root"); - verbose_ = ps.getUntrackedParameter("Verbose", false); - testNumber_ = ps.getParameter("TestNumber"); - hep17_ = ps.getParameter("hep17"); - checkHit_ = true; - - tok_hits_ = consumes(edm::InputTag(g4Label, hcalHits)); - tok_HRNDC_ = esConsumes(); - - edm::LogInfo("HcalSim") << "Module Label: " << g4Label << " Hits: " << hcalHits << " / " << checkHit_ - << " Output: " << outFile_; +HcalSimHitStudy::HcalSimHitStudy(const edm::ParameterSet &ps) + : g4Label(ps.getUntrackedParameter("moduleLabel", "g4SimHits")), + hcalHits(ps.getUntrackedParameter("HitCollection", "HcalHits")), + outFile_(ps.getUntrackedParameter("outputFile", "hcHit.root")), + verbose_(ps.getUntrackedParameter("Verbose", false)), + checkHit_(true), + testNumber_(ps.getParameter("TestNumber")), + hep17_(ps.getParameter("hep17")), + tok_hits_(consumes(edm::InputTag(g4Label, hcalHits))), + tok_HRNDC_(esConsumes()) { + edm::LogVerbatim("HcalSim") << "Module Label: " << g4Label << " Hits: " << hcalHits << " / " << checkHit_ + << " Output: " << outFile_; } -HcalSimHitStudy::~HcalSimHitStudy() {} - void HcalSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) { hcons_ = &es.getData(tok_HRNDC_); maxDepthHB_ = hcons_->getMaxDepth(0); @@ -263,23 +258,19 @@ void HcalSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, void HcalSimHitStudy::analyze(const edm::Event &e, const edm::EventSetup &) { edm::LogVerbatim("HcalSim") << "Run = " << e.id().run() << " Event = " << e.id().event(); - std::vector caloHits; - edm::Handle hitsHcal; - bool getHits = false; if (checkHit_) { - e.getByToken(tok_hits_, hitsHcal); - if (hitsHcal.isValid()) + const edm::Handle &hitsHcal = e.getHandle(tok_hits_); + if (hitsHcal.isValid()) { getHits = true; + std::vector caloHits; + caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end()); + edm::LogVerbatim("HcalSim") << "HcalValidation: Hit buffer " << caloHits.size(); + analyzeHits(caloHits); + } } edm::LogVerbatim("HcalSim") << "HcalValidation: Input flags Hits " << getHits; - - if (getHits) { - caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end()); - edm::LogVerbatim("HcalSim") << "HcalValidation: Hit buffer " << caloHits.size(); - analyzeHits(caloHits); - } } void HcalSimHitStudy::analyzeHits(std::vector &hits) { diff --git a/Validation/HcalHits/plugins/ZdcSimHitStudy.cc b/Validation/HcalHits/plugins/ZdcSimHitStudy.cc index fdf2dec77a466..04b6338173849 100644 --- a/Validation/HcalHits/plugins/ZdcSimHitStudy.cc +++ b/Validation/HcalHits/plugins/ZdcSimHitStudy.cc @@ -53,7 +53,7 @@ class ZdcSimHitStudy : public DQMEDAnalyzer { public: ZdcSimHitStudy(const edm::ParameterSet &ps); - ~ZdcSimHitStudy() override; + ~ZdcSimHitStudy() override = default; protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; @@ -73,10 +73,10 @@ class ZdcSimHitStudy : public DQMEDAnalyzer { //# they will be filled in the .cc file # ///////////////////////////////////////// - std::string g4Label, zdcHits, outFile_; - edm::EDGetTokenT tok_gen_; - edm::EDGetTokenT tok_hits_; - bool verbose_, checkHit_; + const std::string g4Label, zdcHits, outFile_; + const bool verbose_, checkHit_; + const edm::EDGetTokenT tok_gen_; + const edm::EDGetTokenT tok_hits_; MonitorElement *meAllZdcNHit_, *meBadZdcDetHit_, *meBadZdcSecHit_, *meBadZdcIdHit_; MonitorElement *meZdcNHit_, *meZdcDetectHit_, *meZdcSideHit_, *meZdcETime_; @@ -123,23 +123,18 @@ class ZdcSimHitStudy : public DQMEDAnalyzer { MonitorElement *genpart_GammaB_counts; }; -ZdcSimHitStudy::ZdcSimHitStudy(const edm::ParameterSet &ps) { - g4Label = ps.getUntrackedParameter("moduleLabel", "g4SimHits"); - zdcHits = ps.getUntrackedParameter("HitCollection", "ZdcHits"); - outFile_ = ps.getUntrackedParameter("outputFile", "zdcHitStudy.root"); - verbose_ = ps.getUntrackedParameter("Verbose", false); - checkHit_ = true; - - tok_gen_ = consumes(edm::InputTag("genParticles")); - tok_hits_ = consumes(edm::InputTag(g4Label, zdcHits)); - - edm::LogInfo("ZdcSimHitStudy") - // std::cout - << "Module Label: " << g4Label << " Hits: " << zdcHits << " / " << checkHit_ << " Output: " << outFile_; +ZdcSimHitStudy::ZdcSimHitStudy(const edm::ParameterSet &ps) + : g4Label(ps.getUntrackedParameter("moduleLabel", "g4SimHits")), + zdcHits(ps.getUntrackedParameter("HitCollection", "ZdcHits")), + outFile_(ps.getUntrackedParameter("outputFile", "zdcHitStudy.root")), + verbose_(ps.getUntrackedParameter("Verbose", false)), + checkHit_(true), + tok_gen_(consumes(edm::InputTag("genParticles"))), + tok_hits_(consumes(edm::InputTag(g4Label, zdcHits))) { + edm::LogVerbatim("ZdcSimHitStudy") << "Module Label: " << g4Label << " Hits: " << zdcHits << " / " << checkHit_ + << " Output: " << outFile_; } -ZdcSimHitStudy::~ZdcSimHitStudy() {} - void ZdcSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) { ib.setCurrentFolder("ZDCValidation"); // Histograms for Hits @@ -623,14 +618,10 @@ void ZdcSimHitStudy::analyze(const edm::Event &iEvent, const edm::EventSetup &iS using namespace edm; bool gotGenParticles = true; - Handle genhandle; + const edm::Handle &genhandle = iEvent.getHandle(tok_gen_); - if (!(iEvent.getByToken(tok_gen_, genhandle))) { - gotGenParticles = false; // this is the same kind of boolean except for the - // genparticles collection - } if (!(genhandle.isValid())) { - gotGenParticles = false; + gotGenParticles = false; // this is the same kind of boolean except for the } // Handle zdcsimhandle; @@ -638,8 +629,8 @@ void ZdcSimHitStudy::analyze(const edm::Event &iEvent, const edm::EventSetup &iS ////////////////////////////////////GEN PARTICLE /// HISTOS/////////////////////////////////// - if (gotGenParticles == true) { // if the boolean was able to find the leaf - // "genparticles" then do this + if (gotGenParticles) { // if the boolean was able to find the leaf + // "genparticles" then do this for (reco::GenParticleCollection::const_iterator gen = genhandle->begin(); gen != genhandle->end(); ++gen) // here we iterate over all generated particles { @@ -716,23 +707,19 @@ void ZdcSimHitStudy::analyze(const edm::Event &iEvent, const edm::EventSetup &iS edm::LogVerbatim("ZdcSimHitStudy") << "Run = " << iEvent.id().run() << " Event = " << iEvent.id().event(); - std::vector caloHits; - edm::Handle hitsZdc; - bool getHits = false; if (checkHit_) { - iEvent.getByToken(tok_hits_, hitsZdc); - if (hitsZdc.isValid()) + const edm::Handle &hitsZdc = iEvent.getHandle(tok_hits_); + if (hitsZdc.isValid()) { getHits = true; + std::vector caloHits; + caloHits.insert(caloHits.end(), hitsZdc->begin(), hitsZdc->end()); + edm::LogVerbatim("ZdcSimHitStudy") << "ZdcValidation: Hit buffer " << caloHits.size(); + analyzeHits(caloHits); + } } edm::LogVerbatim("ZdcSim") << "ZdcValidation: Input flags Hits " << getHits; - - if (getHits) { - caloHits.insert(caloHits.end(), hitsZdc->begin(), hitsZdc->end()); - edm::LogVerbatim("ZdcSimHitStudy") << "ZdcValidation: Hit buffer " << caloHits.size(); - analyzeHits(caloHits); - } } void ZdcSimHitStudy::analyzeHits(std::vector &hits) { diff --git a/Validation/HcalHits/src/HcalSimHitsClient.cc b/Validation/HcalHits/src/HcalSimHitsClient.cc index cff751a40125b..eab78fc3fb614 100644 --- a/Validation/HcalHits/src/HcalSimHitsClient.cc +++ b/Validation/HcalHits/src/HcalSimHitsClient.cc @@ -8,13 +8,10 @@ #include "DQMServices/Core/interface/DQMStore.h" -HcalSimHitsClient::HcalSimHitsClient(const edm::ParameterSet &iConfig) { - dirName_ = iConfig.getParameter("DQMDirName"); - verbose_ = iConfig.getUntrackedParameter("Verbosity", false); - tok_HRNDC_ = esConsumes(); -} - -HcalSimHitsClient::~HcalSimHitsClient() {} +HcalSimHitsClient::HcalSimHitsClient(const edm::ParameterSet &iConfig) + : dirName_(iConfig.getParameter("DQMDirName")), + verbose_(iConfig.getUntrackedParameter("Verbosity", false)), + tok_HRNDC_(esConsumes()) {} void HcalSimHitsClient::beginRun(edm::Run const &run, edm::EventSetup const &c) { const auto &pHRNDC = c.getData(tok_HRNDC_); @@ -24,8 +21,8 @@ void HcalSimHitsClient::beginRun(edm::Run const &run, edm::EventSetup const &c) maxDepthHF_ = hcons->getMaxDepth(2); maxDepthHO_ = hcons->getMaxDepth(3); - edm::LogInfo("HitsValidationHcal") << " Maximum Depths HB:" << maxDepthHB_ << " HE:" << maxDepthHE_ - << " HO:" << maxDepthHO_ << " HF:" << maxDepthHF_; + edm::LogVerbatim("HitsValidationHcal") << " Maximum Depths HB:" << maxDepthHB_ << " HE:" << maxDepthHE_ + << " HO:" << maxDepthHO_ << " HF:" << maxDepthHF_; } void HcalSimHitsClient::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig) { runClient_(ib, ig); } @@ -34,25 +31,25 @@ void HcalSimHitsClient::runClient_(DQMStore::IBooker &ib, DQMStore::IGetter &ig) ig.setCurrentFolder(dirName_); if (verbose_) - edm::LogInfo("HitsValidationHcal") << "runClient"; + edm::LogVerbatim("HitsValidationHcal") << "runClient"; std::vector hcalMEs; std::vector fullPathHLTFolders = ig.getSubdirs(); for (unsigned int i = 0; i < fullPathHLTFolders.size(); i++) { if (verbose_) - edm::LogInfo("HitsValidationHcal") << "fullPath: " << fullPathHLTFolders[i]; + edm::LogVerbatim("HitsValidationHcal") << "fullPath: " << fullPathHLTFolders[i]; ig.setCurrentFolder(fullPathHLTFolders[i]); std::vector fullSubPathHLTFolders = ig.getSubdirs(); for (unsigned int j = 0; j < fullSubPathHLTFolders.size(); j++) { if (verbose_) - edm::LogInfo("HitsValidationHcal") << "fullSub: " << fullSubPathHLTFolders[j]; + edm::LogVerbatim("HitsValidationHcal") << "fullSub: " << fullSubPathHLTFolders[j]; if (strcmp(fullSubPathHLTFolders[j].c_str(), "HcalHitsV/SimHitsValidationHcal") == 0) { hcalMEs = ig.getContents(fullSubPathHLTFolders[j]); if (verbose_) - edm::LogInfo("HitsValidationHcal") << "hltMES size : " << hcalMEs.size(); + edm::LogVerbatim("HitsValidationHcal") << "hltMES size : " << hcalMEs.size(); if (!SimHitsEndjob(hcalMEs)) edm::LogWarning("HitsValidationHcal") << "Error in SimhitEndjob!"; } @@ -117,7 +114,7 @@ int HcalSimHitsClient::SimHitsEndjob(const std::vector &hcalME double nevent = Energy[0]->getEntries(); if (verbose_) - edm::LogInfo("HitsValidationHcal") << "nevent : " << nevent; + edm::LogVerbatim("HitsValidationHcal") << "nevent : " << nevent; float cont[nTime][divisions.size()]; float en[nType1], tme[nType1]; @@ -169,13 +166,13 @@ int HcalSimHitsClient::SimHitsEndjob(const std::vector &hcalME std::vector HcalSimHitsClient::getHistogramTypes() { int maxDepth = std::max(maxDepthHB_, maxDepthHE_); if (verbose_) - edm::LogInfo("HitsValidationHcal") << "Max depth 1st step:: " << maxDepth; + edm::LogVerbatim("HitsValidationHcal") << "Max depth 1st step:: " << maxDepth; maxDepth = std::max(maxDepth, maxDepthHF_); if (verbose_) - edm::LogInfo("HitsValidationHcal") << "Max depth 2nd step:: " << maxDepth; + edm::LogVerbatim("HitsValidationHcal") << "Max depth 2nd step:: " << maxDepth; maxDepth = std::max(maxDepth, maxDepthHO_); if (verbose_) - edm::LogInfo("HitsValidationHcal") << "Max depth 3rd step:: " << maxDepth; + edm::LogVerbatim("HitsValidationHcal") << "Max depth 3rd step:: " << maxDepth; std::vector divisions; char name1[20]; diff --git a/Validation/HcalHits/src/HcalSimHitsValidation.cc b/Validation/HcalHits/src/HcalSimHitsValidation.cc index 9d7ee450a27b6..ba4dc0a32706e 100644 --- a/Validation/HcalHits/src/HcalSimHitsValidation.cc +++ b/Validation/HcalHits/src/HcalSimHitsValidation.cc @@ -1,28 +1,27 @@ #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h" #include "Validation/HcalHits/interface/HcalSimHitsValidation.h" -HcalSimHitsValidation::HcalSimHitsValidation(edm::ParameterSet const &conf) { +HcalSimHitsValidation::HcalSimHitsValidation(edm::ParameterSet const &conf) + : g4Label_(conf.getUntrackedParameter("ModuleLabel", "g4SimHits")), + hcalHits_(conf.getUntrackedParameter("HcalHitCollection", "HcalHits")), + ebHits_(conf.getUntrackedParameter("EBHitCollection", "EcalHitsEB")), + eeHits_(conf.getUntrackedParameter("EEHitCollection", "EcalHitsEE")), + hf1_(conf.getParameter("hf1")), + hf2_(conf.getParameter("hf2")), + outputFile_(conf.getUntrackedParameter("outputFile", "myfile.root")), + testNumber_(conf.getUntrackedParameter("TestNumber", false)), + auxPlots_(conf.getUntrackedParameter("auxiliaryPlots", false)), + tok_evt_(consumes(edm::InputTag("generatorSmeared"))), + tok_hcal_(consumes(edm::InputTag(g4Label_, hcalHits_))), + tok_ecalEB_(consumes(edm::InputTag(g4Label_, ebHits_))), + tok_ecalEE_(consumes(edm::InputTag(g4Label_, eeHits_))), + tok_HRNDC_(esConsumes()), + tok_geom_(esConsumes()) { // DQM ROOT output - outputFile_ = conf.getUntrackedParameter("outputFile", "myfile.root"); - testNumber_ = conf.getUntrackedParameter("TestNumber", false); - auxPlots_ = conf.getUntrackedParameter("auxiliaryPlots", false); // register for data access - g4Label_ = conf.getUntrackedParameter("ModuleLabel", "g4SimHits"); - hcalHits_ = conf.getUntrackedParameter("HcalHitCollection", "HcalHits"); - ebHits_ = conf.getUntrackedParameter("EBHitCollection", "EcalHitsEB"); - eeHits_ = conf.getUntrackedParameter("EEHitCollection", "EcalHitsEE"); // import sampling factors - hf1_ = conf.getParameter("hf1"); - hf2_ = conf.getParameter("hf2"); - - tok_evt_ = consumes(edm::InputTag("generatorSmeared")); - tok_hcal_ = consumes(edm::InputTag(g4Label_, hcalHits_)); - tok_ecalEB_ = consumes(edm::InputTag(g4Label_, ebHits_)); - tok_ecalEE_ = consumes(edm::InputTag(g4Label_, eeHits_)); - tok_HRNDC_ = esConsumes(); - tok_geom_ = esConsumes(); if (!outputFile_.empty()) { edm::LogVerbatim("OutputInfo") << " Hcal SimHit Task histograms will be saved to '" << outputFile_.c_str() << "'"; @@ -33,8 +32,6 @@ HcalSimHitsValidation::HcalSimHitsValidation(edm::ParameterSet const &conf) { nevtot = 0; } -HcalSimHitsValidation::~HcalSimHitsValidation() {} - void HcalSimHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) { hcons_ = &es.getData(tok_HRNDC_); maxDepthHB_ = hcons_->getMaxDepth(0); @@ -292,8 +289,7 @@ void HcalSimHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const double phi_MC = -999.; // phi of initial particle from HepMC double eta_MC = -999.; // eta of initial particle from HepMC - edm::Handle evtMC; - ev.getByToken(tok_evt_, evtMC); // generator in late 310_preX + const edm::Handle &evtMC = ev.getHandle(tok_evt_); // generator in late 310_preX if (!evtMC.isValid()) { edm::LogVerbatim("OutputInfo") << "no HepMCProduct found"; } @@ -326,8 +322,7 @@ void HcalSimHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const const float calib_HF1 = hf1_; // 1.0/0.383; const float calib_HF2 = hf2_; // 1.0/0.368; - edm::Handle hcalHits; - ev.getByToken(tok_hcal_, hcalHits); + const edm::Handle &hcalHits = ev.getHandle(tok_hcal_); const auto SimHitResult = hcalHits.product(); float eta_diff; @@ -426,9 +421,7 @@ void HcalSimHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const double EcalCone = 0; if (!ebHits_.empty()) { - edm::Handle ecalEBHits; - ev.getByToken(tok_ecalEB_, ecalEBHits); - const auto SimHitResultEB = ecalEBHits.product(); + const auto &SimHitResultEB = &ev.get(tok_ecalEB_); for (std::vector::const_iterator SimHits = SimHitResultEB->begin(); SimHits != SimHitResultEB->end(); ++SimHits) { @@ -448,9 +441,7 @@ void HcalSimHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const // Ecal EE SimHits if (!eeHits_.empty()) { - edm::Handle ecalEEHits; - ev.getByToken(tok_ecalEE_, ecalEEHits); - const auto SimHitResultEE = ecalEEHits.product(); + const auto &SimHitResultEE = &ev.get(tok_ecalEE_); for (std::vector::const_iterator SimHits = SimHitResultEE->begin(); SimHits != SimHitResultEE->end(); ++SimHits) { diff --git a/Validation/HcalHits/src/SimG4HcalHitCluster.cc b/Validation/HcalHits/src/SimG4HcalHitCluster.cc index 33db5a48846d6..8636143d5b220 100644 --- a/Validation/HcalHits/src/SimG4HcalHitCluster.cc +++ b/Validation/HcalHits/src/SimG4HcalHitCluster.cc @@ -8,8 +8,6 @@ SimG4HcalHitCluster::SimG4HcalHitCluster() : ec(0), etac(0), phic(0) {} -SimG4HcalHitCluster::~SimG4HcalHitCluster() {} - bool SimG4HcalHitCluster::operator<(const SimG4HcalHitCluster &cluster) const { return (ec / cosh(etac) < cluster.e() / cosh(cluster.eta())) ? false : true; } diff --git a/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc b/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc index 5870651aa75f3..11291a953282a 100644 --- a/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc +++ b/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc @@ -12,7 +12,7 @@ SimG4HcalHitJetFinder::SimG4HcalHitJetFinder(double cone) : jetcone(cone) {} -SimG4HcalHitJetFinder::~SimG4HcalHitJetFinder() { edm::LogInfo("ValidHcal") << "SimG4HcalHitJetFinder:: Deleting"; } +SimG4HcalHitJetFinder::~SimG4HcalHitJetFinder() { edm::LogVerbatim("ValidHcal") << "SimG4HcalHitJetFinder:: Deleting"; } void SimG4HcalHitJetFinder::setCone(double cone) { jetcone = cone; } diff --git a/Validation/HcalHits/src/SimHitsValidationHcal.cc b/Validation/HcalHits/src/SimHitsValidationHcal.cc index 6bffcba2c1b18..61a4914102fc1 100644 --- a/Validation/HcalHits/src/SimHitsValidationHcal.cc +++ b/Validation/HcalHits/src/SimHitsValidationHcal.cc @@ -2,23 +2,19 @@ #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h" #include "Validation/HcalHits/interface/SimHitsValidationHcal.h" -//#define DebugLog - -SimHitsValidationHcal::SimHitsValidationHcal(const edm::ParameterSet &ps) { - g4Label_ = ps.getParameter("ModuleLabel"); - hcalHits_ = ps.getParameter("HitCollection"); - verbose_ = ps.getParameter("Verbose"); - testNumber_ = ps.getParameter("TestNumber"); - - tok_hits_ = consumes(edm::InputTag(g4Label_, hcalHits_)); - tok_HRNDC_ = esConsumes(); - +//#define EDM_ML_DEBUG + +SimHitsValidationHcal::SimHitsValidationHcal(const edm::ParameterSet &ps) + : g4Label_(ps.getParameter("ModuleLabel")), + hcalHits_(ps.getParameter("HitCollection")), + verbose_(ps.getParameter("Verbose")), + testNumber_(ps.getParameter("TestNumber")), + tok_hits_(consumes(edm::InputTag(g4Label_, hcalHits_))), + tok_HRNDC_(esConsumes()) { edm::LogVerbatim("HitsValidationHcal") << "Module Label: " << g4Label_ << " Hits: " << hcalHits_ << " TestNumbering " << testNumber_; } -SimHitsValidationHcal::~SimHitsValidationHcal() {} - void SimHitsValidationHcal::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) { const auto &pHRNDC = es.getData(tok_HRNDC_); hcons = &pHRNDC; @@ -75,7 +71,7 @@ void SimHitsValidationHcal::bookHistograms(DQMStore::IBooker &ib, edm::Run const // float ieta_max_HO = iEtaHOMax + 1.5; // int ieta_bins_HO = (int) (ieta_max_HO - ieta_min_HO); -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << " Maximum Depths HB:" << maxDepthHB_ << " HE:" << maxDepthHE_ << " HO:" << maxDepthHO_ << " HF:" << maxDepthHF_; #endif @@ -147,22 +143,21 @@ void SimHitsValidationHcal::bookHistograms(DQMStore::IBooker &ib, edm::Run const } void SimHitsValidationHcal::analyze(const edm::Event &e, const edm::EventSetup &) { -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << "Run = " << e.id().run() << " Event = " << e.id().event(); #endif - std::vector caloHits; - edm::Handle hitsHcal; bool getHits = false; - e.getByToken(tok_hits_, hitsHcal); + const edm::Handle &hitsHcal = e.getHandle(tok_hits_); if (hitsHcal.isValid()) getHits = true; -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << "HitsValidationHcal.: Input flags Hits " << getHits; #endif if (getHits) { + std::vector caloHits; caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end()); -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << "testNumber_:" << testNumber_; #endif if (testNumber_) { @@ -170,12 +165,12 @@ void SimHitsValidationHcal::analyze(const edm::Event &e, const edm::EventSetup & unsigned int id_ = caloHits[i].id(); HcalDetId hid = HcalHitRelabeller::relabel(id_, hcons); caloHits[i].setID(hid.rawId()); -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << "Hit[" << i << "] " << hid; #endif } } -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << "HitsValidationHcal: Hit buffer " << caloHits.size(); #endif analyzeHits(caloHits); @@ -238,7 +233,7 @@ void SimHitsValidationHcal::analyzeHits(std::vector &hits) { } map_try[id0] = ensum; -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << "Hit[" << i << "] ID " << std::dec << " " << id << std::dec << " Det " << id.det() << " Sub " << subdet << " depth " << depth << " depthX " << dep << " Eta " << eta << " Phi " << id.iphi() << " E " << energy @@ -294,7 +289,7 @@ void SimHitsValidationHcal::analyzeHits(std::vector &hits) { meHcalEnergyl250_[types.second]->Fill(etax, phix, ensum.e250); } -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << " energy of tower =" << (*itr).first.first << " in time 25ns is == " << (*itr).second.e25 << " in time 25-50ns == " << (*itr).second.e50 << " in time 50-100ns == " << (*itr).second.e100 @@ -343,7 +338,7 @@ SimHitsValidationHcal::etaRange SimHitsValidationHcal::getLimits(idType type) { low = -41; high = 41; } -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HitsValidationHcal") << "Subdetector:" << type.subdet << " z:" << type.z << " range.first:" << range.first << " and second:" << range.second; edm::LogVerbatim("HitsValidationHcal") << "bins: " << bins << " low:" << low << " high:" << high; diff --git a/Validation/HcalRecHits/interface/HcalRecHitsValidation.h b/Validation/HcalRecHits/interface/HcalRecHitsValidation.h index 4504281e97078..2e03fe759fcb8 100644 --- a/Validation/HcalRecHits/interface/HcalRecHitsValidation.h +++ b/Validation/HcalRecHits/interface/HcalRecHitsValidation.h @@ -57,7 +57,7 @@ class HcalRecHitsValidation : public DQMEDAnalyzer { public: HcalRecHitsValidation(edm::ParameterSet const &conf); - ~HcalRecHitsValidation() override; + ~HcalRecHitsValidation() override = default; void analyze(edm::Event const &ev, edm::EventSetup const &c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; @@ -68,26 +68,27 @@ class HcalRecHitsValidation : public DQMEDAnalyzer { double phi12(double phi1, double en1, double phi2, double en2); double dPhiWsign(double phi1, double phi2); - std::string topFolderName_; - - std::string outputFile_; - std::string hcalselector_; - std::string ecalselector_; - std::string sign_; - std::string mc_; - bool testNumber_; + const std::string topFolderName_; + const std::string outputFile_; + const std::string hcalselector_; + const std::string ecalselector_; + const std::string sign_; + const std::string mc_; + const bool testNumber_; // RecHit Collection input tags - edm::EDGetTokenT tok_evt_; - edm::EDGetTokenT tok_EB_; - edm::EDGetTokenT tok_EE_; - edm::EDGetTokenT tok_hh_; - edm::EDGetTokenT tok_hbhe_; - edm::EDGetTokenT tok_hf_; - edm::EDGetTokenT tok_ho_; - - edm::ESGetToken tok_HRNDC_; - edm::ESGetToken tok_Geom_; + const edm::InputTag EBRecHitCollectionLabel_; + const edm::InputTag EERecHitCollectionLabel_; + const edm::EDGetTokenT tok_evt_; + const edm::EDGetTokenT tok_EB_; + const edm::EDGetTokenT tok_EE_; + const edm::EDGetTokenT tok_hh_; + const edm::EDGetTokenT tok_hbhe_; + const edm::EDGetTokenT tok_hf_; + const edm::EDGetTokenT tok_ho_; + + const edm::ESGetToken tok_HRNDC_; + const edm::ESGetToken tok_Geom_; // choice of subdetector in config : noise/HB/HE/HO/HF/ALL (0/1/2/3/4/5) int subdet_; diff --git a/Validation/HcalRecHits/interface/NoiseRates.h b/Validation/HcalRecHits/interface/NoiseRates.h index 4f296679e71bf..c7db8659b0652 100644 --- a/Validation/HcalRecHits/interface/NoiseRates.h +++ b/Validation/HcalRecHits/interface/NoiseRates.h @@ -41,25 +41,24 @@ class NoiseRates : public DQMEDAnalyzer { public: explicit NoiseRates(const edm::ParameterSet &); - ~NoiseRates() override; + ~NoiseRates() override = default; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: void analyze(const edm::Event &, const edm::EventSetup &) override; - std::string outputFile_; + const std::string outputFile_; // parameters - edm::InputTag rbxCollName_; // label for the rbx collection - edm::EDGetTokenT tok_rbx_; - double minRBXEnergy_; // RBX energy threshold - double minHitEnergy_; // RecHit energy threshold - - bool useAllHistos_; + const edm::InputTag rbxCollName_; // label for the rbx collection + const double minRBXEnergy_; // RBX energy threshold + const double minHitEnergy_; // RecHit energy threshold + const bool useAllHistos_; + const edm::EDGetTokenT tok_rbx_; // Hcal Noise Summary Parameters - edm::EDGetTokenT noisetoken_; + const edm::EDGetTokenT noisetoken_; MonitorElement *hLumiBlockCount_; MonitorElement *hRBXEnergy_; diff --git a/Validation/HcalRecHits/src/HcalRecHitsValidation.cc b/Validation/HcalRecHits/src/HcalRecHitsValidation.cc index 45118cb71c00e..53cc56d4ab8cb 100644 --- a/Validation/HcalRecHits/src/HcalRecHitsValidation.cc +++ b/Validation/HcalRecHits/src/HcalRecHitsValidation.cc @@ -4,10 +4,25 @@ #include "Validation/HcalRecHits/interface/HcalRecHitsValidation.h" HcalRecHitsValidation::HcalRecHitsValidation(edm::ParameterSet const &conf) - : topFolderName_(conf.getParameter("TopFolderName")) { + : topFolderName_(conf.getParameter("TopFolderName")), + outputFile_(conf.getUntrackedParameter("outputFile", "myfile.root")), + hcalselector_(conf.getUntrackedParameter("hcalselector", "all")), + ecalselector_(conf.getUntrackedParameter("ecalselector", "yes")), + sign_(conf.getUntrackedParameter("sign", "*")), + mc_(conf.getUntrackedParameter("mc", "yes")), + testNumber_(conf.getParameter("TestNumber")), + EBRecHitCollectionLabel_(conf.getParameter("EBRecHitCollectionLabel")), + EERecHitCollectionLabel_(conf.getParameter("EERecHitCollectionLabel")), + tok_evt_(consumes(edm::InputTag("generatorSmeared"))), + tok_EB_(consumes(EBRecHitCollectionLabel_)), + tok_EE_(consumes(EERecHitCollectionLabel_)), + tok_hh_(consumes(conf.getUntrackedParameter("SimHitCollectionLabel"))), + tok_hbhe_(consumes(conf.getUntrackedParameter("HBHERecHitCollectionLabel"))), + tok_hf_(consumes(conf.getUntrackedParameter("HFRecHitCollectionLabel"))), + tok_ho_(consumes(conf.getUntrackedParameter("HORecHitCollectionLabel"))), + tok_HRNDC_(esConsumes()), + tok_Geom_(esConsumes()) { // DQM ROOT output - outputFile_ = conf.getUntrackedParameter("outputFile", "myfile.root"); - if (!outputFile_.empty()) { edm::LogInfo("OutputInfo") << " Hcal RecHit Task histograms will be saved to '" << outputFile_.c_str() << "'"; } else { @@ -16,28 +31,9 @@ HcalRecHitsValidation::HcalRecHitsValidation(edm::ParameterSet const &conf) nevtot = 0; - hcalselector_ = conf.getUntrackedParameter("hcalselector", "all"); - ecalselector_ = conf.getUntrackedParameter("ecalselector", "yes"); - sign_ = conf.getUntrackedParameter("sign", "*"); - mc_ = conf.getUntrackedParameter("mc", "yes"); - testNumber_ = conf.getParameter("TestNumber"); - // Collections - tok_hbhe_ = consumes(conf.getUntrackedParameter("HBHERecHitCollectionLabel")); - tok_hf_ = consumes(conf.getUntrackedParameter("HFRecHitCollectionLabel")); - tok_ho_ = consumes(conf.getUntrackedParameter("HORecHitCollectionLabel")); // register for data access - tok_evt_ = consumes(edm::InputTag("generatorSmeared")); - edm::InputTag EBRecHitCollectionLabel = conf.getParameter("EBRecHitCollectionLabel"); - tok_EB_ = consumes(EBRecHitCollectionLabel); - edm::InputTag EERecHitCollectionLabel = conf.getParameter("EERecHitCollectionLabel"); - tok_EE_ = consumes(EERecHitCollectionLabel); - - tok_hh_ = consumes(conf.getUntrackedParameter("SimHitCollectionLabel")); - - tok_HRNDC_ = esConsumes(); - tok_Geom_ = esConsumes(); subdet_ = 5; if (hcalselector_ == "noise") @@ -66,8 +62,6 @@ HcalRecHitsValidation::HcalRecHitsValidation(edm::ParameterSet const &conf) imc = 0; } -HcalRecHitsValidation::~HcalRecHitsValidation() {} - void HcalRecHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) { Char_t histo[200]; @@ -225,8 +219,7 @@ void HcalRecHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const double partR = 0.3; if (imc != 0) { - edm::Handle evtMC; - ev.getByToken(tok_evt_, evtMC); // generator in late 310_preX + const edm::Handle &evtMC = ev.getHandle(tok_evt_); // generator in late 310_preX if (!evtMC.isValid()) { edm::LogInfo("HcalRecHitsValidation") << "no HepMCProduct found"; } else { @@ -270,12 +263,12 @@ void HcalRecHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const // ECAL if (ecalselector_ == "yes" && (subdet_ == 1 || subdet_ == 2 || subdet_ == 5)) { - Handle rhitEB; + const edm::Handle &rhitEB = ev.getHandle(tok_EB_); EcalRecHitCollection::const_iterator RecHit; EcalRecHitCollection::const_iterator RecHitEnd; - if (ev.getByToken(tok_EB_, rhitEB)) { + if (rhitEB.isValid()) { RecHit = rhitEB.product()->begin(); RecHitEnd = rhitEB.product()->end(); @@ -297,9 +290,9 @@ void HcalRecHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const } } - Handle rhitEE; + const edm::Handle &rhitEE = ev.getHandle(tok_EE_); - if (ev.getByToken(tok_EE_, rhitEE)) { + if (rhitEE.isValid()) { RecHit = rhitEE.product()->begin(); RecHitEnd = rhitEE.product()->end(); @@ -432,8 +425,8 @@ void HcalRecHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const // SimHits vs. RecHits if (subdet_ > 0 && subdet_ < 6 && imc != 0) { // not noise - edm::Handle hcalHits; - if (ev.getByToken(tok_hh_, hcalHits)) { + const edm::Handle &hcalHits = ev.getHandle(tok_hh_); + if (hcalHits.isValid()) { const PCaloHitContainer *SimHitResult = hcalHits.product(); double enSimHits = 0.; @@ -537,8 +530,8 @@ void HcalRecHitsValidation::fillRecHitsTmp(int subdet_, edm::Event const &ev) { if (subdet_ == 1 || subdet_ == 2 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) { // HBHE - edm::Handle hbhecoll; - if (ev.getByToken(tok_hbhe_, hbhecoll)) { + const edm::Handle &hbhecoll = ev.getHandle(tok_hbhe_); + if (hbhecoll.isValid()) { for (HBHERecHitCollection::const_iterator j = hbhecoll->begin(); j != hbhecoll->end(); j++) { HcalDetId cell(j->id()); const HcalGeometry *cellGeometry = @@ -572,8 +565,8 @@ void HcalRecHitsValidation::fillRecHitsTmp(int subdet_, edm::Event const &ev) { if (subdet_ == 4 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) { // HF - edm::Handle hfcoll; - if (ev.getByToken(tok_hf_, hfcoll)) { + const edm::Handle &hfcoll = ev.getHandle(tok_hf_); + if (hfcoll.isValid()) { for (HFRecHitCollection::const_iterator j = hfcoll->begin(); j != hfcoll->end(); j++) { HcalDetId cell(j->id()); auto cellGeometry = geometry_->getSubdetectorGeometry(cell)->getGeometry(cell); @@ -606,8 +599,8 @@ void HcalRecHitsValidation::fillRecHitsTmp(int subdet_, edm::Event const &ev) { // HO if (subdet_ == 3 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) { - edm::Handle hocoll; - if (ev.getByToken(tok_ho_, hocoll)) { + const edm::Handle &hocoll = ev.getHandle(tok_ho_); + if (hocoll.isValid()) { for (HORecHitCollection::const_iterator j = hocoll->begin(); j != hocoll->end(); j++) { HcalDetId cell(j->id()); auto cellGeometry = geometry_->getSubdetectorGeometry(cell)->getGeometry(cell); diff --git a/Validation/HcalRecHits/src/NoiseRates.cc b/Validation/HcalRecHits/src/NoiseRates.cc index fa61f08df3933..83ebd12b26f9a 100644 --- a/Validation/HcalRecHits/src/NoiseRates.cc +++ b/Validation/HcalRecHits/src/NoiseRates.cc @@ -14,25 +14,19 @@ // constructors and destructor // -NoiseRates::NoiseRates(const edm::ParameterSet &iConfig) { +NoiseRates::NoiseRates(const edm::ParameterSet &iConfig) + : outputFile_(iConfig.getUntrackedParameter("outputFile", "myfile.root")), + rbxCollName_(iConfig.getUntrackedParameter("rbxCollName")), + minRBXEnergy_(iConfig.getUntrackedParameter("minRBXEnergy")), + minHitEnergy_(iConfig.getUntrackedParameter("minHitEnergy")), + useAllHistos_(iConfig.getUntrackedParameter("useAllHistos", false)), + tok_rbx_(consumes(rbxCollName_)), + noisetoken_(consumes(iConfig.getParameter("noiselabel"))) { // DQM ROOT output - outputFile_ = iConfig.getUntrackedParameter("outputFile", "myfile.root"); - // set parameters - rbxCollName_ = iConfig.getUntrackedParameter("rbxCollName"); - minRBXEnergy_ = iConfig.getUntrackedParameter("minRBXEnergy"); - minHitEnergy_ = iConfig.getUntrackedParameter("minHitEnergy"); - - tok_rbx_ = consumes(rbxCollName_); - - useAllHistos_ = iConfig.getUntrackedParameter("useAllHistos", false); - // Hcal Noise Summary - noisetoken_ = consumes(iConfig.getParameter("noiselabel")); } -NoiseRates::~NoiseRates() {} - // // member functions // @@ -102,8 +96,7 @@ void NoiseRates::analyze(const edm::Event &iEvent, const edm::EventSetup &evSetu lumiCountMap_[lumiSection]++; // get the RBX Noise collection - edm::Handle handle; - iEvent.getByToken(tok_rbx_, handle); + const edm::Handle &handle = iEvent.getHandle(tok_rbx_); if (!handle.isValid()) { throw edm::Exception(edm::errors::ProductNotFound) << " could not find HcalNoiseRBXCollection named " << rbxCollName_ << ".\n"; @@ -111,8 +104,7 @@ void NoiseRates::analyze(const edm::Event &iEvent, const edm::EventSetup &evSetu } // get the Noise summary object - edm::Handle summary_h; - iEvent.getByToken(noisetoken_, summary_h); + const edm::Handle &summary_h = iEvent.getHandle(noisetoken_); if (!summary_h.isValid()) { throw edm::Exception(edm::errors::ProductNotFound) << " could not find HcalNoiseSummary.\n"; return; diff --git a/Validation/HcalRecHits/test/HcalDumpHits.cc b/Validation/HcalRecHits/test/HcalDumpHits.cc index fe4fc8609f2ad..546f4c927cba3 100644 --- a/Validation/HcalRecHits/test/HcalDumpHits.cc +++ b/Validation/HcalRecHits/test/HcalDumpHits.cc @@ -29,7 +29,7 @@ class HcalDumpHits : public edm::one::EDAnalyzer { public: explicit HcalDumpHits(const edm::ParameterSet&); - ~HcalDumpHits() override {} + ~HcalDumpHits() override = default; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); @@ -79,8 +79,7 @@ void HcalDumpHits::beginRun(const edm::Run&, const edm::EventSetup& iSetup) { hc void HcalDumpHits::analyze(const edm::Event& iEvent, const edm::EventSetup&) { // first SimHits - edm::Handle theCaloHitContainer; - iEvent.getByToken(simHitSource_, theCaloHitContainer); + const edm::Handle& theCaloHitContainer = iEvent.getHandle(simHitSource_); if (theCaloHitContainer.isValid()) { edm::LogVerbatim("HcalValidation") << theCaloHitContainer->size() << " SimHits in HCAL"; unsigned int k(0); @@ -93,8 +92,7 @@ void HcalDumpHits::analyze(const edm::Event& iEvent, const edm::EventSetup&) { } // Digis (HBHE/HF/HO) - edm::Handle hbheDigiCollection; - iEvent.getByToken(hbheDigiSource_, hbheDigiCollection); + const edm::Handle& hbheDigiCollection = iEvent.getHandle(hbheDigiSource_); if (hbheDigiCollection.isValid()) { edm::LogVerbatim("HcalValidation") << hbheDigiCollection->size() << " Digis for HB/HE"; unsigned int k(0); @@ -109,8 +107,7 @@ void HcalDumpHits::analyze(const edm::Event& iEvent, const edm::EventSetup&) { ++k; } } - edm::Handle hfDigiCollection; - iEvent.getByToken(hfDigiSource_, hfDigiCollection); + const edm::Handle& hfDigiCollection = iEvent.getHandle(hfDigiSource_); if (hfDigiCollection.isValid()) { edm::LogVerbatim("HcalValidation") << hfDigiCollection->size() << " Digis for HF"; unsigned int k(0); @@ -125,8 +122,7 @@ void HcalDumpHits::analyze(const edm::Event& iEvent, const edm::EventSetup&) { ++k; } } - edm::Handle hoDigiCollection; - iEvent.getByToken(hoDigiSource_, hoDigiCollection); + const edm::Handle& hoDigiCollection = iEvent.getHandle(hoDigiSource_); if (hoDigiCollection.isValid()) { edm::LogVerbatim("HcalValidation") << hoDigiCollection->size() << " Digis for HO"; unsigned int k(0); @@ -142,8 +138,7 @@ void HcalDumpHits::analyze(const edm::Event& iEvent, const edm::EventSetup&) { } // RecHits (HBHE/HF/HO) - edm::Handle hbhecoll; - iEvent.getByToken(hbheRecHitSource_, hbhecoll); + const edm::Handle& hbhecoll = iEvent.getHandle(hbheRecHitSource_); if (hbhecoll.isValid()) { edm::LogVerbatim("HcalValidation") << hbhecoll->size() << " RecHits for HB/HE"; unsigned int k(0); @@ -153,8 +148,7 @@ void HcalDumpHits::analyze(const edm::Event& iEvent, const edm::EventSetup&) { ++k; } } - edm::Handle hfcoll; - iEvent.getByToken(hfRecHitSource_, hfcoll); + const edm::Handle& hfcoll = iEvent.getHandle(hfRecHitSource_); if (hfcoll.isValid()) { edm::LogVerbatim("HcalValidation") << hfcoll->size() << " RecHits for HF"; unsigned int k(0); @@ -164,8 +158,7 @@ void HcalDumpHits::analyze(const edm::Event& iEvent, const edm::EventSetup&) { ++k; } } - edm::Handle hocoll; - iEvent.getByToken(hoRecHitSource_, hocoll); + const edm::Handle& hocoll = iEvent.getHandle(hoRecHitSource_); if (hocoll.isValid()) { edm::LogVerbatim("HcalValidation") << hocoll->size() << " RecHits for HO"; unsigned int k(0); diff --git a/Validation/MuonCSCDigis/src/CSCStubMatcher.cc b/Validation/MuonCSCDigis/src/CSCStubMatcher.cc index 2bbe013a2b391..457ecc42eb3b4 100644 --- a/Validation/MuonCSCDigis/src/CSCStubMatcher.cc +++ b/Validation/MuonCSCDigis/src/CSCStubMatcher.cc @@ -141,6 +141,7 @@ void CSCStubMatcher::matchCLCTsToSimTrack(const CSCCLCTDigiCollection& clcts) { if (isME1a) ring = 1; CSCDetId ch_id2(ch_id.endcap(), ch_id.station(), ring, ch_id.chamber(), 0); + auto id2 = ch_id2.rawId(); // CLCTs should be sorted into the det of the CLCTs. const auto& clcts_in_det = clcts.get(ch_id2); @@ -156,7 +157,7 @@ void CSCStubMatcher::matchCLCTsToSimTrack(const CSCCLCTDigiCollection& clcts) { continue; // store all CLCTs in this chamber - chamber_to_clcts_all_[id].push_back(*c); + chamber_to_clcts_all_[id2].push_back(*c); // check that at least 3 comparator digis were matched! int nMatches = 0; @@ -190,13 +191,14 @@ void CSCStubMatcher::matchCLCTsToSimTrack(const CSCCLCTDigiCollection& clcts) { edm::LogInfo("CSCStubMatcher") << "clctGOOD"; // store matching CLCTs in this chamber - if (std::find(chamber_to_clcts_[id].begin(), chamber_to_clcts_[id].end(), *c) == chamber_to_clcts_[id].end()) { - chamber_to_clcts_[id].push_back(*c); + if (std::find(chamber_to_clcts_[id2].begin(), chamber_to_clcts_[id2].end(), *c) == chamber_to_clcts_[id2].end()) { + chamber_to_clcts_[id2].push_back(*c); } } - if (chamber_to_clcts_[id].size() > 2) { - edm::LogInfo("CSCStubMatcher") << "WARNING!!! too many CLCTs " << chamber_to_clcts_[id].size() << " in " << ch_id; - for (auto& c : chamber_to_clcts_[id]) + if (chamber_to_clcts_[id2].size() > 2) { + edm::LogInfo("CSCStubMatcher") << "WARNING!!! too many CLCTs " << chamber_to_clcts_[id2].size() << " in " + << ch_id2; + for (auto& c : chamber_to_clcts_[id2]) edm::LogInfo("CSCStubMatcher") << " " << c; } } @@ -220,8 +222,9 @@ void CSCStubMatcher::matchALCTsToSimTrack(const CSCALCTDigiCollection& alcts) { int ring = ch_id.ring(); if (ring == 4) - ring = 1; //use ME1b id to get CLCTs + ring = 1; //use ME1b id to get ALCTs CSCDetId ch_id2(ch_id.endcap(), ch_id.station(), ring, ch_id.chamber(), 0); + auto id2 = ch_id2.rawId(); // ALCTs should be sorted into the det of the ALCTs. const auto& alcts_in_det = alcts.get(ch_id2); for (auto a = alcts_in_det.first; a != alcts_in_det.second; ++a) { @@ -238,7 +241,7 @@ void CSCStubMatcher::matchALCTsToSimTrack(const CSCALCTDigiCollection& alcts) { int wg = a->getKeyWG() + 1; // as ALCT wiregroups numbers start from 0 // store all ALCTs in this chamber - chamber_to_alcts_all_[id].push_back(*a); + chamber_to_alcts_all_[id2].push_back(*a); // match by wiregroup with the digis if (digi_wgs.find(wg) == digi_wgs.end()) { @@ -248,13 +251,14 @@ void CSCStubMatcher::matchALCTsToSimTrack(const CSCALCTDigiCollection& alcts) { edm::LogInfo("CSCStubMatcher") << "alctGOOD"; // store matching ALCTs in this chamber - if (std::find(chamber_to_alcts_[id].begin(), chamber_to_alcts_[id].end(), *a) == chamber_to_alcts_[id].end()) { - chamber_to_alcts_[id].push_back(*a); + if (std::find(chamber_to_alcts_[id2].begin(), chamber_to_alcts_[id2].end(), *a) == chamber_to_alcts_[id2].end()) { + chamber_to_alcts_[id2].push_back(*a); } } - if (chamber_to_alcts_[id].size() > 2) { - edm::LogInfo("CSCStubMatcher") << "WARNING!!! too many ALCTs " << chamber_to_alcts_[id].size() << " in " << ch_id; - for (auto& a : chamber_to_alcts_[id]) + if (chamber_to_alcts_[id2].size() > 2) { + edm::LogInfo("CSCStubMatcher") << "WARNING!!! too many ALCTs " << chamber_to_alcts_[id2].size() << " in " + << ch_id; + for (auto& a : chamber_to_alcts_[id2]) edm::LogInfo("CSCStubMatcher") << " " << a; } } @@ -282,6 +286,7 @@ void CSCStubMatcher::matchLCTsToSimTrack(const CSCCorrelatedLCTDigiCollection& l if (ring == 4) ring = 1; CSCDetId ch_id2(ch_id.endcap(), ch_id.station(), ring, ch_id.chamber(), 0); + auto id2 = ch_id2.rawId(); // LCTs should be sorted into the det of the LCTs. const auto& lcts_in_det = lcts.get(ch_id2); @@ -377,8 +382,8 @@ void CSCStubMatcher::matchLCTsToSimTrack(const CSCCorrelatedLCTDigiCollection& l if (lct_matched) { if (verboseLCT_) edm::LogInfo("CSCStubMatcher") << "...was matched"; - if (std::find(chamber_to_lcts_[id].begin(), chamber_to_lcts_[id].end(), lct) == chamber_to_lcts_[id].end()) { - chamber_to_lcts_[id].emplace_back(lct); + if (std::find(chamber_to_lcts_[id2].begin(), chamber_to_lcts_[id2].end(), lct) == chamber_to_lcts_[id2].end()) { + chamber_to_lcts_[id2].emplace_back(lct); } } } // lct loop over @@ -643,9 +648,15 @@ GlobalPoint CSCStubMatcher::getGlobalPosition(unsigned int rawId, const CSCCorre CSCDetId cscId(rawId); CSCDetId keyId(cscId.endcap(), cscId.station(), cscId.ring(), cscId.chamber(), CSCConstants::KEY_CLCT_LAYER); float fractional_strip = lct.getFractionalStrip(); - // case ME1/a - if (cscId.station() == 1 and cscId.ring() == 4 and lct.getStrip() > CSCConstants::MAX_HALF_STRIP_ME1B) { - fractional_strip -= CSCConstants::NUM_STRIPS_ME1B; + // case ME1/1 + if (cscId.station() == 1 and (cscId.ring() == 4 || cscId.ring() == 1)) { + int ring = 1; // Default to ME1/b + if (lct.getStrip() > CSCConstants::MAX_HALF_STRIP_ME1B) { + ring = 4; // Change to ME1/a if the HalfStrip Number exceeds the range of ME1/b + fractional_strip -= CSCConstants::NUM_STRIPS_ME1B; + } + CSCDetId cscId_(cscId.endcap(), cscId.station(), ring, cscId.chamber(), cscId.layer()); + cscId = cscId_; } // regular cases const auto& chamber = cscGeometry_->chamber(cscId);