From 2152fd103631ea971c30790b8e127c087f651c0d Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 14 Mar 2018 22:06:55 +0100 Subject: [PATCH 1/6] Take care of HLT codes for IsoTrackHB/HE in view of increased noise level in EE --- .../IsolatedEcalPixelTrackCandidateProducer.h | 9 +- .../python/isolEcalPixelTrackProd_cfi.py | 9 +- ...IsolatedEcalPixelTrackCandidateProducer.cc | 97 +++++++++++++------ .../plugins/HLTEcalPixelIsolTrackFilter.cc | 26 +++-- .../plugins/HLTEcalPixelIsolTrackFilter.h | 10 +- 5 files changed, 106 insertions(+), 45 deletions(-) diff --git a/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h b/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h index c3e69a1c1e573..247050123ad40 100644 --- a/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h +++ b/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h @@ -31,8 +31,13 @@ class IsolatedEcalPixelTrackCandidateProducer : public edm::global::EDProducer<> const edm::EDGetTokenT tok_trigcand; const double coneSizeEta0_; const double coneSizeEta1_; - const double hitCountEthr_; - const double hitEthr_; + const double hitCountEthrEB_; + const double hitEthrEB_; + const double fachitCountEE_; + const double hitEthrEE0_; + const double hitEthrEE1_; + const double hitEthrEE2_; + const double hitEthrEE3_; }; #endif diff --git a/Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py b/Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py index c2452fd2da21e..865be9d0177c6 100644 --- a/Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py +++ b/Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py @@ -4,8 +4,13 @@ filterLabel = cms.InputTag("hltIsolPixelTrackL2Filter"), EBRecHitSource = cms.InputTag("hltEcalRecHit", "EcalRecHitsEB"), EERecHitSource = cms.InputTag("hltEcalRecHit", "EcalRecHitsEE"), - ECHitEnergyThreshold = cms.double(0.05), - ECHitCountEnergyThreshold = cms.double(0.5), + EBHitEnergyThreshold = cms.double(0.10), + EBHitCountEnergyThreshold = cms.double(0.5), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold= cms.double(10.0), EcalConeSizeEta0 = cms.double(0.09), EcalConeSizeEta1 = cms.double(0.14) ) diff --git a/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc b/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc index 2baf1c9fd8903..6de52dd2547b6 100644 --- a/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc +++ b/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc @@ -17,7 +17,7 @@ // // -//#define DebugLog +//#define EDM_ML_DEBUG // system include files #include @@ -40,8 +40,13 @@ IsolatedEcalPixelTrackCandidateProducer::IsolatedEcalPixelTrackCandidateProducer tok_trigcand( consumes(conf.getParameter("filterLabel")) ), coneSizeEta0_( conf.getParameter("EcalConeSizeEta0") ), coneSizeEta1_( conf.getParameter("EcalConeSizeEta1") ), - hitCountEthr_( conf.getParameter("ECHitCountEnergyThreshold") ), - hitEthr_( conf.getParameter("ECHitEnergyThreshold") ) + hitCountEthrEB_( conf.getParameter("EBHitCountEnergyThreshold") ), + hitEthrEB_( conf.getParameter("EBHitEnergyThreshold") ), + fachitCountEE_( conf.getParameter("EEFacHitCountEnergyThreshold") ), + hitEthrEE0_( conf.getParameter("EEHitEnergyThreshold0") ), + hitEthrEE1_( conf.getParameter("EEHitEnergyThreshold1") ), + hitEthrEE2_( conf.getParameter("EEHitEnergyThreshold2") ), + hitEthrEE3_( conf.getParameter("EEHitEnergyThreshold3") ) { // register the products produces< reco::IsolatedPixelTrackCandidateCollection >(); @@ -51,7 +56,7 @@ IsolatedEcalPixelTrackCandidateProducer::~IsolatedEcalPixelTrackCandidateProduce // ------------ method called to produce the data ------------ void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { -#ifdef DebugLog +#ifdef EDM_ML_DEBUG edm::LogInfo("HcalIsoTrack") << "==============Inside IsolatedEcalPixelTrackCandidateProducer"; #endif edm::ESHandle pG; @@ -63,8 +68,9 @@ void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID, edm::Event& edm::Handle ecalEE; iEvent.getByToken(tok_ee,ecalEE); -#ifdef DebugLog - edm::LogInfo("HcalIsoTrack") << "ecal Collections isValid: " << ecalEB.isValid() << "/" << ecalEE.isValid(); +#ifdef EDM_ML_DEBUG + edm::LogInfo("HcalIsoTrack") << "ecal Collections isValid: " + << ecalEB.isValid() << "/" << ecalEE.isValid(); #endif edm::Handle trigCand; @@ -75,8 +81,14 @@ void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID, edm::Event& int nCand=isoPixTrackRefs.size(); auto iptcCollection = std::make_unique(); -#ifdef DebugLog - edm::LogInfo("HcalIsoTrack") << "coneSize_ " << coneSizeEta0_ << "/"<< coneSizeEta1_ << " hitCountEthr_ " << hitCountEthr_ << " hitEthr_ " << hitEthr_; +#ifdef EDM_ML_DEBUG + edm::LogInfo("HcalIsoTrack") << "coneSize_ " << coneSizeEta0_ << "/" + << coneSizeEta1_ << " hitCountEthrEB_ " + << hitCountEthrEB_ << " hitEthrEB_ " + << hitEthrEB_ << " fachitCountEE_ " + << fachitCountEE_ << " hitEthrEE " + << hitEthrEE0_ << ":" << hitEthrEE1_ << ":" + << hitEthrEE2_ << ":" << hitEthrEE3_; #endif for (int p=0; petaPhiEcalValid()) etaPhi = isoPixTrackRefs[p]->etaPhiEcal(); double etaAbs = std::abs(etaPhi.first); double coneSize_ = (etaAbs > 1.5) ? coneSizeEta1_ : (coneSizeEta0_*(1.5-etaAbs)+coneSizeEta1_*etaAbs)/1.5; -#ifdef DebugLog - edm::LogInfo("HcalIsoTrack") << "Track: eta/phi " << etaPhi.first << "/" << etaPhi.second << " pt:" << isoPixTrackRefs[p]->track()->pt() << " cone " << coneSize_ << "\n" << "rechit size EB/EE : " << ecalEB->size() << "/" << ecalEE->size() << " coneSize_: " << coneSize_; +#ifdef EDM_ML_DEBUG + edm::LogInfo("HcalIsoTrack") << "Track: eta/phi " << etaPhi.first << "/" + << etaPhi.second << " pt:" + << isoPixTrackRefs[p]->track()->pt() + << " cone " << coneSize_ << "\n" + << "rechit size EB/EE : " << ecalEB->size() + << "/" << ecalEE->size() << " coneSize_: " + << coneSize_; #endif if (etaAbs<1.7) { - for (EcalRecHitCollection::const_iterator eItr=ecalEB->begin(); eItr!=ecalEB->end(); eItr++) { - const GlobalPoint& pos = geo->getPosition(eItr->detid()); + int nin(0), nout(0); + for (auto eItr : *(ecalEB.product())) { + const GlobalPoint& pos = geo->getPosition(eItr.detid()); double R = reco::deltaR(pos.eta(),pos.phi(),etaPhi.first,etaPhi.second); if (R < coneSize_) { nhitIn++; - inEnergy += (eItr->energy()); - if (eItr->energy() > hitCountEthr_) nhitOut++; - if (eItr->energy() > hitEthr_) outEnergy += (eItr->energy()); -#ifdef DebugLog - edm::LogInfo("HcalIsoTrack") << "Rechit Close to the track has energy " << eItr->energy() << " eta/phi: " << pos.eta() << "/" << pos.phi() << " deltaR: " << R; + inEnergy += (eItr.energy()); + ++nin; + if (eItr.energy() > hitCountEthrEB_) nhitOut++; + if (eItr.energy() > hitEthrEB_) { + outEnergy += (eItr.energy()); + ++nout; + } +#ifdef EDM_ML_DEBUG + edm::LogInfo("HcalIsoTrack") << "EBRechit close to the track has E " + << eItr.energy() << " eta/phi: " + << pos.eta() << "/" << pos.phi() + << " deltaR: " << R; #endif } } } if (etaAbs>1.25) { - for (EcalRecHitCollection::const_iterator eItr=ecalEE->begin(); eItr!=ecalEE->end(); eItr++) { - const GlobalPoint& pos = geo->getPosition(eItr->detid()); + int nin(0), nout(0); + for (auto eItr : *(ecalEE.product())) { + const GlobalPoint& pos = geo->getPosition(eItr.detid()); double R = reco::deltaR(pos.eta(),pos.phi(),etaPhi.first,etaPhi.second); if (R < coneSize_) { + double eta = std::abs(pos.eta()); + double hitEthr = (((eta*hitEthrEE3_+hitEthrEE2_)*eta+hitEthrEE1_)*eta+ + hitEthrEE0_); + if (hitEthr < hitEthrEB_) hitEthr = hitEthrEB_; nhitIn++; - inEnergy += (eItr->energy()); - if (eItr->energy() > hitCountEthr_) nhitOut++; - if (eItr->energy() > hitEthr_) outEnergy += (eItr->energy()); -#ifdef DebugLog - edm::LogInfo("HcalIsoTrack") << "Rechit Close to the track has energy " << eItr->energy() << " eta/phi: " << pos.eta() << "/" << pos.phi() << " deltaR: " << R; + inEnergy += (eItr.energy()); + ++nin; + if (eItr.energy() > fachitCountEE_*hitEthr) nhitOut++; + if (eItr.energy() > hitEthr) { + outEnergy += (eItr.energy()); + ++nout; + } +#ifdef EDM_ML_DEBUG + edm::LogInfo("HcalIsoTrack") << "EERechit close to the track has E " + << eItr.energy() << " eta/phi: " + << pos.eta() << "/" << pos.phi() + << " deltaR: " << R; #endif } } } -#ifdef DebugLog - edm::LogInfo("HcalIsoTrack") << "nhitIn:" << nhitIn << " inEnergy:" << inEnergy << " nhitOut:" << nhitOut << " outEnergy:" << outEnergy; +#ifdef EDM_ML_DEBUG + edm::LogInfo("HcalIsoTrack") << "nhitIn:" << nhitIn << " inEnergy:" + << inEnergy << " nhitOut:" << nhitOut + << " outEnergy:" << outEnergy; #endif reco::IsolatedPixelTrackCandidate newca(*isoPixTrackRefs[p]); newca.setEnergyIn(inEnergy); @@ -128,8 +168,9 @@ void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID, edm::Event& newca.setNHitOut(nhitOut); iptcCollection->push_back(newca); } -#ifdef DebugLog - edm::LogInfo("HcalIsoTrack") << "ncand:" << nCand << " outcollction size:" << iptcCollection->size(); +#ifdef EDM_ML_DEBUG + edm::LogInfo("HcalIsoTrack") << "ncand:" << nCand << " outcollction size:" + << iptcCollection->size(); #endif iEvent.put(std::move(iptcCollection)); } diff --git a/HLTrigger/special/plugins/HLTEcalPixelIsolTrackFilter.cc b/HLTrigger/special/plugins/HLTEcalPixelIsolTrackFilter.cc index d354b337a294b..5eb89e40fcf86 100644 --- a/HLTrigger/special/plugins/HLTEcalPixelIsolTrackFilter.cc +++ b/HLTrigger/special/plugins/HLTEcalPixelIsolTrackFilter.cc @@ -7,12 +7,15 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -HLTEcalPixelIsolTrackFilter::HLTEcalPixelIsolTrackFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig) { - candTag_ = iConfig.getParameter ("candTag"); - maxEnergyIn_ = iConfig.getParameter ("MaxEnergyIn"); - maxEnergyOut_ = iConfig.getParameter ("MaxEnergyOut"); - nMaxTrackCandidates_ = iConfig.getParameter("NMaxTrackCandidates"); - dropMultiL2Event_ = iConfig.getParameter ("DropMultiL2Event"); +HLTEcalPixelIsolTrackFilter::HLTEcalPixelIsolTrackFilter(const edm::ParameterSet& iConfig) : + HLTFilter(iConfig), + candTag_( iConfig.getParameter ("candTag")), + maxEnergyInEB_(iConfig.getParameter ("MaxEnergyInEB")), + maxEnergyInEE_(iConfig.getParameter ("MaxEnergyInEE")), + maxEnergyOutEB_(iConfig.getParameter ("MaxEnergyOutEB")), + maxEnergyOutEE_(iConfig.getParameter ("MaxEnergyOutEE")), + nMaxTrackCandidates_(iConfig.getParameter("NMaxTrackCandidates")), + dropMultiL2Event_(iConfig.getParameter ("DropMultiL2Event")) { candTok = consumes(candTag_); } @@ -22,8 +25,10 @@ void HLTEcalPixelIsolTrackFilter::fillDescriptions(edm::ConfigurationDescription edm::ParameterSetDescription desc; makeHLTFilterDescription(desc); desc.add("candTag",edm::InputTag("hltIsolEcalPixelTrackProd")); - desc.add("MaxEnergyIn",1.2); - desc.add("MaxEnergyOut",1.2); + desc.add("MaxEnergyInEB",1.2); + desc.add("MaxEnergyInEE",2.0); + desc.add("MaxEnergyOutEB",1.2); + desc.add("MaxEnergyOutEE",2.0); desc.add("NMaxTrackCandidates",10); desc.add("DropMultiL2Event",false); descriptions.add("isolEcalPixelTrackFilter",desc); @@ -47,8 +52,11 @@ bool HLTEcalPixelIsolTrackFilter::hltFilter(edm::Event& iEvent, const edm::Event LogDebug("IsoTrk") << "candref.track().isNull() " << candref->track().isNull() << "\n"; if(candref->track().isNull()) continue; // select on transverse momentum + double etaAbs = std::abs(candref->track()->eta()); + double maxEnergyIn = (etaAbs < 1.479) ? maxEnergyInEB_ : maxEnergyInEE_; + double maxEnergyOut= (etaAbs < 1.479) ? maxEnergyOutEB_ : maxEnergyOutEE_; LogDebug("IsoTrk") << "energyin/out: " << candref->energyIn() << "/" << candref->energyOut() << "\n"; - if (candref->energyIn()energyOut()energyIn()energyOut() candTok; edm::InputTag candTag_; - double maxEnergyIn_; - double maxEnergyOut_; - int nMaxTrackCandidates_; - bool dropMultiL2Event_; + const double maxEnergyInEB_; + const double maxEnergyInEE_; + const double maxEnergyOutEB_; + const double maxEnergyOutEE_; + const int nMaxTrackCandidates_; + const bool dropMultiL2Event_; }; #endif From 00c40bcd493914597ab1db385577877cf717db0b Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 15 Mar 2018 21:55:19 +0100 Subject: [PATCH 2/6] Change cff/cfg files because of changes in producers/filters --- .../Configuration/python/HLT_FULL_cff.py | 34 +++++++++++++------ .../Configuration/python/HLT_GRun_cff.py | 34 +++++++++++++------ .../Configuration/test/OnLine_HLT_FULL.py | 34 +++++++++++++------ .../Configuration/test/OnLine_HLT_GRun.py | 33 ++++++++++++------ 4 files changed, 95 insertions(+), 40 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index b2dbe0be14fba..1c7c6e21d8e86 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -85278,19 +85278,26 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -85348,19 +85355,26 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index f3b541cc14db6..eb7986840f63f 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -68687,19 +68687,26 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -68757,19 +68764,26 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index df4b557aade73..c2c322ccc1910 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -85578,19 +85578,26 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -85648,19 +85655,26 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index ad2f945fc4121..de3f1903ded9f 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -68987,19 +68987,26 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -69057,19 +69064,25 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ECHitCountEnergyThreshold = cms.double( 0.5 ), - EcalConeSizeEta0 = cms.double( 0.09 ), EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EcalConeSizeEta0 = cms.double( 0.09 ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyIn = cms.double( 1.2 ), - MaxEnergyOut = cms.double( 1.2 ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) From 5ccdd830d5bacc077a19150ed566cf7815fdd2f1 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 15 Mar 2018 22:33:12 +0100 Subject: [PATCH 3/6] Add fillDescription method --- .../IsolatedEcalPixelTrackCandidateProducer.h | 2 ++ .../IsolatedEcalPixelTrackCandidateProducer.cc | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h b/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h index 247050123ad40..7647e4549f7bc 100644 --- a/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h +++ b/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h @@ -23,6 +23,8 @@ class IsolatedEcalPixelTrackCandidateProducer : public edm::global::EDProducer<> explicit IsolatedEcalPixelTrackCandidateProducer(const edm::ParameterSet&); ~IsolatedEcalPixelTrackCandidateProducer() override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; diff --git a/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc b/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc index 6de52dd2547b6..27f8ccd7b8a23 100644 --- a/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc +++ b/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc @@ -54,6 +54,23 @@ IsolatedEcalPixelTrackCandidateProducer::IsolatedEcalPixelTrackCandidateProducer IsolatedEcalPixelTrackCandidateProducer::~IsolatedEcalPixelTrackCandidateProducer() { } +void IsolatedEcalPixelTrackCandidateProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("filterLabel",edm::InputTag("hltIsolPixelTrackL2Filter")); + desc.add("EBRecHitSource",edm::InputTag("hltEcalRecHit", "EcalRecHitsEB")); + desc.add("EERecHitSource",edm::InputTag("hltEcalRecHit", "EcalRecHitsEE")); + desc.add("EBHitEnergyThreshold",0.10); + desc.add("EBHitCountEnergyThreshold",0.5); + desc.add("EEHitEnergyThreshold0",-20.5332); + desc.add("EEHitEnergyThreshold1",34.3975); + desc.add("EEHitEnergyThreshold2",-19.0741); + desc.add("EEHitEnergyThreshold3",3.52151); + desc.add("EEFacHitCountEnergyThreshold",10.0); + desc.add("EcalConeSizeEta0",0.09); + desc.add("EcalConeSizeEta1",0.14); + descriptions.add("isolEcalPixelTrackProd",desc); +} + // ------------ method called to produce the data ------------ void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { #ifdef EDM_ML_DEBUG From 87c228361fe6620bd71ebc28f2ff17d846993335 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 16 Mar 2018 14:35:40 +0100 Subject: [PATCH 4/6] Take Martin's suggestions --- .../Configuration/python/HLT_FULL_cff.py | 34 +++------- .../Configuration/python/HLT_GRun_cff.py | 34 +++------- .../python/customizeHLTforCMSSW.py | 65 +++++++++++++++++++ 3 files changed, 85 insertions(+), 48 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 1c7c6e21d8e86..b2dbe0be14fba 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -85278,26 +85278,19 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -85355,26 +85348,19 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index eb7986840f63f..f3b541cc14db6 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -68687,26 +68687,19 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -68764,26 +68757,19 @@ filterTrackEnergy = cms.bool( True ) ) fragment.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) fragment.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 35468e4f20f85..9ab849ed406e6 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -17,6 +17,7 @@ # pset.minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('HLTSiStripClusterChargeCutNone')) # return process +<<<<<<< HEAD from RecoParticleFlow.PFClusterProducer.particleFlowClusterHBHE_cfi import recHitEnergyNorms2018,seedFinderThresholdsByDetector2018,initialClusteringStepThresholdsByDetector2018,logWeightDenominatorByDetector2018 from RecoParticleFlow.PFClusterProducer.particleFlowClusterHCAL_cfi import logWeightDenominatorByDetector2018 as logWeightDenominatorByDetector2018_HCAL @@ -55,6 +56,69 @@ def customiseForUncollapsed(process): return process +======= +def customiseFor22621_forIsoTrackHBHE(process): + """Adapt the HLT to run with different setting + of thresholds for EB/EE in """ + + if hasattr(process,'hltIsolEcalPixelTrackProdHB'): + process.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), + EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), + EcalConeSizeEta1 = cms.double( 0.14 ) + ) + + if hasattr(process,'hltIsolEcalPixelTrackProdHE'): + process.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), + EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + EBHitEnergyThreshold = cms.double( 0.10 ), + EBHitCountEnergyThreshold = cms.double( 0.5 ), + EEHitEnergyThreshold0 = cms.double(-20.5332), + EEHitEnergyThreshold1 = cms.double(34.3975), + EEHitEnergyThreshold2 = cms.double(-19.0741), + EEHitEnergyThreshold3 = cms.double(3.52151), + EEFacHitCountEnergyThreshold = cms.double(10.0), + EcalConeSizeEta0 = cms.double( 0.09 ), + EcalConeSizeEta1 = cms.double( 0.14 ) + ) + + if hasattr(process,'hltEcalIsolPixelTrackL2FilterHB'): + process.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", + saveTags = cms.bool( True ), + DropMultiL2Event = cms.bool( False ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), + NMaxTrackCandidates = cms.int32( 10 ), + candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) + ) + + if hasattr(process,'hltEcalIsolPixelTrackL2FilterHB'): + process.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", + saveTags = cms.bool( True ), + DropMultiL2Event = cms.bool( False ), + MaxEnergyInEB = cms.double( 1.2 ), + MaxEnergyInEE = cms.double( 2.0 ), + MaxEnergyOutEB = cms.double( 1.2 ), + MaxEnergyOutEE = cms.double( 2.0 ), + NMaxTrackCandidates = cms.int32( 10 ), + candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) + ) + + return process +>>>>>>> Take Martin's suggestions def customiseFor21664_forMahiOn(process): @@ -196,5 +260,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) + process = customiseFor22621_forIsoTrackHBHE(process) return process From b9a7b992b925ec4469a448be4516682d5ec31f23 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 16 Mar 2018 16:04:52 +0100 Subject: [PATCH 5/6] Remove the changes in the test directory --- .../Configuration/test/OnLine_HLT_FULL.py | 34 ++++++------------- .../Configuration/test/OnLine_HLT_GRun.py | 33 ++++++------------ 2 files changed, 20 insertions(+), 47 deletions(-) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index c2c322ccc1910..df4b557aade73 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -85578,26 +85578,19 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -85655,26 +85648,19 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index de3f1903ded9f..ad2f945fc4121 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -68987,26 +68987,19 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) ) @@ -69064,25 +69057,19 @@ filterTrackEnergy = cms.bool( True ) ) process.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", + ECHitEnergyThreshold = cms.double( 0.05 ), filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), + ECHitCountEnergyThreshold = cms.double( 0.5 ), EcalConeSizeEta0 = cms.double( 0.09 ), + EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), EcalConeSizeEta1 = cms.double( 0.14 ) ) process.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", saveTags = cms.bool( True ), DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), + MaxEnergyIn = cms.double( 1.2 ), + MaxEnergyOut = cms.double( 1.2 ), NMaxTrackCandidates = cms.int32( 10 ), candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) ) From 2b376da5b04c921dffe48ace0cc6c09825b80831 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 20 Mar 2018 11:58:16 +0100 Subject: [PATCH 6/6] Other changes --- .../python/isolEcalPixelTrackProd_cfi.py | 18 ----- .../python/customizeHLTforCMSSW.py | 80 +++++-------------- 2 files changed, 22 insertions(+), 76 deletions(-) delete mode 100644 Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py diff --git a/Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py b/Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py deleted file mode 100644 index 865be9d0177c6..0000000000000 --- a/Calibration/HcalIsolatedTrackReco/python/isolEcalPixelTrackProd_cfi.py +++ /dev/null @@ -1,18 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -isolEcalPixelTrackProd = cms.EDProducer("IsolatedEcalPixelTrackCandidateProducer", - filterLabel = cms.InputTag("hltIsolPixelTrackL2Filter"), - EBRecHitSource = cms.InputTag("hltEcalRecHit", "EcalRecHitsEB"), - EERecHitSource = cms.InputTag("hltEcalRecHit", "EcalRecHitsEE"), - EBHitEnergyThreshold = cms.double(0.10), - EBHitCountEnergyThreshold = cms.double(0.5), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold= cms.double(10.0), - EcalConeSizeEta0 = cms.double(0.09), - EcalConeSizeEta1 = cms.double(0.14) - ) - - diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 9ab849ed406e6..677eb44aba50f 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -17,7 +17,6 @@ # pset.minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('HLTSiStripClusterChargeCutNone')) # return process -<<<<<<< HEAD from RecoParticleFlow.PFClusterProducer.particleFlowClusterHBHE_cfi import recHitEnergyNorms2018,seedFinderThresholdsByDetector2018,initialClusteringStepThresholdsByDetector2018,logWeightDenominatorByDetector2018 from RecoParticleFlow.PFClusterProducer.particleFlowClusterHCAL_cfi import logWeightDenominatorByDetector2018 as logWeightDenominatorByDetector2018_HCAL @@ -56,69 +55,34 @@ def customiseForUncollapsed(process): return process -======= def customiseFor22621_forIsoTrackHBHE(process): """Adapt the HLT to run with different setting of thresholds for EB/EE in """ - if hasattr(process,'hltIsolEcalPixelTrackProdHB'): - process.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ), - EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), - EcalConeSizeEta0 = cms.double( 0.09 ), - EcalConeSizeEta1 = cms.double( 0.14 ) - ) - - if hasattr(process,'hltIsolEcalPixelTrackProdHE'): - process.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer", - filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ), - EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - EBHitEnergyThreshold = cms.double( 0.10 ), - EBHitCountEnergyThreshold = cms.double( 0.5 ), - EEHitEnergyThreshold0 = cms.double(-20.5332), - EEHitEnergyThreshold1 = cms.double(34.3975), - EEHitEnergyThreshold2 = cms.double(-19.0741), - EEHitEnergyThreshold3 = cms.double(3.52151), - EEFacHitCountEnergyThreshold = cms.double(10.0), - EcalConeSizeEta0 = cms.double( 0.09 ), - EcalConeSizeEta1 = cms.double( 0.14 ) - ) - - if hasattr(process,'hltEcalIsolPixelTrackL2FilterHB'): - process.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", - saveTags = cms.bool( True ), - DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), - NMaxTrackCandidates = cms.int32( 10 ), - candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" ) - ) - - if hasattr(process,'hltEcalIsolPixelTrackL2FilterHB'): - process.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter", - saveTags = cms.bool( True ), - DropMultiL2Event = cms.bool( False ), - MaxEnergyInEB = cms.double( 1.2 ), - MaxEnergyInEE = cms.double( 2.0 ), - MaxEnergyOutEB = cms.double( 1.2 ), - MaxEnergyOutEE = cms.double( 2.0 ), - NMaxTrackCandidates = cms.int32( 10 ), - candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" ) - ) + for producer in producers_by_type(process, "IsolatedEcalPixelTrackCandidateProducer"): + del producer.ECHitEnergyThreshold + del producer.ECHitCountEnergyThreshold + del producer.EcalConeSizeEta0 + del producer.EcalConeSizeEta1 + producer.EBHitEnergyThreshold = cms.double(0.10) + producer.EBHitCountEnergyThreshold = cms.double(0.5) + producer.EEHitEnergyThreshold0 = cms.double(-20.5332) + producer.EEHitEnergyThreshold1 = cms.double(34.3975) + producer.EEHitEnergyThreshold2 = cms.double(-19.0741) + producer.EEHitEnergyThreshold3 = cms.double(3.52151) + producer.EEFacHitCountEnergyThreshold= cms.double(10.0) + producer.EcalConeSizeEta0 = cms.double(0.09) + producer.EcalConeSizeEta1 = cms.double(0.14) + + for filter in filters_by_type(process, "HLTEcalPixelIsolTrackFilter"): + del filter.MaxEnergyIn + del filter.MaxEnergyOut + filter.MaxEnergyInEB = cms.double( 2.0 ) + filter.MaxEnergyOutEB = cms.double( 1.2 ) + filter.MaxEnergyInEE = cms.double( 2.0 ) + filter.MaxEnergyOutEE = cms.double( 1.2 ) return process ->>>>>>> Take Martin's suggestions def customiseFor21664_forMahiOn(process):