diff --git a/[refs] b/[refs] index a1adbfb6e48c4..629ca58c48c1a 100644 --- a/[refs] +++ b/[refs] @@ -3,4 +3,4 @@ refs/heads/gh-pages: 90c10214674639ca7a94515baf184b0cc75e1b69 refs/heads/CMSSW_4_1_X: a4334f9063dcad3cb0c038ac911fd8357c3bbaaa refs/heads/with_VBF_Hbb_fragment: 5b1f2347e6db46cfd6288879a97056d280cf27c5 refs/heads/withOnlineToOfflineProducer: c0b9423e0d6c6d5315f93d1ee32e9bf68078d9c0 -refs/heads/withNewDZ: 7f1bc799a309e621dc5e47637f79214c17534355 +refs/heads/withNewDZ: e426c964219f35402d92f3fb2c319e300a6378ca diff --git a/branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRTagInfoValueMapProducer.cc b/branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRTagInfoValueMapProducer.cc deleted file mode 100644 index d7eae534c4d12..0000000000000 --- a/branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRTagInfoValueMapProducer.cc +++ /dev/null @@ -1,138 +0,0 @@ -/* \class JetDeltaRTagInfoValueMapProducer - * - * Inputs two jet collections ("src" and "matched", type T), with - * the second having tag infos run on them ("matchedTagInfos", type I). - * The jet collections are matched using delta-R matching. The - * tag infos from the second collection are then rewritten into a - * new TagInfoCollection, keyed to the first jet collection. - * This can be used in the miniAOD to associate the previously-run - * CA8 "Top-Tagged" jets with their CATopTagInfos to the AK8 jets - * that are stored in the miniAOD. - * - * \author: Sal Rappoccio - * - * - * for more details about the cut syntax, see the documentation - * page below: - * - * https://twiki.cern.ch/twiki/bin/view/CMS/SWGuidePhysicsCutParser - * - * - */ - - -#include "FWCore/Framework/interface/EDProducer.h" - -#include "DataFormats/JetReco/interface/Jet.h" -#include "DataFormats/JetReco/interface/CATopJetTagInfo.h" -#include "DataFormats/JetReco/interface/PFJet.h" -#include "DataFormats/JetReco/interface/CaloJet.h" - -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/Common/interface/ValueMap.h" -#include "DataFormats/Math/interface/deltaR.h" - -template < class T, class I > -class JetDeltaRTagInfoValueMapProducer : public edm::EDProducer { - -public: - - typedef std::vector JetsInput; - typedef std::vector TagInfosCollection; - - JetDeltaRTagInfoValueMapProducer ( edm::ParameterSet const & params ) : - srcToken_( consumes< typename edm::View >( params.getParameter("src") ) ), - matchedToken_( consumes< typename edm::View >( params.getParameter( "matched" ) ) ), - matchedTagInfosToken_( consumes< typename edm::View >( params.getParameter( "matchedTagInfos" ) ) ), - distMax_( params.getParameter( "distMax" ) ) - { - produces< TagInfosCollection >(); - } - - virtual ~JetDeltaRTagInfoValueMapProducer() {} - -private: - - virtual void beginJob() override {} - virtual void endJob() override {} - - virtual void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override { - - std::auto_ptr< TagInfosCollection > mappedTagInfos ( new TagInfosCollection() ); - - - edm::Handle< typename edm::View > h_jets1; - iEvent.getByToken( srcToken_, h_jets1 ); - edm::Handle< typename edm::View > h_jets2; - iEvent.getByToken( matchedToken_, h_jets2 ); - edm::Handle< typename edm::View > h_tagInfos; - iEvent.getByToken( matchedTagInfosToken_, h_tagInfos ); - - double distMax2 = distMax_*distMax_; - - std::vector jets2_locks( h_jets2->size(), false ); - - for ( typename edm::View::const_iterator ibegin = h_jets1->begin(), - iend = h_jets1->end(), ijet = ibegin; - ijet != iend; ++ijet ) - { - float matched_dR2 = 1e9; - int matched_index = -1; - - //std::cout << "Looking at jet " << ijet - ibegin << ", mass = " << ijet->mass() << std::endl; - - for ( typename edm::View::const_iterator jbegin = h_jets2->begin(), - jend = h_jets2->end(), jjet = jbegin; - jjet != jend; ++jjet ) - { - int index=jjet - jbegin; - - //std::cout << "Checking jet " << index << ", mass = " << jjet->mass() << std::endl; - - if( jets2_locks.at(index) ) continue; // skip jets that have already been matched - - float temp_dR2 = reco::deltaR2(ijet->eta(),ijet->phi(),jjet->eta(),jjet->phi()); - if ( temp_dR2 < matched_dR2 ) - { - matched_dR2 = temp_dR2; - matched_index = index; - } - }// end loop over src jets - - I mappedTagInfo; - - if( matched_index>=0 && matched_index < h_tagInfos->size() ) - { - if ( matched_dR2 > distMax2 ) - LogDebug("MatchedJetsFarApart") << "Matched jets separated by dR greater than distMax=" << distMax_; - else - { - jets2_locks.at(matched_index) = true; - - auto otherTagInfo = h_tagInfos->at( matched_index ); - otherTagInfo.setJetRef( h_jets1->refAt( ijet - ibegin) ); - mappedTagInfo = otherTagInfo; - //std::cout << "Matched! : " << matched_index << ", mass = " << mappedTagInfo.properties().topMass << std::endl; - } - } - - mappedTagInfos->push_back( mappedTagInfo ); - - }// end loop over matched jets - - - // put in Event - iEvent.put(mappedTagInfos); - } - - edm::EDGetTokenT< typename edm::View > srcToken_; - edm::EDGetTokenT< typename edm::View > matchedToken_; - edm::EDGetTokenT< typename edm::View > matchedTagInfosToken_; - double distMax_; - -}; - -typedef JetDeltaRTagInfoValueMapProducer RecoJetDeltaRTagInfoValueMapProducer; - -DEFINE_FWK_MODULE( RecoJetDeltaRTagInfoValueMapProducer ); diff --git a/branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc b/branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc index 0e194e11eeffb..f2f89b522424a 100644 --- a/branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc +++ b/branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc @@ -1,8 +1,8 @@ -/* \class JetDeltaRValueMapProducer +/* \class PFJetSelector * - * Associates jets using delta-R matching, and writes out - * a valuemap of single float variables based on a StringObjectFunction. - * This is used for miniAOD. + * Selects jets with a configurable string-based cut, + * and also writes out the constituents of the jet + * into a separate collection. * * \author: Sal Rappoccio * diff --git a/branches/withNewDZ/CondCore/CondDB/src/IOVSchema.h b/branches/withNewDZ/CondCore/CondDB/src/IOVSchema.h index 2396e607d2295..014ea015e8483 100644 --- a/branches/withNewDZ/CondCore/CondDB/src/IOVSchema.h +++ b/branches/withNewDZ/CondCore/CondDB/src/IOVSchema.h @@ -165,7 +165,7 @@ namespace cond { column( SOURCE_ACCOUNT, std::string ); column( SOURCE_TOKEN, std::string ); - column( PAYLOAD_HASH, std::string, PAYLOAD::PAYLOAD_HASH_SIZE ); + column( PAYLOAD_HASH, std::string ); column( INSERTION_TIME, boost::posix_time::ptime ); class Table : public IPayloadMigrationTable { diff --git a/branches/withNewDZ/CondCore/ESSources/plugins/CondDBESSource.cc b/branches/withNewDZ/CondCore/ESSources/plugins/CondDBESSource.cc index b4ace331b829e..fbf60da236c4e 100644 --- a/branches/withNewDZ/CondCore/ESSources/plugins/CondDBESSource.cc +++ b/branches/withNewDZ/CondCore/ESSources/plugins/CondDBESSource.cc @@ -344,7 +344,7 @@ CondDBESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey& iKey // compute the smallest interval (assume all objects have the same timetype....) cond::ValidityInterval recordValidity(1,cond::TIMELIMIT); - cond::TimeType timetype = cond::TimeType::invalid; + cond::TimeType timetype; bool userTime=true; //FIXME use equal_range diff --git a/branches/withNewDZ/CondCore/Utilities/bin/conddb_migrate.cpp b/branches/withNewDZ/CondCore/Utilities/bin/conddb_migrate.cpp index f6422f670a4c7..fba3830bb855e 100644 --- a/branches/withNewDZ/CondCore/Utilities/bin/conddb_migrate.cpp +++ b/branches/withNewDZ/CondCore/Utilities/bin/conddb_migrate.cpp @@ -47,21 +47,12 @@ cond::MigrateUtilities::~MigrateUtilities(){ int cond::MigrateUtilities::execute(){ bool debug = hasDebug(); - int filterPosition = -1; std::string tag(""); if( hasOptionValue("tag")) { tag = getOptionValue("tag"); if(debug){ std::cout << "tag " << tag << std::endl; } - if( tag[0] == '*' ){ - tag = tag.substr(1); - filterPosition = 0; - } - if( tag[tag.size()-1] == '*' ){ - tag = tag.substr(0,tag.size()-1); - filterPosition = 1; - } } bool replace = hasOptionValue("replace"); bool validate = !hasOptionValue("fast"); @@ -77,18 +68,10 @@ int cond::MigrateUtilities::execute(){ sourcedb.transaction().start( true ); cond::MetaData metadata(sourcedb); std::vector tagToProcess; - if( !tag.empty() && filterPosition == -1 ){ + if( !tag.empty() ){ tagToProcess.push_back( tag ); } else { metadata.listAllTags( tagToProcess ); - if( filterPosition != -1 ) { - std::vector filteredList; - for( const auto& t: tagToProcess ) { - size_t ptr = t.find( tag ); - if( ptr != std::string::npos && ptr < filterPosition ) filteredList.push_back( t ); - } - tagToProcess = filteredList; - } } cond::DbSession logdb = openDbSession("log", cond::Auth::COND_READER_ROLE, true ); diff --git a/branches/withNewDZ/CondCore/Utilities/src/CondDBImport.cc b/branches/withNewDZ/CondCore/Utilities/src/CondDBImport.cc index 9368d5629b892..97dca60f31b4a 100644 --- a/branches/withNewDZ/CondCore/Utilities/src/CondDBImport.cc +++ b/branches/withNewDZ/CondCore/Utilities/src/CondDBImport.cc @@ -232,8 +232,6 @@ namespace cond { bool exists = false; std::pair > missingPayload = fetchIfExists( sourcePid, source, exists ); if( exists ) pid = import( source, sourcePid, missingPayload.first, missingPayload.second.get(), destination ); - std::cout <<"WARNING: OID "< > missingPayload = fetchIfExists( sourcePid, source, exists ); if( exists ) pid = import( source, sourcePid, missingPayload.first, missingPayload.second.get(), destination ); - std::cout <<"WARNING: OID "< ) IMPORT_PAYLOAD_CASE( PhysicsTools::Calibration::MVAComputerContainer ) IMPORT_PAYLOAD_CASE( PCaloGeometry ) IMPORT_PAYLOAD_CASE( PGeometricDet ) @@ -474,8 +468,6 @@ namespace cond { FETCH_PAYLOAD_CASE( HcalRespCorrs ) FETCH_PAYLOAD_CASE( HcalTimeCorrs ) FETCH_PAYLOAD_CASE( HcalZSThresholds ) - FETCH_PAYLOAD_CASE( OOTPileupCorrectionBuffer ) - FETCH_PAYLOAD_CASE( StorableDoubleMap ) FETCH_PAYLOAD_CASE( JetCorrectorParametersCollection ) FETCH_PAYLOAD_CASE( L1CaloEcalScale ) FETCH_PAYLOAD_CASE( L1CaloEtScale ) diff --git a/branches/withNewDZ/CondCore/Utilities/src/CondFormats.h b/branches/withNewDZ/CondCore/Utilities/src/CondFormats.h index 564125acc9fe3..a8922df8b3ce3 100644 --- a/branches/withNewDZ/CondCore/Utilities/src/CondFormats.h +++ b/branches/withNewDZ/CondCore/Utilities/src/CondFormats.h @@ -55,10 +55,7 @@ #include "CondFormats/EcalObjects/interface/EcalTimeBiasCorrections.h" #include "CondFormats/EcalObjects/interface/EcalTimeDependentCorrections.h" #include "CondFormats/EgammaObjects/interface/GBRForest.h" -#include "CondFormats/HcalObjects/interface/AbsOOTPileupCorrection.h" #include "CondFormats/HcalObjects/interface/HcalElectronicsMap.h" -#include "CondFormats/HcalObjects/interface/OOTPileupCorrectionBuffer.h" -#include "CondFormats/HcalObjects/interface/StorableDoubleMap.h" #include "CondFormats/JetMETObjects/interface/JetCorrectorParameters.h" #include "CondFormats/JetMETObjects/interface/QGLikelihoodObject.h" #include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h" diff --git a/branches/withNewDZ/CondFormats/Serialization/python/condformats_serialization_generate.py b/branches/withNewDZ/CondFormats/Serialization/python/condformats_serialization_generate.py index a966ba2fd2845..4377ee9d8380c 100755 --- a/branches/withNewDZ/CondFormats/Serialization/python/condformats_serialization_generate.py +++ b/branches/withNewDZ/CondFormats/Serialization/python/condformats_serialization_generate.py @@ -214,8 +214,6 @@ def get_serializable_classes_members(node, all_template_types=None, namespace='' # Template non-type parameters (e.g. ) elif member.kind == clang.cindex.CursorKind.TEMPLATE_NON_TYPE_PARAMETER: type_string = get_type_string(member) - if not type_string: - type_string = get_basic_type_string(member) logging.info(' Found template non-type parameter: %s %s', type_string, member.spelling) template_types.append((type_string, member.spelling)) diff --git a/branches/withNewDZ/Configuration/PyReleaseValidation/python/MatrixInjector.py b/branches/withNewDZ/Configuration/PyReleaseValidation/python/MatrixInjector.py index 4e58db6ff7167..648a8b3dfdc53 100644 --- a/branches/withNewDZ/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/branches/withNewDZ/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -79,9 +79,7 @@ def __init__(self,opt,mode='init',options=''): print '\n\tFound wmclient\n' self.defaultChain={ - "RequestType" : "TaskChain", #this is how we handle relvals - "SubRequestType" : "RelVal", #this is how we handle relvals, now that TaskChain is also used for central MC production - "RequestPriority": 1000000, + "RequestType" : "TaskChain", #this is how we handle relvals "Requestor": self.user, #Person responsible "Group": self.group, #group for the request "CMSSWVersion": os.getenv('CMSSW_VERSION'), #CMSSW Version (used for all tasks in chain) diff --git a/branches/withNewDZ/Configuration/PyReleaseValidation/python/relval_steps.py b/branches/withNewDZ/Configuration/PyReleaseValidation/python/relval_steps.py index ba9acee904f21..ee6252bca9918 100644 --- a/branches/withNewDZ/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/branches/withNewDZ/Configuration/PyReleaseValidation/python/relval_steps.py @@ -299,9 +299,9 @@ def gen2015(fragment,howMuch): steps['LM1_sfts']=gen('LM1_sfts_8TeV_cfi',Kby(9,100)) steps['QCD_FlatPt_15_3000']=gen('QCDForPF_8TeV_cfi',Kby(5,100)) steps['QCD_FlatPt_15_3000HS']=gen('QCDForPF_8TeV_cfi',Kby(50,100)) -steps['TTbar_13']=gen2015('TTbar_Tauola_13TeV_cfi',Kby(9,50)) +steps['TTbar_13']=gen2015('TTbar_Tauola_13TeV_cfi',Kby(9,100)) steps['TTbarLepton_13']=gen2015('TTbarLepton_Tauola_13TeV_cfi',Kby(9,100)) -steps['ZEE_13']=gen2015('ZEE_13TeV_cfi',Kby(9,50)) +steps['ZEE_13']=gen2015('ZEE_13TeV_cfi',Kby(9,100)) steps['Wjet_Pt_80_120_13']=gen2015('Wjet_Pt_80_120_13TeV_cfi',Kby(9,100)) steps['Wjet_Pt_3000_3500_13']=gen2015('Wjet_Pt_3000_3500_13TeV_cfi',Kby(9,50)) steps['LM1_sfts_13']=gen2015('LM1_sfts_13TeV_cfi',Kby(9,100)) @@ -323,7 +323,7 @@ def identitySim(wf): baseDataSetRelease=[ 'CMSSW_7_1_0_pre7-PRE_STA71_V3-v1', # run1 samples; keep GEN-SIM fixed to 710_pre7, for samples not routinely produced - 'CMSSW_7_2_0_pre6-PRE_SHI72_V7-v1', # Run1 HI GEN-SIM (only MB = wf 140) + 'CMSSW_7_1_0-STARTHI71_V13-v1', # Run1 HI GEN-SIM (only MB = wf 140) 'CMSSW_6_2_0_pre8-PRE_ST62_V8_FastSim-v1', # for fastsim id test # 'CMSSW_6_2_0_pre8-PRE_SH62_V15-v2', # Run1 HI GEN-SIM (only HydjetQ_B3_2760) -- unused in 72_pre4 # 'CMSSW_6_1_0_pre6-STARTHI61_V6-v1', # Run1 HI GEN-SIM (only HydjetQ_B0_2760) -- unused in 72_pre4 @@ -333,7 +333,7 @@ def identitySim(wf): #'CMSSW_7_1_0_pre5-START71_V1-v1', # 8 TeV , for the one sample which is part of the routine relval production (MinBias) -- unused in 72_pre4 'CMSSW_7_1_0_pre5-START71_V1-v2', # 8 TeV , for the one sample which is part of the routine relval production (RelValZmumuJets_Pt_20_300, because of -v2) # this an previous should be unified, when -v2 will be gone - 'CMSSW_7_2_0_pre6-PRE_LS172_V11-v1', # 13 TeV samples with GEN-SIM from 720_p4; + 'CMSSW_7_2_0_pre4-POSTLS172_V3-v2', # 13 TeV samples with GEN-SIM from 720_p4; ] # note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available @@ -459,19 +459,19 @@ def genS(fragment,howMuch): steps['WE_13']=gen2015('WE_13TeV_cfi',Kby(9,100)) steps['WM_13']=gen2015('WM_13TeV_cfi',Kby(9,200)) steps['WpM_13']=gen2015('WpM_13TeV_cfi',Kby(9,200)) -steps['ZMM_13']=gen2015('ZMM_13TeV_cfi',Kby(18,150)) +steps['ZMM_13']=gen2015('ZMM_13TeV_cfi',Kby(18,300)) steps['ZpMM_13']=gen2015('ZpMM_13TeV_cfi',Kby(9,200)) steps['ZTT']=genS('ZTT_Tauola_All_hadronic_8TeV_cfi',Kby(9,150)) steps['H130GGgluonfusion']=genS('H130GGgluonfusion_8TeV_cfi',Kby(9,100)) steps['PhotonJets_Pt_10']=genS('PhotonJet_Pt_10_8TeV_cfi',Kby(9,150)) steps['QQH1352T_Tauola']=genS('QQH1352T_Tauola_8TeV_cfi',Kby(9,100)) -steps['ZTT_13']=gen2015('ZTT_Tauola_All_hadronic_13TeV_cfi',Kby(9,60)) -steps['H130GGgluonfusion_13']=gen2015('H130GGgluonfusion_13TeV_cfi',Kby(9,50)) +steps['ZTT_13']=gen2015('ZTT_Tauola_All_hadronic_13TeV_cfi',Kby(9,150)) +steps['H130GGgluonfusion_13']=gen2015('H130GGgluonfusion_13TeV_cfi',Kby(9,100)) steps['PhotonJets_Pt_10_13']=gen2015('PhotonJet_Pt_10_13TeV_cfi',Kby(9,150)) -steps['QQH1352T_Tauola_13']=gen2015('QQH1352T_Tauola_13TeV_cfi',Kby(9,50)) +steps['QQH1352T_Tauola_13']=gen2015('QQH1352T_Tauola_13TeV_cfi',Kby(9,100)) steps['ZmumuJets_Pt_20_300']=gen('ZmumuJets_Pt_20_300_GEN_8TeV_cfg',Kby(25,100)) -steps['ZmumuJets_Pt_20_300_13']=gen2015('ZmumuJets_Pt_20_300_GEN_13TeV_cfg',Kby(25,50)) +steps['ZmumuJets_Pt_20_300_13']=gen2015('ZmumuJets_Pt_20_300_GEN_13TeV_cfg',Kby(25,100)) steps['ADDMonoJet_d3MD3']=genS('ADDMonoJet_8TeV_d3MD3_cfi',Kby(9,100)) steps['ADDMonoJet_d3MD3_13']=gen2015('ADDMonoJet_13TeV_d3MD3_cfi',Kby(9,100)) steps['RSKKGluon_m3000GeV_13']=gen2015('RSKKGluon_m3000GeV_13TeV_cff',Kby(9,100)) # re-named to remove RelvalRelval in the dataset name diff --git a/branches/withNewDZ/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py b/branches/withNewDZ/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py index d45bdc9a0ee37..5d1ec8a3321d1 100644 --- a/branches/withNewDZ/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py +++ b/branches/withNewDZ/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py @@ -11,21 +11,14 @@ destinations = cms.untracked.vstring('cout') ) -live=True -# uncomment for running on lxplus -#live=False -offlineTesting=not live -#print "live: "+str(live)+" ==> offlineTesting: "+str(offlineTesting) - #---------------------------- # Event Source #----------------------------- # for live online DQM in P5 -if (live): - process.load("DQM.Integration.test.inputsource_cfi") +process.load("DQM.Integration.test.inputsource_cfi") + # for testing in lxplus -elif(offlineTesting): - process.load("DQM.Integration.test.fileinputsource_cfi") +#process.load("DQM.Integration.test.fileinputsource_cfi") #---------------------------- # DQM Environment @@ -45,7 +38,7 @@ process.dqmEnv.subSystemFolder = "SiStrip" process.dqmSaver.producer = "Playback" -process.dqmSaver.saveByLumiSection = 30 +process.dqmSaver.saveByLumiSection = 1 # uncomment for running in local process.dqmSaver.dirName = '.' @@ -59,8 +52,8 @@ ## uncooment for running in local ## collector #process.DQM.collectorHost = 'vmepcs2b18-20.cms' -#process.DQM.collectorPort = 9190 -#process.DQM.collectorHost = 'lxplus414' +process.DQM.collectorPort = 9190 +process.DQM.collectorHost = 'lxplus414' #process.DQM.collectorPort = 8070 #-------------------------- @@ -87,11 +80,9 @@ # Calibration #-------------------------- # Condition for P5 cluster -if (live): - process.load("DQM.Integration.test.FrontierCondition_GT_cfi") +process.load("DQM.Integration.test.FrontierCondition_GT_cfi") # Condition for lxplus -elif(offlineTesting): - process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") +#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") #-------------------------------------------- ## Patch to avoid using Run Info information in reconstruction @@ -129,11 +120,10 @@ import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi process.offlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone() -#------------------------------ -# Strip and Tracking DQM Source -#------------------------------ +#-------------------------- +# Strip DQM Source and Client +#-------------------------- process.load("DQM.SiStripMonitorClient.SiStripSourceConfigP5_cff") -process.load("DQM.TrackingMonitorSource.TrackingSourceConfigP5_cff") process.TrackMon_gentk.doLumiAnalysis = False process.TrackMon_ckf.doLumiAnalysis = False process.TrackMon_hi.doLumiAnalysis = False @@ -142,7 +132,7 @@ #-------------------------- # Quality Test #-------------------------- -process.stripQTester = cms.EDAnalyzer("QualityTester", +process.qTester = cms.EDAnalyzer("QualityTester", qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config.xml'), prescaleFactor = cms.untracked.int32(3), getQualityTestsFromFile = cms.untracked.bool(True), @@ -150,15 +140,6 @@ qtestOnEndRun = cms.untracked.bool(True) ) -process.trackingQTester = cms.EDAnalyzer("QualityTester", - qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config.xml'), - prescaleFactor = cms.untracked.int32(3), - getQualityTestsFromFile = cms.untracked.bool(True), - qtestOnEndLumi = cms.untracked.bool(True), - qtestOnEndRun = cms.untracked.bool(True) -) - - #-------------------------- # Service #-------------------------- @@ -166,8 +147,7 @@ # Simple filter for event process.eventFilter = cms.EDFilter("SimpleEventFilter", -# EventsToSkip = cms.untracked.int32(3) - EventsToSkip = cms.untracked.int32(100) + EventsToSkip = cms.untracked.int32(3) ) #-------------------------- @@ -205,7 +185,7 @@ # Scheduling #-------------------------- process.SiStripSources_LocalReco = cms.Sequence(process.siStripFEDMonitor*process.SiStripMonitorDigi*process.SiStripMonitorClusterReal) -process.DQMCommon = cms.Sequence(process.stripQTester*process.trackingQTester*process.dqmEnv*process.dqmEnvTr*process.dqmSaver) +process.DQMCommon = cms.Sequence(process.qTester*process.dqmEnv*process.dqmEnvTr*process.dqmSaver) process.RecoForDQM_LocalReco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.gtDigis*process.trackerlocalreco*process.gtEvmDigis) #-------------------------- @@ -214,16 +194,13 @@ process.SiStripMonitorClusterReal.TH1ClusterCharge.moduleswitchon = True process.SiStripMonitorDigi.TotalNumberOfDigisFailure.subdetswitchon = cms.bool(False) -### COSMIC RUN SETTING if (process.runType.getRunType() == process.runType.cosmic_run): # event selection for cosmic data # process.DQMStreamerReader.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('HLT_L1*','HLT_*Cosmic*','HLT_ZeroBias*')) # Reference run for cosmic process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/sistrip_reference_cosmic.root' - # Source config for cosmic data + # Source and Client config for cosmic data process.SiStripSources_TrkReco_cosmic = cms.Sequence(process.SiStripMonitorTrack_ckf*process.TrackMon_ckf) - # Client config for cosmic data - ### STRIP process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_Cosmic_cff") process.SiStripAnalyserCosmic.RawDataTag = cms.untracked.InputTag("rawDataCollector") process.SiStripAnalyserCosmic.TkMapCreationFrequency = -1 @@ -231,12 +208,6 @@ process.SiStripAnalyserCosmic.StaticUpdateFrequency = 5 process.SiStripAnalyserCosmic.MonitorSiStripBackPlaneCorrection = cms.bool(False) process.SiStripClients = cms.Sequence(process.SiStripAnalyserCosmic) - ### TRACKING - process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_Cosmic_cff") - process.TrackingAnalyserCosmic.RawDataTag = cms.untracked.InputTag("rawDataCollector") - process.TrackingAnalyserCosmic.ShiftReportFrequency = -1 - process.TrackingAnalyserCosmic.StaticUpdateFrequency = 5 - process.TrackingClient = cms.Sequence( process.TrackingAnalyserCosmic ) # Reco for cosmic data process.load('RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cfi') @@ -244,27 +215,13 @@ process.RecoForDQM_TrkReco_cosmic = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEvent*process.ctftracksP5) - - process.stripQTester.qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_cosmic.xml') - process.stripQTester.prescaleFactor = cms.untracked.int32(2) - process.stripQTester.getQualityTestsFromFile = cms.untracked.bool(True) - process.stripQTester.qtestOnEndLumi = cms.untracked.bool(True) - process.stripQTester.qtestOnEndRun = cms.untracked.bool(True) - - process.trackingQTester.qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml') - process.trackingQTester.prescaleFactor = cms.untracked.int32(1) - process.trackingQTester.getQualityTestsFromFile = cms.untracked.bool(True) - process.trackingQTester.qtestOnEndLumi = cms.untracked.bool(True) - process.trackingQTester.qtestOnEndRun = cms.untracked.bool(True) - -# process.trackingQTester = cms.EDAnalyzer("QualityTester", -# qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml'), -# prescaleFactor = cms.untracked.int32(1), -# getQualityTestsFromFile = cms.untracked.bool(True), -# qtestOnEndLumi = cms.untracked.bool(True), -# qtestOnEndRun = cms.untracked.bool(True) -# ) -# print "process.trackingQTester: " + str(process.trackingQTester.prescaleFactor) + " " + str(process.trackingQTester.qtList) + process.qTester = cms.EDAnalyzer("QualityTester", + qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_cosmic.xml'), + prescaleFactor = cms.untracked.int32(2), + getQualityTestsFromFile = cms.untracked.bool(True), + qtestOnEndLumi = cms.untracked.bool(True), + qtestOnEndRun = cms.untracked.bool(True) + ) process.p = cms.Path(process.scalersRawToDigi* process.APVPhases* @@ -275,14 +232,12 @@ process.SiStripClients* process.SiStripSources_LocalReco* process.RecoForDQM_TrkReco_cosmic* - process.SiStripSources_TrkReco_cosmic* - process.TrackingClient + process.SiStripSources_TrkReco_cosmic ) #else : -### pp COLLISION SETTING if (process.runType.getRunType() == process.runType.pp_run): #event selection for pp collisions # process.DQMEventStreamerReader.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('HLT_L1*', @@ -307,8 +262,6 @@ process.SiStripMonitorTrack_gentk.TrackProducer = 'earlyGeneralTracks' process.SiStripSources_TrkReco = cms.Sequence(process.SiStripMonitorTrack_gentk*process.MonitorTrackResiduals_gentk*process.TrackMon_gentk) - # Client config for cosmic data - ### STRIP process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_cff") process.SiStripAnalyser.UseGoodTracks = cms.untracked.bool(True) process.SiStripAnalyser.TkMapCreationFrequency = -1 @@ -319,12 +272,6 @@ process.SiStripClients = cms.Sequence(process.SiStripAnalyser) process.SiStripMonitorDigi.TotalNumberOfDigisFailure.integrateNLumisections = cms.int32(25) - ### TRACKING - process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_cff") - process.TrackingAnalyser.ShiftReportFrequency = -1 - process.TrackingAnalyser.StaticUpdateFrequency = 5 - process.TrackingAnalyser.RawDataTag = cms.untracked.InputTag("rawDataCollector") - process.TrackingClient = cms.Sequence( process.TrackingAnalyser ) # Reco for pp collisions @@ -368,8 +315,7 @@ process.SiStripSources_LocalReco* process.hltHighLevel* process.RecoForDQM_TrkReco* - process.SiStripSources_TrkReco* - process.TrackingClient + process.SiStripSources_TrkReco ) #-------------------------------------------------- # For high PU run - no tracking in cmssw42x @@ -411,12 +357,6 @@ process.SiStripAnalyser.RawDataTag = cms.untracked.InputTag("rawDataCollector") process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = cms.bool(False) process.SiStripClients = cms.Sequence(process.SiStripAnalyser) - ### TRACKING - process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_cff") - process.TrackingAnalyser.ShiftReportFrequency = -1 - process.TrackingAnalyser.StaticUpdateFrequency = 5 - process.TrackingAnalyser.RawDataTag = cms.untracked.InputTag("rawDataCollector") - process.TrackingClient = cms.Sequence( process.TrackingAnalyser ) # Reco for pp collisions @@ -461,8 +401,7 @@ process.hltHighLevel* process.eventFilter* process.RecoForDQM_TrkReco* - process.SiStripSources_TrkReco* - process.TrackingClient + process.SiStripSources_TrkReco ) process.castorDigis.InputLabel = cms.InputTag("rawDataCollector") @@ -486,7 +425,7 @@ #-------------------------------------------------- print "Running with run type = ", process.runType.getRunType() -### HEAVY ION SETTING + if (process.runType.getRunType() == process.runType.hi_run): process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker") process.csctfDigis.producer = cms.InputTag("rawDataRepacker") @@ -517,7 +456,7 @@ # process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/sistrip_reference_hi.root' # Quality test for HI - process.stripQTester = cms.EDAnalyzer("QualityTester", + process.qTester = cms.EDAnalyzer("QualityTester", qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_heavyion.xml'), prescaleFactor = cms.untracked.int32(3), getQualityTestsFromFile = cms.untracked.bool(True), @@ -525,39 +464,17 @@ qtestOnEndRun = cms.untracked.bool(True) ) - process.trackingQTester.qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_heavyion.xml') - process.trackingQTester.prescaleFactor = cms.untracked.int32(2) - process.trackingQTester.getQualityTestsFromFile = cms.untracked.bool(True) - process.trackingQTester.qtestOnEndLumi = cms.untracked.bool(True) - process.trackingQTester.qtestOnEndRun = cms.untracked.bool(True) - -# process.trackingQTester = cms.EDAnalyzer("QualityTester", -# qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_heavyion.xml'), -# prescaleFactor = cms.untracked.int32(2), -# getQualityTestsFromFile = cms.untracked.bool(True), -# qtestOnEndLumi = cms.untracked.bool(True), -# qtestOnEndRun = cms.untracked.bool(True) -# ) - # Sources for HI process.load("Configuration.StandardSequences.RawToDigi_Repacked_cff") process.SiStripBaselineValidator.srcProcessedRawDigi = cms.InputTag('siStripVRDigis','VirginRaw') process.SiStripSources_TrkReco = cms.Sequence(process.SiStripMonitorTrack_hi*process.TrackMon_hi) - # Client for HI - ### STRIP +# Client for HI process.load("DQM.SiStripMonitorClient.SiStripClientConfigP5_HeavyIons_cff") process.SiStripAnalyserHI.RawDataTag = cms.untracked.InputTag("rawDataRepacker") process.SiStripAnalyserHI.TkMapCreationFrequency = -1 process.SiStripAnalyserHI.ShiftReportFrequency = -1 process.SiStripAnalyserHI.StaticUpdateFrequency = 5 process.SiStripClients = cms.Sequence(process.SiStripAnalyserHI) - ### TRACKING - process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_HeavyIons_cff") - process.TrackingAnalyserHI.ShiftReportFrequency = -1 - process.TrackingAnalyserHI.StaticUpdateFrequency = 5 - process.TrackingAnalyserHI.RawDataTag = cms.untracked.InputTag("rawDataCollector") - process.TrackingClient = cms.Sequence( process.TrackingAnalyserHI ) - # Reco for HI collisions process.load("Configuration.StandardSequences.ReconstructionHeavyIons_cff") process.RecoForDQM_LocalReco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.siStripVRDigis*process.gtDigis*process.trackerlocalreco) @@ -574,7 +491,6 @@ process.RecoForDQM_TrkReco* process.SiStripSources_TrkReco* process.multFilter* - process.SiStripBaselineValidator* - process.TrackingClients + process.SiStripBaselineValidator ) diff --git a/branches/withNewDZ/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/branches/withNewDZ/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc index b2022129dd691..8733fe32ca9bf 100644 --- a/branches/withNewDZ/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc +++ b/branches/withNewDZ/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc @@ -1121,9 +1121,9 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev meClSizeOnTrack_fpix->Fill((*clust).size()); meClSizeXOnTrack_fpix->Fill((*clust).sizeX()); meClSizeYOnTrack_fpix->Fill((*clust).sizeY()); - uint32_t DBdisk = 0; + uint32_t DBdisk; if (!isUpgrade) { DBdisk = PixelEndcapName(DetId((*hit).geographicalId())).diskName(); } - else { DBdisk = PixelEndcapNameUpgrade(DetId((*hit).geographicalId())).diskName(); } + else if (isUpgrade) { DBdisk = PixelEndcapNameUpgrade(DetId((*hit).geographicalId())).diskName(); } float x = clustgp.x(); float y = clustgp.y(); float z = clustgp.z(); diff --git a/branches/withNewDZ/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py b/branches/withNewDZ/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py index dd0ee2714b82b..0e0d580c4f7ab 100644 --- a/branches/withNewDZ/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py +++ b/branches/withNewDZ/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py @@ -129,6 +129,81 @@ #MonitorTrackResiduals_hi.OutputMEsInRootFile = False #MonitorTrackResiduals_hi.Mod_On = False +# TrackingMonitor #### +# Clone for Cosmic Track Finder +import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi +TrackMon_cosmicTk = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone() +TrackMon_cosmicTk.TrackProducer = 'cosmictrackfinderP5' +TrackMon_cosmicTk.AlgoName = 'CosmicTk' +TrackMon_cosmicTk.FolderName = 'Tracking/TrackParameters' +TrackMon_cosmicTk.doSeedParameterHistos = True + +# Clone for CKF Tracks +import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi +TrackMon_ckf = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone() +TrackMon_ckf.TrackProducer = 'ctfWithMaterialTracksP5' +TrackMon_ckf.AlgoName = 'CKFTk' +TrackMon_ckf.FolderName = 'Tracking/TrackParameters' +TrackMon_ckf.doSeedParameterHistos = True + +# Clone for Road Search Tracks +#import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi +#TrackMon_rs = DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi.TrackerCosmicTrackMon.clone() +#TrackMon_rs.TrackProducer = 'rsWithMaterialTracksP5' +#TrackMon_rs.AlgoName = 'RSTk' +#TrackMon_rs.FolderName = 'Tracking/TrackParameters' +#TrackMon_rs.doSeedParameterHistos = True + +# Clone for General Track (for Collision data) +import DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi +TrackMon_gentk = DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi.TrackerCollisionTrackMon.clone() +TrackMon_gentk.FolderName = 'Tracking/TrackParameters' +TrackMon_gentk.BSFolderName = 'Tracking/TrackParameters/BeamSpotParameters' +# decrease number of histograms +#TrackMon_gentk.doTrackerSpecific = False + +# Clone for Heavy Ion Tracks (for HI Collisions) +import DQM.TrackingMonitor.TrackerHeavyIonTrackingMonitor_cfi +TrackMon_hi = DQM.TrackingMonitor.TrackerHeavyIonTrackingMonitor_cfi.TrackerHeavyIonTrackMon.clone() +TrackMon_hi.FolderName = 'Tracking/TrackParameters' +TrackMon_hi.BSFolderName = 'Tracking/TrackParameters/BeamSpotParameters' + +# Tracking Efficiency #### +# Clone for Cosmic Tracks +import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi +TrackEffMon_cosmicTk = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone() +TrackEffMon_cosmicTk.TKTrackCollection = 'cosmictrackfinderP5' +TrackEffMon_cosmicTk.AlgoName = 'CosmicTk' +TrackEffMon_cosmicTk.FolderName = 'Tracking/TrackParameters/TrackEfficiency' + +# Clone for CKF Tracks +import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi +TrackEffMon_ckf = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone() +TrackEffMon_ckf.TKTrackCollection = 'ctfWithMaterialTracksP5' +TrackEffMon_ckf.AlgoName = 'CKFTk' +TrackEffMon_ckf.FolderName = 'Tracking/TrackParameters/TrackEfficiency' + +# Clone for RS Tracks +#import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi +#TrackEffMon_rs = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone() +#TrackEffMon_rs.TKTrackCollection = 'rsWithMaterialTracksP5' +#TrackEffMon_rs.AlgoName = 'RSTk' +#TrackEffMon_rs.FolderName = 'Tracking/TrackParameters/TrackEfficiency' + +# Clone for Beam Halo Tracks +import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi +TrackEffMon_bhmuon = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone() +TrackEffMon_bhmuon.TKTrackCollection = 'ctfWithMaterialTracksBeamHaloMuon' +TrackEffMon_bhmuon.AlgoName = 'BHMuonTk' +TrackEffMon_bhmuon.FolderName = 'Tracking/TrackParameters/TrackEfficiency' + +# Clone for Heavy Ion Tracks (for HI Collisions) +import DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi +TrackEffMon_hi = DQM.TrackingMonitor.TrackEfficiencyMonitor_cfi.TrackEffMon.clone() +TrackEffMon_hi.TKTrackCollection = 'hiGlobalPrimTracks' +TrackEffMon_hi.AlgoName = 'HeavyIonTk' +TrackEffMon_hi.FolderName = 'Tracking/TrackParameters/TrackEfficiency' + # Services needed for TkHistoMap TkDetMap = cms.Service("TkDetMap") SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader") diff --git a/branches/withNewDZ/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h b/branches/withNewDZ/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h index eaacb66a9f7ea..a53b6dda6a00d 100644 --- a/branches/withNewDZ/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h +++ b/branches/withNewDZ/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h @@ -84,8 +84,6 @@ class SiStripMonitorCluster : public thread_unsafe::DQMEDAnalyzer { MonitorElement* SubDetClusterApvTH2 = 0; MonitorElement* SubDetClusterDBxCycleProf = 0; MonitorElement* SubDetApvDBxProf2 = 0; - MonitorElement* SubDetClusterChargeTH1 = 0; - MonitorElement* SubDetClusterWidthTH1 = 0; }; struct ClusterProperties { // Cluster Properties @@ -183,8 +181,6 @@ class SiStripMonitorCluster : public thread_unsafe::DQMEDAnalyzer { bool subdetswitchapvcycledbxprof2on; bool subdetswitchdbxcycleprofon; bool subdetswitchtotclusth1on; - bool subdetswitchcluschargeon; - bool subdetswitchcluswidthon; bool globalswitchapvcycledbxth2on; bool globalswitchcstripvscpix; bool globalswitchMultiRegions; diff --git a/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorClusterAlca_cfi.py b/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorClusterAlca_cfi.py index cafac15458a6b..e4fda43560439 100644 --- a/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorClusterAlca_cfi.py +++ b/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorClusterAlca_cfi.py @@ -100,16 +100,14 @@ xmin = cms.double(-0.5), xmax = cms.double(799.5), layerswitchon = cms.bool(False), - moduleswitchon = cms.bool(False), - subdetswitchon = cms.bool(True) + moduleswitchon = cms.bool(False) ) SiStripCalZeroBiasMonitorCluster.TH1ClusterWidth = cms.PSet( - Nbinx = cms.int32(30), + Nbinx = cms.int32(20), xmin = cms.double(-0.5), - xmax = cms.double(29.5), + xmax = cms.double(19.5), layerswitchon = cms.bool(False), - moduleswitchon = cms.bool(False), - subdetswitchon = cms.bool(True) + moduleswitchon = cms.bool(False) ) SiStripCalZeroBiasMonitorCluster.TProfNumberOfCluster = cms.PSet( Nbinx = cms.int32(100), diff --git a/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py b/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py index 5bd0cd3443dfa..2b68dafff6062 100644 --- a/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py +++ b/branches/withNewDZ/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py @@ -99,16 +99,14 @@ xmin = cms.double(-0.5), xmax = cms.double(799.5), layerswitchon = cms.bool(False), - moduleswitchon = cms.bool(True), - subdetswitchon = cms.bool(False) + moduleswitchon = cms.bool(True) ), TH1ClusterWidth = cms.PSet( Nbinx = cms.int32(20), xmin = cms.double(-0.5), xmax = cms.double(19.5), layerswitchon = cms.bool(False), - moduleswitchon = cms.bool(True), - subdetswitchon = cms.bool(False) + moduleswitchon = cms.bool(True) ), TProfNumberOfCluster = cms.PSet( diff --git a/branches/withNewDZ/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc b/branches/withNewDZ/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc index 517a1ec90f494..cc97a8f9074b9 100644 --- a/branches/withNewDZ/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc +++ b/branches/withNewDZ/DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc @@ -73,7 +73,6 @@ SiStripMonitorCluster::SiStripMonitorCluster(const edm::ParameterSet& iConfig) edm::ParameterSet ParametersClusterCharge = conf_.getParameter("TH1ClusterCharge"); layerswitchcluschargeon = ParametersClusterCharge.getParameter("layerswitchon"); moduleswitchcluschargeon = ParametersClusterCharge.getParameter("moduleswitchon"); - subdetswitchcluschargeon = ParametersClusterCharge.getParameter("subdetswitchon"); edm::ParameterSet ParametersClusterStoN = conf_.getParameter("TH1ClusterStoN"); layerswitchclusstonon = ParametersClusterStoN.getParameter("layerswitchon"); @@ -98,7 +97,6 @@ SiStripMonitorCluster::SiStripMonitorCluster(const edm::ParameterSet& iConfig) edm::ParameterSet ParametersClusterWidth = conf_.getParameter("TH1ClusterWidth"); layerswitchcluswidthon = ParametersClusterWidth.getParameter("layerswitchon"); moduleswitchcluswidthon = ParametersClusterWidth.getParameter("moduleswitchon"); - subdetswitchcluswidthon = ParametersClusterWidth.getParameter("subdetswitchon"); edm::ParameterSet ParametersModuleLocalOccupancy = conf_.getParameter("TH1ModuleLocalOccupancy"); layerswitchlocaloccupancy = ParametersModuleLocalOccupancy.getParameter("layerswitchon"); @@ -646,16 +644,6 @@ void SiStripMonitorCluster::analyze(const edm::Event& iEvent, const edm::EventSe if (layerswitchclusterwidthprofon) layer_single.LayerClusterWidthProfile->Fill(iDet, cluster_width); } - - if (subdetswitchcluschargeon || subdetswitchcluswidthon) - { - std::map::iterator iSubdet = SubDetMEsMap.find(subdet_label); - if(iSubdet != SubDetMEsMap.end()) - { - if (subdetswitchcluschargeon) iSubdet->second.SubDetClusterChargeTH1->Fill(cluster_signal); - if (subdetswitchcluswidthon) iSubdet->second.SubDetClusterWidthTH1->Fill(cluster_width); - } - } } // end loop over clusters short total_nr_strips = SiStripDetCabling_->nApvPairs(detid) * 2 * 128; // get correct # of avp pairs @@ -949,24 +937,8 @@ void SiStripMonitorCluster::createSubDetMEs(std::string label , DQMStore::IBooke subdetMEs.SubDetClusterApvTH2 = 0; subdetMEs.SubDetClusterDBxCycleProf = 0; subdetMEs.SubDetApvDBxProf2 = 0; - subdetMEs.SubDetClusterChargeTH1 = 0; - subdetMEs.SubDetClusterWidthTH1 = 0; std::string HistoName; - // cluster charge - if (subdetswitchcluschargeon){ - HistoName = "ClusterCharge__" + label; - subdetMEs.SubDetClusterChargeTH1 = bookME1D("TH1ClusterCharge",HistoName.c_str() , ibooker); - subdetMEs.SubDetClusterChargeTH1->setAxisTitle("Cluster charge [ADC counts]"); - subdetMEs.SubDetClusterChargeTH1->getTH1()->StatOverflows(kTRUE); // over/underflows in Mean calculation - } - // cluster width - if (subdetswitchcluswidthon){ - HistoName = "ClusterWidth__" + label; - subdetMEs.SubDetClusterWidthTH1 = bookME1D("TH1ClusterWidth",HistoName.c_str() , ibooker); - subdetMEs.SubDetClusterWidthTH1->setAxisTitle("Cluster width [strips]"); - subdetMEs.SubDetClusterWidthTH1->getTH1()->StatOverflows(kTRUE); // over/underflows in Mean calculation - } // Total Number of Cluster - 1D if (subdetswitchtotclusth1on){ HistoName = "TotalNumberOfCluster__" + label; diff --git a/branches/withNewDZ/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h b/branches/withNewDZ/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h index 9788555de5c77..2cdcef6a4dc40 100644 --- a/branches/withNewDZ/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h +++ b/branches/withNewDZ/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h @@ -173,6 +173,7 @@ class SiStripMonitorDigi : public thread_unsafe::DQMEDAnalyzer { bool subdetswitchapvcycleprofon; bool subdetswitchapvcycleth2on; + bool subdetswitchtotdigiproflson; bool subdetswitchtotdigifailureon; bool subdetswitchnapvshotson; diff --git a/branches/withNewDZ/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc b/branches/withNewDZ/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc index 3ddf08945e8bf..e503d9a39e5d6 100644 --- a/branches/withNewDZ/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc +++ b/branches/withNewDZ/DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc @@ -106,6 +106,9 @@ SiStripMonitorDigi::SiStripMonitorDigi(const edm::ParameterSet& iConfig) : edm::ParameterSet ParametersTotDigiProf = conf_.getParameter("TProfTotalNumberOfDigis"); subdetswitchtotdigiprofon = ParametersTotDigiProf.getParameter("subdetswitchon"); + // edm::ParameterSet ParametersTotDigisProfVsLS = conf_.getParameter("TProfTotalNumberOfDigisVsLS"); + // subdetswitchtotdigiproflson = ParametersTotDigisProfVsLS.getParameter("subdetswitchon"); + edm::ParameterSet ParametersTotDigiFailure = conf_.getParameter("TotalNumberOfDigisFailure"); subdetswitchtotdigifailureon = ParametersTotDigiFailure.getParameter("subdetswitchon"); @@ -269,6 +272,9 @@ void SiStripMonitorDigi::endRun(const edm::Run&, const edm::EventSetup&){ //-------------------------------------------------------------------------------------------- void SiStripMonitorDigi::beginLuminosityBlock(const edm::LuminosityBlock& lb, const edm::EventSetup& es){ + if (subdetswitchtotdigiproflson){ + // if (digiFailureMEs.SubDetTotDigiProfLS) digiFailureMEs.SubDetTotDigiProfLS->Reset(); + } if (subdetswitchtotdigifailureon) { isStableBeams = false; //integrate stats over several LS to prevent eventual low trigger rates @@ -517,6 +523,7 @@ void SiStripMonitorDigi::createMEs(DQMStore::IBooker & ibooker , const edm::Even folder_organizer.getLayerFolderName(ss, 0, tTopo); ibooker.setCurrentFolder(ss.str().c_str()); + // if (subdetswitchtotdigiproflson) { if (subdetswitchtotdigifailureon) { const char* HistoName = "NumberOfDigisInLastLS"; digiFailureMEs.SubDetTotDigiProfLS= ibooker.bookProfile(HistoName, HistoName, @@ -760,6 +767,7 @@ void SiStripMonitorDigi::analyze(const edm::Event& iEvent, const edm::EventSetup for (std::map::iterator it = SubDetMEsMap.begin(); it != SubDetMEsMap.end(); it++) { + // if (subdetswitchtotdigiproflson) { if (subdetswitchtotdigifailureon) { if (strcmp(it->first.c_str(),"TEC__MINUS")==0){ digiFailureMEs.SubDetTotDigiProfLS->Fill(1, it->second.totNDigis); diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_plot_layout.xml b/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_plot_layout.xml deleted file mode 100644 index 6564af6ec85a2..0000000000000 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_plot_layout.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config.xml b/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config.xml deleted file mode 100644 index 2e97cb45c822d..0000000000000 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ContentsXRange - 0.85 - 0.95 - 0.0 - 600.0 - - - ContentsXRange - 0.80 - 0.90 - 5.0 - 35.0 - - - ContentsXRange - 0.85 - 0.95 - 0 - 10.0 - - - ContentsXRange - 0.85 - 0.95 - 0 - 100.0 - - - XrangeWithin:NumberOfTracks - - - XrangeWithin:NumberOfRecHitsPerTrk - - - XrangeWithin:Chi2overDoF - - - XrangeWithin:TrackPt - - diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml b/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml deleted file mode 100644 index 98e4ef65ccaeb..0000000000000 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_cosmic.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - MeanWithinExpected - 0.85 - 0.95 - 1.0 - 0 - 0 - 1 - 0.01 - 10.0 - - - ContentsXRange - 0.85 - 0.95 - 5.0 - 100.0 - - - ContentsXRange - 0.85 - 0.95 - 0 - 25.0 - - - - MeanWithinExpectedRange:TrkRate - - - XrangeWithin:NumberOfRecHitsPerTrk - - - XrangeWithin:Chi2overDoF - - diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_heavyion.xml b/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_heavyion.xml deleted file mode 100644 index c6dc69a66ee12..0000000000000 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_heavyion.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - ContentsXRange - 0.85 - 0.95 - 0.0 - 2000.0 - - - ContentsXRange - 0.80 - 0.90 - 4.0 - 35.0 - - - ContentsXRange - 0.85 - 0.95 - 0 - 10.0 - - - ContentsXRange - 0.85 - 0.95 - 0 - 100.0 - - - - XrangeWithin:NumberOfTracks - - - XrangeWithin:NumberOfRecHitsPerTrk - - - XrangeWithin:Chi2overDoF - - - XrangeWithin:TrackPt - - diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_cosmic.xml b/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_cosmic.xml deleted file mode 100644 index c20633d1ec83c..0000000000000 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_cosmic.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - MeanWithinExpected - 0.85 - 0.95 - 1.0 - 0 - 0 - 1 - 0.01 - 10.0 - - - ContentsXRange - 0.85 - 0.95 - 5.0 - 100.0 - - - ContentsXRange - 0.85 - 0.95 - 0 - 25.0 - - - ContentsXRange - 0.85 - 0.95 - -1.1 - 1.1 - - - - MeanWithinExpectedRange:TrkRate - - - XrangeWithin:NumberOfRecHitsPerTrk - - - XrangeWithin:Chi2overDoF - - - XrangeWithin:FractionOfGoodTracks - - diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/interface/TrackingQualityChecker.h b/branches/withNewDZ/DQM/TrackingMonitorClient/interface/TrackingQualityChecker.h index 7764c0f49d0b8..4cf8ac939b329 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/interface/TrackingQualityChecker.h +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/interface/TrackingQualityChecker.h @@ -67,7 +67,6 @@ class TrackingQualityChecker { MonitorElement* TrackLSSummaryReportGlobal; edm::ParameterSet pSet_; - bool verbose_; bool bookedTrackingGlobalStatus_; bool bookedTrackingLSStatus_; diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc b/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc index a802c4469a62b..06c99cab85f89 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.cc @@ -1,3 +1,4 @@ + #include "DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.h" @@ -42,12 +43,10 @@ // // -- Constructor // -TrackingAnalyser::TrackingAnalyser(edm::ParameterSet const& ps) : - verbose_(ps.getUntrackedParameter("verbose",false)) -{ +TrackingAnalyser::TrackingAnalyser(edm::ParameterSet const& ps) { // Get TkMap ParameterSet - // tkMapPSet_ = ps.getParameter("TkmapParameters"); + tkMapPSet_ = ps.getParameter("TkmapParameters"); std::string localPath = std::string("DQM/TrackingMonitorClient/test/loader.html"); std::ifstream fin(edm::FileInPath(localPath).fullPath().c_str(), std::ios::in); @@ -102,6 +101,7 @@ void TrackingAnalyser::beginJob(){ // -- Begin Run // void TrackingAnalyser::beginRun(edm::Run const& run, edm::EventSetup const& eSetup) { + std::cout << "[TrackingAnalyser::beginRun] .. starting" << std::endl; edm::LogInfo ("TrackingAnalyser") <<"TrackingAnalyser:: Begining of Run"; // Check latest Fed cabling and create TrackerMapCreator @@ -125,6 +125,7 @@ void TrackingAnalyser::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, // -- Analyze // void TrackingAnalyser::analyze(edm::Event const& e, edm::EventSetup const& eSetup){ + std::cout << "[TrackingAnalyser::analyze] .. starting" << std::endl; nEvents_++; if (nEvents_ == 1 && globalStatusFilling_ > 0) { checkTrackerFEDs(e); @@ -136,13 +137,14 @@ void TrackingAnalyser::analyze(edm::Event const& e, edm::EventSetup const& eSetu if (shiftReportFrequency_ != -1) actionExecutor_->createShiftReport(dqmStore_); } } + } // // -- End Luminosity Block // void TrackingAnalyser::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) { edm::LogInfo ("TrackingAnalyser") <<"TrackingAnalyser:: End of LS transition, performing the DQM client operation"; - if (verbose_) std::cout << "[TrackingAnalyser::endLuminosityBlock]" << std::endl; + nLumiSecs_++; if (!trackerFEDsFound_) { @@ -151,12 +153,12 @@ void TrackingAnalyser::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, e } endLumiAnalysisOn_ = true; - if (verbose_) std::cout << "====================================================== " << std::endl; - if (verbose_) std::cout << " ===> Iteration # " << nLumiSecs_ << " " << lumiSeg.luminosityBlock() << std::endl; - if (verbose_) std::cout << "====================================================== " << std::endl; + std::cout << "====================================================== " << std::endl; + std::cout << " ===> Iteration # " << nLumiSecs_ << " " << lumiSeg.luminosityBlock() << std::endl; + std::cout << "====================================================== " << std::endl; // Fill Global Status if (globalStatusFilling_ > 0) { - actionExecutor_->fillGlobalStatus(dqmStore_); + actionExecutor_->fillStatusAtLumi(dqmStore_); } endLumiAnalysisOn_ = false; } @@ -200,7 +202,7 @@ void TrackingAnalyser::checkTrackerFEDs(edm::Event const& e) { } trackerFEDsFound_ = (nFed > 0); - + } #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.h b/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.h index 7c384991a3ea2..0079b0daa6bc1 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.h +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/plugins/TrackingAnalyzer.h @@ -59,8 +59,6 @@ class TrackingAnalyser: public edm::EDAnalyzer{ private: - bool verbose_; - void checkTrackerFEDs(edm::Event const& e); DQMStore* dqmStore_; diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_Cosmic_cff.py b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_Cosmic_cff.py index 602ed86d6a951..d9e5c9999dd95 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_Cosmic_cff.py +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_Cosmic_cff.py @@ -1,54 +1,40 @@ import FWCore.ParameterSet.Config as cms +from DQM.TrackingMonitorSummary.OnDemandMonitoring_cfi import * # TrackingMonitorAnalyser #### TrackingAnalyserCosmic = cms.EDAnalyzer("TrackingAnalyser", StaticUpdateFrequency = cms.untracked.int32(1), GlobalStatusFilling = cms.untracked.int32(2), + TkMapCreationFrequency = cms.untracked.int32(3), + SummaryCreationFrequency = cms.untracked.int32(5), ShiftReportFrequency = cms.untracked.int32(-1), + SummaryConfigPath = cms.untracked.string("DQM/TrackingMonitorClient/data/tracking_monitorelement_config.xml"), + PrintFaultyModuleList = cms.untracked.bool(True), RawDataTag = cms.untracked.InputTag("source"), - TopFolderName = cms.untracked.string("Tracking"), - TrackingGlobalQualityPSets = cms.VPSet( - cms.PSet( - QT = cms.string("Rate"), - dir = cms.string("TrackParameters/GeneralProperties/"), - name = cms.string("NumberOfTracks_"), - ), - cms.PSet( - QT = cms.string("Chi2"), - dir = cms.string("TrackParameters/GeneralProperties/"), - name = cms.string("Chi2oNDF_"), - ), - cms.PSet( - QT = cms.string("RecHits"), - dir = cms.string("TrackParameters/HitProperties/"), - name = cms.string("NumberOfRecHitsPerTrack_"), - ), - ), - TrackingLSQualityPSets = cms.VPSet( - cms.PSet( - QT = cms.string("Rate"), - LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"), - LSname = cms.string("NumberOfTracks_lumiFlag_"), - LSlowerCut = cms.double( -1.0 ), - LSupperCut = cms.double( 1.0 ) - ), - cms.PSet( - QT = cms.string("Chi2"), - LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"), - LSname = cms.string("Chi2oNDF_lumiFlag_"), - LSlowerCut = cms.double( 0.0 ), - LSupperCut = cms.double( 25.0 ) - ), - cms.PSet( - QT = cms.string("RecHits"), - LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"), - LSname = cms.string("NumberOfRecHitsPerTrack_lumiFlag_"), - LSlowerCut = cms.double( 3.0 ), - LSupperCut = cms.double( 35.0 ) - ), + TrackRatePSet = cms.PSet( + Name = cms.string("NumberOfTracks_"), + LowerCut = cms.double(1.0), + UpperCut = cms.double(100.0), + ), + TrackChi2PSet = cms.PSet( + Name = cms.string("Chi2oNDF_"), + LowerCut = cms.double(0.0), + UpperCut = cms.double(25.0), + ), + TrackHitPSet = cms.PSet( + Name = cms.string("NumberOfRecHitsPerTrack_"), + LowerCut = cms.double(3.0), + UpperCut = cms.double(35.0), + ), + TkmapParameters = cms.PSet( + loadFedCabling = cms.untracked.bool(True), + loadFecCabling = cms.untracked.bool(True), + loadLVCabling = cms.untracked.bool(True), + loadHVCabling = cms.untracked.bool(True), + trackerdatPath = cms.untracked.string('CommonTools/TrackerMap/data/'), + trackermaptxtPath = cms.untracked.string('DQM/Integration/test/TkMap/') ) ) - # Track Efficiency Client from DQM.TrackingMonitor.TrackEfficiencyClient_cfi import * diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_cff.py b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_cff.py index 2aeafc4142bac..7cf4a7931cbfc 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_cff.py +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfigP5_cff.py @@ -11,38 +11,29 @@ SummaryConfigPath = cms.untracked.string("DQM/TrackingMonitorClient/data/tracking_monitorelement_config.xml"), PrintFaultyModuleList = cms.untracked.bool(True), RawDataTag = cms.untracked.InputTag("source"), - TrackingGlobalQualityPSets = cms.VPSet( - cms.PSet( - QT = cms.string("Rate"), - dir = cms.string("TrackParameters/GeneralProperties"), - name = cms.string("NumberOfTracks_"), - ), - cms.PSet( - QT = cms.string("Chi2"), - dir = cms.string("TrackParameters/GeneralProperties"), - name = cms.string("TrackChi2oNDF_"), - ), - cms.PSet( - QT = cms.string("RecHits"), - dir = cms.string("TrackParameters/HitProperties"), - name = cms.string("TrackNumberOfRecHitsPerTrack_"), - ), - ), - TrackRatePSet = cms.PSet( - Name = cms.string("NumberOfTracks_"), - LowerCut = cms.double(1.0), - UpperCut = cms.double(1000.0), - ), - TrackChi2PSet = cms.PSet( - Name = cms.string("TrackChi2oNDF_"), - LowerCut = cms.double(0.0), - UpperCut = cms.double(25.0), - ), - TrackHitPSet = cms.PSet( - Name = cms.string("TrackNumberOfRecHitsPerTrack_"), - LowerCut = cms.double(5.0), - UpperCut = cms.double(20.0), - ), + TrackRatePSet = cms.PSet( + Name = cms.string("NumberOfGoodTracks_"), + LowerCut = cms.double(1.0), + UpperCut = cms.double(1000.0), + ), + TrackChi2PSet = cms.PSet( + Name = cms.string("GoodTrackChi2oNDF_"), + LowerCut = cms.double(0.0), + UpperCut = cms.double(25.0), + ), + TrackHitPSet = cms.PSet( + Name = cms.string("GoodTrackNumberOfRecHitsPerTrack_"), + LowerCut = cms.double(5.0), + UpperCut = cms.double(20.0), + ), + TkmapParameters = cms.PSet( + loadFedCabling = cms.untracked.bool(True), + loadFecCabling = cms.untracked.bool(True), + loadLVCabling = cms.untracked.bool(True), + loadHVCabling = cms.untracked.bool(True), + trackerdatPath = cms.untracked.string('CommonTools/TrackerMap/data/'), + trackermaptxtPath = cms.untracked.string('DQM/Integration/test/TkMap/') + ) ) # Track Efficiency Client diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_Cosmic_cff.py b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_Cosmic_cff.py index 10a4183d33622..80ea2939d3cd9 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_Cosmic_cff.py +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_Cosmic_cff.py @@ -2,48 +2,27 @@ # TrackingOfflineDQM (for Tier0 Harvesting Step) #### trackingOfflineAnalyser = cms.EDAnalyzer("TrackingOfflineDQM", - GlobalStatusFilling = cms.untracked.int32(2), - UsedWithEDMtoMEConverter = cms.untracked.bool(True), - TopFolderName = cms.untracked.string("Tracking"), - TrackingGlobalQualityPSets = cms.VPSet( - cms.PSet( - QT = cms.string("Rate"), - dir = cms.string("TrackParameters/GeneralProperties"), - name = cms.string("NumberOfTracks_"), - ), - cms.PSet( - QT = cms.string("Chi2"), - dir = cms.string("TrackParameters/GeneralProperties"), - name = cms.string("Chi2oNDF_"), - ), - cms.PSet( - QT = cms.string("RecHits"), - dir = cms.string("TrackParameters/HitProperties"), - name = cms.string("NumberOfRecHitsPerTrack_"), - ), + GlobalStatusFilling = cms.untracked.int32(2), + UsedWithEDMtoMEConverter = cms.untracked.bool(True), + TrackRatePSet = cms.PSet( + Name = cms.string("NumberOfTracks_"), + LowerCut = cms.double(0.0), + UpperCut = cms.double(100.0), ), - TrackingLSQualityPSets = cms.VPSet( - cms.PSet( - QT = cms.string("Rate"), - LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"), - LSname = cms.string("NumberOfTracks_lumiFlag_"), - LSlowerCut = cms.double( -1.0 ), - LSupperCut = cms.double( 1.0 ) - ), - cms.PSet( - QT = cms.string("Chi2"), - LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"), - LSname = cms.string("Chi2oNDF_lumiFlag_"), - LSlowerCut = cms.double( 0.0 ), - LSupperCut = cms.double( 25.0 ) - ), - cms.PSet( - QT = cms.string("RecHits"), - LSdir = cms.string("TrackParameters/GeneralProperties/LSanalysis"), - LSname = cms.string("NumberOfRecHitsPerTrack_lumiFlag_"), - LSlowerCut = cms.double( 3.0 ), - LSupperCut = cms.double( 35.0 ) - ), + TrackChi2PSet = cms.PSet( + Name = cms.string("Chi2oNDF_"), + LowerCut = cms.double(0.0), + UpperCut = cms.double(25.0), + ), + TrackHitPSet = cms.PSet( + Name = cms.string("NumberOfRecHitsPerTrack_"), + LowerCut = cms.double(3.0), + UpperCut = cms.double(35.0), + ), + GoodTrackFractionPSet = cms.PSet( + Name = cms.string("FractionOfGoodTracks_"), + LowerCut = cms.double(-1.), + UpperCut = cms.double(1.), ) ) diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py index 718bd1a26eaf8..d104ecee0a0c3 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py @@ -9,17 +9,17 @@ cms.PSet( QT = cms.string("Rate"), dir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"), - name = cms.string("NumberOfTracks_"), + name = cms.string("NumberOfGoodTracks_"), ), cms.PSet( QT = cms.string("Chi2"), dir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties"), - name = cms.string("Chi2oNDF_"), + name = cms.string("GoodTrackChi2oNDF_"), ), cms.PSet( QT = cms.string("RecHits"), dir = cms.string("TrackParameters/highPurityTracks/pt_1/HitProperties"), - name = cms.string("NumberOfRecHitsPerTrack_"), + name = cms.string("GoodTrackNumberOfRecHitsPerTrack_"), ), cms.PSet( QT = cms.string("Seed"), @@ -31,21 +31,21 @@ cms.PSet( QT = cms.string("Rate"), LSdir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"), - LSname = cms.string("NumberOfTracks_lumiFlag_"), + LSname = cms.string("NumberOfGoodTracks_lumiFlag_"), LSlowerCut = cms.double( 1.0 ), LSupperCut = cms.double( 1000.0 ) ), cms.PSet( QT = cms.string("Chi2"), LSdir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"), - LSname = cms.string("Chi2oNDF_lumiFlag_"), + LSname = cms.string("GoodTrackChi2oNDF_lumiFlag_"), LSlowerCut = cms.double( 0.0 ), LSupperCut = cms.double( 25.0 ) ), cms.PSet( QT = cms.string("RecHits"), LSdir = cms.string("TrackParameters/highPurityTracks/pt_1/GeneralProperties/LSanalysis"), - LSname = cms.string("NumberOfRecHitsPerTrack_lumiFlag_"), + LSname = cms.string("GoodTrackNumberOfRecHitsPerTrack_lumiFlag_"), LSlowerCut = cms.double( 5.0 ), LSupperCut = cms.double( 20.0 ) ), diff --git a/branches/withNewDZ/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc b/branches/withNewDZ/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc index 8e01c2b9f1519..feeb84a067465 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc +++ b/branches/withNewDZ/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc @@ -23,8 +23,7 @@ // -- Constructor // TrackingQualityChecker::TrackingQualityChecker(edm::ParameterSet const& ps) : - pSet_(ps), - verbose_( pSet_.getUntrackedParameter("verbose",false)) + pSet_(ps) { edm::LogInfo("TrackingQualityChecker") << " Creating TrackingQualityChecker " << "\n" ; @@ -48,10 +47,10 @@ TrackingQualityChecker::TrackingQualityChecker(edm::ParameterSet const& ps) : std::string QTname = meQTset.getParameter("QT"); tracking_mes.HistoDir = meQTset.getParameter("dir"); tracking_mes.HistoName = meQTset.getParameter("name"); - if (verbose_) std::cout << "[TrackingQualityChecker::TrackingQualityChecker] inserting " << QTname << " in TrackingMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::TrackingQualityChecker] inserting " << QTname << " in TrackingMEsMap" << std::endl; TrackingMEsMap.insert(std::pair(QTname, tracking_mes)); } - if (verbose_) std::cout << "[TrackingQualityChecker::TrackingQualityChecker] created TrackingMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::TrackingQualityChecker] created TrackingMEsMap" << std::endl; TrackingLSMEs tracking_ls_mes; std::vector TrackingLSQualityMEs = pSet_.getParameter< std::vector >("TrackingLSQualityPSets" ); @@ -64,10 +63,10 @@ TrackingQualityChecker::TrackingQualityChecker(edm::ParameterSet const& ps) : tracking_ls_mes.HistoLSUpperCut = meQTset.exists("LSupperCut") ? meQTset.getParameter("LSupperCut") : -1.; tracking_ls_mes.TrackingFlag = 0; - if (verbose_) std::cout << "[TrackingQualityChecker::TrackingQualityChecker] inserting " << QTname << " in TrackingMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::TrackingQualityChecker] inserting " << QTname << " in TrackingMEsMap" << std::endl; TrackingLSMEsMap.insert(std::pair(QTname, tracking_ls_mes)); } - if (verbose_) std::cout << "[TrackingQualityChecker::TrackingQualityChecker] created TrackingLSMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::TrackingQualityChecker] created TrackingLSMEsMap" << std::endl; } // @@ -81,7 +80,7 @@ TrackingQualityChecker::~TrackingQualityChecker() { // void TrackingQualityChecker::bookGlobalStatus(DQMStore* dqm_store) { - if (verbose_) std::cout << "[TrackingQualityChecker::bookGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::bookGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; if (!bookedTrackingGlobalStatus_) { dqm_store->cd(); @@ -98,7 +97,7 @@ void TrackingQualityChecker::bookGlobalStatus(DQMStore* dqm_store) { htitle = "Tracking Report Summary Map"; size_t nQT = TrackingMEsMap.size(); - if (verbose_) std::cout << "[TrackingQualityChecker::bookGlobalStatus] nQT: " << nQT << std::endl; + // std::cout << "[TrackingQualityChecker::bookGlobalStatus] nQT: " << nQT << std::endl; TrackGlobalSummaryReportMap = dqm_store->book2D(hname, htitle, nQT,0.5,float(nQT)+0.5,1,0.5,1.5); TrackGlobalSummaryReportMap->setAxisTitle("Track Quality Type", 1); TrackGlobalSummaryReportMap->setAxisTitle("QTest Flag", 2); @@ -114,8 +113,8 @@ void TrackingQualityChecker::bookGlobalStatus(DQMStore* dqm_store) { it != TrackingMEsMap.end(); it++) { std::string meQTname = it->first; it->second.TrackingFlag = dqm_store->bookFloat("Track"+meQTname); - if (verbose_) std::cout << "[TrackingQualityChecker::bookGlobalStatus] " << it->first << " exists ? " << it->second.TrackingFlag << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::bookGlobalStatus] DONE w/ TrackingMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::bookGlobalStatus] " << it->first << " exists ? " << it->second.TrackingFlag << std::endl; + // std::cout << "[TrackingQualityChecker::bookGlobalStatus] DONE w/ TrackingMEsMap" << std::endl; } bookedTrackingGlobalStatus_ = true; @@ -125,7 +124,7 @@ void TrackingQualityChecker::bookGlobalStatus(DQMStore* dqm_store) { void TrackingQualityChecker::bookLSStatus(DQMStore* dqm_store) { - if (verbose_) std::cout << "[TrackingQualityChecker::bookLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::bookLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; if (!bookedTrackingLSStatus_) { dqm_store->cd(); @@ -141,19 +140,16 @@ void TrackingQualityChecker::bookLSStatus(DQMStore* dqm_store) { hname = "reportSummaryMap"; htitle = "Tracking Report Summary Map"; - - if (verbose_) { - size_t nQT = TrackingLSMEsMap.size(); - std::cout << "[TrackingQualityChecker::bookLSStatus] nQT: " << nQT << std::endl; - } + // size_t nQT = TrackingLSMEsMap.size(); + // std::cout << "[TrackingQualityChecker::bookLSStatus] nQT: " << nQT << std::endl; dqm_store->setCurrentFolder(TopFolderName_+"/EventInfo/reportSummaryContents"); for (std::map::iterator it = TrackingLSMEsMap.begin(); it != TrackingLSMEsMap.end(); it++) { std::string meQTname = it->first; it->second.TrackingFlag = dqm_store->bookFloat("Track"+meQTname); - if (verbose_) std::cout << "[TrackingQualityChecker::bookLSStatus] " << it->first << " exists ? " << it->second.TrackingFlag << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::bookLSStatus] DONE w/ TrackingLSMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::bookLSStatus] " << it->first << " exists ? " << it->second.TrackingFlag << std::endl; + // std::cout << "[TrackingQualityChecker::bookLSStatus] DONE w/ TrackingLSMEsMap" << std::endl; } bookedTrackingLSStatus_ = true; @@ -165,10 +161,10 @@ void TrackingQualityChecker::bookLSStatus(DQMStore* dqm_store) { // -- Fill Dummy Status // void TrackingQualityChecker::fillDummyGlobalStatus(){ - if (verbose_) std::cout << "[TrackingQualityChecker::fillDummyGlobalStatus] starting ..." << std::endl; + // std::cout << "[TrackingQualityChecker::fillDummyGlobalStatus] starting ..." << std::endl; resetGlobalStatus(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillDummyGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::fillDummyGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; if (bookedTrackingGlobalStatus_) { TrackGlobalSummaryReportGlobal->Fill(-1.0); @@ -180,22 +176,22 @@ void TrackingQualityChecker::fillDummyGlobalStatus(){ for (std::map::iterator it = TrackingMEsMap.begin(); it != TrackingMEsMap.end(); it++) it->second.TrackingFlag->Fill(-1.0); - if (verbose_) std::cout << "[TrackingQualityChecker::fillDummyGlobalStatus] DONE w/ TrackingMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::fillDummyGlobalStatus] DONE w/ TrackingMEsMap" << std::endl; } } void TrackingQualityChecker::fillDummyLSStatus(){ - if (verbose_) std::cout << "[TrackingQualityChecker::fillDummyLSStatus] starting ..." << std::endl; + // std::cout << "[TrackingQualityChecker::fillDummyLSStatus] starting ..." << std::endl; resetLSStatus(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillDummyLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::fillDummyLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; if (bookedTrackingLSStatus_) { TrackLSSummaryReportGlobal->Fill(-1.0); for (std::map::iterator it = TrackingLSMEsMap.begin(); it != TrackingLSMEsMap.end(); it++) it->second.TrackingFlag->Fill(-1.0); - if (verbose_) std::cout << "[TrackingQualityChecker::fillDummyLSStatus] DONE w/ TrackingLSMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::fillDummyLSStatus] DONE w/ TrackingLSMEsMap" << std::endl; } } @@ -205,7 +201,7 @@ void TrackingQualityChecker::fillDummyLSStatus(){ // void TrackingQualityChecker::resetGlobalStatus() { - if (verbose_) std::cout << "[TrackingQualityChecker::resetGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::resetGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; if (bookedTrackingGlobalStatus_) { TrackGlobalSummaryReportGlobal -> Reset(); @@ -214,26 +210,26 @@ void TrackingQualityChecker::resetGlobalStatus() { for (std::map::iterator it = TrackingMEsMap.begin(); it != TrackingMEsMap.end(); it++) { MonitorElement* me = it->second.TrackingFlag; - if (verbose_) std::cout << "[TrackingQualityChecker::resetGlobalStatus] " << it->second.HistoName << " exist ? " << ( it->second.TrackingFlag == NULL ? "nope" : "yes" ) << " ---> " << me << std::endl; + // std::cout << "[TrackingQualityChecker::resetGlobalStatus] " << it->second.HistoName << " exist ? " << ( it->second.TrackingFlag == NULL ? "nope" : "yes" ) << " ---> " << me << std::endl; me->Reset(); } - if (verbose_) std::cout << "[TrackingQualityChecker::resetGlobalStatus] DONE w/ TrackingMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::resetGlobalStatus] DONE w/ TrackingMEsMap" << std::endl; } } void TrackingQualityChecker::resetLSStatus() { - if (verbose_) std::cout << "[TrackingQualityChecker::resetLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::resetLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; if (bookedTrackingLSStatus_) { TrackLSSummaryReportGlobal -> Reset(); for (std::map::iterator it = TrackingLSMEsMap.begin(); it != TrackingLSMEsMap.end(); it++) { MonitorElement* me = it->second.TrackingFlag; - if (verbose_) std::cout << "[TrackingQualityChecker::resetLSStatus] " << it->second.HistoLSName << " exist ? " << ( it->second.TrackingFlag == NULL ? "nope" : "yes" ) << " ---> " << me << std::endl; + // std::cout << "[TrackingQualityChecker::resetLSStatus] " << it->second.HistoLSName << " exist ? " << ( it->second.TrackingFlag == NULL ? "nope" : "yes" ) << " ---> " << me << std::endl; me->Reset(); } - if (verbose_) std::cout << "[TrackingQualityChecker::resetLSStatus] DONE w/ TrackingLSMEsMap" << std::endl; + // std::cout << "[TrackingQualityChecker::resetLSStatus] DONE w/ TrackingLSMEsMap" << std::endl; } } @@ -243,23 +239,23 @@ void TrackingQualityChecker::resetLSStatus() { // void TrackingQualityChecker::fillGlobalStatus(DQMStore* dqm_store) { - if (verbose_) std::cout << "[TrackingQualityChecker::fillGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::fillGlobalStatus] already booked ? " << (bookedTrackingGlobalStatus_ ? "yes" : "nope") << std::endl; if (!bookedTrackingGlobalStatus_) bookGlobalStatus(dqm_store); fillDummyGlobalStatus(); fillTrackingStatus(dqm_store); - if (verbose_) std::cout << "[TrackingQualityChecker::fillGlobalStatus] DONE" << std::endl; + // std::cout << "[TrackingQualityChecker::fillGlobalStatus] DONE" << std::endl; dqm_store->cd(); } void TrackingQualityChecker::fillLSStatus(DQMStore* dqm_store) { - if (verbose_) std::cout << "[TrackingQualityChecker::fillLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; + // std::cout << "[TrackingQualityChecker::fillLSStatus] already booked ? " << (bookedTrackingLSStatus_ ? "yes" : "nope") << std::endl; if (!bookedTrackingLSStatus_) bookLSStatus(dqm_store); fillDummyLSStatus(); fillTrackingStatusAtLumi(dqm_store); - if (verbose_) std::cout << "[TrackingQualityChecker::fillLSStatus] DONE" << std::endl; + // std::cout << "[TrackingQualityChecker::fillLSStatus] DONE" << std::endl; dqm_store->cd(); } @@ -278,7 +274,7 @@ void TrackingQualityChecker::fillTrackingStatus(DQMStore* dqm_store) { for (std::map::iterator it = TrackingMEsMap.begin(); it != TrackingMEsMap.end(); it++) { - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; ibin++; @@ -286,58 +282,49 @@ void TrackingQualityChecker::fillTrackingStatus(DQMStore* dqm_store) { std::string MEname = it->second.HistoName; std::vector tmpMEvec = dqm_store->getContents(dqm_store->pwd()+"/"+localMEdirpath); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] tmpMEvec: " << tmpMEvec.size() << std::endl; MonitorElement* me = NULL; size_t nMEs = 0; for ( auto ime : tmpMEvec ) { std::string name = ime->getName(); - if (verbose_) std::cout << "name: " << name << " <-- --> " << MEname << std::endl; if ( name.find(MEname) != std::string::npos) { me = ime; nMEs++; } } // only one ME found - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] nMEs: " << nMEs << std::endl; if (nMEs == 1) { float status = 0.; for ( auto ime : tmpMEvec ) { std::string name = ime->getName(); - if (verbose_) std::cout << "name: " << name << " [" << MEname << "]" << std::endl; if ( name.find(MEname) != std::string::npos) { me = ime; - if (verbose_) std::cout << "inside the loop nQTme: " << me->getQReports().size() << "[" << ime->getFullname() << "]" << std::endl; } } - if (verbose_) std::cout << "me: " << me << "[" << me->getName() << ", " << me->getFullname() << "]" << std::endl; if (!me) continue; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] status: " << status << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] status: " << status << std::endl; std::vector qt_reports = me->getQReports(); size_t nQTme = qt_reports.size(); - if (verbose_) std::cout << "nQTme: " << nQTme << std::endl; if (nQTme != 0) { - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] qt_reports: " << qt_reports.size() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] qt_reports: " << qt_reports.size() << std::endl; // loop on possible QTs for ( auto iQT : qt_reports ) { status += iQT->getQTresult(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT: " << iQT->getQRName() << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << iQT->getQTresult() << " exists ? " << (it->second.TrackingFlag ? "yes " : "no ") << it->second.TrackingFlag << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT message: " << iQT->getMessage() << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT status: " << iQT->getStatus() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT: " << iQT->getQRName() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << iQT->getQTresult() << " exists ? " << (it->second.TrackingFlag ? "yes " : "no ") << it->second.TrackingFlag << std::endl; } status = status/float(nQTme); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << status << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << status << std::endl; it->second.TrackingFlag->Fill(status); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] TrackGlobalSummaryReportMap: " << TrackGlobalSummaryReportMap << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] TrackGlobalSummaryReportMap: " << TrackGlobalSummaryReportMap << std::endl; fillStatusHistogram(TrackGlobalSummaryReportMap, ibin, 1, status); } - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] gstatus: " << gstatus << " x status: " << status << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] gstatus: " << gstatus << " x status: " << status << std::endl; if ( status < 0. ) gstatus = -1.; else gstatus += status; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] ===> gstatus: " << gstatus << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] ===> gstatus: " << gstatus << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; } else { // more than 1 ME w/ the same root => they need to be considered together float status = 1.; @@ -347,19 +334,16 @@ void TrackingQualityChecker::fillTrackingStatus(DQMStore* dqm_store) { if ( name.find(MEname) != std::string::npos) { me = ime; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] status: " << status << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] status: " << status << std::endl; std::vector qt_reports = me->getQReports(); size_t nQTme = qt_reports.size(); - if (verbose_) std::cout << "nQTme: " << nQTme << "[" << name << ", " << ime->getFullname() << "]" << std::endl; if (nQTme != 0) { - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] qt_reports: " << qt_reports.size() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] qt_reports: " << qt_reports.size() << std::endl; // loop on possible QTs for ( auto iQT : qt_reports ) { tmp_status += iQT->getQTresult(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT: " << iQT->getQRName() << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << iQT->getQTresult() << " exists ? " << (it->second.TrackingFlag ? "yes " : "no ") << it->second.TrackingFlag << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT message: " << iQT->getMessage() << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT status: " << iQT->getStatus() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] iQT: " << iQT->getQRName() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << iQT->getQTresult() << " exists ? " << (it->second.TrackingFlag ? "yes " : "no ") << it->second.TrackingFlag << std::endl; } tmp_status = tmp_status/float(nQTme); } @@ -368,24 +352,24 @@ void TrackingQualityChecker::fillTrackingStatus(DQMStore* dqm_store) { } if ( status < 0. ) gstatus = -1.; else gstatus += status; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << status << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] MEname: " << MEname << " status: " << status << std::endl; it->second.TrackingFlag->Fill(status); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] TrackGlobalSummaryReportMap: " << TrackGlobalSummaryReportMap << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] TrackGlobalSummaryReportMap: " << TrackGlobalSummaryReportMap << std::endl; fillStatusHistogram(TrackGlobalSummaryReportMap, ibin, 1, status); } } - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] gstatus: " << gstatus << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] gstatus: " << gstatus << std::endl; size_t nQT = TrackingMEsMap.size(); if (gstatus < 1.) gstatus = -1.; else gstatus = gstatus/float(nQT); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] ===> gstatus: " << gstatus << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] ===> gstatus: " << gstatus << std::endl; TrackGlobalSummaryReportGlobal->Fill(gstatus); dqm_store->cd(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatus] DONE" << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatus] DONE" << std::endl; } @@ -403,7 +387,7 @@ void TrackingQualityChecker::fillTrackingStatus(DQMStore* dqm_store) { // void TrackingQualityChecker::fillTrackingStatusAtLumi(DQMStore* dqm_store){ - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] starting .. " << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] starting .. " << std::endl; float gstatus = 1.0; dqm_store->cd(); @@ -414,7 +398,7 @@ void TrackingQualityChecker::fillTrackingStatusAtLumi(DQMStore* dqm_store){ for (std::map::iterator it = TrackingLSMEsMap.begin(); it != TrackingLSMEsMap.end(); it++) { - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; ibin++; @@ -426,7 +410,7 @@ void TrackingQualityChecker::fillTrackingStatusAtLumi(DQMStore* dqm_store){ float status = 1.0; std::vector tmpMEvec = dqm_store->getContents(dqm_store->pwd()+"/"+localMEdirpath); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] tmpMEvec: " << tmpMEvec.size() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] tmpMEvec: " << tmpMEvec.size() << std::endl; MonitorElement* me = NULL; @@ -450,7 +434,7 @@ void TrackingQualityChecker::fillTrackingStatusAtLumi(DQMStore* dqm_store){ if (me->kind() == MonitorElement::DQM_KIND_TH1F) { float x_mean = me->getMean(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] MEname: " << MEname << " x_mean: " << x_mean << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] MEname: " << MEname << " x_mean: " << x_mean << std::endl; if (x_mean <= lower_cut || x_mean > upper_cut) status = 0.0; else status = 1.0; } @@ -464,25 +448,25 @@ void TrackingQualityChecker::fillTrackingStatusAtLumi(DQMStore* dqm_store){ if (me->kind() == MonitorElement::DQM_KIND_TH1F) { float x_mean = me->getMean(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] MEname: " << MEname << "[" << me->getName() << "] x_mean: " << x_mean << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] MEname: " << MEname << "[" << me->getName() << "] x_mean: " << x_mean << std::endl; if (x_mean <= lower_cut || x_mean > upper_cut) tmp_status = 0.0; else tmp_status = 1.0; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] tmp_status: " << tmp_status << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] tmp_status: " << tmp_status << std::endl; } } status = fminf(tmp_status,status); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ==> status: " << status << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ==> status: " << status << std::endl; } // loop on tmpMEvec } it->second.TrackingFlag->Fill(status); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ===> status: " << status << " [" << gstatus << "]" << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ===> status: " << status << " [" << gstatus << "]" << std::endl; if (status == 0.0) gstatus = -1.0; else gstatus = gstatus * status; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ===> gstatus: " << gstatus << std::endl; - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ===> gstatus: " << gstatus << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] ME: " << it->first << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; } TrackLSSummaryReportGlobal->Fill(gstatus); dqm_store->cd(); - if (verbose_) std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] DONE" << std::endl; + // std::cout << "[TrackingQualityChecker::fillTrackingStatusAtLumi] DONE" << std::endl; } diff --git a/branches/withNewDZ/DQM/TrackingMonitorSource/python/TrackingSourceConfigP5_cff.py b/branches/withNewDZ/DQM/TrackingMonitorSource/python/TrackingSourceConfigP5_cff.py index ea07f96ccc45f..98736269e095b 100644 --- a/branches/withNewDZ/DQM/TrackingMonitorSource/python/TrackingSourceConfigP5_cff.py +++ b/branches/withNewDZ/DQM/TrackingMonitorSource/python/TrackingSourceConfigP5_cff.py @@ -8,9 +8,6 @@ TrackMon_cosmicTk.AlgoName = 'CosmicTk' TrackMon_cosmicTk.FolderName = 'Tracking/TrackParameters' TrackMon_cosmicTk.doSeedParameterHistos = True -TrackMon_cosmicTk.TkSizeBin = cms.int32(4) -TrackMon_cosmicTk.TkSizeMax = cms.double( 3.5) -TrackMon_cosmicTk.TkSizeMin = cms.double(-0.5) # Clone for CKF Tracks import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi @@ -19,9 +16,6 @@ TrackMon_ckf.AlgoName = 'CKFTk' TrackMon_ckf.FolderName = 'Tracking/TrackParameters' TrackMon_ckf.doSeedParameterHistos = True -TrackMon_ckf.TkSizeBin = cms.int32(4) -TrackMon_ckf.TkSizeMax = cms.double( 3.5) -TrackMon_ckf.TkSizeMin = cms.double(-0.5) # Clone for Road Search Tracks #import DQM.TrackingMonitor.TrackerCosmicsTrackingMonitor_cfi diff --git a/branches/withNewDZ/DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py b/branches/withNewDZ/DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py index 83dc98978a1d8..f9a2b43e1e970 100644 --- a/branches/withNewDZ/DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py +++ b/branches/withNewDZ/DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py @@ -37,10 +37,8 @@ from DQMOffline.Trigger.DQMOffline_Trigger_Client_cff import * from DQMOffline.Trigger.DQMOffline_HLT_Client_cff import * from DQMOffline.JetMET.SusyPostProcessor_cff import * -from DQM.TrackingMonitorClient.TrackingClientConfig_Tier0_Cosmic_cff import * -DQMOfflineCosmics_SecondStep_PrePOG = cms.Sequence( TrackingCosmicDQMClient * - cosmicMuonQualityTests * +DQMOfflineCosmics_SecondStep_PrePOG = cms.Sequence( cosmicMuonQualityTests * photonOfflineDQMClient * # l1TriggerDqmOfflineClient * triggerOfflineDQMClient * diff --git a/branches/withNewDZ/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py b/branches/withNewDZ/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py index 893288a8f5889..3ef6c16fe6352 100644 --- a/branches/withNewDZ/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py +++ b/branches/withNewDZ/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py @@ -11,7 +11,6 @@ DQMCertCommon = cms.Sequence(siStripDaqInfo * sipixelDaqInfo * siStripDcsInfo * sipixelDcsInfo * siStripCertificationInfo * sipixelCertification * - trackingCertificationInfo * egammaDataCertificationTask * dqmOfflineTriggerCert) diff --git a/branches/withNewDZ/DQMOffline/L1Trigger/src/L1TRate_Offline.cc b/branches/withNewDZ/DQMOffline/L1Trigger/src/L1TRate_Offline.cc index 405a5a787cf4f..b75805efed25b 100644 --- a/branches/withNewDZ/DQMOffline/L1Trigger/src/L1TRate_Offline.cc +++ b/branches/withNewDZ/DQMOffline/L1Trigger/src/L1TRate_Offline.cc @@ -113,7 +113,7 @@ void L1TRate_Offline::beginRun(const edm::Run& run, const edm::EventSetup& iSetu m_ErrorMonitor->setBinLabel(UNKNOWN ,"UNKNOWN"); m_ErrorMonitor->setBinLabel(WARNING_PY_MISSING_FIT,"WARNING_PY_MISSING_FIT"); - if (m_verbose) {cout << "[L1TRate_Offline:] m_ErrorMonitor: " << m_ErrorMonitor << endl;} + cout << "[L1TRate_Offline:] m_ErrorMonitor: " << m_ErrorMonitor << endl; // Retriving the list of prescale sets m_listsPrescaleFactors = &(m_l1GtPfAlgo->gtPrescaleFactors()); diff --git a/branches/withNewDZ/DQMServices/Components/src/DQMFileSaver.cc b/branches/withNewDZ/DQMServices/Components/src/DQMFileSaver.cc index 7fd5d80b49f3d..445e01f7df2c0 100644 --- a/branches/withNewDZ/DQMServices/Components/src/DQMFileSaver.cc +++ b/branches/withNewDZ/DQMServices/Components/src/DQMFileSaver.cc @@ -263,7 +263,7 @@ DQMFileSaver::fillJson(int run, int lumi, const std::string& dataFilePathName, b std::string dataFileName = bfs::path(dataFilePathName).filename().string(); // The availability test of the FastMonitoringService was done in the ctor. bpt::ptree data; - bpt::ptree processedEvents, acceptedEvents, errorEvents, bitmask, fileList, fileSize, inputFiles, fileAdler32; + bpt::ptree processedEvents, acceptedEvents, errorEvents, bitmask, fileList, fileSize, inputFiles; processedEvents.put("", fms_ ? (fms_->getEventsProcessedForLumi(lumi)) : -1); // Processed events acceptedEvents.put("", fms_ ? (fms_->getEventsProcessedForLumi(lumi)) : -1); // Accepted events, same as processed for our purposes @@ -273,7 +273,6 @@ DQMFileSaver::fillJson(int run, int lumi, const std::string& dataFilePathName, b fileList.put("", dataFileName); // Data file the information refers to fileSize.put("", dataFileStat.st_size); // Size in bytes of the data file inputFiles.put("", ""); // We do not care about input files! - fileAdler32.put("", -1); // placeholder to match output json definition data.push_back(std::make_pair("", processedEvents)); data.push_back(std::make_pair("", acceptedEvents)); @@ -282,7 +281,6 @@ DQMFileSaver::fillJson(int run, int lumi, const std::string& dataFilePathName, b data.push_back(std::make_pair("", fileList)); data.push_back(std::make_pair("", fileSize)); data.push_back(std::make_pair("", inputFiles)); - data.push_back(std::make_pair("", fileAdler32)); pt.add_child("data", data); diff --git a/branches/withNewDZ/DataFormats/L1Trigger/interface/BXVector.h b/branches/withNewDZ/DataFormats/L1Trigger/interface/BXVector.h index b3d30a7d0c47d..f264e715dfb4f 100644 --- a/branches/withNewDZ/DataFormats/L1Trigger/interface/BXVector.h +++ b/branches/withNewDZ/DataFormats/L1Trigger/interface/BXVector.h @@ -93,7 +93,7 @@ class BXVector { // this method converts integer BX index into an unsigned index // used by the internal data representation unsigned indexFromBX(int bx) const; - unsigned numBX() const {return static_cast(bxLast_) - bxFirst_; } + unsigned numBX() const {return (unsigned) bxLast_ - bxFirst_; } private: diff --git a/branches/withNewDZ/DataFormats/METReco/interface/MET.h b/branches/withNewDZ/DataFormats/METReco/interface/MET.h index 78af47fb1f963..371700f2a697a 100755 --- a/branches/withNewDZ/DataFormats/METReco/interface/MET.h +++ b/branches/withNewDZ/DataFormats/METReco/interface/MET.h @@ -31,14 +31,11 @@ #include #include #include -#include -#include +#include "TMatrixD.h" //____________________________________________________________________________|| namespace reco { - typedef ROOT::Math::SMatrix METCovMatrix; - class MET : public RecoCandidate { public: @@ -70,8 +67,8 @@ namespace reco std::vector mEtCorr() const { return corr; } //________________________________________________________________________|| - void setSignificanceMatrix(const reco::METCovMatrix& matrix); - reco::METCovMatrix getSignificanceMatrix(void) const; + void setSignificanceMatrix(const TMatrixD& matrix); + TMatrixD getSignificanceMatrix(void) const; private: virtual bool overlap( const Candidate & ) const; diff --git a/branches/withNewDZ/DataFormats/METReco/interface/SigInputObj.h b/branches/withNewDZ/DataFormats/METReco/interface/SigInputObj.h index 73523a1da35ec..1aee56157d20a 100644 --- a/branches/withNewDZ/DataFormats/METReco/interface/SigInputObj.h +++ b/branches/withNewDZ/DataFormats/METReco/interface/SigInputObj.h @@ -27,7 +27,6 @@ //=== Class SigInputObj ==============================// namespace metsig{ - class SigInputObj{ public: diff --git a/branches/withNewDZ/DataFormats/METReco/src/MET.cc b/branches/withNewDZ/DataFormats/METReco/src/MET.cc index 542f2f0b707c0..a5440b3ea4c08 100755 --- a/branches/withNewDZ/DataFormats/METReco/src/MET.cc +++ b/branches/withNewDZ/DataFormats/METReco/src/MET.cc @@ -78,16 +78,14 @@ MET * MET::clone() const { double MET::significance() const { if(signif_dxx==0 && signif_dyy==0 && signif_dxy==0 && signif_dyx==0) return -1; - METCovMatrix metmat = getSignificanceMatrix(); - ROOT::Math::SVector metvec; + TMatrixD metmat = getSignificanceMatrix(); + TVectorD metvec(2); metvec(0)=this->px(); metvec(1)=this->py(); double signif = -1; - double det=0; - metmat.Det(det); - if(std::fabs(det)>0.000001){ + if(std::fabs(metmat.Determinant())>0.000001){ metmat.Invert(); - signif = ROOT::Math::Dot(metvec, (metmat * metvec) ); + signif = metvec * (metmat * metvec); } return signif; } @@ -136,9 +134,9 @@ std::vector MET::dsumEt() const // returns the significance matrix //____________________________________________________________________________|| -METCovMatrix MET::getSignificanceMatrix(void) const +TMatrixD MET::getSignificanceMatrix(void) const { - METCovMatrix result; + TMatrixD result(2,2); result(0,0)=signif_dxx; result(0,1)=signif_dxy; result(1,0)=signif_dyx; @@ -154,7 +152,7 @@ bool MET::overlap( const Candidate & ) const } //____________________________________________________________________________|| -void MET::setSignificanceMatrix(const METCovMatrix &inmatrix) +void MET::setSignificanceMatrix(const TMatrixD &inmatrix) { signif_dxx=inmatrix(0,0); signif_dxy=inmatrix(0,1); diff --git a/branches/withNewDZ/DataFormats/PatCandidates/src/classes_def_objects.xml b/branches/withNewDZ/DataFormats/PatCandidates/src/classes_def_objects.xml index 843cf0b6d677b..4d5d1dff840d2 100644 --- a/branches/withNewDZ/DataFormats/PatCandidates/src/classes_def_objects.xml +++ b/branches/withNewDZ/DataFormats/PatCandidates/src/classes_def_objects.xml @@ -16,10 +16,9 @@ - + - - + @@ -110,11 +109,9 @@ - + - - - + diff --git a/branches/withNewDZ/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h b/branches/withNewDZ/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h index c9523b39c1dd2..eba68872a06bb 100644 --- a/branches/withNewDZ/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h +++ b/branches/withNewDZ/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h @@ -30,18 +30,18 @@ class PixelChannelIdentifier{ // Constructor: pre-computes masks and shifts from field widths // gcc4.8: sorry, unimplemented: use of the value of the object being constructed in a constant expression // no constexpr yet.... - Packing(unsigned int row_w, unsigned int column_w, - unsigned int time_w, unsigned int adc_w) : + Packing(int row_w, int column_w, + int time_w, int adc_w) : row_width(row_w), column_width(column_w), adc_width(adc_w) ,row_shift(0) ,column_shift(row_shift + row_w) ,time_shift(column_shift + column_w) ,adc_shift(time_shift + time_w) - ,row_mask(~(~0U << row_w)) - ,column_mask( ~(~0U << column_w)) - ,time_mask(~(~0U << time_w)) - ,adc_mask(~(~0U << adc_w)) - ,rowcol_mask(~(~0U << (column_w+row_w))) + ,row_mask(~(~0 << row_w)) + ,column_mask( ~(~0 << column_w)) + ,time_mask(~(~0 << time_w)) + ,adc_mask(~(~0 << adc_w)) + ,rowcol_mask(~(~0 << (column_w+row_w))) ,max_row(row_mask) ,max_column(column_mask) ,max_adc(adc_mask){} diff --git a/branches/withNewDZ/DetectorDescription/Core/interface/DDValue.h b/branches/withNewDZ/DetectorDescription/Core/interface/DDValue.h index 3d20cda54c18c..2476bef214e0d 100644 --- a/branches/withNewDZ/DetectorDescription/Core/interface/DDValue.h +++ b/branches/withNewDZ/DetectorDescription/Core/interface/DDValue.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include "tbb/concurrent_vector.h" @@ -11,14 +12,21 @@ #include "DetectorDescription/Core/interface/DDValuePair.h" +class DDValue; +class DDSpecifics; +class DDLSpecPar; + /** A DDValue std::maps a std::vector of DDValuePair (std::string,double) to a name. Names of DDValues are stored transiently. Furthermore, an ID is assigned std::mapping to the name. - Use DDValue::setEvalState(true) to indicate whether the double numbers stored in + If a particular DDValue is not used anymore, use DDValue::clear() to free the internally + allocated memory. Use DDValue::setEvalState(true) to indicate whether the double numbers stored in the DDValuePair make sense, otherwise an exception will be thrown when trying to get access to these values via DDValue::doubles() or DDValue::operator[]. */ class DDValue { + friend class DDSpecifics; + friend class DDLSpecPar; public: //! create a unnamed emtpy value. One can assing a named DDValue to it. DDValue( void ) : id_(0), vecPair_() { } diff --git a/branches/withNewDZ/DetectorDescription/RegressionTest/test/BuildFile.xml b/branches/withNewDZ/DetectorDescription/RegressionTest/test/BuildFile.xml index cd63e4f528b39..fc713f4a80466 100644 --- a/branches/withNewDZ/DetectorDescription/RegressionTest/test/BuildFile.xml +++ b/branches/withNewDZ/DetectorDescription/RegressionTest/test/BuildFile.xml @@ -26,44 +26,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/withNewDZ/DetectorDescription/RegressionTest/test/algorithm_plugin_test.cpp b/branches/withNewDZ/DetectorDescription/RegressionTest/test/algorithm_plugin_test.cpp index 9126cc368af5b..0397bef9c258f 100644 --- a/branches/withNewDZ/DetectorDescription/RegressionTest/test/algorithm_plugin_test.cpp +++ b/branches/withNewDZ/DetectorDescription/RegressionTest/test/algorithm_plugin_test.cpp @@ -4,22 +4,21 @@ #include "FWCore/PluginManager/interface/standard.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithmFactory.h" +#include "SealBase/Signal.h" int main(int, char **argv) { + seal::Signal::handleFatal (argv [0]); DDAlgorithm * algo; - DDCompactView cpv; edmplugin::PluginManager::configure(edmplugin::standard::config()); - std::string name("test:DDTestAlgorithm"); + string name("DDTestAlgorithm"); algo = DDAlgorithmFactory::get()->create(name); if (algo) { - algo->execute( cpv ); - std::cout << "OK\n"; + algo->execute(); } else { - std::cout << "SEVERE ERROR: algorithm not found in registered plugins!" << std::endl; - std::cout << " name=" << name << std::endl; + cout << "SEVERE ERROR: algorithm not found in registered plugins!" << endl; + cout << " name=" << name << endl; } return 0; } - diff --git a/branches/withNewDZ/DetectorDescription/RegressionTest/test/html_ddd.cpp b/branches/withNewDZ/DetectorDescription/RegressionTest/test/html_ddd.cpp index 5ae3c3da72ce2..c3e859c583c0d 100644 --- a/branches/withNewDZ/DetectorDescription/RegressionTest/test/html_ddd.cpp +++ b/branches/withNewDZ/DetectorDescription/RegressionTest/test/html_ddd.cpp @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) std::cout << "about to set configuration" << std::endl; // std::string configfile("configuration.xml"); - std::string configfile("DetectorDescription/RegressionTest/test/"); + std::string configfile("DetectorDescription/RegressionTest/test/dddhtml/"); if (argc==2) { configfile += argv[1]; } else { diff --git a/branches/withNewDZ/DetectorDescription/RegressionTest/test/named_types.cpp b/branches/withNewDZ/DetectorDescription/RegressionTest/test/named_types.cpp index 29c48a3dfd661..546ad94123194 100644 --- a/branches/withNewDZ/DetectorDescription/RegressionTest/test/named_types.cpp +++ b/branches/withNewDZ/DetectorDescription/RegressionTest/test/named_types.cpp @@ -3,7 +3,6 @@ #include "DetectorDescription/Core/interface/DDString.h" #include "DetectorDescription/Core/interface/DDVector.h" #include "DetectorDescription/Core/interface/DDMap.h" -#include "FWCore/Utilities/interface/Exception.h" using namespace std; @@ -42,7 +41,7 @@ int main() { cout << "dd_map['second']=" << get_value(dd_map,"second") << endl; cout << "dd_map['xyz']=" << get_value(dd_map,"xyz") << endl; } - catch(const cms::Exception & e) { + catch(const DDException & e) { cout << "EXCEPTION: " << e.what() << endl; } diff --git a/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser.cpp b/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser.cpp index 2d75be185a0e2..296fedeef2237 100644 --- a/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser.cpp +++ b/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser.cpp @@ -10,7 +10,6 @@ #include using namespace std; -using namespace xercesc; class ADummy { @@ -276,8 +275,7 @@ int main(int argC, char* argV[]) } cout << endl; } - cout << "dom-size=" << handler.dom().size() - << "duration " << duration << endl; + cout << "dom-size=" << handler.dom().size() << endl; /* TinyDomWalker walker(handler.dom()); bool go = true; diff --git a/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser2.cpp b/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser2.cpp index c007df334411b..0deff3b64e868 100644 --- a/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser2.cpp +++ b/branches/withNewDZ/DetectorDescription/RegressionTest/test/simple_dom_parser2.cpp @@ -10,7 +10,6 @@ #include using namespace std; -using namespace xercesc; class ADummy2 { diff --git a/branches/withNewDZ/DetectorDescription/RegressionTest/test/test_module.cc b/branches/withNewDZ/DetectorDescription/RegressionTest/test/test_module.cc deleted file mode 100644 index 3d733df37a26b..0000000000000 --- a/branches/withNewDZ/DetectorDescription/RegressionTest/test/test_module.cc +++ /dev/null @@ -1,24 +0,0 @@ -#include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" -#include "DetectorDescription/Algorithm/interface/DDAlgorithmFactory.h" - -class DDTestAlgorithm : public DDAlgorithm -{ -public: - DDTestAlgorithm( void ) {} - virtual ~DDTestAlgorithm( void ){} - - void initialize( const DDNumericArguments &, - const DDVectorArguments &, - const DDMapArguments &, - const DDStringArguments &, - const DDStringVectorArguments & ) - { - std::cout << "DDTestAlgorithm::initialize\n"; - } - - void execute( DDCompactView& ) { - std::cout << "DDTestAlgorithm::execute\n"; - } -}; - -DEFINE_EDM_PLUGIN( DDAlgorithmFactory, DDTestAlgorithm, "test:DDTestAlgorithm"); diff --git a/branches/withNewDZ/EventFilter/ESRawToDigi/interface/ESUnpacker.h b/branches/withNewDZ/EventFilter/ESRawToDigi/interface/ESUnpacker.h index fcff44ba6ef61..e19d1823f04b0 100644 --- a/branches/withNewDZ/EventFilter/ESRawToDigi/interface/ESUnpacker.h +++ b/branches/withNewDZ/EventFilter/ESRawToDigi/interface/ESUnpacker.h @@ -27,7 +27,7 @@ class ESUnpacker { public : typedef unsigned int Word32; - typedef unsigned long long Word64; + typedef long long Word64; ESUnpacker(const edm::ParameterSet& ps); ~ESUnpacker(); diff --git a/branches/withNewDZ/EventFilter/Utilities/interface/DataPointDefinition.h b/branches/withNewDZ/EventFilter/Utilities/interface/DataPointDefinition.h index 3cfb8a5673db2..a091635200c01 100644 --- a/branches/withNewDZ/EventFilter/Utilities/interface/DataPointDefinition.h +++ b/branches/withNewDZ/EventFilter/Utilities/interface/DataPointDefinition.h @@ -67,7 +67,6 @@ class DataPointDefinition: public JsonSerializable { static const std::string CAT; static const std::string MERGE; static const std::string BINARYOR; - static const std::string ADLER32; // JSON field names static const std::string LEGEND; diff --git a/branches/withNewDZ/EventFilter/Utilities/interface/EvFDaqDirector.h b/branches/withNewDZ/EventFilter/Utilities/interface/EvFDaqDirector.h index 31358a08e6a23..0311a58939bb9 100644 --- a/branches/withNewDZ/EventFilter/Utilities/interface/EvFDaqDirector.h +++ b/branches/withNewDZ/EventFilter/Utilities/interface/EvFDaqDirector.h @@ -62,7 +62,6 @@ namespace evf{ std::string getOpenOutputJsonFilePath(const unsigned int ls, std::string const& stream) const; std::string getOutputJsonFilePath(const unsigned int ls, std::string const& stream) const; std::string getMergedDatFilePath(const unsigned int ls, std::string const& stream) const; - std::string getMergedDatChecksumFilePath(const unsigned int ls, std::string const& stream) const; std::string getInitFilePath(std::string const& stream) const; std::string getOpenProtocolBufferHistogramFilePath(const unsigned int ls, std::string const& stream) const; std::string getProtocolBufferHistogramFilePath(const unsigned int ls, std::string const& stream) const; @@ -75,7 +74,6 @@ namespace evf{ std::string getEoRFilePath() const; std::string getEoRFilePathOnFU() const; std::string getRunOpenDirPath() const {return run_dir_ +"/open";} - bool outputAdler32Recheck() const {return outputAdler32Recheck_;} void removeFile(unsigned int ls, unsigned int index); void removeFile(std::string ); @@ -122,7 +120,6 @@ namespace evf{ std::string bu_base_dir_; bool directorBu_; unsigned int run_; - bool outputAdler32Recheck_; std::string hostname_; std::string run_string_; diff --git a/branches/withNewDZ/EventFilter/Utilities/interface/FFFNamingSchema.h b/branches/withNewDZ/EventFilter/Utilities/interface/FFFNamingSchema.h index cbe3a9981c14e..d31c56f0390c0 100644 --- a/branches/withNewDZ/EventFilter/Utilities/interface/FFFNamingSchema.h +++ b/branches/withNewDZ/EventFilter/Utilities/interface/FFFNamingSchema.h @@ -79,15 +79,6 @@ namespace fffnaming { return ss.str(); } - inline std::string streamerDataChecksumFileNameWithInstance(const unsigned int run, const unsigned int ls, std::string const& stream, std::string const& instance) { - std::stringstream ss; - runLumiPrefixFill(ss,run,ls); - ss << "_" << stream - << "_" << instance - << ".checksum"; - return ss.str(); - } - inline std::string streamerJsonFileNameWithPid(const unsigned int run, const unsigned int ls, std::string const& stream) { std::stringstream ss; runLumiPrefixFill(ss,run,ls); diff --git a/branches/withNewDZ/EventFilter/Utilities/plugins/BuildFile.xml b/branches/withNewDZ/EventFilter/Utilities/plugins/BuildFile.xml index 6e689c936990c..494a33a243cc2 100644 --- a/branches/withNewDZ/EventFilter/Utilities/plugins/BuildFile.xml +++ b/branches/withNewDZ/EventFilter/Utilities/plugins/BuildFile.xml @@ -3,7 +3,6 @@ - diff --git a/branches/withNewDZ/EventFilter/Utilities/plugins/RecoEventOutputModuleForFU.h b/branches/withNewDZ/EventFilter/Utilities/plugins/RecoEventOutputModuleForFU.h index 87416d76e2115..b86562784139f 100644 --- a/branches/withNewDZ/EventFilter/Utilities/plugins/RecoEventOutputModuleForFU.h +++ b/branches/withNewDZ/EventFilter/Utilities/plugins/RecoEventOutputModuleForFU.h @@ -8,15 +8,13 @@ #include #include -#include -#include +#include "boost/filesystem.hpp" #include "EventFilter/Utilities/interface/JsonMonitorable.h" #include "EventFilter/Utilities/interface/FastMonitor.h" #include "EventFilter/Utilities/interface/JSONSerializer.h" #include "EventFilter/Utilities/interface/FileIO.h" #include "EventFilter/Utilities/interface/FastMonitoringService.h" -#include "FWCore/Utilities/interface/Adler32Calculator.h" namespace evf { @@ -49,7 +47,6 @@ namespace evf { std::auto_ptr c_; std::string stream_label_; boost::filesystem::path openDatFilePath_; - boost::filesystem::path openDatChecksumFilePath_; IntJ processed_; mutable IntJ accepted_; IntJ errorEvents_; @@ -57,12 +54,10 @@ namespace evf { StringJ filelist_; IntJ filesize_; StringJ inputFiles_; - IntJ fileAdler32_; boost::shared_ptr jsonMonitor_; evf::FastMonitoringService *fms_; DataPointDefinition outJsonDef_; unsigned char* outBuf_=0; - bool readAdler32Check_=false; }; //end-of-class-def @@ -79,11 +74,9 @@ namespace evf { filelist_(), filesize_(0), inputFiles_(), - fileAdler32_(1), outBuf_(new unsigned char[1024*1024]) { std::string baseRunDir = edm::Service()->baseRunDir(); - readAdler32Check_ = edm::Service()->outputAdler32Recheck(); LogDebug("RecoEventOutputModuleForFU") << "writing .dat files to -: " << baseRunDir; // create open dir if not already there edm::Service()->createRunOpendirMaybe(); @@ -102,7 +95,6 @@ namespace evf { filelist_.setName("Filelist"); filesize_.setName("Filesize"); inputFiles_.setName("InputFiles"); - fileAdler32_.setName("FileAdler32"); outJsonDef_.setDefaultGroup("data"); outJsonDef_.addLegendItem("Processed","integer",DataPointDefinition::SUM); @@ -112,7 +104,6 @@ namespace evf { outJsonDef_.addLegendItem("Filelist","string",DataPointDefinition::MERGE); outJsonDef_.addLegendItem("Filesize","integer",DataPointDefinition::SUM); outJsonDef_.addLegendItem("InputFiles","string",DataPointDefinition::CAT); - outJsonDef_.addLegendItem("FileAdler32","integer",DataPointDefinition::ADLER32); std::stringstream tmpss,ss; tmpss << baseRunDir << "/open/" << "output_" << getpid() << ".jsd"; ss << baseRunDir << "/" << "output_" << getpid() << ".jsd"; @@ -139,7 +130,6 @@ namespace evf { jsonMonitor_->registerGlobalMonitorable(&filelist_,false); jsonMonitor_->registerGlobalMonitorable(&filesize_,false); jsonMonitor_->registerGlobalMonitorable(&inputFiles_,false); - jsonMonitor_->registerGlobalMonitorable(&fileAdler32_,false); jsonMonitor_->commit(nullptr); } @@ -192,7 +182,6 @@ namespace evf { { //edm::LogInfo("RecoEventOutputModuleForFU") << "begin lumi"; openDatFilePath_ = edm::Service()->getOpenDatFilePath(ls.luminosityBlock(),stream_label_); - openDatChecksumFilePath_ = edm::Service()->getOpenDatFilePath(ls.luminosityBlock(),stream_label_); c_->setOutputFile(openDatFilePath_.string()); filelist_ = openDatFilePath_.filename().string(); } @@ -202,45 +191,22 @@ namespace evf { { //edm::LogInfo("RecoEventOutputModuleForFU") << "end lumi"; long filesize=0; - fileAdler32_.value() = c_->get_adler32(); c_->closeOutputFile(); processed_.value() = fms_->getEventsProcessedForLumi(ls.luminosityBlock()); - - if(processed_.value()!=0){ + //int b; + // move dat file to one level up - this is VERRRRRY inefficient, come up with a smarter idea - //lock FILE *des = edm::Service()->maybeCreateAndLockFileHeadForStream(ls.luminosityBlock(),stream_label_); - - std::string deschecksum = edm::Service()->getMergedDatChecksumFilePath(ls.luminosityBlock(), stream_label_); - - struct stat istat; - FILE * cf = NULL; - uint32_t mergedAdler32=1; - //get adler32 accumulated checksum for the merged file - if (!stat(deschecksum.c_str(), &istat)) { - std::cout << "checksum size " << istat.st_size << std::endl; - if (istat.st_size) { - cf = fopen(deschecksum.c_str(),"r"); - if (!cf) throw cms::Exception("RecoEventOutputModuleForFU") << "Unable to open checksum file -: " << deschecksum.c_str(); - fscanf(cf,"%u",&mergedAdler32); - fclose(cf); - } - else edm::LogWarning("RecoEventOutputModuleForFU") << "Checksum file size is empty -: "<< deschecksum.c_str(); - } - FILE *src = fopen(openDatFilePath_.string().c_str(),"r"); + struct stat istat; stat(openDatFilePath_.string().c_str(), &istat); off_t readInput=0; - uint32_t adlera=1; - uint32_t adlerb=0; while (readInput()->unlockAndCloseMergeStream(); fclose(src); - - if (readAdler32Check_ && ((adlerb << 16) | adlera) != fileAdler32_.value()) { - - throw cms::Exception("RecoEventOutputModuleForFU") << "Adler32 checksum mismatch after reading file -: " - << openDatFilePath_.string() <<" in LS " << ls.luminosityBlock() << std::endl; - } - } //remove file remove(openDatFilePath_.string().c_str()); diff --git a/branches/withNewDZ/EventFilter/Utilities/plugins/output.jsd b/branches/withNewDZ/EventFilter/Utilities/plugins/output.jsd index c688558031e0d..3db428cdcc24b 100644 --- a/branches/withNewDZ/EventFilter/Utilities/plugins/output.jsd +++ b/branches/withNewDZ/EventFilter/Utilities/plugins/output.jsd @@ -34,11 +34,6 @@ "name" : "InputFiles", "operation" : "cat", "type" : "string" - }, - { - "name" : "FileAdler32", - "operation" : "sum", - "type" : "integer" } ] } diff --git a/branches/withNewDZ/EventFilter/Utilities/python/EvFDaqDirector_cfi.py b/branches/withNewDZ/EventFilter/Utilities/python/EvFDaqDirector_cfi.py index 6f2b825d47724..a224bcae7d17c 100644 --- a/branches/withNewDZ/EventFilter/Utilities/python/EvFDaqDirector_cfi.py +++ b/branches/withNewDZ/EventFilter/Utilities/python/EvFDaqDirector_cfi.py @@ -3,7 +3,6 @@ EvFDaqDirector = cms.Service( "EvFDaqDirector", buBaseDir = cms.untracked.string(""), baseDir = cms.untracked.string(""), - runNumber = cms.untracked.uint32(0), - outputAdler32Recheck=cms.untracked.bool(False) + runNumber = cms.untracked.uint32(0) ) diff --git a/branches/withNewDZ/EventFilter/Utilities/src/DataPointDefinition.cc b/branches/withNewDZ/EventFilter/Utilities/src/DataPointDefinition.cc index a17278fe805e8..5b836589af69b 100644 --- a/branches/withNewDZ/EventFilter/Utilities/src/DataPointDefinition.cc +++ b/branches/withNewDZ/EventFilter/Utilities/src/DataPointDefinition.cc @@ -20,7 +20,6 @@ const std::string DataPointDefinition::HISTO = "histo"; const std::string DataPointDefinition::CAT = "cat"; const std::string DataPointDefinition::BINARYOR = "binaryOr"; const std::string DataPointDefinition::MERGE = "merge"; -const std::string DataPointDefinition::ADLER32 = "adler32"; const std::string DataPointDefinition::LEGEND = "legend"; const std::string DataPointDefinition::DATA = "data"; diff --git a/branches/withNewDZ/EventFilter/Utilities/src/EvFDaqDirector.cc b/branches/withNewDZ/EventFilter/Utilities/src/EvFDaqDirector.cc index 474c46abea29c..620067b2f760e 100644 --- a/branches/withNewDZ/EventFilter/Utilities/src/EvFDaqDirector.cc +++ b/branches/withNewDZ/EventFilter/Utilities/src/EvFDaqDirector.cc @@ -48,7 +48,6 @@ namespace evf { pset.getUntrackedParameter ("directorIsBu", false) ), run_(pset.getUntrackedParameter ("runNumber",0)), - outputAdler32Recheck_(pset.getUntrackedParameter("outputAdler32Recheck",false)), hostname_(""), bu_readlock_fd_(-1), bu_writelock_fd_(-1), @@ -305,6 +304,7 @@ namespace evf { return bu_run_dir_ + "/open/" + fffnaming::inputJsonFileName(run_,ls,index); } + std::string EvFDaqDirector::getOpenDatFilePath(const unsigned int ls, std::string const& stream) const { return run_dir_ + "/open/" + fffnaming::streamerDataFileNameWithPid(run_,ls,stream); } @@ -321,10 +321,6 @@ namespace evf { return run_dir_ + "/" + fffnaming::streamerDataFileNameWithInstance(run_,ls,stream,hostname_); } - std::string EvFDaqDirector::getMergedDatChecksumFilePath(const unsigned int ls, std::string const& stream) const { - return run_dir_ + "/" + fffnaming::streamerDataChecksumFileNameWithInstance(run_,ls,stream,hostname_); - } - std::string EvFDaqDirector::getInitFilePath(std::string const& stream) const { return run_dir_ + "/" + fffnaming::initFileNameWithPid(run_,0,stream); } diff --git a/branches/withNewDZ/EventFilter/Utilities/test/startFU.py b/branches/withNewDZ/EventFilter/Utilities/test/startFU.py index 02ed57a728472..6cb1337f3ecc3 100644 --- a/branches/withNewDZ/EventFilter/Utilities/test/startFU.py +++ b/branches/withNewDZ/EventFilter/Utilities/test/startFU.py @@ -88,7 +88,7 @@ getLSFromFilename = cms.untracked.bool(True), testModeNoBuilderUnit = cms.untracked.bool(False), verifyAdler32 = cms.untracked.bool(True), - useL1EventID = cms.untracked.bool(True), + useL1EventID = cms.untracked.bool(False), eventChunkSize = cms.untracked.uint32(16), numBuffers = cms.untracked.uint32(2), eventChunkBlock = cms.untracked.uint32(1) diff --git a/branches/withNewDZ/FWCore/Framework/bin/BuildFile.xml b/branches/withNewDZ/FWCore/Framework/bin/BuildFile.xml index abbc85b94ae16..f086b20c10079 100644 --- a/branches/withNewDZ/FWCore/Framework/bin/BuildFile.xml +++ b/branches/withNewDZ/FWCore/Framework/bin/BuildFile.xml @@ -1,9 +1,6 @@ - - - diff --git a/branches/withNewDZ/FWCore/ParameterSet/bin/BuildFile.xml b/branches/withNewDZ/FWCore/ParameterSet/bin/BuildFile.xml index 18e318fdca304..28de362e0a1d7 100644 --- a/branches/withNewDZ/FWCore/ParameterSet/bin/BuildFile.xml +++ b/branches/withNewDZ/FWCore/ParameterSet/bin/BuildFile.xml @@ -1,9 +1,3 @@ - - - - - - diff --git a/branches/withNewDZ/FWCore/PluginManager/bin/BuildFile.xml b/branches/withNewDZ/FWCore/PluginManager/bin/BuildFile.xml index 199714824519c..8ee3feeb94b7b 100644 --- a/branches/withNewDZ/FWCore/PluginManager/bin/BuildFile.xml +++ b/branches/withNewDZ/FWCore/PluginManager/bin/BuildFile.xml @@ -1,16 +1,16 @@ - - - - - - + + + + + + diff --git a/branches/withNewDZ/FWCore/Sources/src/ProducerSourceBase.cc b/branches/withNewDZ/FWCore/Sources/src/ProducerSourceBase.cc index e8242e55ac600..0c4dc04d6ea76 100644 --- a/branches/withNewDZ/FWCore/Sources/src/ProducerSourceBase.cc +++ b/branches/withNewDZ/FWCore/Sources/src/ProducerSourceBase.cc @@ -206,7 +206,6 @@ namespace edm { } } else { // new run - assert(numberEventsInLumi_ != 0); eventID = eventID.previousRunLastEvent(origEventID_.luminosityBlock() + numberEventsInRun_/numberEventsInLumi_); eventID = EventID(numberEventsInRun_, eventID.luminosityBlock(), eventID.run()); numberEventsInThisLumi_ = numberEventsInLumi_; diff --git a/branches/withNewDZ/FastSimulation/Calorimetry/interface/HCALResponse.h b/branches/withNewDZ/FastSimulation/Calorimetry/interface/HCALResponse.h index 2d040d05ee031..f6e6c44924c42 100644 --- a/branches/withNewDZ/FastSimulation/Calorimetry/interface/HCALResponse.h +++ b/branches/withNewDZ/FastSimulation/Calorimetry/interface/HCALResponse.h @@ -87,7 +87,7 @@ class HCALResponse double respFactorEM; // Tabulated energy, et/pt and eta points - vec1 eGridHD[4]; + vec1 eGridHD[3]; vec1 eGridEM; vec1 eGridMU; vec1 etaGridMU; diff --git a/branches/withNewDZ/FastSimulation/Calorimetry/src/HCALResponse.cc b/branches/withNewDZ/FastSimulation/Calorimetry/src/HCALResponse.cc index 4468791919bd7..ee65eef702d06 100644 --- a/branches/withNewDZ/FastSimulation/Calorimetry/src/HCALResponse.cc +++ b/branches/withNewDZ/FastSimulation/Calorimetry/src/HCALResponse.cc @@ -236,8 +236,6 @@ double HCALResponse::getMIPfraction(double energy, double eta){ } double HCALResponse::responseHCAL(int _mip, double energy, double eta, int partype, RandomEngineAndDistribution const* random) { - - int ieta = abs((int)(eta / etaStep)) ; int ie = -1; @@ -396,65 +394,62 @@ double HCALResponse::interHD(int mip, double e, int ie, int ieta, int det, Rando double mean = 0; vec1 pars(nPar,0); - // for ieta < 5 there is overlap between HE and HF, and measurement comes from HE if (det==2 && ieta>5 && e<20){ - - for(int p = 0; p < 4; p++){ - y1=PoissonParameters[p][ie][ieta]; - y2=PoissonParameters[p][ie+1][ieta]; - if(e>5){ - x1 = eGridHD[det+1][ie]; - x2 = eGridHD[det+1][ie+1]; - pars[p] = (y1*(x2-e) + y2*(e-x1))/(x2-x1); - } - else pars[p] = y1; - } - mean =random->poissonShoot((int (PoissonShootNoNegative(pars[0],pars[1],random))+(int (PoissonShootNoNegative(pars[2],pars[3],random)))/4+random->flatShoot()/4) *6)/(0.3755*6); + + x1 = eGridHD[det+1][ie]; + x2 = eGridHD[det+1][ie+1]; + for(int p = 0; p < 4; p++){ + y1=PoissonParameters[p][ie][ieta]; + y2=PoissonParameters[p][ie+1][ieta]; + if(e>5)pars[p] = (y1*(x2-e) + y2*(e-x1))/(x2-x1); + else pars[p] = y1; + } + mean =random->poissonShoot((int (PoissonShootNoNegative(pars[0],pars[1],random))+(int (PoissonShootNoNegative(pars[2],pars[3],random)))/4+random->flatShoot()/4) *6)/(0.3755*6); } else{ - x1 = eGridHD[det][ie]; - x2 = eGridHD[det][ie+1]; - - //calculate all parameters - for(int p = 0; p < nPar; p++){ - y1 = parameters[p][mip][det][ie][ieta]; - y2 = parameters[p][mip][det][ie+1][ieta]; - - //par-specific checks - double custom = 0; - bool use_custom = false; - - //do not let mu or sigma get extrapolated below zero for low energies - //especially important for HF since extrapolation is used for E < 15 GeV - if((p==0 || p==1) && e < x1){ - double tmp = (y1*x2-y2*x1)/(x2-x1); //extrapolate down to e=0 - if(tmp<0) { //require mu,sigma > 0 for E > 0 - custom = y1*e/x1; - use_custom = true; - } - } - //tail parameters have lower bounds - never extrapolate down - else if((p==2 || p==3 || p==4 || p==5)){ - if(e < x1 && y1 < y2){ - custom = y1; - use_custom = true; + x1 = eGridHD[det][ie]; + x2 = eGridHD[det][ie+1]; + + //calculate all parameters + for(int p = 0; p < nPar; p++){ + y1 = parameters[p][mip][det][ie][ieta]; + y2 = parameters[p][mip][det][ie+1][ieta]; + + //par-specific checks + double custom = 0; + bool use_custom = false; + + //do not let mu or sigma get extrapolated below zero for low energies + //especially important for HF since extrapolation is used for E < 15 GeV + if((p==0 || p==1) && e < x1){ + double tmp = (y1*x2-y2*x1)/(x2-x1); //extrapolate down to e=0 + if(tmp<0) { //require mu,sigma > 0 for E > 0 + custom = y1*e/x1; + use_custom = true; + } } - else if(e > x2 && y2 < y1){ - custom = y2; - use_custom = true; + //tail parameters have lower bounds - never extrapolate down + else if((p==2 || p==3 || p==4 || p==5)){ + if(e < x1 && y1 < y2){ + custom = y1; + use_custom = true; + } + else if(e > x2 && y2 < y1){ + custom = y2; + use_custom = true; + } } - } - - //linear interpolation - if(use_custom) pars[p] = custom; - else pars[p] = (y1*(x2-e) + y2*(e-x1))/(x2-x1); - } - - //random smearing - if(nPar==6) mean = cballShootNoNegative(pars[0],pars[1],pars[2],pars[3],pars[4],pars[5], random); - else if(nPar==2) mean = gaussShootNoNegative(pars[0],pars[1], random); //gaussian fallback + + //linear interpolation + if(use_custom) pars[p] = custom; + else pars[p] = (y1*(x2-e) + y2*(e-x1))/(x2-x1); + } + + //random smearing + if(nPar==6) mean = cballShootNoNegative(pars[0],pars[1],pars[2],pars[3],pars[4],pars[5], random); + else if(nPar==2) mean = gaussShootNoNegative(pars[0],pars[1], random); //gaussian fallback } return mean; } diff --git a/branches/withNewDZ/Fireworks/Core/scripts/cmsShow b/branches/withNewDZ/Fireworks/Core/scripts/cmsShow index ff2eea0e8c226..a390630b510d5 100755 --- a/branches/withNewDZ/Fireworks/Core/scripts/cmsShow +++ b/branches/withNewDZ/Fireworks/Core/scripts/cmsShow @@ -15,12 +15,19 @@ checkOS() exit 1; fi osv=`sw_vers -productVersion |awk '{split($0,a,"\."); print a[1]a[2];}' ` - if [ "$osv" -lt "108" ]; then + if [ "$osv" -lt "106" ]; then echo "#######################################" - echo "Only version 10.8 or greater supported!" + echo "Only version 10.6 or greater supported!" echo "#######################################" exit 1; fi + support_106=`awk -F', ' '{ if ($1 ~/CMSSW_[0-5]_[0-2]_/ ) print $1 }' $CMSSW_BASE/src/Fireworks/Core/data/version.txt` + if [ "$osv" == "106" ] && [ -z "$support_106" ]; then + echo "#######################################" + echo "Only version 10.7 supported!" + echo "#######################################" + exit 1 + fi else arch=`uname -m` if [ f$arch != f"x86_64" -a f$arch != f"amd64" ]; then @@ -91,7 +98,7 @@ setupEnv() # see if we are running in standalone mode if [ ! -d $SHELLDIR/../../.SCRAM ] ; then export CMSSW_BASE=$SHELLDIR - export CMSSW_SEARCH_PATH=".:$CMSSW_BASE" + export CMSSW_SEARCH_PATH="." export CMSSW_DATA_PATH="." export ROOTSYS=$CMSSW_BASE/external/root export LD_LIBRARY_PATH=${CMSSW_BASE}/external/gcc/lib64:${ROOTSYS}/lib:${CMSSW_BASE}/external/lib:${CMSSW_BASE}/lib:$LD_LIBRARY_PATH diff --git a/branches/withNewDZ/Fireworks/Core/standalone_build/make_tarball.sh b/branches/withNewDZ/Fireworks/Core/standalone_build/make_tarball.sh old mode 100644 new mode 100755 index 8d0e169dd9acd..879718db082ec --- a/branches/withNewDZ/Fireworks/Core/standalone_build/make_tarball.sh +++ b/branches/withNewDZ/Fireworks/Core/standalone_build/make_tarball.sh @@ -39,7 +39,7 @@ getExternals() expat fftw3 gdbm gsl hepmc\ libjpg libpng libtiff libungif \ openssl pcre \ - sigcpp xrootd zlib xz freetype tbb + sigcpp xrootd zlib xz freetype do export i; ever=`grep $i $extt | perl -ne 'if ($_ =~ /$ENV{i}\/(.*)\/lib\/(.*)/ ) {print "$1\n"; last;}'` diff --git a/branches/withNewDZ/Fireworks/Geometry/interface/FWTGeoRecoGeometryESProducer.h b/branches/withNewDZ/Fireworks/Geometry/interface/FWTGeoRecoGeometryESProducer.h index f3903e03604d0..22e0fe42125a4 100644 --- a/branches/withNewDZ/Fireworks/Geometry/interface/FWTGeoRecoGeometryESProducer.h +++ b/branches/withNewDZ/Fireworks/Geometry/interface/FWTGeoRecoGeometryESProducer.h @@ -29,7 +29,7 @@ class FWTGeoRecoGeometryESProducer : public edm::ESProducer { enum ERecoDet {kDummy, kSiPixel, kSiStrip, - kMuonDT, kMuonRPC, kMuonCSC, kMuonGEM, kMuonME0, + kMuonDT, kMuonRPC, kMuonCSC, kMuonGEM, kECal, kHCal, kHGCE, kHGCH }; public: @@ -63,7 +63,6 @@ class FWTGeoRecoGeometryESProducer : public edm::ESProducer void addDTGeometry(); void addRPCGeometry(); void addGEMGeometry(); - void addME0Geometry(); void addEcalCaloGeometry(); void addHcalCaloGeometryBarrel(); void addHcalCaloGeometryEndcap(); diff --git a/branches/withNewDZ/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py b/branches/withNewDZ/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py deleted file mode 100644 index c884d41b8952a..0000000000000 --- a/branches/withNewDZ/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py +++ /dev/null @@ -1,152 +0,0 @@ -import FWCore.ParameterSet.Config as cms -import sys -import FWCore.ParameterSet.VarParsing as VarParsing -from FWCore.Utilities.Enumerate import Enumerate - -varType = Enumerate ("Run1 2015 2017 2019 PhaseIPixel 2023Muon SLHC SLHCDB") - -def help(): - print "Usage: cmsRun dumpFWRecoGeometry_cfg.py tag=TAG " - print " tag=tagname" - print " indentify geometry condition database tag" - print " ", varType.keys() - print "" - print " tgeo=bool" - print " dump in TGeo format to borwse it geomtery viewer" - print " import this will in Fireworks with option --sim-geom-file" - print "" - print "" - exit(1); - -def recoGeoLoad(score): - print "Loading configuration for tag ", options.tag ,"...\n" - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") - - if score == "Run1": - from Configuration.AlCa.autoCond import autoCond - process.GlobalTag.globaltag = autoCond['mc'] - process.load("Configuration.StandardSequences.GeometryDB_cff") - process.load("Configuration.StandardSequences.Reconstruction_cff") - - elif score == "2015": - from Configuration.AlCa.autoCond import autoCond - process.GlobalTag.globaltag = autoCond['mc'] - process.load("Configuration.Geometry.GeometryExtended2015Reco_cff"); - - elif score == "2017": - from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2017', '') - process.load('Configuration.Geometry.GeometryExtended2017Reco_cff') - # Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms - from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2017 - # process = cust_2017(process) - - elif score == "2019": - from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2019', '') - process.load('Configuration.Geometry.GeometryExtended2019Reco_cff') - - elif score == "PhaseIPixel": - from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:mc', '') - process.load('Configuration.Geometry.GeometryExtendedPhaseIPixelReco_cff') - - elif score == "2023Muon": - from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '') - process.load('Configuration.Geometry.GeometryExtended2023MuonReco_cff') - # Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms - from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023Muon - #call to customisation function cust_2023Muon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms - # process = cust_2023Muon(process) - - elif score == "SLHCDB": # orig dumpFWRecoSLHCGeometry_cfg.py - process.GlobalTag.globaltag = 'DESIGN42_V17::All' - process.load("Configuration.StandardSequences.GeometryDB_cff") - process.load("Configuration.StandardSequences.Reconstruction_cff") - - process.GlobalTag.toGet = cms.VPSet( - cms.PSet(record = cms.string("GeometryFileRcd"), - tag = cms.string("XMLFILE_Geometry_428SLHCYV0_Phase1_R30F12_HCal_Ideal_mc"), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_42X_GEOMETRY") - ), - cms.PSet(record = cms.string('IdealGeometryRecord'), - tag = cms.string('TKRECO_Geometry_428SLHCYV0'), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_42X_GEOMETRY")), - cms.PSet(record = cms.string('PGeometricDetExtraRcd'), - tag = cms.string('TKExtra_Geometry_428SLHCYV0'), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_42X_GEOMETRY")), - ) - - elif score == varType.valueForKey("SLHC"): # orig dumpFWRecoGeometrySLHC_cfg.py - from Configuration.AlCa.autoCond import autoCond - process.GlobalTag.globaltag = autoCond['mc'] - process.load("Configuration.Geometry.GeometrySLHCSimIdeal_cff") - process.load("Configuration.Geometry.GeometrySLHCReco_cff") - process.load("Configuration.StandardSequences.Reconstruction_cff") - process.trackerSLHCGeometry.applyAlignment = False - - else: - help() - - - - -options = VarParsing.VarParsing () - - -defaultOutputFileName="cmsRecoGeom.root" - -options.register ('tag', - "2015", # default value - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.string, - "tag info about geometry database conditions") - - -options.register ('tgeo', - False, # default value - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.bool, - "write geometry in TGeo format") - - -options.register ('out', - defaultOutputFileName, # default value - VarParsing.VarParsing.multiplicity.singleton, - VarParsing.VarParsing.varType.string, - "Output file name") - -options.parseArguments() - - - - -process = cms.Process("DUMP") -process.add_(cms.Service("InitRootHandlers", ResetRootErrHandler = cms.untracked.bool(False))) -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1)) - - -recoGeoLoad(options.tag) - -if ( options.tgeo == True): - if (options.out == defaultOutputFileName ): - options.out = "cmsTGeoRecoGeom-" + str(options.tag) + ".root" - process.add_(cms.ESProducer("FWTGeoRecoGeometryESProducer")) - process.dump = cms.EDAnalyzer("DumpFWTGeoRecoGeometry", - tagInfo = cms.untracked.string(options.tag), - outputFileName = cms.untracked.string(options.out) - ) -else: - if (options.out == defaultOutputFileName ): - options.out = "cmsRecoGeom-" + str(options.tag) + ".root" - process.add_(cms.ESProducer("FWRecoGeometryESProducer")) - process.dump = cms.EDAnalyzer("DumpFWRecoGeometry", - level = cms.untracked.int32(1), - tagInfo = cms.untracked.string(options.tag), - outputFileName = cms.untracked.string(options.out) - ) - -print "Dumping geometry in " , options.out, "\n"; -process.p = cms.Path(process.dump) diff --git a/branches/withNewDZ/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc b/branches/withNewDZ/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc index f0813254090c2..540013f1b0058 100644 --- a/branches/withNewDZ/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc +++ b/branches/withNewDZ/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc @@ -12,7 +12,6 @@ #include "DataFormats/SiStripDetId/interface/TECDetId.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" #include "DataFormats/MuonDetId/interface/GEMDetId.h" -// #include "DataFormats/MuonDetId/interface/ME0DetId.h" #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" #include "DataFormats/HcalDetId/interface/HcalSubdetector.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" @@ -31,7 +30,6 @@ #include "Geometry/RPCGeometry/interface/RPCGeometry.h" #include "Geometry/GEMGeometry/interface/GEMEtaPartition.h" #include "Geometry/GEMGeometry/interface/GEMGeometry.h" -// #include "Geometry/GEMGeometry/interface/ME0Geometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" @@ -152,19 +150,6 @@ TGeoVolume* FWTGeoRecoGeometryESProducer::GetTopHolder(const char* prefix, EReco return res; } -namespace { - -enum GMCol { Green = 4, - Blue0 = 13, Blue1 = 24, Blue2 = 6, - Yellow0 = 3, Yellow1 = 16, - Pink = 10, - Red = 29, Orange0 = 79, Orange1 = 14, - Magenta = 8, - Gray = 12 -}; - -} - TGeoMedium* FWTGeoRecoGeometryESProducer::GetMedium(ERecoDet det) @@ -175,62 +160,48 @@ FWTGeoRecoGeometryESProducer::GetMedium(ERecoDet det) std::string name; int color; - - + // see TGeoManager::DefaultColors() switch (det) { - // TRACKER case kSiPixel: name = "SiPixel"; - color = GMCol::Green; + color = 4;//kGreen-10 break; - case kSiStrip: name = "SiStrip"; - color = GMCol::Gray; + color = 29; // kOrange+9 break; - // MUON case kMuonDT: name = "MuonDT"; - color = GMCol::Blue2; + color = 13; // kBlue -10 break; - - case kMuonRPC: - name = "MuonRPC"; - color = GMCol::Red; - break; - case kMuonGEM: name = "MuonGEM"; - color = GMCol::Yellow1; + color = 16; //kYellow+1 break; - - case kMuonCSC: - name = "MuonCSC"; - color = GMCol::Gray; + case kMuonRPC: + name = "MuonRPC"; + color = 10; //kRed-10 break; - - case kMuonME0: - name = "MuonME0"; - color = GMCol::Yellow0; + case kMuonCSC: + name = "MuonCSC"; // kMagenta + color = 9; break; - - // CALO case kECal: name = "ECal"; - color = GMCol::Blue2; + color = 6; break; case kHCal: name = "HCal"; - color = GMCol::Orange1; + color = 10; // kRed-10 break; case kHGCE: name = "HGCEE"; - color = GMCol::Blue2; + color = 10; break; case kHGCH: name = "HGCEH"; - color = GMCol::Blue1; + color = 6; // kBlue -7 break; default: printf("invalid medium id \n"); @@ -290,27 +261,33 @@ FWTGeoRecoGeometryESProducer::produce( const FWTGeoRecoGeometryRecord& record ) top->SetLineColor( kBlue ); addPixelBarrelGeometry(); - addPixelForwardGeometry(); + addPixelForwardGeometry(); addTIBGeometry(); addTIDGeometry(); addTOBGeometry(); addTECGeometry(); addDTGeometry(); - addCSCGeometry(); addRPCGeometry(); - addME0Geometry(); - addGEMGeometry(); + try { + addGEMGeometry(); + } + catch ( cms::Exception& exception ) { + edm::LogWarning("FWRecoGeometryProducerException") + << "addGEMGeometry() Exception caught while building GEM geometry: " << exception.what() + << std::endl; + } - addEcalCaloGeometry(); + + addEcalCaloGeometry(); + addHcalCaloGeometryBarrel(); addHcalCaloGeometryEndcap(); geom->CloseGeometry(); geom->DefaultColors(); - // printf("==== geo manager NNodes = %d \n", geom->GetNNodes()); geom->CloseGeometry(); return m_fwGeometry; @@ -728,39 +705,35 @@ FWTGeoRecoGeometryESProducer::addCSCGeometry() void FWTGeoRecoGeometryESProducer::addGEMGeometry() { - try { - DetId detId( DetId::Muon, MuonSubdetId::GEM ); - const GEMGeometry* gemGeom = (const GEMGeometry*) m_geomRecord->slaveGeometry( detId ); + + DetId detId( DetId::Muon, MuonSubdetId::GEM ); + const GEMGeometry* gemGeom = (const GEMGeometry*) m_geomRecord->slaveGeometry( detId ); - TGeoVolume* tv = GetTopHolder("Muon", kMuonRPC); - TGeoVolume *assembly = GetDaughter(tv, "GEM", kMuonGEM); + TGeoVolume* tv = GetTopHolder("Muon", kMuonRPC); + TGeoVolume *assembly = GetDaughter(tv, "GEM", kMuonGEM); - for( auto it = gemGeom->etaPartitions().begin(), - end = gemGeom->etaPartitions().end(); - it != end; ++it ) + for( auto it = gemGeom->etaPartitions().begin(), + end = gemGeom->etaPartitions().end(); + it != end; ++it ) + { + const GEMEtaPartition* roll = (*it); + if( roll ) { - const GEMEtaPartition* roll = (*it); - if( roll ) - { - GEMDetId detid = roll->geographicalId(); - std::stringstream s; - s << detid; - std::string name = s.str(); + GEMDetId detid = roll->geographicalId(); + std::stringstream s; + s << detid; + std::string name = s.str(); - TGeoVolume* child = createVolume( name, roll, kMuonGEM ); + TGeoVolume* child = createVolume( name, roll, kMuonGEM ); - TGeoVolume* holder = GetDaughter(assembly, "ROLL Region", kMuonGEM , detid.region()); - holder = GetDaughter(holder, "Ring", kMuonGEM , detid.ring()); - holder = GetDaughter(holder, "Station", kMuonGEM , detid.station()); - holder = GetDaughter(holder, "Layer", kMuonGEM , detid.layer()); - holder = GetDaughter(holder, "Chamber", kMuonGEM , detid.chamber()); + TGeoVolume* holder = GetDaughter(assembly, "ROLL Region", kMuonGEM , detid.region()); + holder = GetDaughter(holder, "Ring", kMuonGEM , detid.ring()); + holder = GetDaughter(holder, "Station", kMuonGEM , detid.station()); + holder = GetDaughter(holder, "Layer", kMuonGEM , detid.layer()); + holder = GetDaughter(holder, "Chamber", kMuonGEM , detid.chamber()); - AddLeafNode(holder, child, name.c_str(), createPlacement(*it)); - } + AddLeafNode(holder, child, name.c_str(), createPlacement(*it)); } - }catch (cms::Exception &exception) { - edm::LogInfo("FWRecoGeometry") << "failed to produce GEM geometry " << exception.what() << std::endl; - } } @@ -801,47 +774,19 @@ FWTGeoRecoGeometryESProducer::addRPCGeometry( ) }; } -void -FWTGeoRecoGeometryESProducer::addME0Geometry( ) -{ - /* - TGeoVolume* tv = GetTopHolder("Muon", kMuonCSC); - TGeoVolume *assembly = GetDaughter(tv, "ME0", kMuonME0); - DetId detId( DetId::Muon, 5 ); - try - { - const ME0Geometry* me0Geom = (const ME0Geometry*) m_geomRecord->slaveGeometry( detId ); - - for(auto roll : me0Geom->etaPartitions()) - { - if( roll ) - { - unsigned int rawid = roll->geographicalId().rawId(); - // std::cout << "AMT FWTTTTRecoGeometryES\n" << rawid ; - - ME0DetId detid(rawid); - std::stringstream s; - s << detid; - std::string name = s.str(); - TGeoVolume* child = createVolume( name, roll, kMuonME0 ); - - TGeoVolume* holder = GetDaughter(assembly, "Region", kMuonME0, detid.region()); - holder = GetDaughter(holder, "Layer", kMuonME0, detid.layer()); - holder = GetDaughter(holder, "Chamber", kMuonME0, detid.chamber()); - AddLeafNode(holder, child, name.c_str(), createPlacement(roll)); +namespace { +double etatotheta(double eta) +{ + using namespace TMath; - } - } - } - catch( cms::Exception &exception ) - { - edm::LogInfo("FWRecoGeometry") << "failed to produce ME0 geometry " << exception.what() << std::endl; - } - */ + if (eta < 0) + return 3.14 - 2*ATan(Exp(- Abs(eta))); + else + return 2*ATan(Exp(- Abs(eta))); +} } - //============================================================================== //================================= CALO ======================================= diff --git a/branches/withNewDZ/Geometry/GEMGeometry/interface/ME0Geometry.h b/branches/withNewDZ/Geometry/GEMGeometry/interface/ME0Geometry.h index c97fab87d869f..048e83d85d31e 100644 --- a/branches/withNewDZ/Geometry/GEMGeometry/interface/ME0Geometry.h +++ b/branches/withNewDZ/Geometry/GEMGeometry/interface/ME0Geometry.h @@ -50,7 +50,7 @@ class ME0Geometry : public TrackingGeometry { //---- Extension of the interface /// Return a vector of all ME0 eta partitions - const std::vector& etaPartitions() const; + const std::vector& etaPartitions() const; /// Return a etaPartition given its id const ME0EtaPartition* etaPartition(ME0DetId id) const; @@ -68,7 +68,7 @@ class ME0Geometry : public TrackingGeometry { // Map for efficient lookup by DetId mapIdToDet theMap; - std::vector allEtaPartitions; // Are not owned by this class; are owned by their chamber. + std::vector allEtaPartitions; // Are not owned by this class; are owned by their chamber. }; diff --git a/branches/withNewDZ/Geometry/GEMGeometry/src/ME0Geometry.cc b/branches/withNewDZ/Geometry/GEMGeometry/src/ME0Geometry.cc index 7433c66499286..bd9d70b9122c9 100644 --- a/branches/withNewDZ/Geometry/GEMGeometry/src/ME0Geometry.cc +++ b/branches/withNewDZ/Geometry/GEMGeometry/src/ME0Geometry.cc @@ -54,7 +54,7 @@ const std::vector& ME0Geometry::chambers() const { */ -const std::vector& ME0Geometry::etaPartitions() const{ +const std::vector& ME0Geometry::etaPartitions() const{ return allEtaPartitions; } diff --git a/branches/withNewDZ/Geometry/MuonCommonData/data/v2/rpcf.xml b/branches/withNewDZ/Geometry/MuonCommonData/data/v2/rpcf.xml index f52905f157f78..9e94bb857e029 100644 --- a/branches/withNewDZ/Geometry/MuonCommonData/data/v2/rpcf.xml +++ b/branches/withNewDZ/Geometry/MuonCommonData/data/v2/rpcf.xml @@ -528,7 +528,7 @@ RE3/1 staged volumes --> - + @@ -539,7 +539,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -561,7 +561,7 @@ - + diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_Famos_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_Famos_cff.py index ab842a8145615..8d9eb78862536 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_Famos_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_Famos_cff.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/2014/V5 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_0/GRun/V63 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms from FastSimulation.HighLevelTrigger.HLTSetup_cff import * HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/2014/V5') + tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V63') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -847,11 +847,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -873,7 +873,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1497,22 +1497,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2330,6 +2322,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2344,14 +2337,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2361,24 +2354,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2388,7 +2378,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2401,11 +2391,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "offlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -6888,19 +6877,15 @@ ) hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltIter4Merged" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltIter4Merged" ) ) hltDeDxFilter50DEDX3p6 = cms.EDFilter( "HLTDeDxFilter", @@ -9250,19 +9235,15 @@ ) hltDeDxEstimatorProducerL3Tk = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltL3TkTracksFromL2OIState" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltL3TkTracksFromL2OIState" ) ) hltDeDxFilter50DEDX3p6Mu = cms.EDFilter( "HLTDeDxFilter", @@ -21806,9 +21787,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -23009,9 +22988,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltDoublePFTau30 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -24164,9 +24141,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltDoublePFTau30Reg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -42534,5 +42509,8 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_cff.py index e52a90c7ffbc6..cbc9b950bee43 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_2014_cff.py @@ -1,10 +1,10 @@ -# /dev/CMSSW_7_2_0/2014/V5 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_0/GRun/V63 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/2014/V5') + tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V63') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -2584,11 +2584,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -2610,7 +2610,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -3234,22 +3234,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -4567,6 +4559,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -4581,14 +4574,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -4598,24 +4591,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -4625,7 +4615,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -4638,11 +4628,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -11480,19 +11469,15 @@ ) hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltIter4Merged" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltIter4Merged" ) ) hltDeDxFilter50DEDX3p6 = cms.EDFilter( "HLTDeDxFilter", @@ -14220,19 +14205,15 @@ ) hltDeDxEstimatorProducerL3Tk = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltL3TkTracksFromL2OIState" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltL3TkTracksFromL2OIState" ) ) hltDeDxFilter50DEDX3p6Mu = cms.EDFilter( "HLTDeDxFilter", @@ -28047,9 +28028,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -29371,9 +29350,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltDoublePFTau30 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -31804,9 +31781,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltDoublePFTau30Reg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -51963,5 +51938,8 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py index 977cdfc600264..ae2aaef19f615 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/HLT/V4 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/HLT/V23 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms from FastSimulation.HighLevelTrigger.HLTSetup_cff import * HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V4') + tableName = cms.string('/dev/CMSSW_7_1_2/HLT/V23') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -719,11 +719,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -745,7 +745,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1255,22 +1255,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -1798,6 +1790,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -1812,14 +1805,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -1829,24 +1822,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -1856,7 +1846,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -1869,11 +1859,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "offlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -6029,11 +6018,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -10241,9 +10230,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -10305,9 +10292,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -10453,13 +10438,13 @@ L1GtObjectMapTag = cms.InputTag( "gtDigis" ), L1TechTriggerSeeding = cms.bool( False ) ) -hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -10482,17 +10467,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -10500,61 +10485,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -10564,7 +10549,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -10579,79 +10564,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -10666,10 +10633,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -10682,14 +10649,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -10702,7 +10669,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -11416,9 +11383,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -11480,9 +11445,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -12366,9 +12329,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -12430,9 +12391,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -12714,9 +12673,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -13032,11 +12989,10 @@ L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -13082,51 +13038,49 @@ L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), @@ -13185,11 +13139,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -13382,20 +13335,15 @@ L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -16137,7 +16085,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) @@ -17009,32 +16957,10 @@ htLabels = cms.VInputTag( 'hltPFHT' ), minHt = cms.vdouble( 900.0 ) ) -hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_ETM40" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "l1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), - L1CollectionsTag = cms.InputTag( "l1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "gtDigis" ), - L1TechTriggerSeeding = cms.bool( False ) -) hltPrePFMHT100SingleCentralJet60BTagCSV0p6 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltMET80 = cms.EDFilter( "HLT1CaloMET", - saveTags = cms.bool( True ), - MinPt = cms.double( 80.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( -1.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltMet" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 87 ) -) hltSingleCentralJet60L1FastJetCorrected = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), MinPt = cms.double( 60.0 ), @@ -17126,11 +17052,6 @@ mhtLabels = cms.VInputTag( 'hltPFMhtIDLoose' ), minMht = cms.vdouble( 100.0 ) ) -hltPFMET100Filter = cms.EDFilter( "HLTMhtFilter", - saveTags = cms.bool( True ), - mhtLabels = cms.VInputTag( 'hltPFMETProducer' ), - minMht = cms.vdouble( 100.0 ) -) hltPrePhysics = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) @@ -17228,9 +17149,9 @@ HLTPFTriggerSequenceMuTau = cms.Sequence( HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) HLTLooseIsoPFTauSequence = cms.Sequence( hltTauPFJets08Region + hltTauPFJetsRecoTauChargedHadrons + hltPFTauPiZeros + hltPFTausSansRef + hltPFTaus + hltPFTauTrackFindingDiscriminator + hltPFTauLooseAbsoluteIsolationDiscriminator + hltPFTauLooseRelativeIsolationDiscriminator + hltPFTauLooseAbsOrRelIsolationDiscriminator ) HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltPFTauAgainstMuonDiscriminator + hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + hltPFTau20TrackLooseIsoAgainstMuon + hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -HLTEle22WP85GsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP85ClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP85HEFilter + hltEgammaEcalPFClusterIso + hltEle22WP85EcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP85HcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP85PixelMatchFilter + HLTGsfElectronSequence + hltEle22WP85GsfOneOESuperMinusOneOPFilter + hltEle22WP85GsfMissingHitsFilter + hltEle22WP85GsfDetaFilter + hltEle22WP85GsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP85GsfTrackIsoFilter ) +HLTEle22WP90RhoGsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP90RhoClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP90RhoHEFilter + hltEgammaEcalPFClusterIso + hltEle22WP90RhoEcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP90RhoHcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP90RhoPixelMatchFilter + HLTGsfElectronSequence + hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + hltEle22WP90RhoGsfDetaFilter + hltEle22WP90RhoGsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP90RhoGsfTrackIsoFilter ) HLTPFTriggerSequenceForTaus = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) -HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) HLTCaloTausCreatorRegionalSequence = cms.Sequence( HLTDoCaloSequence + hltCaloTowersTau1Regional + hltIconeTau1Regional + hltCaloTowersTau2Regional + hltIconeTau2Regional + hltCaloTowersTau3Regional + hltIconeTau3Regional + hltCaloTowersTau4Regional + hltIconeTau4Regional + hltCaloTowersCentral1Regional + hltIconeCentral1Regional + hltCaloTowersCentral2Regional + hltIconeCentral2Regional + hltCaloTowersCentral3Regional + hltIconeCentral3Regional + hltCaloTowersCentral4Regional + hltIconeCentral4Regional ) HLTL2TauJetsSequence = cms.Sequence( HLTCaloTausCreatorRegionalSequence + hltL2TauJets ) HLTPixelTrackingSequenceRegL2Tau = cms.Sequence( HLTDoLocalPixelSequenceRegL2Tau + hltPixelLayerTripletsReg + hltPixelTracksReg + hltPixelVerticesReg ) @@ -17308,7 +17229,7 @@ HLT_PFHT650_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT650 + HLTAK4CaloJetsSequence + hltHtMht + hltHt550 + HLTAK4PFJetsSequence + hltPFHT + hltPFHT650 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_AK8PFJet360TrimMod_Mass30_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleJet128 + hltPreAK8PFJet360TrimModMass30 + HLTAK8CaloJetsSequence + hltAK8SingleCaloJet260 + HLTAK8PFJetsSequence + hltAK8PFJetsCorrectedMatchedToCaloJets260 + hltAK8TrimModJets + hltAK8SinglePFJet360TrimModMass30 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sMu14erORMu16er + hltPreIsoMu17eta2p1LooseIsoPFTau20 + hltL1fL1sMu14erORMu16erL1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + HLTL3muonrecoSequence + hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + HLTPFTriggerSequenceMuTau + HLTIsoMuLooseIsoPFTauSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + HLTEle22WP85GsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22WP85GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + HLTEle22WP90RhoGsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22GsfLooseIsoPFTau20Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1 = cms.Path( HLTBeginSequence + hltL1sDoubleTauJet44erorDoubleJetC64 + hltPreDoubleMediumIsoPFTau40Trk1eta2p1 + HLTL2TauJetsSequence + hltDoubleL2Tau35eta2p1 + HLTL2TauPixelIsolationSequence + hltL2DiTauIsoFilter + hltL2TauJetsIso + hltDoubleL2IsoTau35eta2p1 + HLTPFReconstructionSequenceForTaus + HLTMediumIsoPFTauSequence + hltDoublePFTau40 + hltPFTauTrackPt1Discriminator + hltSelectedPFTausTrackPt1 + hltDoublePFTau40TrackPt1 + hltSelectedPFTausTrackPt1MediumIsolation + hltDoublePFTau40TrackPt1MediumIsolation + hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatch + hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatched + hltDoublePFTau40TrackPt1MediumIsolationDz02 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( HLTBeginSequence + hltL1sDoubleTauJet44erorDoubleJetC64 + hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + HLTL2TauJetsSequence + hltDoubleL2Tau35eta2p1 + HLTL2TauPixelIsolationSequence + hltL2DiTauIsoFilter + hltL2TauJetsIso + hltDoubleL2IsoTau35eta2p1 + HLTRecoJetSequenceAK4PrePF + HLTPFJetTriggerSequenceReg + HLTMediumIsoPFTauSequenceReg + hltDoublePFTau40Reg + hltPFTauTrackPt1DiscriminatorReg + hltSelectedPFTausTrackPt1Reg + hltDoublePFTau40TrackPt1Reg + hltSelectedPFTausTrackPt1MediumIsolationReg + hltDoublePFTau40TrackPt1MediumIsolationReg + hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM70 + hltPreLooseIsoPFTau50Trk30eta2p1MET120 + HLTL2TauJetsSequence + hltSingleL2Tau35eta2p1 + HLTRecoMETSequence + hltMET120 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean120 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID120 + HLTRecoJetSequenceAK4PrePF + HLTPFTriggerSequenceForTaus + HLTLooseIsoPFTauSequence + hltPFTau50 + hltSelectedPFTausTrackFinding + hltPFTau50Track + hltPFTauTrackPt30Discriminator + hltSelectedPFTausTrackPt30 + hltPFTau50TrackPt30 + hltPFTauLooseRelativeIsolationDiscriminator0p06 + hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + hltSelectedPFTausTrackPt30AbsOrRelIsolation + hltPFTau50TrackPt30LooseAbsOrRelIso + cms.SequencePlaceholder( "HLTEndSequence" ) ) @@ -17318,11 +17239,11 @@ HLT_ReducedIterativeTracking_v1 = cms.Path( HLTBeginSequence + hltPreReducedIterativeTracking + HLTRecoJetSequenceAK4PrePF + HLTDoLocalPixelSequence + HLTRecopixelvertexingSequence + HLTDoLocalStripSequence + HLTIterativeTrackingIter02 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet605035 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet35MuCleaned + hltIsoMu24Trk02DiCentralPFJet50MuCleaned + hltIsoMu24Trk02CentralPFJet60MuCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet40 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet40MuCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet40EleCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet35EleCleaned + hltEle27DiCentralPFJet50EleCleaned + hltEle27CentralPFJet60EleCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet40 + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet35 + hlt2PFJet50 + hlt1PFJet60 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopIsoMu24 + hltJetFilterSingleTopIsoMu24 + hltCentralJets30SingleTopIsoMu24 + hltLeadingCentralJets30SingleTopIsoMu24 + hltJetTrackAssociationSingleTopIsoMu24 + hltTrackIPTagInfosSingleTopIsoMu24 + hltSecondaryVertexSingleTopIsoMu24 + hltCSVJetTagSingleTopIsoMu24 + hltCSVFilterSingleTopIsoMu24 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreMu40eta2p1PFJet200PFJet50 + hltL1fL1sMu16Eta2p1L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltMu40eta2p1CleanAK4PFJet + hltMu40eta2p1DiCentralPFJet50MuCleaned + hltMu40eta2p1CentralPFJet200MuCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopEle27 + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + HLTEle45CaloIdVTGsfTrkIdTGsfSequence + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltDiPFJet50 + hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleEG137 + hltPreEle23Ele12CaloIdTrackIdIso + HLTEle23Ele12CaloIdTrackIdIsoSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( HLTBeginSequence + hltL1sL1EG12EG7EG5 + hltPreEle17Ele12Ele10CaloIdTrackId + HLTEle17Ele12Ele10CaloIdTrackIdSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) @@ -17350,7 +17271,7 @@ HLT_Photon300_NoHE_VBF_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG30 + hltPrePhoton300NoHEVBF + HLTSinglePhoton300NoHESequence + HLTAK4CaloJetsSequence + hltDiCaloJet20MJJ400AllJetsDEta3Filter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + hltDiEle33CaloIdLNewPixelMatchUnseededFilter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle95CaloIdVTGsfTrkIdT + HLTEle95CaloIdVTGsfTrkIdTGsfSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_DoublePhoton85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePhoton85 + HLTDoublePho85Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_DoublePho85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePho85 + HLTDoublePho85Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Photon155_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPrePhoton155 + HLTPhoton155Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_PFHT550_4Jet_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT5504Jet + HLTAK4CaloJetsSequence + hltHtMht4Jet + hlt4JetHt450 + HLTAK4PFJetsSequence + hltPFHT4Jet + hltPF4JetHT550 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_PFHT650_4Jet_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT6504Jet + HLTAK4CaloJetsSequence + hltHtMht4Jet + hlt4JetHt550 + HLTAK4PFJetsSequence + hltPFHT4Jet + hltPF4JetHT650 + cms.SequencePlaceholder( "HLTEndSequence" ) ) @@ -17364,16 +17285,19 @@ HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM36ORETM40 + hltPrePFMET120NoiseCleanedBTagCSV07 + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean70 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID70 + hltSusyPreBtagJetFilter + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSVsusy + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT350PFMET120NoiseCleaned + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean60 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID60 + hltHtMht + hltHt280 + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + hltPFHT + hltPFHT350 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_PFHT900_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT900 + HLTAK4CaloJetsSequence + hltHtMht + hltHt700 + HLTAK4PFJetsSequence + hltPFHT + hltPFHT900 + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 + hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + HLTRecoMETSequence + hltMET80 + HLTAK4CaloJetsSequence + hltSingleCentralJet60L1FastJetCorrected + hltDiCentralJet20L1FastJetCorrected + hltSelectorJets20L1FastJetForNoPU + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTNoPUSequence + hltMhtProducerNoPU20 + hltMhtNoPU80Filter + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSV0p6 + HLTAK4PFJetsSequence + HLTPFJetIDProducerLoose + hltPFMhtIDLoose + hltPFMHTIDLoose100Filter + hltPFMETProducer + hltPFMET100Filter + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( HLTBeginSequence + hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + HLTAK4CaloJetsSequence + hltSingleCentralJet60L1FastJetCorrected + hltDiCentralJet20L1FastJetCorrected + hltSelectorJets20L1FastJetForNoPU + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTNoPUSequence + hltMhtProducerNoPU20 + hltMhtNoPU80Filter + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSV0p6 + HLTAK4PFJetsSequence + HLTPFJetIDProducerLoose + hltPFMhtIDLoose + hltPFMHTIDLoose100Filter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Physics_v1 = cms.Path( HLTBeginSequence + hltPrePhysics + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLTriggerFinalPath = cms.Path( HLTBeginSequence + hltScalersRawToDigi + hltFEDSelector + hltTriggerSummaryAOD + hltTriggerSummaryRAW ) -HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu17_NoFilters_v1, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_DoubleMu4_Jpsi_Displaced_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_Ele27_WP85_Gsf_v1, HLT_Ele17_Ele8_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon20_CaloIdVL_IsoL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_PFJet40_v1, HLT_PFJet260_v1, HLT_CaloJet260_v1, HLT_HT650_v1, HLT_PFHT650_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_PFchMET90_NoiseCleaned_v1, HLT_BTagCSV07_v1, HLT_IterativeTracking_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePhoton85_v1, HLT_Photon155_v1, HLT_PFHT550_4Jet_v1, HLT_PFHT650_4Jet_v1, HLT_PFHT750_4Jet_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_L2DoubleMu23_NoVertex_v1, HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1, HLT_Physics_v1, HLTriggerFinalPath )) +HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu17_NoFilters_v1, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_DoubleMu4_Jpsi_Displaced_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_Ele27_WP85_Gsf_v1, HLT_Ele17_Ele8_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon20_CaloIdVL_IsoL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_PFJet40_v1, HLT_PFJet260_v1, HLT_CaloJet260_v1, HLT_HT650_v1, HLT_PFHT650_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_PFchMET90_NoiseCleaned_v1, HLT_BTagCSV07_v1, HLT_IterativeTracking_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePho85_v1, HLT_Photon155_v1, HLT_PFHT550_4Jet_v1, HLT_PFHT650_4Jet_v1, HLT_PFHT750_4Jet_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_L2DoubleMu23_NoVertex_v1, HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1, HLT_Physics_v1, HLTriggerFinalPath )) # CMSSW version specific customizations import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_cff.py index a4dd5397debd8..3fa4c33d3957d 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,10 +1,10 @@ -# /dev/CMSSW_7_2_0/HLT/V4 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/HLT/V23 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V4') + tableName = cms.string('/dev/CMSSW_7_1_2/HLT/V23') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -479,10 +479,10 @@ 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -860,11 +860,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -886,7 +886,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1396,22 +1396,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2049,6 +2041,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2063,14 +2056,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2080,24 +2073,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2107,7 +2097,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2120,11 +2110,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -12481,11 +12470,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -18805,9 +18794,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -18869,9 +18856,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -19017,13 +19002,13 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -19046,17 +19031,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -19064,61 +19049,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -19128,7 +19113,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -19143,79 +19128,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -19230,10 +19197,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -19246,14 +19213,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -19266,7 +19233,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -20101,9 +20068,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -20165,9 +20130,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -21783,9 +21746,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -21847,9 +21808,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -22227,9 +22186,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -23980,11 +23937,10 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -24030,51 +23986,49 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), @@ -24133,11 +24087,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -24330,20 +24283,15 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -26963,7 +26911,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) @@ -27832,32 +27780,10 @@ htLabels = cms.VInputTag( 'hltPFHT' ), minHt = cms.vdouble( 900.0 ) ) -hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_ETM40" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) hltPrePFMHT100SingleCentralJet60BTagCSV0p6 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltMET80 = cms.EDFilter( "HLT1CaloMET", - saveTags = cms.bool( True ), - MinPt = cms.double( 80.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( -1.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltMet" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 87 ) -) hltSingleCentralJet60L1FastJetCorrected = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), MinPt = cms.double( 60.0 ), @@ -28105,11 +28031,6 @@ mhtLabels = cms.VInputTag( 'hltPFMhtIDLoose' ), minMht = cms.vdouble( 100.0 ) ) -hltPFMET100Filter = cms.EDFilter( "HLTMhtFilter", - saveTags = cms.bool( True ), - mhtLabels = cms.VInputTag( 'hltPFMETProducer' ), - minMht = cms.vdouble( 100.0 ) -) hltPrePhysics = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) @@ -28272,9 +28193,9 @@ HLTPFTriggerSequenceMuTau = cms.Sequence( HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) HLTLooseIsoPFTauSequence = cms.Sequence( hltTauPFJets08Region + hltTauPFJetsRecoTauChargedHadrons + hltPFTauPiZeros + hltPFTausSansRef + hltPFTaus + hltPFTauTrackFindingDiscriminator + hltPFTauLooseAbsoluteIsolationDiscriminator + hltPFTauLooseRelativeIsolationDiscriminator + hltPFTauLooseAbsOrRelIsolationDiscriminator ) HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltPFTauAgainstMuonDiscriminator + hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + hltPFTau20TrackLooseIsoAgainstMuon + hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -HLTEle22WP85GsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP85ClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP85HEFilter + hltEgammaEcalPFClusterIso + hltEle22WP85EcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP85HcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP85PixelMatchFilter + HLTGsfElectronSequence + hltEle22WP85GsfOneOESuperMinusOneOPFilter + hltEle22WP85GsfMissingHitsFilter + hltEle22WP85GsfDetaFilter + hltEle22WP85GsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP85GsfTrackIsoFilter ) +HLTEle22WP90RhoGsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP90RhoClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP90RhoHEFilter + hltEgammaEcalPFClusterIso + hltEle22WP90RhoEcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP90RhoHcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP90RhoPixelMatchFilter + HLTGsfElectronSequence + hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + hltEle22WP90RhoGsfDetaFilter + hltEle22WP90RhoGsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP90RhoGsfTrackIsoFilter ) HLTPFTriggerSequenceForTaus = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) -HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) HLTCaloTausCreatorRegionalSequence = cms.Sequence( HLTDoCaloSequence + hltCaloTowersTau1Regional + hltIconeTau1Regional + hltCaloTowersTau2Regional + hltIconeTau2Regional + hltCaloTowersTau3Regional + hltIconeTau3Regional + hltCaloTowersTau4Regional + hltIconeTau4Regional + hltCaloTowersCentral1Regional + hltIconeCentral1Regional + hltCaloTowersCentral2Regional + hltIconeCentral2Regional + hltCaloTowersCentral3Regional + hltIconeCentral3Regional + hltCaloTowersCentral4Regional + hltIconeCentral4Regional ) HLTL2TauJetsSequence = cms.Sequence( HLTCaloTausCreatorRegionalSequence + hltL2TauJets ) HLTDoLocalPixelSequenceRegL2Tau = cms.Sequence( hltSiPixelDigisReg + hltSiPixelClustersReg + hltSiPixelClustersRegCache + hltSiPixelRecHitsReg ) @@ -28381,7 +28302,7 @@ HLT_JetE50_NoBPTX3BX_NoHalo_v1 = cms.Path( HLTBeginSequenceAntiBPTX + hltL1sL1SingleJetC32NotBptxOR + hltL1BeamHaloAntiCoincidence3BX + hltPreJetE50NoBPTX3BXNoHalo + HLTStoppedHSCPLocalHcalReco + hltStoppedHSCPHpdFilter + HLTStoppedHSCPJetSequence + hltStoppedHSCP1CaloJetEnergy50 + HLTEndSequence ) HLT_JetE70_NoBPTX3BX_NoHalo_v1 = cms.Path( HLTBeginSequenceAntiBPTX + hltL1sL1SingleJetC32NotBptxOR + hltL1BeamHaloAntiCoincidence3BX + hltPreJetE70NoBPTX3BXNoHalo + HLTStoppedHSCPLocalHcalReco + hltStoppedHSCPHpdFilter + HLTStoppedHSCPJetSequence + hltStoppedHSCP1CaloJetEnergy70 + HLTEndSequence ) HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sMu14erORMu16er + hltPreIsoMu17eta2p1LooseIsoPFTau20 + hltL1fL1sMu14erORMu16erL1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + HLTL3muonrecoSequence + hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + HLTPFTriggerSequenceMuTau + HLTIsoMuLooseIsoPFTauSequence + HLTEndSequence ) -HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + HLTEle22WP85GsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22WP85GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + HLTEndSequence ) +HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + HLTEle22WP90RhoGsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22GsfLooseIsoPFTau20Sequence + HLTEndSequence ) HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1 = cms.Path( HLTBeginSequence + hltL1sDoubleTauJet44erorDoubleJetC64 + hltPreDoubleMediumIsoPFTau40Trk1eta2p1 + HLTL2TauJetsSequence + hltDoubleL2Tau35eta2p1 + HLTL2TauPixelIsolationSequence + hltL2DiTauIsoFilter + hltL2TauJetsIso + hltDoubleL2IsoTau35eta2p1 + HLTPFReconstructionSequenceForTaus + HLTMediumIsoPFTauSequence + hltDoublePFTau40 + hltPFTauTrackPt1Discriminator + hltSelectedPFTausTrackPt1 + hltDoublePFTau40TrackPt1 + hltSelectedPFTausTrackPt1MediumIsolation + hltDoublePFTau40TrackPt1MediumIsolation + hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatch + hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatched + hltDoublePFTau40TrackPt1MediumIsolationDz02 + HLTEndSequence ) HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( HLTBeginSequence + hltL1sDoubleTauJet44erorDoubleJetC64 + hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + HLTL2TauJetsSequence + hltDoubleL2Tau35eta2p1 + HLTL2TauPixelIsolationSequence + hltL2DiTauIsoFilter + hltL2TauJetsIso + hltDoubleL2IsoTau35eta2p1 + HLTRecoJetSequenceAK4PrePF + HLTPFJetTriggerSequenceReg + HLTMediumIsoPFTauSequenceReg + hltDoublePFTau40Reg + hltPFTauTrackPt1DiscriminatorReg + hltSelectedPFTausTrackPt1Reg + hltDoublePFTau40TrackPt1Reg + hltSelectedPFTausTrackPt1MediumIsolationReg + hltDoublePFTau40TrackPt1MediumIsolationReg + hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + HLTEndSequence ) HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM70 + hltPreLooseIsoPFTau50Trk30eta2p1MET120 + HLTL2TauJetsSequence + hltSingleL2Tau35eta2p1 + HLTRecoMETSequence + hltMET120 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean120 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID120 + HLTRecoJetSequenceAK4PrePF + HLTPFTriggerSequenceForTaus + HLTLooseIsoPFTauSequence + hltPFTau50 + hltSelectedPFTausTrackFinding + hltPFTau50Track + hltPFTauTrackPt30Discriminator + hltSelectedPFTausTrackPt30 + hltPFTau50TrackPt30 + hltPFTauLooseRelativeIsolationDiscriminator0p06 + hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + hltSelectedPFTausTrackPt30AbsOrRelIsolation + hltPFTau50TrackPt30LooseAbsOrRelIso + HLTEndSequence ) @@ -28391,11 +28312,11 @@ HLT_ReducedIterativeTracking_v1 = cms.Path( HLTBeginSequence + hltPreReducedIterativeTracking + HLTRecoJetSequenceAK4PrePF + HLTDoLocalPixelSequence + HLTRecopixelvertexingSequence + HLTDoLocalStripSequence + HLTIterativeTrackingIter02 + HLTEndSequence ) HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet605035 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet35MuCleaned + hltIsoMu24Trk02DiCentralPFJet50MuCleaned + hltIsoMu24Trk02CentralPFJet60MuCleaned + HLTEndSequence ) HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet40 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet40MuCleaned + HLTEndSequence ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet40EleCleaned + HLTEndSequence ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet35EleCleaned + hltEle27DiCentralPFJet50EleCleaned + hltEle27CentralPFJet60EleCleaned + HLTEndSequence ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet40 + HLTEndSequence ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet35 + hlt2PFJet50 + hlt1PFJet60 + HLTEndSequence ) HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopIsoMu24 + hltJetFilterSingleTopIsoMu24 + hltCentralJets30SingleTopIsoMu24 + hltLeadingCentralJets30SingleTopIsoMu24 + hltJetTrackAssociationSingleTopIsoMu24 + hltTrackIPTagInfosSingleTopIsoMu24 + hltSecondaryVertexSingleTopIsoMu24 + hltCSVJetTagSingleTopIsoMu24 + hltCSVFilterSingleTopIsoMu24 + HLTEndSequence ) HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreMu40eta2p1PFJet200PFJet50 + hltL1fL1sMu16Eta2p1L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltMu40eta2p1CleanAK4PFJet + hltMu40eta2p1DiCentralPFJet50MuCleaned + hltMu40eta2p1CentralPFJet200MuCleaned + HLTEndSequence ) -HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopEle27 + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + HLTEndSequence ) +HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + HLTEndSequence ) HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + HLTEle45CaloIdVTGsfTrkIdTGsfSequence + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltDiPFJet50 + hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + HLTEndSequence ) HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleEG137 + hltPreEle23Ele12CaloIdTrackIdIso + HLTEle23Ele12CaloIdTrackIdIsoSequence + HLTEndSequence ) HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( HLTBeginSequence + hltL1sL1EG12EG7EG5 + hltPreEle17Ele12Ele10CaloIdTrackId + HLTEle17Ele12Ele10CaloIdTrackIdSequence + HLTEndSequence ) @@ -28423,7 +28344,7 @@ HLT_Photon300_NoHE_VBF_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG30 + hltPrePhoton300NoHEVBF + HLTSinglePhoton300NoHESequence + HLTAK4CaloJetsSequence + hltDiCaloJet20MJJ400AllJetsDEta3Filter + HLTEndSequence ) HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + hltDiEle33CaloIdLNewPixelMatchUnseededFilter + HLTEndSequence ) HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle95CaloIdVTGsfTrkIdT + HLTEle95CaloIdVTGsfTrkIdTGsfSequence + HLTEndSequence ) -HLT_DoublePhoton85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePhoton85 + HLTDoublePho85Sequence + HLTEndSequence ) +HLT_DoublePho85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePho85 + HLTDoublePho85Sequence + HLTEndSequence ) HLT_Photon155_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPrePhoton155 + HLTPhoton155Sequence + HLTEndSequence ) HLT_PFHT550_4Jet_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT5504Jet + HLTAK4CaloJetsSequence + hltHtMht4Jet + hlt4JetHt450 + HLTAK4PFJetsSequence + hltPFHT4Jet + hltPF4JetHT550 + HLTEndSequence ) HLT_PFHT650_4Jet_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT6504Jet + HLTAK4CaloJetsSequence + hltHtMht4Jet + hlt4JetHt550 + HLTAK4PFJetsSequence + hltPFHT4Jet + hltPF4JetHT650 + HLTEndSequence ) @@ -28437,17 +28358,20 @@ HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM36ORETM40 + hltPrePFMET120NoiseCleanedBTagCSV07 + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean70 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID70 + hltSusyPreBtagJetFilter + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSVsusy + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + HLTEndSequence ) HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT350PFMET120NoiseCleaned + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean60 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID60 + hltHtMht + hltHt280 + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + hltPFHT + hltPFHT350 + HLTEndSequence ) HLT_PFHT900_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT900 + HLTAK4CaloJetsSequence + hltHtMht + hltHt700 + HLTAK4PFJetsSequence + hltPFHT + hltPFHT900 + HLTEndSequence ) -HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 + hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + HLTRecoMETSequence + hltMET80 + HLTAK4CaloJetsSequence + hltSingleCentralJet60L1FastJetCorrected + hltDiCentralJet20L1FastJetCorrected + hltSelectorJets20L1FastJetForNoPU + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTNoPUSequence + hltMhtProducerNoPU20 + hltMhtNoPU80Filter + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSV0p6 + HLTAK4PFJetsSequence + HLTPFJetIDProducerLoose + hltPFMhtIDLoose + hltPFMHTIDLoose100Filter + hltPFMETProducer + hltPFMET100Filter + HLTEndSequence ) +HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( HLTBeginSequence + hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + HLTAK4CaloJetsSequence + hltSingleCentralJet60L1FastJetCorrected + hltDiCentralJet20L1FastJetCorrected + hltSelectorJets20L1FastJetForNoPU + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTNoPUSequence + hltMhtProducerNoPU20 + hltMhtNoPU80Filter + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSV0p6 + HLTAK4PFJetsSequence + HLTPFJetIDProducerLoose + hltPFMhtIDLoose + hltPFMHTIDLoose100Filter + HLTEndSequence ) HLT_Physics_v1 = cms.Path( HLTBeginSequence + hltPrePhysics + HLTEndSequence ) HLTriggerFinalPath = cms.Path( hltGtDigis + hltScalersRawToDigi + hltFEDSelector + hltTriggerSummaryAOD + hltTriggerSummaryRAW ) HLTAnalyzerEndpath = cms.EndPath( hltL1GtTrigReport + hltTrigReport ) -HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu17_NoFilters_v1, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_DoubleMu4_Jpsi_Displaced_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_DoubleMu33NoFiltersNoVtx_v1, HLT_DoubleMu38NoFiltersNoVtx_v1, HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1, HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1, HLT_Ele27_WP85_Gsf_v1, HLT_Ele17_Ele8_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon20_CaloIdVL_IsoL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_PFJet40_v1, HLT_PFJet260_v1, HLT_CaloJet260_v1, HLT_HT650_v1, HLT_PFHT650_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_L2Mu10_NoVertex_NoBPTX_v1, HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1, HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_L2Mu30_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_JetE30_NoBPTX_v1, HLT_JetE30_NoBPTX3BX_NoHalo_v1, HLT_JetE50_NoBPTX3BX_NoHalo_v1, HLT_JetE70_NoBPTX3BX_NoHalo_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_PFchMET90_NoiseCleaned_v1, HLT_BTagCSV07_v1, HLT_IterativeTracking_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePhoton85_v1, HLT_Photon155_v1, HLT_PFHT550_4Jet_v1, HLT_PFHT650_4Jet_v1, HLT_PFHT750_4Jet_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_L2DoubleMu23_NoVertex_v1, HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1, HLT_Physics_v1, HLTriggerFinalPath, HLTAnalyzerEndpath )) +HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu17_NoFilters_v1, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_DoubleMu4_Jpsi_Displaced_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_DoubleMu33NoFiltersNoVtx_v1, HLT_DoubleMu38NoFiltersNoVtx_v1, HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1, HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1, HLT_Ele27_WP85_Gsf_v1, HLT_Ele17_Ele8_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon20_CaloIdVL_IsoL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_PFJet40_v1, HLT_PFJet260_v1, HLT_CaloJet260_v1, HLT_HT650_v1, HLT_PFHT650_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_L2Mu10_NoVertex_NoBPTX_v1, HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1, HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_L2Mu30_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_JetE30_NoBPTX_v1, HLT_JetE30_NoBPTX3BX_NoHalo_v1, HLT_JetE50_NoBPTX3BX_NoHalo_v1, HLT_JetE70_NoBPTX3BX_NoHalo_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_PFchMET90_NoiseCleaned_v1, HLT_BTagCSV07_v1, HLT_IterativeTracking_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePho85_v1, HLT_Photon155_v1, HLT_PFHT550_4Jet_v1, HLT_PFHT650_4Jet_v1, HLT_PFHT750_4Jet_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_L2DoubleMu23_NoVertex_v1, HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1, HLT_Physics_v1, HLTriggerFinalPath, HLTAnalyzerEndpath )) # CMSSW version specific customizations import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py index 2a3c1b5484687..8957e0f96356b 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/GRun/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/GRun/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms from FastSimulation.HighLevelTrigger.HLTSetup_cff import * HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/GRun/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/GRun/V15') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -719,11 +719,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -745,7 +745,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1255,22 +1255,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -1798,6 +1790,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -1812,14 +1805,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -1829,24 +1822,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -1856,7 +1846,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -1869,11 +1859,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "offlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -5487,11 +5476,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -7153,11 +7142,11 @@ L1GtObjectMapTag = cms.InputTag( "gtDigis" ), L1TechTriggerSeeding = cms.bool( False ) ) -hltPrePFJet260 = cms.EDFilter( "HLTPrescaler", +hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", +hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), voronoiRfact = cms.double( 0.9 ), @@ -7176,7 +7165,7 @@ useDeterministicSeed = cms.bool( True ), doPVCorrection = cms.bool( False ), maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), + rParam = cms.double( 0.8 ), maxProblematicHcalCells = cms.uint32( 9999999 ), doOutputJets = cms.bool( True ), src = cms.InputTag( "hltTowerMakerForAll" ), @@ -7184,7 +7173,7 @@ puPtMin = cms.double( 10.0 ), srcPVs = cms.InputTag( "NotUsed" ), jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.4 ), + radiusPU = cms.double( 0.8 ), maxProblematicEcalCells = cms.uint32( 9999999 ), doPUOffsetCorr = cms.bool( False ), inputEMin = cms.double( 0.0 ), @@ -7217,11 +7206,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) -hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", +hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", min_N90 = cms.int32( -2 ), min_N90hits = cms.int32( 2 ), min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK4CaloJets" ), + jetsInput = cms.InputTag( "hltAK8CaloJets" ), JetIDParams = cms.PSet( useRecHits = cms.bool( True ), hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), @@ -7237,21 +7226,21 @@ maxRapidity = cms.double( 5.0 ), pfCandidatesTag = cms.InputTag( "hltTowerMakerForAll" ) ) -hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJets" ), +hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJets" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), +hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -hltSingleCaloJet200 = cms.EDFilter( "HLT1CaloJet", +hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), - MinPt = cms.double( 200.0 ), + MinPt = cms.double( 260.0 ), MinN = cms.int32( 1 ), MaxEta = cms.double( 5.0 ), MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK4CaloJetsCorrectedIDPassed" ), + inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), MinE = cms.double( -1.0 ), triggerType = cms.int32( 85 ) ) @@ -7323,6 +7312,66 @@ HOGrid = cms.vdouble( ), EBGrid = cms.vdouble( ) ) +hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( False ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.8 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForPF" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.8 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) hltAK4CaloJetsPF = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), @@ -7383,6 +7432,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) +hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", + filter = cms.bool( False ), + src = cms.InputTag( "hltAK8CaloJetsPF" ), + etMin = cms.double( 5.0 ) +) hltAK4CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", filter = cms.bool( False ), src = cms.InputTag( "hltAK4CaloJetsPF" ), @@ -8108,7 +8162,7 @@ muon_ECAL = cms.vdouble( 0.5, 0.5 ), usePFSCEleCalib = cms.bool( True ) ) -hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", +hltAK8PFJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), voronoiRfact = cms.double( -9.0 ), @@ -8127,7 +8181,7 @@ useDeterministicSeed = cms.bool( True ), doPVCorrection = cms.bool( False ), maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), + rParam = cms.double( 0.8 ), maxProblematicHcalCells = cms.uint32( 9999999 ), doOutputJets = cms.bool( True ), src = cms.InputTag( "hltParticleFlow" ), @@ -8135,7 +8189,7 @@ puPtMin = cms.double( 10.0 ), srcPVs = cms.InputTag( "hltPixelVertices" ), jetPtMin = cms.double( 0.0 ), - radiusPU = cms.double( 0.4 ), + radiusPU = cms.double( 0.8 ), maxProblematicEcalCells = cms.uint32( 9999999 ), doPUOffsetCorr = cms.bool( False ), inputEMin = cms.double( 0.0 ), @@ -8173,40 +8227,26 @@ maxRapidity = cms.double( 5.0 ), pfCandidatesTag = cms.InputTag( "hltParticleFlow" ) ) -hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", - src = cms.InputTag( "hltAK4PFJets" ), +hltAK8PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", + src = cms.InputTag( "hltAK8PFJets" ), correctors = cms.vstring( 'hltESPAK4PFCorrection' ) ) -hltPFJetsCorrectedMatchedToCaloJets200 = cms.EDProducer( "PFJetsMatchedToFilteredCaloJetsProducer", +hltAK8PFJetsCorrectedMatchedToCaloJets260 = cms.EDProducer( "PFJetsMatchedToFilteredCaloJetsProducer", DeltaR = cms.double( 0.5 ), - CaloJetFilter = cms.InputTag( "hltSingleCaloJet200" ), + CaloJetFilter = cms.InputTag( "hltAK8SingleCaloJet260" ), TriggerType = cms.int32( 85 ), - PFJetSrc = cms.InputTag( "hltAK4PFJetsCorrected" ) -) -hltSinglePFJet260 = cms.EDFilter( "HLT1PFJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltPFJetsCorrectedMatchedToCaloJets200" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), - offset = cms.uint32( 0 ) + PFJetSrc = cms.InputTag( "hltAK8PFJetsCorrected" ) ) -hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), +hltAK8TrimModJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 1 ), doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( 0.9 ), + voronoiRfact = cms.double( -0.9 ), maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), + doAreaDiskApprox = cms.bool( False ), maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), + jetType = cms.string( "PFJet" ), minSeed = cms.uint32( 14327 ), - Ghost_EtaMax = cms.double( 6.0 ), + Ghost_EtaMax = cms.double( 5.0 ), doRhoFastjet = cms.bool( False ), jetAlgorithm = cms.string( "AntiKt" ), nSigmaPU = cms.double( 1.0 ), @@ -8219,11 +8259,11 @@ rParam = cms.double( 0.8 ), maxProblematicHcalCells = cms.uint32( 9999999 ), doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForAll" ), - inputEtMin = cms.double( 0.3 ), + src = cms.InputTag( "hltParticleFlow" ), + inputEtMin = cms.double( 0.0 ), puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), + srcPVs = cms.InputTag( "hltPixelVertices" ), + jetPtMin = cms.double( 20.0 ), radiusPU = cms.double( 0.8 ), maxProblematicEcalCells = cms.uint32( 9999999 ), doPUOffsetCorr = cms.bool( False ), @@ -8233,11 +8273,11 @@ subtractorName = cms.string( "" ), muCut = cms.double( -1.0 ), subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), + useTrimming = cms.bool( True ), muMax = cms.double( -1.0 ), yMin = cms.double( -1.0 ), useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), + rFilt = cms.double( 0.1 ), yMax = cms.double( -1.0 ), zcut = cms.double( -1.0 ), MinVtxNdof = cms.int32( 5 ), @@ -8252,246 +8292,18 @@ UseOnlyOnePV = cms.bool( False ), rcut_factor = cms.double( -1.0 ), sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), + trimPtFracMin = cms.double( 0.03 ), dRMax = cms.double( -1.0 ), DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) -hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", - min_N90 = cms.int32( -2 ), - min_N90hits = cms.int32( 2 ), - min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK8CaloJets" ), - JetIDParams = cms.PSet( - useRecHits = cms.bool( True ), - hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), - hoRecHitsColl = cms.InputTag( "hltHoreco" ), - hfRecHitsColl = cms.InputTag( "hltHfreco" ), - ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) - ), - max_EMF = cms.double( 999.0 ) -) -hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJets" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", +hltAK8SinglePFJet360TrimModMass30 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), + MinPt = cms.double( 360.0 ), MinN = cms.int32( 1 ), MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( False ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForPF" ), - inputEtMin = cms.double( 0.3 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", - filter = cms.bool( False ), - src = cms.InputTag( "hltAK8CaloJetsPF" ), - etMin = cms.double( 5.0 ) -) -hltAK8PFJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "PFJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltParticleFlow" ), - inputEtMin = cms.double( 0.0 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "hltPixelVertices" ), - jetPtMin = cms.double( 0.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 0 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -hltAK8PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", - src = cms.InputTag( "hltAK8PFJets" ), - correctors = cms.vstring( 'hltESPAK4PFCorrection' ) -) -hltAK8PFJetsCorrectedMatchedToCaloJets260 = cms.EDProducer( "PFJetsMatchedToFilteredCaloJetsProducer", - DeltaR = cms.double( 0.5 ), - CaloJetFilter = cms.InputTag( "hltAK8SingleCaloJet260" ), - TriggerType = cms.int32( 85 ), - PFJetSrc = cms.InputTag( "hltAK8PFJetsCorrected" ) -) -hltAK8TrimModJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 1 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -0.9 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( False ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "PFJet" ), - minSeed = cms.uint32( 14327 ), - Ghost_EtaMax = cms.double( 5.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltParticleFlow" ), - inputEtMin = cms.double( 0.0 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "hltPixelVertices" ), - jetPtMin = cms.double( 20.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( True ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( 0.1 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( 0.03 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -hltAK8SinglePFJet360TrimModMass30 = cms.EDFilter( "HLT1PFJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 360.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( 30.0 ), - inputTag = cms.InputTag( "hltAK8TrimModJets" ), + MinMass = cms.double( 30.0 ), + inputTag = cms.InputTag( "hltAK8TrimModJets" ), MinE = cms.double( -1.0 ), triggerType = cms.int32( 85 ) ) @@ -9073,9 +8885,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -9137,9 +8947,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -9285,13 +9093,13 @@ L1GtObjectMapTag = cms.InputTag( "gtDigis" ), L1TechTriggerSeeding = cms.bool( False ) ) -hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -9314,17 +9122,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -9332,61 +9140,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -9396,7 +9204,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -9411,79 +9219,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -9498,10 +9288,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -9514,14 +9304,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -9534,7 +9324,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -10969,9 +10759,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -11033,9 +10821,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -11194,6 +10980,89 @@ MinE = cms.double( -1.0 ), triggerType = cms.int32( 87 ) ) +hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( 0.9 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 14327 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForAll" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", + min_N90 = cms.int32( -2 ), + min_N90hits = cms.int32( 2 ), + min_EMF = cms.double( 1.0E-6 ), + jetsInput = cms.InputTag( "hltAK4CaloJets" ), + JetIDParams = cms.PSet( + useRecHits = cms.bool( True ), + hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), + hoRecHitsColl = cms.InputTag( "hltHoreco" ), + hfRecHitsColl = cms.InputTag( "hltHfreco" ), + ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) + ), + max_EMF = cms.double( 999.0 ) +) +hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJets" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) +hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) hltMetCleanUsingJetID = cms.EDProducer( "HLTMETCleanerUsingJetID", minPt = cms.double( 20.0 ), maxEta = cms.double( 5.0 ), @@ -11317,9 +11186,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -11367,11 +11234,74 @@ L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "PFJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltParticleFlow" ), + inputEtMin = cms.double( 0.0 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "hltPixelVertices" ), + jetPtMin = cms.double( 0.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 0 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", + src = cms.InputTag( "hltAK4PFJets" ), + correctors = cms.vstring( 'hltESPAK4PFCorrection' ) +) +hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -11417,51 +11347,49 @@ L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), @@ -11520,11 +11448,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -11724,20 +11651,15 @@ L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) -hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -14506,7 +14428,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), offset = cms.uint32( 0 ) ) @@ -15037,135 +14959,6 @@ reqOppCharge = cms.untracked.bool( False ), nZcandcut = cms.int32( 1 ) ) -hltPreL2DoubleMu23NoVertex = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), - offset = cms.uint32( 0 ) -) -hltL2MuonCandidatesNoVtx = cms.EDProducer( "L2MuonCandidateProducer", - InputObjects = cms.InputTag( "hltL2Muons" ) -) -hltL2DoubleMu23NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 23.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "offlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), - offset = cms.uint32( 0 ) -) -hltL2DoubleMu28NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 28.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "offlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 28.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 28.0 ), - BeamSpotTag = cms.InputTag( "offlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) -hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "gtDigis" ), - offset = cms.uint32( 0 ) -) -hltL2DoubleMu38NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 38.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "offlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 38.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 38.0 ), - BeamSpotTag = cms.InputTag( "offlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) hltL1sL1ETM36ORETM40 = cms.EDFilter( "HLTLevel1GTSeed", L1SeedsLogicalExpression = cms.string( "L1_ETM36 OR L1_ETM40" ), saveTags = cms.bool( True ), @@ -15626,23 +15419,15 @@ HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1SingleEG35Filter + hltEG42EtL1Seed35EtFilter + hltEgammaR9ID + hltEG42R9Id65R9IdFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEG42HE10R9Id65HEFilter + cms.ignore(hltEG42R9Id85HE10R9Id65R9IdLastFilter) + hltEgammaClusterShape + cms.ignore(hltEG42CaloId24b40eHE10R9Id65ClusterShapeFilter) + hltEgammaEcalPFClusterIsoRhoCorr + cms.ignore(hltEG42Iso50T80LCaloId24b40eHE10R9Id65EcalIsoFilter) + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + cms.ignore(hltEG42Iso50T80LCaloId24b40eHE10R9Id65HcalIsoLastFilter) + hltEG42RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter + HLTPFClusteringForEgammaUnseeded + hltEgammaCandidatesUnseeded + hltEgammaCandidatesWrapperUnseeded + hltDiEG22EtUnseededFilter + hltEgammaR9IDUnseeded + hltDiEG22R9Id65R9IdUnseededFilter + hltEgammaHoverEUnseeded + hltDiEG22HE10R9Id65HEUnseededFilter + cms.ignore(hltEG22R9Id85HE10R9Id65R9IdUnseededLastFilter) + hltEgammaClusterShapeUnseeded + cms.ignore(hltEG22CaloId24b40eHE10R9Id65ClusterShapeUnseededFilter) + hltEgammaEcalPFClusterIsoUnseeded + cms.ignore(hltEG22Iso50T80LCaloId24b40eHE10R9Id65EcalIsoUnseededFilter) + HLTPFHcalClusteringForEgammaUnseeded + hltEgammaHcalPFClusterIsoUnseeded + cms.ignore(hltEG22Iso50T80LCaloId24b40eHE10R9Id65HcalIsoUnseededFilter) + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + HLTTrackReconstructionForIsoForPhotons + hltEgammaHollowTrackIsoUnseeded + cms.ignore(hltEG22Iso50T80LCaloId24b40eHE10R9Id65TrackIsoUnseededLastFilter) + hltDiEG22RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter ) HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence = cms.Sequence( hltEcalDigis + hltEcalUncalibRecHit + hltEcalDetIdToBeRecovered + hltEcalRecHit ) HLTDoCaloSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + HLTDoLocalHcalSequence + hltTowerMakerForAll ) -HLTAK4CaloJetsReconstructionSequence = cms.Sequence( HLTDoCaloSequence + hltAK4CaloJets + hltAK4CaloJetsIDPassed ) -HLTAK4CaloJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAllCalo + hltAK4CaloJetsCorrected + hltAK4CaloJetsCorrectedIDPassed ) -HLTAK4CaloJetsSequence = cms.Sequence( HLTAK4CaloJetsReconstructionSequence + HLTAK4CaloJetsCorrectionSequence ) -HLTDoCaloSequencePF = cms.Sequence( HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + HLTDoLocalHcalSequence + hltTowerMakerForPF ) -HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( HLTDoCaloSequencePF + hltAK4CaloJetsPF ) -HLTPreAK4PFJetsRecoSequence = cms.Sequence( HLTAK4CaloJetsPrePFRecoSequence + hltAK4CaloJetsPFEt5 ) -HLTTrackReconstructionForPF = cms.Sequence( HLTDoLocalPixelSequence + HLTRecopixelvertexingSequence + HLTDoLocalStripSequence + HLTIterativeTrackingIter02 + hltPFMuonMerging + hltMuonLinks + hltMuons ) -HLTPreshowerSequence = cms.Sequence( hltEcalPreshowerDigis + hltEcalPreshowerRecHit ) -HLTParticleFlowSequence = cms.Sequence( HLTPreshowerSequence + hltParticleFlowRecHitECALUnseeded + hltParticleFlowRecHitHCAL + hltParticleFlowRecHitPSUnseeded + hltParticleFlowClusterECALUncorrectedUnseeded + hltParticleFlowClusterPSUnseeded + hltParticleFlowClusterECALUnseeded + hltParticleFlowClusterHCAL + hltParticleFlowClusterHFEM + hltParticleFlowClusterHFHAD + hltLightPFTracks + hltParticleFlowBlock + hltParticleFlow ) -HLTAK4PFJetsReconstructionSequence = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequence + hltAK4PFJets ) -HLTAK4PFJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAll + hltAK4PFJetsCorrected ) -HLTAK4PFJetsSequence = cms.Sequence( HLTPreAK4PFJetsRecoSequence + HLTAK4PFJetsReconstructionSequence + HLTAK4PFJetsCorrectionSequence ) HLTAK8CaloJetsReconstructionSequence = cms.Sequence( HLTDoCaloSequence + hltAK8CaloJets + hltAK8CaloJetsIDPassed ) HLTAK8CaloJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAllCalo + hltAK8CaloJetsCorrected + hltAK8CaloJetsCorrectedIDPassed ) HLTAK8CaloJetsSequence = cms.Sequence( HLTAK8CaloJetsReconstructionSequence + HLTAK8CaloJetsCorrectionSequence ) +HLTDoCaloSequencePF = cms.Sequence( HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + HLTDoLocalHcalSequence + hltTowerMakerForPF ) HLTAK8CaloJetsPrePFRecoSequence = cms.Sequence( HLTDoCaloSequencePF + hltAK8CaloJetsPF + hltAK4CaloJetsPF ) HLTPreAK8PFJetsRecoSequence = cms.Sequence( HLTAK8CaloJetsPrePFRecoSequence + hltAK8CaloJetsPFEt5 + hltAK4CaloJetsPFEt5 ) +HLTTrackReconstructionForPF = cms.Sequence( HLTDoLocalPixelSequence + HLTRecopixelvertexingSequence + HLTDoLocalStripSequence + HLTIterativeTrackingIter02 + hltPFMuonMerging + hltMuonLinks + hltMuons ) +HLTPreshowerSequence = cms.Sequence( hltEcalPreshowerDigis + hltEcalPreshowerRecHit ) +HLTParticleFlowSequence = cms.Sequence( HLTPreshowerSequence + hltParticleFlowRecHitECALUnseeded + hltParticleFlowRecHitHCAL + hltParticleFlowRecHitPSUnseeded + hltParticleFlowClusterECALUncorrectedUnseeded + hltParticleFlowClusterPSUnseeded + hltParticleFlowClusterECALUnseeded + hltParticleFlowClusterHCAL + hltParticleFlowClusterHFEM + hltParticleFlowClusterHFHAD + hltLightPFTracks + hltParticleFlowBlock + hltParticleFlow ) HLTAK8PFJetsReconstructionSequence = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequence + hltAK8PFJets ) HLTAK8PFJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAll + hltAK8PFJetsCorrected ) HLTAK8PFJetsSequence = cms.Sequence( HLTPreAK8PFJetsRecoSequence + HLTAK8PFJetsReconstructionSequence + HLTAK8PFJetsCorrectionSequence ) @@ -15652,9 +15437,9 @@ HLTPFTriggerSequenceMuTau = cms.Sequence( HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) HLTLooseIsoPFTauSequence = cms.Sequence( hltTauPFJets08Region + hltTauPFJetsRecoTauChargedHadrons + hltPFTauPiZeros + hltPFTausSansRef + hltPFTaus + hltPFTauTrackFindingDiscriminator + hltPFTauLooseAbsoluteIsolationDiscriminator + hltPFTauLooseRelativeIsolationDiscriminator + hltPFTauLooseAbsOrRelIsolationDiscriminator ) HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltPFTauAgainstMuonDiscriminator + hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + hltPFTau20TrackLooseIsoAgainstMuon + hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -HLTEle22WP85GsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP85ClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP85HEFilter + hltEgammaEcalPFClusterIso + hltEle22WP85EcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP85HcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP85PixelMatchFilter + HLTGsfElectronSequence + hltEle22WP85GsfOneOESuperMinusOneOPFilter + hltEle22WP85GsfMissingHitsFilter + hltEle22WP85GsfDetaFilter + hltEle22WP85GsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP85GsfTrackIsoFilter ) +HLTEle22WP90RhoGsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP90RhoClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP90RhoHEFilter + hltEgammaEcalPFClusterIso + hltEle22WP90RhoEcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP90RhoHcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP90RhoPixelMatchFilter + HLTGsfElectronSequence + hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + hltEle22WP90RhoGsfDetaFilter + hltEle22WP90RhoGsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP90RhoGsfTrackIsoFilter ) HLTPFTriggerSequenceForTaus = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) -HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) HLTCaloTausCreatorRegionalSequence = cms.Sequence( HLTDoCaloSequence + hltCaloTowersTau1Regional + hltIconeTau1Regional + hltCaloTowersTau2Regional + hltIconeTau2Regional + hltCaloTowersTau3Regional + hltIconeTau3Regional + hltCaloTowersTau4Regional + hltIconeTau4Regional + hltCaloTowersCentral1Regional + hltIconeCentral1Regional + hltCaloTowersCentral2Regional + hltIconeCentral2Regional + hltCaloTowersCentral3Regional + hltIconeCentral3Regional + hltCaloTowersCentral4Regional + hltIconeCentral4Regional ) HLTL2TauJetsSequence = cms.Sequence( HLTCaloTausCreatorRegionalSequence + hltL2TauJets ) HLTPixelTrackingSequenceRegL2Tau = cms.Sequence( HLTDoLocalPixelSequenceRegL2Tau + hltPixelLayerTripletsReg + hltPixelTracksReg + hltPixelVerticesReg ) @@ -15666,6 +15451,14 @@ HLTPFJetTriggerSequenceReg = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTPFJetTriggerSequenceRegNoMu ) HLTMediumIsoPFTauSequenceReg = cms.Sequence( hltTauPFJets08RegionReg + hltTauPFJetsRecoTauChargedHadronsReg + hltPFTauPiZerosReg + hltPFTausSansRefReg + hltPFTausReg + hltPFTauTrackFindingDiscriminatorReg + hltPFTauMediumAbsoluteIsolationDiscriminatorReg + hltPFTauMediumRelativeIsolationDiscriminatorReg + hltPFTauMediumAbsOrRelIsolationDiscriminatorReg ) HLTRecoMETSequence = cms.Sequence( HLTDoCaloSequence + hltMet ) +HLTAK4CaloJetsReconstructionSequence = cms.Sequence( HLTDoCaloSequence + hltAK4CaloJets + hltAK4CaloJetsIDPassed ) +HLTAK4CaloJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAllCalo + hltAK4CaloJetsCorrected + hltAK4CaloJetsCorrectedIDPassed ) +HLTAK4CaloJetsSequence = cms.Sequence( HLTAK4CaloJetsReconstructionSequence + HLTAK4CaloJetsCorrectionSequence ) +HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( HLTDoCaloSequencePF + hltAK4CaloJetsPF ) +HLTPreAK4PFJetsRecoSequence = cms.Sequence( HLTAK4CaloJetsPrePFRecoSequence + hltAK4CaloJetsPFEt5 ) +HLTAK4PFJetsReconstructionSequence = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequence + hltAK4PFJets ) +HLTAK4PFJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAll + hltAK4PFJetsCorrected ) +HLTAK4PFJetsSequence = cms.Sequence( HLTPreAK4PFJetsRecoSequence + HLTAK4PFJetsReconstructionSequence + HLTAK4PFJetsCorrectionSequence ) HLTEle45CaloIdVTGsfTrkIdTGsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1SingleEG22Filter + hltEG45EtFilter + hltEgammaClusterShape + hltEG45CaloIdVTClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEG45CaloIdVTHEFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle45CaloIdVTPixelMatchFilter + HLTGsfElectronSequence + hltEle45CaloIdVTGsfTrkIdTGsfDetaFilter + hltEle45CaloIdVTGsfTrkIdTGsfDphiFilter ) HLTEle23Ele12CaloIdTrackIdIsoSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1DoubleEG137Filter + hltEle23Ele12CaloIdTrackIdIsoEtLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoEtLeg2Filter + hltEgammaClusterShape + hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg2Filter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle23Ele12CaloIdTrackIdIsoHELeg1Filter + hltEle23Ele12CaloIdTrackIdIsoHELeg2Filter + hltEgammaEcalPFClusterIso + hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg2Filter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg2Filter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg2Filter + HLTGsfElectronSequence + hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg2Filter + hltEle23Ele12CaloIdTrackIdIsoDetaLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoDetaLeg2Filter + hltEle23Ele12CaloIdTrackIdIsoDphiLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoDphiLeg2Filter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg2Filter ) HLTEle17Ele12Ele10CaloIdTrackIdSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1EG12EG7EG5Filter + hltEle17Ele12Ele10CaloIdTrackIdEtLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdEtLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdEtLeg3Filter + hltEgammaClusterShape + hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg3Filter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle17Ele12Ele10CaloIdTrackIdHELeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdHELeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdHELeg3Filter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg3Filter + HLTGsfElectronSequence + hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg3Filter + hltEle17Ele12Ele10CaloIdTrackIdDetaLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdDetaLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdDetaLeg3Filter + hltEle17Ele12Ele10CaloIdTrackIdDphiLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdDphiLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdDphiLeg3Filter ) @@ -15691,7 +15484,6 @@ HLTPhoton155Sequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1SingleEG22Filter + hltEG155EtFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEG155HEFilter ) HLTEle20WP60Ele8Mass55Sequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1SingleEG20ORL1SingleEG22Filter + hltEle20WP60Ele8EtFilter + hltEgammaClusterShape + hltEle20WP60Ele8ClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle20WP60Ele8HEFilter + hltEgammaEcalPFClusterIso + hltEle20WP60Ele8EcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle20WP60Ele8HcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle20WP60Ele8PixelMatchFilter + HLTGsfElectronSequence + hltEle20WP60Ele8OneOEMinusOneOPFilter + hltEle20WP60Ele8DetaFilter + hltEle20WP60Ele8DphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle20WP60Ele8TrackIsoFilter + HLTPFClusteringForEgammaUnseeded + hltEgammaCandidatesUnseeded + hltEgammaCandidatesWrapperUnseeded + hltEle20WP60Ele8EtUnseededFilter + HLTElePixelMatchUnseededSequence + hltEle20WP60Ele8PixelMatchUnseededFilter + hltEle20WP60Ele8Mass55Filter ) HLTEle25WP60SC4Mass55Sequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1SingleEG20ORL1SingleEG22Filter + hltEle25WP60SC4EtFilter + hltEgammaClusterShape + hltEle25WP60SC4ClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle25WP60SC4HEFilter + hltEgammaEcalPFClusterIso + hltEle25WP60SC4EcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle25WP60SC4HcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle25WP60SC4PixelMatchFilter + HLTGsfElectronSequence + hltEle25WP60SC4OneOEMinusOneOPFilter + hltEle25WP60SC4DetaFilter + hltEle25WP60SC4DphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle25WP60SC4TrackIsoFilter + HLTPFClusteringForEgammaUnseeded + hltEgammaCandidatesUnseeded + hltEgammaCandidatesWrapperUnseeded + hltEle25WP60SC4EtUnseededFilter + hltEle25WP60SC4Mass55Filter ) -HLTL2muonrecoSequenceNoVtx = cms.Sequence( HLTL2muonrecoNocandSequence + hltL2MuonCandidatesNoVtx ) HLTFastRecopixelvertexingSequence = cms.Sequence( hltFastPrimaryVertex + hltFastPVPixelVertexFilter + hltFastPVPixelTracks + hltFastPVJetTracksAssociator + hltFastPVJetVertexChecker + hltFastPVPixelTracksRecover + hltFastPVPixelTracksMerger + hltFastPVPixelVertices ) HLTFastPrimaryVertexSequence = cms.Sequence( hltSelectorJets20L1FastJet + hltSelectorCentralJets20L1FastJeta + hltSelector4CentralJetsL1FastJet + HLTDoLocalPixelSequenceRegForBTag + HLTFastRecopixelvertexingSequence ) HLTBtagCSVSequenceL3 = cms.Sequence( HLTDoLocalPixelSequenceRegForBTag + HLTDoLocalStripSequenceRegForBTag + HLTIterativeTrackingForBTagIter02 + hltVerticesL3 + hltFastPixelBLifetimeL3Associator + hltFastPixelBLifetimeL3TagInfos + hltL3SecondaryVertexTagInfos + hltL3CombinedSecondaryVertexBJetTags ) @@ -15718,20 +15510,19 @@ HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoubleEle33CaloIdLGsfTrkIdVL + HLTDoubleEle33CaloIdVLGsfTrkIdVLSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleEG2210 + hltPrePhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95 + HLTPhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG35 + hltPrePhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65 + HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_PFJet260_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleJet128 + hltPrePFJet260 + HLTAK4CaloJetsSequence + hltSingleCaloJet200 + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToCaloJets200 + hltSinglePFJet260 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_AK8PFJet360TrimMod_Mass30_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleJet128 + hltPreAK8PFJet360TrimModMass30 + HLTAK8CaloJetsSequence + hltAK8SingleCaloJet260 + HLTAK8PFJetsSequence + hltAK8PFJetsCorrectedMatchedToCaloJets260 + hltAK8TrimModJets + hltAK8SinglePFJet360TrimModMass30 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sMu14erORMu16er + hltPreIsoMu17eta2p1LooseIsoPFTau20 + hltL1fL1sMu14erORMu16erL1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + HLTL3muonrecoSequence + hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + HLTPFTriggerSequenceMuTau + HLTIsoMuLooseIsoPFTauSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + HLTEle22WP85GsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22WP85GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + HLTEle22WP90RhoGsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22GsfLooseIsoPFTau20Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( HLTBeginSequence + hltL1sDoubleTauJet44erorDoubleJetC64 + hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + HLTL2TauJetsSequence + hltDoubleL2Tau35eta2p1 + HLTL2TauPixelIsolationSequence + hltL2DiTauIsoFilter + hltL2TauJetsIso + hltDoubleL2IsoTau35eta2p1 + HLTRecoJetSequenceAK4PrePF + HLTPFJetTriggerSequenceReg + HLTMediumIsoPFTauSequenceReg + hltDoublePFTau40Reg + hltPFTauTrackPt1DiscriminatorReg + hltSelectedPFTausTrackPt1Reg + hltDoublePFTau40TrackPt1Reg + hltSelectedPFTausTrackPt1MediumIsolationReg + hltDoublePFTau40TrackPt1MediumIsolationReg + hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM70 + hltPreLooseIsoPFTau50Trk30eta2p1MET120 + HLTL2TauJetsSequence + hltSingleL2Tau35eta2p1 + HLTRecoMETSequence + hltMET120 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean120 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID120 + HLTRecoJetSequenceAK4PrePF + HLTPFTriggerSequenceForTaus + HLTLooseIsoPFTauSequence + hltPFTau50 + hltSelectedPFTausTrackFinding + hltPFTau50Track + hltPFTauTrackPt30Discriminator + hltSelectedPFTausTrackPt30 + hltPFTau50TrackPt30 + hltPFTauLooseRelativeIsolationDiscriminator0p06 + hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + hltSelectedPFTausTrackPt30AbsOrRelIsolation + hltPFTau50TrackPt30LooseAbsOrRelIso + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_ReducedIterativeTracking_v1 = cms.Path( HLTBeginSequence + hltPreReducedIterativeTracking + HLTRecoJetSequenceAK4PrePF + HLTDoLocalPixelSequence + HLTRecopixelvertexingSequence + HLTDoLocalStripSequence + HLTIterativeTrackingIter02 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet605035 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet35MuCleaned + hltIsoMu24Trk02DiCentralPFJet50MuCleaned + hltIsoMu24Trk02CentralPFJet60MuCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet40 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet40MuCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet40EleCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet35EleCleaned + hltEle27DiCentralPFJet50EleCleaned + hltEle27CentralPFJet60EleCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet40 + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet35 + hlt2PFJet50 + hlt1PFJet60 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopIsoMu24 + hltJetFilterSingleTopIsoMu24 + hltCentralJets30SingleTopIsoMu24 + hltLeadingCentralJets30SingleTopIsoMu24 + hltJetTrackAssociationSingleTopIsoMu24 + hltTrackIPTagInfosSingleTopIsoMu24 + hltSecondaryVertexSingleTopIsoMu24 + hltCSVJetTagSingleTopIsoMu24 + hltCSVFilterSingleTopIsoMu24 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreMu40eta2p1PFJet200PFJet50 + hltL1fL1sMu16Eta2p1L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltMu40eta2p1CleanAK4PFJet + hltMu40eta2p1DiCentralPFJet50MuCleaned + hltMu40eta2p1CentralPFJet200MuCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopEle27 + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + HLTEle45CaloIdVTGsfTrkIdTGsfSequence + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltDiPFJet50 + hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleEG137 + hltPreEle23Ele12CaloIdTrackIdIso + HLTEle23Ele12CaloIdTrackIdIsoSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( HLTBeginSequence + hltL1sL1EG12EG7EG5 + hltPreEle17Ele12Ele10CaloIdTrackId + HLTEle17Ele12Ele10CaloIdTrackIdSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) @@ -15759,13 +15550,10 @@ HLT_Photon300_NoHE_VBF_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG30 + hltPrePhoton300NoHEVBF + HLTSinglePhoton300NoHESequence + HLTAK4CaloJetsSequence + hltDiCaloJet20MJJ400AllJetsDEta3Filter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + hltDiEle33CaloIdLNewPixelMatchUnseededFilter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle95CaloIdVTGsfTrkIdT + HLTEle95CaloIdVTGsfTrkIdTGsfSequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_DoublePhoton85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePhoton85 + HLTDoublePho85Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) +HLT_DoublePho85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePho85 + HLTDoublePho85Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Photon155_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPrePhoton155 + HLTPhoton155Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele20WP60_Ele8_Mass55_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle20WP60Ele8Mass55 + HLTEle20WP60Ele8Mass55Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_Ele25WP60_SC4_Mass55_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle25WP60SC4Mass55 + HLTEle25WP60SC4Mass55Sequence + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_L2DoubleMu23_NoVertex_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreL2DoubleMu23NoVertex + hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2DoubleMu23NoVertexL2PreFiltered + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 + hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2DoubleMu28NoVertexL2PreFiltered + hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 + cms.SequencePlaceholder( "HLTEndSequence" ) ) -HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 + hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2DoubleMu38NoVertexL2PreFiltered + hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_PFMET170_NoiseCleaned_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM36ORETM40 + hltPrePFMET170NoiseCleaned + HLTRecoMETSequence + hltMET90 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean80 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID80 + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET170Filter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM36ORETM40 + hltPrePFMET120NoiseCleanedBTagCSV07 + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean70 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID70 + hltSusyPreBtagJetFilter + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSVsusy + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + cms.SequencePlaceholder( "HLTEndSequence" ) ) HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT350PFMET120NoiseCleaned + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean60 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID60 + hltHtMht + hltHt280 + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + hltPFHT + hltPFHT350 + cms.SequencePlaceholder( "HLTEndSequence" ) ) @@ -15774,11 +15562,14 @@ HLTriggerFinalPath = cms.Path( HLTBeginSequence + hltScalersRawToDigi + hltFEDSelector + hltTriggerSummaryAOD + hltTriggerSummaryRAW ) -HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_Ele27_WP85_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_PFJet260_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePhoton85_v1, HLT_Photon155_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_L2DoubleMu23_NoVertex_v1, HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_Physics_v1, HLTriggerFinalPath )) +HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_Ele27_WP85_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePho85_v1, HLT_Photon155_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_Physics_v1, HLTriggerFinalPath )) # CMSSW version specific customizations import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_cff.py index 642d35f2398d2..8385441d440a9 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,10 +1,10 @@ -# /dev/CMSSW_7_2_0/GRun/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/GRun/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/GRun/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/GRun/V15') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -460,17 +460,15 @@ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1', 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1', 'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1', - 'HLT_DoubleMu33NoFiltersNoVtx_v1', - 'HLT_DoubleMu38NoFiltersNoVtx_v1', 'HLT_DoubleMu4_3_Bs_v1', 'HLT_DoubleMu4_3_Jpsi_Displaced_v1', 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -489,9 +487,6 @@ 'HLT_JetE30_NoBPTX_v1', 'HLT_JetE50_NoBPTX3BX_NoHalo_v1', 'HLT_JetE70_NoBPTX3BX_NoHalo_v1', - 'HLT_L2DoubleMu23_NoVertex_v1', - 'HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1', - 'HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1', 'HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1', 'HLT_L2Mu10_NoVertex_NoBPTX_v1', 'HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1', @@ -504,10 +499,8 @@ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_Mu25_TkMu0_dEta18_Onia_v1', 'HLT_Mu30_TkMu11_v1', - 'HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1', 'HLT_Mu40_eta2p1_PFJet200_PFJet50_v1', 'HLT_Mu40_v1', - 'HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1', 'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_PFHT350_PFMET120_NoiseCleaned_v1', 'HLT_PFHT900_v1', @@ -537,8 +530,7 @@ 'HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1', 'HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1', 'HLT_Physics_v1' ), - Templates = cms.vstring( 'HLT_PFJet260_v1', - 'HLT_ReducedIterativeTracking_v1' ) + Templates = cms.vstring( 'HLT_ReducedIterativeTracking_v1' ) ) hltESSHcalSeverityLevel = cms.ESSource( "EmptyESSource", @@ -827,11 +819,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -853,7 +845,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1363,22 +1355,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2016,6 +2000,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2030,14 +2015,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2047,24 +2032,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2074,7 +2056,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2087,11 +2069,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -9654,1409 +9635,98 @@ MuMuTkVertexTag = cms.InputTag( "hltLowMassNonResonantTkVertexProducer" ), MinPt = cms.double( 0.0 ) ) -hltPreDoubleMu33NoFiltersNoVtx = cms.EDFilter( "HLTPrescaler", +hltL1sL1SingleEG20ORL1SingleEG22 = cms.EDFilter( "HLTLevel1GTSeed", + L1SeedsLogicalExpression = cms.string( "L1_SingleEG20 OR L1_SingleEG22" ), + saveTags = cms.bool( True ), + L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), + L1UseL1TriggerObjectMaps = cms.bool( True ), + L1UseAliasesForSeeding = cms.bool( True ), L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) + L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), + L1NrBxInEvent = cms.int32( 3 ), + L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), + L1TechTriggerSeeding = cms.bool( False ) ) -hltDimuonL1Filtered0 = cms.EDFilter( "HLTMuonL1Filter", - saveTags = cms.bool( True ), - CSCTFtag = cms.InputTag( "unused" ), - PreviousCandTag = cms.InputTag( "hltL1sL1DoubleMu10MuOpenORDoubleMu103p5" ), - MinPt = cms.double( 0.0 ), - MinN = cms.int32( 2 ), - MaxEta = cms.double( 2.5 ), - SelectQualities = cms.vint32( ), - CandTag = cms.InputTag( "hltL1extraParticles" ), - ExcludeSingleSegmentCSC = cms.bool( False ) +hltPreEle27WP85Gsf = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) ) -hltL2MuonCandidatesNoVtx = cms.EDProducer( "L2MuonCandidateProducer", - InputObjects = cms.InputTag( "hltL2Muons" ) +hltRechitInRegionsECAL = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + useUncalib = cms.bool( False ), + regionEtaMargin = cms.double( 0.14 ), + ecalhitLabels = cms.VInputTag( 'hltEcalRecHit:EcalRecHitsEB','hltEcalRecHit:EcalRecHitsEE' ), + regionPhiMargin = cms.double( 0.4 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1UpperThr = cms.double( 999.0 ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + productLabels = cms.vstring( 'EcalRecHitsEB', + 'EcalRecHitsEE' ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) ) -hltDimuonL2NoVtxFiltered10 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL1Filtered0" ), - MinPt = cms.double( 10.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) +hltRechitInRegionsES = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + useUncalib = cms.bool( False ), + regionEtaMargin = cms.double( 0.14 ), + ecalhitLabels = cms.VInputTag( 'hltEcalPreshowerRecHit:EcalRecHitsES' ), + regionPhiMargin = cms.double( 0.4 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1UpperThr = cms.double( 999.0 ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + productLabels = cms.vstring( 'EcalRecHitsES' ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) ) -hltL3TrajSeedOIStateNoVtx = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - propagatorCompatibleName = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - option = cms.uint32( 3 ), - maxChi2 = cms.double( 40.0 ), - errorMatrixPset = cms.PSet( - atIP = cms.bool( True ), - action = cms.string( "use" ), - errorMatrixValuesPSet = cms.PSet( - pf3_V12 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V13 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V11 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V14 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V15 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - yAxis = cms.vdouble( 0.0, 1.0, 1.4, 10.0 ), - pf3_V33 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - zAxis = cms.vdouble( -3.14159, 3.14159 ), - pf3_V44 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - xAxis = cms.vdouble( 0.0, 13.0, 30.0, 70.0, 1000.0 ), - pf3_V22 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V23 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V45 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V55 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V34 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V35 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V25 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) +hltParticleFlowRecHitECALL1Seeded = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEB' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.08 ), + name = cms.string( "PFRecHitQTestThreshold" ) ), - pf3_V24 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) ) - ) + ), + name = cms.string( "PFEBRecHitCreator" ) ), - propagatorName = cms.string( "hltESPSteppingHelixPropagatorAlong" ), - manySeeds = cms.bool( False ), - copyMuonRecHit = cms.bool( False ), - ComponentName = cms.string( "TSGForRoadSearch" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSteppingHelixPropagatorOpposite', - 'hltESPSteppingHelixPropagatorAlong' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEE' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.3 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ), + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) + ) + ), + name = cms.string( "PFEERecHitCreator" ) + ) ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( ), - PtCut = cms.double( 1.0 ) + navigator = cms.PSet( + barrel = cms.PSet( ), + endcap = cms.PSet( ), + name = cms.string( "PFRecHitECALNavigator" ) + ) ) -hltL3TrackCandidateFromL2OIStateNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3TrajSeedOIStateNoVtx" ), - reverseTrajectories = cms.bool( True ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) +hltParticleFlowRecHitPSL1Seeded = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsES','EcalRecHitsES' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 7.0E-6 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ) + ), + name = cms.string( "PFPSRecHitCreator" ) + ) ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilderSeedHit" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilderSeedHit" ), - maxNSeeds = cms.uint32( 100000 ) -) -hltL3TkTracksFromL2OIStateNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3TrackCandidateFromL2OIStateNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -hltL3NoFiltersNoVtxMuonsOIState = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2OIStateNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -hltL3NoFiltersNoVtxTrajSeedOIHit = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - PSetNames = cms.vstring( 'skipTSG', - 'iterativeTSG' ), - L3TkCollectionA = cms.InputTag( "hltL3NoFiltersNoVtxMuonsOIState" ), - iterativeTSG = cms.PSet( - ErrorRescaling = cms.double( 3.0 ), - beamSpot = cms.InputTag( "unused" ), - MaxChi2 = cms.double( 40.0 ), - errorMatrixPset = cms.PSet( - atIP = cms.bool( True ), - action = cms.string( "use" ), - errorMatrixValuesPSet = cms.PSet( - pf3_V12 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V13 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V11 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V14 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V15 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - yAxis = cms.vdouble( 0.0, 1.0, 1.4, 10.0 ), - pf3_V33 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - zAxis = cms.vdouble( -3.14159, 3.14159 ), - pf3_V44 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - xAxis = cms.vdouble( 0.0, 13.0, 30.0, 70.0, 1000.0 ), - pf3_V22 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V23 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V45 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V55 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V34 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V35 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V25 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V24 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ) - ) - ), - UpdateState = cms.bool( True ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - SelectState = cms.bool( False ), - SigmaZ = cms.double( 25.0 ), - ResetMethod = cms.string( "matrix" ), - ComponentName = cms.string( "TSGFromPropagation" ), - UseVertexState = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAnyOpposite" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ) - ), - skipTSG = cms.PSet( ), - ComponentName = cms.string( "DualByL2TSG" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'PropagatorWithMaterial', - 'hltESPSmartPropagatorAnyOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( - cleanerFromSharedHits = cms.bool( True ), - ptCleaner = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - directionCleaner = cms.bool( True ) - ), - PtCut = cms.double( 1.0 ) -) -hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3NoFiltersNoVtxTrajSeedOIHit" ), - reverseTrajectories = cms.bool( True ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) - ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilder" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilder" ), - maxNSeeds = cms.uint32( 100000 ) -) -hltL3NoFiltersTkTracksFromL2OIHitNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -hltL3NoFiltersNoVtxMuonsOIHit = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3NoFiltersTkTracksFromL2OIHitNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -hltL3NoFiltersNoVtxTkFromL2OICombination = cms.EDProducer( "L3TrackCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit' ) -) -hltL3NoFiltersNoVtxTrajSeedIOHit = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - PSetNames = cms.vstring( 'skipTSG', - 'iterativeTSG' ), - L3TkCollectionA = cms.InputTag( "hltL3NoFiltersNoVtxTkFromL2OICombination" ), - iterativeTSG = cms.PSet( - firstTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - ComponentName = cms.string( "StandardHitTripletGenerator" ), - GeneratorPSet = cms.PSet( - useBending = cms.bool( True ), - useFixedPreFiltering = cms.bool( False ), - maxElement = cms.uint32( 0 ), - phiPreFiltering = cms.double( 0.3 ), - extraHitRPhitolerance = cms.double( 0.06 ), - useMultScattering = cms.bool( True ), - ComponentName = cms.string( "PixelTripletHLTGenerator" ), - extraHitRZtolerance = cms.double( 0.06 ), - SeedComparitorPSet = cms.PSet( ComponentName = cms.string( "none" ) ) - ), - SeedingLayers = cms.InputTag( "hltPixelLayerTriplets" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ), - PSetNames = cms.vstring( 'firstTSG', - 'secondTSG' ), - ComponentName = cms.string( "CombinedTSG" ), - thirdTSG = cms.PSet( - PSetNames = cms.vstring( 'endcapTSG', - 'barrelTSG' ), - barrelTSG = cms.PSet( ), - endcapTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - maxElement = cms.uint32( 0 ), - ComponentName = cms.string( "StandardHitPairGenerator" ), - useOnDemandTracker = cms.untracked.int32( 0 ), - SeedingLayers = cms.InputTag( "hltMixedLayerPairs" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ), - etaSeparation = cms.double( 2.0 ), - ComponentName = cms.string( "DualByEtaTSG" ) - ), - secondTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - maxElement = cms.uint32( 0 ), - ComponentName = cms.string( "StandardHitPairGenerator" ), - useOnDemandTracker = cms.untracked.int32( 0 ), - SeedingLayers = cms.InputTag( "hltPixelLayerPairs" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ) - ), - skipTSG = cms.PSet( ), - ComponentName = cms.string( "DualByL2TSG" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'PropagatorWithMaterial' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.1 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.1 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( - cleanerFromSharedHits = cms.bool( True ), - ptCleaner = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - directionCleaner = cms.bool( True ) - ), - PtCut = cms.double( 1.0 ) -) -hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3NoFiltersNoVtxTrajSeedIOHit" ), - reverseTrajectories = cms.bool( False ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) - ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilder" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilder" ), - maxNSeeds = cms.uint32( 100000 ) -) -hltL3NoFiltersTkTracksFromL2IOHitNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -hltL3NoFiltersNoVtxMuonsIOHit = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3NoFiltersTkTracksFromL2IOHitNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -hltL3NoFiltersNoVtxTrajectorySeed = cms.EDProducer( "L3MuonTrajectorySeedCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxTrajSeedIOHit','hltL3TrajSeedOIStateNoVtx','hltL3NoFiltersNoVtxTrajSeedOIHit' ) -) -hltL3NoFiltersTrackCandidateFromL2NoVtx = cms.EDProducer( "L3TrackCandCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx','hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx','hltL3TrackCandidateFromL2OIStateNoVtx' ) -) -hltL3NoFiltersNoVtxTkTracksMergeStep1 = cms.EDProducer( "SimpleTrackListMerger", - ShareFrac = cms.double( 0.19 ), - promoteTrackQuality = cms.bool( True ), - MinPT = cms.double( 0.05 ), - copyExtras = cms.untracked.bool( True ), - Epsilon = cms.double( -0.001 ), - allowFirstHitShare = cms.bool( True ), - newQuality = cms.string( "confirmed" ), - MaxNormalizedChisq = cms.double( 1000.0 ), - TrackProducer1 = cms.string( "hltL3TkTracksFromL2OIStateNoVtx" ), - MinFound = cms.int32( 3 ), - TrackProducer2 = cms.string( "hltL3NoFiltersTkTracksFromL2OIHitNoVtx" ), - LostHitPenalty = cms.double( 0.0 ), - FoundHitBonus = cms.double( 100.0 ) -) -hltL3NoFiltersTkTracksFromL2Novtx = cms.EDProducer( "SimpleTrackListMerger", - ShareFrac = cms.double( 0.19 ), - promoteTrackQuality = cms.bool( True ), - MinPT = cms.double( 0.05 ), - copyExtras = cms.untracked.bool( True ), - Epsilon = cms.double( -0.001 ), - allowFirstHitShare = cms.bool( True ), - newQuality = cms.string( "confirmed" ), - MaxNormalizedChisq = cms.double( 1000.0 ), - TrackProducer1 = cms.string( "hltL3NoFiltersNoVtxTkTracksMergeStep1" ), - MinFound = cms.int32( 3 ), - TrackProducer2 = cms.string( "hltL3NoFiltersTkTracksFromL2IOHitNoVtx" ), - LostHitPenalty = cms.double( 0.0 ), - FoundHitBonus = cms.double( 100.0 ) -) -hltL3NoFiltersNoVtxMuonsLinksCombination = cms.EDProducer( "L3TrackLinksCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit','hltL3NoFiltersNoVtxMuonsIOHit' ) -) -hltL3NoFiltersNoVtxMuons = cms.EDProducer( "L3TrackCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit','hltL3NoFiltersNoVtxMuonsIOHit' ) -) -hltL3NoFiltersNoVtxMuonCandidates = cms.EDProducer( "L3MuonCandidateProducer", - InputLinksObjects = cms.InputTag( "hltL3NoFiltersNoVtxMuonsLinksCombination" ), - InputObjects = cms.InputTag( "hltL3NoFiltersNoVtxMuons" ), - MuonPtOption = cms.string( "Tracker" ) -) -hltDimuonL3NoFiltersNoVtxFiltered33 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL2NoVtxFiltered10" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 2 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 33.0 ) -) -hltPreDoubleMu38NoFiltersNoVtx = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltDimuonL2NoVtxFiltered16 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL1Filtered0" ), - MinPt = cms.double( 16.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltDimuonL3NoFiltersNoVtxFiltered38 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL2NoVtxFiltered16" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 2 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 38.0 ) -) -hltL1sL1Mu3p5EG12 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_Mu3p5_EG12" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) -hltPreMu38NoFiltersNoVtxPhoton38CaloIdL = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltL1Mu3p5EG12L1Filtered3p5 = cms.EDFilter( "HLTMuonL1Filter", - saveTags = cms.bool( False ), - CSCTFtag = cms.InputTag( "unused" ), - PreviousCandTag = cms.InputTag( "hltL1sL1Mu3p5EG12" ), - MinPt = cms.double( 3.5 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 2.5 ), - SelectQualities = cms.vint32( ), - CandTag = cms.InputTag( "hltL1extraParticles" ), - ExcludeSingleSegmentCSC = cms.bool( False ) -) -hltL1Mu3p5EG12L2NoVtxFiltered16 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( False ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L1Filtered3p5" ), - MinPt = cms.double( 16.0 ), - MinN = cms.int32( 1 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered38 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L2NoVtxFiltered16" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 1 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 38.0 ) -) -hltHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaHLTHybridClusterProducer", - xi = cms.double( 0.0 ), - regionEtaMargin = cms.double( 0.14 ), - regionPhiMargin = cms.double( 0.4 ), - severityRecHitThreshold = cms.double( 4.0 ), - RecHitFlagToBeExcluded = cms.vstring( ), - ecalhitcollection = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - eThreshA = cms.double( 0.003 ), - basicclusterCollection = cms.string( "" ), - eThreshB = cms.double( 0.1 ), - dynamicPhiRoad = cms.bool( False ), - useEtForXi = cms.bool( True ), - l1UpperThr = cms.double( 999.0 ), - excludeFlagged = cms.bool( True ), - posCalcParameters = cms.PSet( - T0_barl = cms.double( 7.4 ), - LogWeighted = cms.bool( True ), - T0_endc = cms.double( 3.1 ), - T0_endcPresh = cms.double( 1.2 ), - W0 = cms.double( 4.2 ), - X0 = cms.double( 0.89 ) - ), - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - eseed = cms.double( 0.35 ), - ethresh = cms.double( 0.1 ), - ewing = cms.double( 0.0 ), - RecHitSeverityToBeExcluded = cms.vstring( 'kWeird' ), - step = cms.int32( 17 ), - debugLevel = cms.string( "INFO" ), - dynamicEThresh = cms.bool( False ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), - superclusterCollection = cms.string( "" ), - HybridBarrelSeedThr = cms.double( 1.5 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ) -) -hltCorrectedHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", - corectedSuperClusterCollection = cms.string( "" ), - sigmaElectronicNoise = cms.double( 0.03 ), - superClusterAlgo = cms.string( "Hybrid" ), - etThresh = cms.double( 1.0 ), - rawSuperClusterProducer = cms.InputTag( "hltHybridSuperClustersL1Seeded" ), - applyEnergyCorrection = cms.bool( True ), - isl_fCorrPset = cms.PSet( ), - VerbosityLevel = cms.string( "ERROR" ), - recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - fix_fCorrPset = cms.PSet( ), - modeEE = cms.int32( 0 ), - modeEB = cms.int32( 0 ), - dyn_fCorrPset = cms.PSet( ), - energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), - applyLocalContCorrection = cms.bool( False ), - localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), - crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), - applyCrackCorrection = cms.bool( False ), - hyb_fCorrPset = cms.PSet( - brLinearLowThr = cms.double( 1.1 ), - fBremVec = cms.vdouble( -0.05208, 0.1331, 0.9196, -5.735E-4, 1.343 ), - brLinearHighThr = cms.double( 8.0 ), - fEtEtaVec = cms.vdouble( 1.0012, -0.5714, 0.0, 0.0, 0.0, 0.5549, 12.74, 1.0448, 0.0, 0.0, 0.0, 0.0, 8.0, 1.023, -0.00181, 0.0, 0.0 ) - ) -) -hltMulti5x5BasicClustersL1Seeded = cms.EDProducer( "EgammaHLTMulti5x5ClusterProducer", - l1LowerThr = cms.double( 5.0 ), - Multi5x5BarrelSeedThr = cms.double( 0.5 ), - Multi5x5EndcapSeedThr = cms.double( 0.18 ), - endcapHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - barrelClusterCollection = cms.string( "notused" ), - regionEtaMargin = cms.double( 0.3 ), - regionPhiMargin = cms.double( 0.4 ), - RecHitFlagToBeExcluded = cms.vstring( ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - posCalcParameters = cms.PSet( - T0_barl = cms.double( 7.4 ), - LogWeighted = cms.bool( True ), - T0_endc = cms.double( 3.1 ), - T0_endcPresh = cms.double( 1.2 ), - W0 = cms.double( 4.2 ), - X0 = cms.double( 0.89 ) - ), - VerbosityLevel = cms.string( "ERROR" ), - doIsolated = cms.bool( True ), - barrelHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), - doEndcaps = cms.bool( True ), - doBarrel = cms.bool( False ), - endcapClusterCollection = cms.string( "multi5x5EndcapBasicClusters" ), - l1UpperThr = cms.double( 999.0 ) -) -hltMulti5x5SuperClustersL1Seeded = cms.EDProducer( "Multi5x5SuperClusterProducer", - barrelSuperclusterCollection = cms.string( "multi5x5BarrelSuperClusters" ), - endcapEtaSearchRoad = cms.double( 0.14 ), - dynamicPhiRoad = cms.bool( False ), - endcapClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5EndcapBasicClusters' ), - barrelPhiSearchRoad = cms.double( 0.8 ), - endcapPhiSearchRoad = cms.double( 0.6 ), - seedTransverseEnergyThreshold = cms.double( 1.0 ), - endcapSuperclusterCollection = cms.string( "multi5x5EndcapSuperClusters" ), - barrelEtaSearchRoad = cms.double( 0.06 ), - barrelClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5BarrelBasicClusters' ), - doBarrel = cms.bool( False ), - doEndcaps = cms.bool( True ), - bremRecoveryPset = cms.PSet( - barrel = cms.PSet( ), - endcap = cms.PSet( - a = cms.double( 47.85 ), - c = cms.double( 0.1201 ), - b = cms.double( 108.8 ) - ), - doEndcaps = cms.bool( True ), - doBarrel = cms.bool( False ) - ), - endcapClusterProducer = cms.string( "hltMulti5x5BasicClustersL1Seeded" ) -) -hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "PreshowerClusterProducer", - assocSClusterCollection = cms.string( "" ), - preshStripEnergyCut = cms.double( 0.0 ), - preshClusterCollectionY = cms.string( "preshowerYClusters" ), - preshClusterCollectionX = cms.string( "preshowerXClusters" ), - etThresh = cms.double( 5.0 ), - preshRecHitProducer = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), - endcapSClusterProducer = cms.InputTag( 'hltMulti5x5SuperClustersL1Seeded','multi5x5EndcapSuperClusters' ), - preshNclust = cms.int32( 4 ), - debugLevel = cms.string( "" ), - preshClusterEnergyCut = cms.double( 0.0 ), - preshSeededNstrip = cms.int32( 15 ) -) -hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", - corectedSuperClusterCollection = cms.string( "" ), - sigmaElectronicNoise = cms.double( 0.15 ), - superClusterAlgo = cms.string( "Multi5x5" ), - etThresh = cms.double( 1.0 ), - rawSuperClusterProducer = cms.InputTag( "hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), - applyEnergyCorrection = cms.bool( True ), - isl_fCorrPset = cms.PSet( ), - VerbosityLevel = cms.string( "ERROR" ), - recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - fix_fCorrPset = cms.PSet( - brLinearLowThr = cms.double( 0.6 ), - fBremVec = cms.vdouble( -0.04163, 0.08552, 0.95048, -0.002308, 1.077 ), - brLinearHighThr = cms.double( 6.0 ), - fEtEtaVec = cms.vdouble( 0.9746, -6.512, 0.0, 0.0, 0.02771, 4.983, 0.0, 0.0, -0.007288, -0.9446, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0 ) - ), - modeEE = cms.int32( 0 ), - modeEB = cms.int32( 0 ), - dyn_fCorrPset = cms.PSet( ), - energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), - applyLocalContCorrection = cms.bool( False ), - localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), - crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), - applyCrackCorrection = cms.bool( False ), - hyb_fCorrPset = cms.PSet( ) -) -hltL1SeededRecoEcalCandidate = cms.EDProducer( "EgammaHLTRecoEcalCandidateProducers", - scIslandEndcapProducer = cms.InputTag( "hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), - scHybridBarrelProducer = cms.InputTag( "hltCorrectedHybridSuperClustersL1Seeded" ), - recoEcalCandidateCollection = cms.string( "" ) -) -hltEGRegionalL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", - doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.65 ), - saveTags = cms.bool( False ), - region_eta_size_ecap = cms.double( 1.0 ), - barrel_end = cms.double( 1.4791 ), - l1IsolatedTag = cms.InputTag( 'hltL1extraParticles','Isolated' ), - candIsolatedTag = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - region_phi_size = cms.double( 1.044 ), - region_eta_size = cms.double( 0.522 ), - L1SeedFilterTag = cms.InputTag( "hltL1sL1Mu3p5EG12" ), - candNonIsolatedTag = cms.InputTag( "" ), - l1NonIsolatedTag = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - ncandcut = cms.int32( 1 ) -) -hltEG38EtFilterL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaEtFilter", - saveTags = cms.bool( False ), - L1NonIsoCand = cms.InputTag( "" ), - relaxed = cms.untracked.bool( False ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - inputTag = cms.InputTag( "hltEGRegionalL1Mu3p5EG12" ), - etcutEB = cms.double( 38.0 ), - etcutEE = cms.double( 38.0 ), - ncandcut = cms.int32( 1 ) -) -hltL1SeededHLTClusterShape = cms.EDProducer( "EgammaHLTClusterShapeProducer", - recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - ecalRechitEB = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ecalRechitEE = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - isIeta = cms.bool( True ) -) -hltMuNoFilters38Photon38CaloIdLClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.035 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.014 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededHLTClusterShape" ), - candTag = cms.InputTag( "hltEG38EtFilterL1Mu3p5EG12" ), - nonIsoTag = cms.InputTag( "" ) -) -hltL1SeededPhotonHcalForHE = cms.EDProducer( "EgammaHLTHcalIsolationProducersRegional", - eMinHE = cms.double( 0.8 ), - hbheRecHitProducer = cms.InputTag( "hltHbhereco" ), - effectiveAreaBarrel = cms.double( 0.105 ), - outerCone = cms.double( 0.14 ), - eMinHB = cms.double( 0.7 ), - innerCone = cms.double( 0.0 ), - etMinHE = cms.double( -1.0 ), - etMinHB = cms.double( -1.0 ), - rhoProducer = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ), - depth = cms.int32( -1 ), - doRhoCorrection = cms.bool( False ), - effectiveAreaEndcap = cms.double( 0.17 ), - recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - rhoMax = cms.double( 9.9999999E7 ), - rhoScale = cms.double( 1.0 ), - doEtSum = cms.bool( False ) -) -hltMuNoFilters38Photon38CaloIdLHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( 0.15 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededPhotonHcalForHE" ), - candTag = cms.InputTag( "hltMuNoFilters38Photon38CaloIdLClusterShapeFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -hltPreMu42NoFiltersNoVtxPhoton42CaloIdL = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltL1Mu3p5EG12L2NoVtxFiltered12 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( False ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L1Filtered3p5" ), - MinPt = cms.double( 12.0 ), - MinN = cms.int32( 1 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered42 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L2NoVtxFiltered12" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 1 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 42.0 ) -) -hltEG42EtFilterL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaEtFilter", - saveTags = cms.bool( False ), - L1NonIsoCand = cms.InputTag( "" ), - relaxed = cms.untracked.bool( False ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - inputTag = cms.InputTag( "hltEGRegionalL1Mu3p5EG12" ), - etcutEB = cms.double( 42.0 ), - etcutEE = cms.double( 42.0 ), - ncandcut = cms.int32( 1 ) -) -hltMuNoFilters42Photon42CaloIdLClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.035 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.014 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededHLTClusterShape" ), - candTag = cms.InputTag( "hltEG42EtFilterL1Mu3p5EG12" ), - nonIsoTag = cms.InputTag( "" ) -) -hltMuNoFilters42Photon42CaloIdLHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( 0.15 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededPhotonHcalForHE" ), - candTag = cms.InputTag( "hltMuNoFilters42Photon42CaloIdLClusterShapeFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -hltL1sL1SingleEG20ORL1SingleEG22 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_SingleEG20 OR L1_SingleEG22" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) -hltPreEle27WP85Gsf = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltRechitInRegionsECAL = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - useUncalib = cms.bool( False ), - regionEtaMargin = cms.double( 0.14 ), - ecalhitLabels = cms.VInputTag( 'hltEcalRecHit:EcalRecHitsEB','hltEcalRecHit:EcalRecHitsEE' ), - regionPhiMargin = cms.double( 0.4 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1UpperThr = cms.double( 999.0 ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - productLabels = cms.vstring( 'EcalRecHitsEB', - 'EcalRecHitsEE' ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) -) -hltRechitInRegionsES = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - useUncalib = cms.bool( False ), - regionEtaMargin = cms.double( 0.14 ), - ecalhitLabels = cms.VInputTag( 'hltEcalPreshowerRecHit:EcalRecHitsES' ), - regionPhiMargin = cms.double( 0.4 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1UpperThr = cms.double( 999.0 ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - productLabels = cms.vstring( 'EcalRecHitsES' ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) -) -hltParticleFlowRecHitECALL1Seeded = cms.EDProducer( "PFRecHitProducer", - producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEB' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 0.08 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ), - cms.PSet( timingCleaning = cms.bool( True ), - topologicalCleaning = cms.bool( True ), - cleaningThreshold = cms.double( 2.0 ), - skipTTRecoveredHits = cms.bool( True ), - name = cms.string( "PFRecHitQTestECAL" ) - ) - ), - name = cms.string( "PFEBRecHitCreator" ) - ), - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEE' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 0.3 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ), - cms.PSet( timingCleaning = cms.bool( True ), - topologicalCleaning = cms.bool( True ), - cleaningThreshold = cms.double( 2.0 ), - skipTTRecoveredHits = cms.bool( True ), - name = cms.string( "PFRecHitQTestECAL" ) - ) - ), - name = cms.string( "PFEERecHitCreator" ) - ) - ), - navigator = cms.PSet( - barrel = cms.PSet( ), - endcap = cms.PSet( ), - name = cms.string( "PFRecHitECALNavigator" ) - ) -) -hltParticleFlowRecHitPSL1Seeded = cms.EDProducer( "PFRecHitProducer", - producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsES','EcalRecHitsES' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 7.0E-6 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ) - ), - name = cms.string( "PFPSRecHitCreator" ) - ) - ), - navigator = cms.PSet( name = cms.string( "PFRecHitPreshowerNavigator" ) ) + navigator = cms.PSet( name = cms.string( "PFRecHitPreshowerNavigator" ) ) ) hltParticleFlowClusterPSL1Seeded = cms.EDProducer( "PFClusterProducer", pfClusterBuilder = cms.PSet( @@ -11700,11 +10370,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -14455,11 +13125,11 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -hltPrePFJet260 = cms.EDFilter( "HLTPrescaler", +hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", +hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), voronoiRfact = cms.double( 0.9 ), @@ -14478,7 +13148,7 @@ useDeterministicSeed = cms.bool( True ), doPVCorrection = cms.bool( False ), maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), + rParam = cms.double( 0.8 ), maxProblematicHcalCells = cms.uint32( 9999999 ), doOutputJets = cms.bool( True ), src = cms.InputTag( "hltTowerMakerForAll" ), @@ -14486,7 +13156,7 @@ puPtMin = cms.double( 10.0 ), srcPVs = cms.InputTag( "NotUsed" ), jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.4 ), + radiusPU = cms.double( 0.8 ), maxProblematicEcalCells = cms.uint32( 9999999 ), doPUOffsetCorr = cms.bool( False ), inputEMin = cms.double( 0.0 ), @@ -14519,11 +13189,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) -hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", +hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", min_N90 = cms.int32( -2 ), min_N90hits = cms.int32( 2 ), min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK4CaloJets" ), + jetsInput = cms.InputTag( "hltAK8CaloJets" ), JetIDParams = cms.PSet( useRecHits = cms.bool( True ), hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), @@ -14539,21 +13209,21 @@ maxRapidity = cms.double( 5.0 ), pfCandidatesTag = cms.InputTag( "hltTowerMakerForAll" ) ) -hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJets" ), +hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJets" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), +hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -hltSingleCaloJet200 = cms.EDFilter( "HLT1CaloJet", +hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), - MinPt = cms.double( 200.0 ), + MinPt = cms.double( 260.0 ), MinN = cms.int32( 1 ), MaxEta = cms.double( 5.0 ), MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK4CaloJetsCorrectedIDPassed" ), + inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), MinE = cms.double( -1.0 ), triggerType = cms.int32( 85 ) ) @@ -14625,6 +13295,66 @@ HOGrid = cms.vdouble( ), EBGrid = cms.vdouble( ) ) +hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( False ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.8 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForPF" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.8 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) hltAK4CaloJetsPF = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), @@ -14685,6 +13415,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) +hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", + filter = cms.bool( False ), + src = cms.InputTag( "hltAK8CaloJetsPF" ), + etMin = cms.double( 5.0 ) +) hltAK4CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", filter = cms.bool( False ), src = cms.InputTag( "hltAK4CaloJetsPF" ), @@ -16081,279 +14816,32 @@ maxHcalEOverEcalE = cms.double( 0.1 ), maxEcalEOverP_1 = cms.double( 0.5 ), maxHcalEOverP = cms.double( 1.0 ), - maxEcalEOverPRes = cms.double( 0.2 ), - maxHcalE = cms.double( 10.0 ), - maxEeleOverPout = cms.double( 0.2 ), - maxNtracks = cms.double( 3.0 ), - maxEleHcalEOverEcalE = cms.double( 0.1 ), - maxDPhiIN = cms.double( 0.1 ), - maxEeleOverPoutRes = cms.double( 0.5 ) - ), - electron_iso_pt = cms.double( 10.0 ), - isolatedElectronID_mvaWeightFile = cms.string( "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml" ), - vertexCollection = cms.InputTag( "hltPixelVertices" ), - X0_Map = cms.string( "RecoParticleFlow/PFProducer/data/allX0histos.root" ), - calibPFSCEle_Fbrem_barrel = cms.vdouble( 0.6, 6.0, -0.0255975, 0.0576727, 0.975442, -5.46394E-4, 1.26147, 25.0, -0.02025, 0.04537, 0.9728, -8.962E-4, 1.172 ), - blocks = cms.InputTag( "hltParticleFlowBlock" ), - punchThroughMETFactor = cms.double( 4.0 ), - metSignificanceForRejection = cms.double( 4.0 ), - photon_protectionsForJetMET = cms.PSet( - sumPtTrackIsoSlope = cms.double( 0.001 ), - sumPtTrackIso = cms.double( 2.0 ) - ), - usePhotonReg = cms.bool( False ), - dzPV = cms.double( 0.2 ), - calibHF_a_EMHAD = cms.vdouble( 1.42215, 1.00496, 0.68961, 0.81656, 0.98504, 0.98504, 1.00802, 1.0593, 1.4576, 1.4576 ), - useRegressionFromDB = cms.bool( False ), - muon_ECAL = cms.vdouble( 0.5, 0.5 ), - usePFSCEleCalib = cms.bool( True ) -) -hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "PFJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltParticleFlow" ), - inputEtMin = cms.double( 0.0 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "hltPixelVertices" ), - jetPtMin = cms.double( 0.0 ), - radiusPU = cms.double( 0.4 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 0 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -hltFixedGridRhoFastjetAll = cms.EDProducer( "FixedGridRhoProducerFastjet", - gridSpacing = cms.double( 0.55 ), - maxRapidity = cms.double( 5.0 ), - pfCandidatesTag = cms.InputTag( "hltParticleFlow" ) -) -hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", - src = cms.InputTag( "hltAK4PFJets" ), - correctors = cms.vstring( 'hltESPAK4PFCorrection' ) -) -hltPFJetsCorrectedMatchedToCaloJets200 = cms.EDProducer( "PFJetsMatchedToFilteredCaloJetsProducer", - DeltaR = cms.double( 0.5 ), - CaloJetFilter = cms.InputTag( "hltSingleCaloJet200" ), - TriggerType = cms.int32( 85 ), - PFJetSrc = cms.InputTag( "hltAK4PFJetsCorrected" ) -) -hltSinglePFJet260 = cms.EDFilter( "HLT1PFJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltPFJetsCorrectedMatchedToCaloJets200" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( 0.9 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), - minSeed = cms.uint32( 14327 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForAll" ), - inputEtMin = cms.double( 0.3 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", - min_N90 = cms.int32( -2 ), - min_N90hits = cms.int32( 2 ), - min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK8CaloJets" ), - JetIDParams = cms.PSet( - useRecHits = cms.bool( True ), - hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), - hoRecHitsColl = cms.InputTag( "hltHoreco" ), - hfRecHitsColl = cms.InputTag( "hltHfreco" ), - ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) + maxEcalEOverPRes = cms.double( 0.2 ), + maxHcalE = cms.double( 10.0 ), + maxEeleOverPout = cms.double( 0.2 ), + maxNtracks = cms.double( 3.0 ), + maxEleHcalEOverEcalE = cms.double( 0.1 ), + maxDPhiIN = cms.double( 0.1 ), + maxEeleOverPoutRes = cms.double( 0.5 ) ), - max_EMF = cms.double( 999.0 ) -) -hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJets" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( False ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForPF" ), - inputEtMin = cms.double( 0.3 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", - filter = cms.bool( False ), - src = cms.InputTag( "hltAK8CaloJetsPF" ), - etMin = cms.double( 5.0 ) + electron_iso_pt = cms.double( 10.0 ), + isolatedElectronID_mvaWeightFile = cms.string( "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml" ), + vertexCollection = cms.InputTag( "hltPixelVertices" ), + X0_Map = cms.string( "RecoParticleFlow/PFProducer/data/allX0histos.root" ), + calibPFSCEle_Fbrem_barrel = cms.vdouble( 0.6, 6.0, -0.0255975, 0.0576727, 0.975442, -5.46394E-4, 1.26147, 25.0, -0.02025, 0.04537, 0.9728, -8.962E-4, 1.172 ), + blocks = cms.InputTag( "hltParticleFlowBlock" ), + punchThroughMETFactor = cms.double( 4.0 ), + metSignificanceForRejection = cms.double( 4.0 ), + photon_protectionsForJetMET = cms.PSet( + sumPtTrackIsoSlope = cms.double( 0.001 ), + sumPtTrackIso = cms.double( 2.0 ) + ), + usePhotonReg = cms.bool( False ), + dzPV = cms.double( 0.2 ), + calibHF_a_EMHAD = cms.vdouble( 1.42215, 1.00496, 0.68961, 0.81656, 0.98504, 0.98504, 1.00802, 1.0593, 1.4576, 1.4576 ), + useRegressionFromDB = cms.bool( False ), + muon_ECAL = cms.vdouble( 0.5, 0.5 ), + usePFSCEleCalib = cms.bool( True ) ) hltAK8PFJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -16415,6 +14903,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) +hltFixedGridRhoFastjetAll = cms.EDProducer( "FixedGridRhoProducerFastjet", + gridSpacing = cms.double( 0.55 ), + maxRapidity = cms.double( 5.0 ), + pfCandidatesTag = cms.InputTag( "hltParticleFlow" ) +) hltAK8PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", src = cms.InputTag( "hltAK8PFJets" ), correctors = cms.vstring( 'hltESPAK4PFCorrection' ) @@ -16522,6 +15015,9 @@ CandTag = cms.InputTag( "hltL1extraParticles" ), ExcludeSingleSegmentCSC = cms.bool( False ) ) +hltL2MuonCandidatesNoVtx = cms.EDProducer( "L2MuonCandidateProducer", + InputObjects = cms.InputTag( "hltL2Muons" ) +) hltL2fL1sMu6NotBptxORL1f0L2Filtered10 = cms.EDFilter( "HLTMuonL2PreFilter", saveTags = cms.bool( True ), MaxDr = cms.double( 9999.0 ), @@ -17398,9 +15894,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -17462,9 +15956,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -17610,13 +16102,13 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -17639,17 +16131,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -17657,61 +16149,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -17721,7 +16213,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -17736,79 +16228,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -17823,10 +16297,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -17839,14 +16313,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -17859,7 +16333,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -20147,9 +18621,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -20211,9 +18683,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -20468,6 +18938,89 @@ MinE = cms.double( -1.0 ), triggerType = cms.int32( 87 ) ) +hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( 0.9 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 14327 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForAll" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", + min_N90 = cms.int32( -2 ), + min_N90hits = cms.int32( 2 ), + min_EMF = cms.double( 1.0E-6 ), + jetsInput = cms.InputTag( "hltAK4CaloJets" ), + JetIDParams = cms.PSet( + useRecHits = cms.bool( True ), + hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), + hoRecHitsColl = cms.InputTag( "hltHoreco" ), + hfRecHitsColl = cms.InputTag( "hltHfreco" ), + ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) + ), + max_EMF = cms.double( 999.0 ) +) +hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJets" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) +hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) hltMetCleanUsingJetID = cms.EDProducer( "HLTMETCleanerUsingJetID", minPt = cms.double( 20.0 ), maxEta = cms.double( 5.0 ), @@ -20591,9 +19144,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -20637,15 +19188,78 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltPreIsoMu24IterTrk02TriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) +hltPreIsoMu24IterTrk02TriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) +) +hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "PFJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltParticleFlow" ), + inputEtMin = cms.double( 0.0 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "hltPixelVertices" ), + jetPtMin = cms.double( 0.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 0 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", + src = cms.InputTag( "hltAK4PFJets" ), + correctors = cms.vstring( 'hltESPAK4PFCorrection' ) ) -hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -20691,51 +19305,49 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), @@ -20794,11 +19406,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -20998,20 +19609,15 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -22500,63 +21106,223 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.02 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.015 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( 0.02 ), + thrOverEEE = cms.double( -1.0 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( -1.0 ), + thrRegularEB = cms.double( 0.015 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), + candTag = cms.InputTag( "hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( 0.04 ), + thrOverEEE = cms.double( -1.0 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( -1.0 ), + thrRegularEB = cms.double( 0.015 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), + candTag = cms.InputTag( "hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( -1.0 ), + thrOverEEE = cms.double( 0.1 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( 0.1 ), + thrRegularEB = cms.double( -1.0 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), + candTag = cms.InputTag( "hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +hltPrePhoton22R9Id90HE10Iso40EBOnlyPFMET40 = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) +) +hltHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaHLTHybridClusterProducer", + xi = cms.double( 0.0 ), + regionEtaMargin = cms.double( 0.14 ), + regionPhiMargin = cms.double( 0.4 ), + severityRecHitThreshold = cms.double( 4.0 ), + RecHitFlagToBeExcluded = cms.vstring( ), + ecalhitcollection = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + eThreshA = cms.double( 0.003 ), + basicclusterCollection = cms.string( "" ), + eThreshB = cms.double( 0.1 ), + dynamicPhiRoad = cms.bool( False ), + useEtForXi = cms.bool( True ), + l1UpperThr = cms.double( 999.0 ), + excludeFlagged = cms.bool( True ), + posCalcParameters = cms.PSet( + T0_barl = cms.double( 7.4 ), + LogWeighted = cms.bool( True ), + T0_endc = cms.double( 3.1 ), + T0_endcPresh = cms.double( 1.2 ), + W0 = cms.double( 4.2 ), + X0 = cms.double( 0.89 ) + ), + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + eseed = cms.double( 0.35 ), + ethresh = cms.double( 0.1 ), + ewing = cms.double( 0.0 ), + RecHitSeverityToBeExcluded = cms.vstring( 'kWeird' ), + step = cms.int32( 17 ), + debugLevel = cms.string( "INFO" ), + dynamicEThresh = cms.bool( False ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), + superclusterCollection = cms.string( "" ), + HybridBarrelSeedThr = cms.double( 1.5 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ) +) +hltCorrectedHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", + corectedSuperClusterCollection = cms.string( "" ), + sigmaElectronicNoise = cms.double( 0.03 ), + superClusterAlgo = cms.string( "Hybrid" ), + etThresh = cms.double( 1.0 ), + rawSuperClusterProducer = cms.InputTag( "hltHybridSuperClustersL1Seeded" ), + applyEnergyCorrection = cms.bool( True ), + isl_fCorrPset = cms.PSet( ), + VerbosityLevel = cms.string( "ERROR" ), + recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + fix_fCorrPset = cms.PSet( ), + modeEE = cms.int32( 0 ), + modeEB = cms.int32( 0 ), + dyn_fCorrPset = cms.PSet( ), + energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), + applyLocalContCorrection = cms.bool( False ), + localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), + crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), + applyCrackCorrection = cms.bool( False ), + hyb_fCorrPset = cms.PSet( + brLinearLowThr = cms.double( 1.1 ), + fBremVec = cms.vdouble( -0.05208, 0.1331, 0.9196, -5.735E-4, 1.343 ), + brLinearHighThr = cms.double( 8.0 ), + fEtEtaVec = cms.vdouble( 1.0012, -0.5714, 0.0, 0.0, 0.0, 0.5549, 12.74, 1.0448, 0.0, 0.0, 0.0, 0.0, 8.0, 1.023, -0.00181, 0.0, 0.0 ) + ) +) +hltMulti5x5BasicClustersL1Seeded = cms.EDProducer( "EgammaHLTMulti5x5ClusterProducer", + l1LowerThr = cms.double( 5.0 ), + Multi5x5BarrelSeedThr = cms.double( 0.5 ), + Multi5x5EndcapSeedThr = cms.double( 0.18 ), + endcapHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + barrelClusterCollection = cms.string( "notused" ), + regionEtaMargin = cms.double( 0.3 ), + regionPhiMargin = cms.double( 0.4 ), + RecHitFlagToBeExcluded = cms.vstring( ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + posCalcParameters = cms.PSet( + T0_barl = cms.double( 7.4 ), + LogWeighted = cms.bool( True ), + T0_endc = cms.double( 3.1 ), + T0_endcPresh = cms.double( 1.2 ), + W0 = cms.double( 4.2 ), + X0 = cms.double( 0.89 ) + ), + VerbosityLevel = cms.string( "ERROR" ), + doIsolated = cms.bool( True ), + barrelHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), + doEndcaps = cms.bool( True ), + doBarrel = cms.bool( False ), + endcapClusterCollection = cms.string( "multi5x5EndcapBasicClusters" ), + l1UpperThr = cms.double( 999.0 ) +) +hltMulti5x5SuperClustersL1Seeded = cms.EDProducer( "Multi5x5SuperClusterProducer", + barrelSuperclusterCollection = cms.string( "multi5x5BarrelSuperClusters" ), + endcapEtaSearchRoad = cms.double( 0.14 ), + dynamicPhiRoad = cms.bool( False ), + endcapClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5EndcapBasicClusters' ), + barrelPhiSearchRoad = cms.double( 0.8 ), + endcapPhiSearchRoad = cms.double( 0.6 ), + seedTransverseEnergyThreshold = cms.double( 1.0 ), + endcapSuperclusterCollection = cms.string( "multi5x5EndcapSuperClusters" ), + barrelEtaSearchRoad = cms.double( 0.06 ), + barrelClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5BarrelBasicClusters' ), + doBarrel = cms.bool( False ), + doEndcaps = cms.bool( True ), + bremRecoveryPset = cms.PSet( + barrel = cms.PSet( ), + endcap = cms.PSet( + a = cms.double( 47.85 ), + c = cms.double( 0.1201 ), + b = cms.double( 108.8 ) + ), + doEndcaps = cms.bool( True ), + doBarrel = cms.bool( False ) + ), + endcapClusterProducer = cms.string( "hltMulti5x5BasicClustersL1Seeded" ) ) -hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.04 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.015 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "PreshowerClusterProducer", + assocSClusterCollection = cms.string( "" ), + preshStripEnergyCut = cms.double( 0.0 ), + preshClusterCollectionY = cms.string( "preshowerYClusters" ), + preshClusterCollectionX = cms.string( "preshowerXClusters" ), + etThresh = cms.double( 5.0 ), + preshRecHitProducer = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), + endcapSClusterProducer = cms.InputTag( 'hltMulti5x5SuperClustersL1Seeded','multi5x5EndcapSuperClusters' ), + preshNclust = cms.int32( 4 ), + debugLevel = cms.string( "" ), + preshClusterEnergyCut = cms.double( 0.0 ), + preshSeededNstrip = cms.int32( 15 ) ) -hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.1 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", + corectedSuperClusterCollection = cms.string( "" ), + sigmaElectronicNoise = cms.double( 0.15 ), + superClusterAlgo = cms.string( "Multi5x5" ), + etThresh = cms.double( 1.0 ), + rawSuperClusterProducer = cms.InputTag( "hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), + applyEnergyCorrection = cms.bool( True ), + isl_fCorrPset = cms.PSet( ), + VerbosityLevel = cms.string( "ERROR" ), + recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + fix_fCorrPset = cms.PSet( + brLinearLowThr = cms.double( 0.6 ), + fBremVec = cms.vdouble( -0.04163, 0.08552, 0.95048, -0.002308, 1.077 ), + brLinearHighThr = cms.double( 6.0 ), + fEtEtaVec = cms.vdouble( 0.9746, -6.512, 0.0, 0.0, 0.02771, 4.983, 0.0, 0.0, -0.007288, -0.9446, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0 ) + ), + modeEE = cms.int32( 0 ), + modeEB = cms.int32( 0 ), + dyn_fCorrPset = cms.PSet( ), + energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), + applyLocalContCorrection = cms.bool( False ), + localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), + crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), + applyCrackCorrection = cms.bool( False ), + hyb_fCorrPset = cms.PSet( ) ) -hltPrePhoton22R9Id90HE10Iso40EBOnlyPFMET40 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) +hltL1SeededRecoEcalCandidate = cms.EDProducer( "EgammaHLTRecoEcalCandidateProducers", + scIslandEndcapProducer = cms.InputTag( "hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), + scHybridBarrelProducer = cms.InputTag( "hltCorrectedHybridSuperClustersL1Seeded" ), + recoEcalCandidateCollection = cms.string( "" ) ) hltEGRegionalL1SingleEG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), @@ -22583,6 +21349,24 @@ etcutEE = cms.double( 999999.0 ), ncandcut = cms.int32( 1 ) ) +hltL1SeededPhotonHcalForHE = cms.EDProducer( "EgammaHLTHcalIsolationProducersRegional", + eMinHE = cms.double( 0.8 ), + hbheRecHitProducer = cms.InputTag( "hltHbhereco" ), + effectiveAreaBarrel = cms.double( 0.105 ), + outerCone = cms.double( 0.14 ), + eMinHB = cms.double( 0.7 ), + innerCone = cms.double( 0.0 ), + etMinHE = cms.double( -1.0 ), + etMinHB = cms.double( -1.0 ), + rhoProducer = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ), + depth = cms.int32( -1 ), + doRhoCorrection = cms.bool( False ), + effectiveAreaEndcap = cms.double( 0.17 ), + recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), + rhoMax = cms.double( 9.9999999E7 ), + rhoScale = cms.double( 1.0 ), + doEtSum = cms.bool( False ) +) hltPhoton22R9Id90HE10Iso40EBOnlyHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), @@ -23658,7 +22442,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) @@ -24189,132 +22973,6 @@ reqOppCharge = cms.untracked.bool( False ), nZcandcut = cms.int32( 1 ) ) -hltPreL2DoubleMu23NoVertex = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltL2DoubleMu23NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 23.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltL2DoubleMu28NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 28.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 28.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 28.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) -hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -hltL2DoubleMu38NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 38.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 38.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 38.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) hltL1sL1ETM36ORETM40 = cms.EDFilter( "HLTLevel1GTSeed", L1SeedsLogicalExpression = cms.string( "L1_ETM36 OR L1_ETM40" ), saveTags = cms.bool( True ), @@ -25575,16 +24233,6 @@ HLTIterativeTrackingDisplacedNRMuMuIteration1 = cms.Sequence( hltIter1DisplacedNRMuMuClustersRefRemoval + hltIter1DisplacedNRMuMuMaskedMeasurementTrackerEvent + hltIter1DisplacedNRMuMuPixelLayerTriplets + hltIter1DisplacedNRMuMuPixelSeeds + hltIter1DisplacedNRMuMuCkfTrackCandidates + hltIter1DisplacedNRMuMuCtfWithMaterialTracks + hltIter1DisplacedNRMuMuTrackSelectionHighPurityLoose + hltIter1DisplacedNRMuMuTrackSelectionHighPurityTight + hltIter1DisplacedNRMuMuTrackSelectionHighPurity ) HLTIterativeTrackingDisplacedNRMuMuIteration2 = cms.Sequence( hltIter2DisplacedNRMuMuClustersRefRemoval + hltIter2DisplacedNRMuMuMaskedMeasurementTrackerEvent + hltIter2DisplacedNRMuMuPixelLayerPairs + hltIter2DisplacedNRMuMuPixelSeeds + hltIter2DisplacedNRMuMuCkfTrackCandidates + hltIter2DisplacedNRMuMuCtfWithMaterialTracks + hltIter2DisplacedNRMuMuTrackSelectionHighPurity ) HLTIterativeTrackingDisplacedNRMuMuIter02 = cms.Sequence( HLTIterativeTrackingDisplacedNRMuMuIteration0 + HLTIterativeTrackingDisplacedNRMuMuIteration1 + hltIter1DisplacedNRMuMuMerged + HLTIterativeTrackingDisplacedNRMuMuIteration2 + hltIter2DisplacedNRMuMuMerged ) -HLTL2muonrecoSequenceNoVtx = cms.Sequence( HLTL2muonrecoNocandSequence + hltL2MuonCandidatesNoVtx ) -HLTL3NoFiltersNoVtxmuonTkCandidateSequence = cms.Sequence( HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltL3TrajSeedOIStateNoVtx + hltL3TrackCandidateFromL2OIStateNoVtx + hltL3TkTracksFromL2OIStateNoVtx + hltL3NoFiltersNoVtxMuonsOIState + hltL3NoFiltersNoVtxTrajSeedOIHit + hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx + hltL3NoFiltersTkTracksFromL2OIHitNoVtx + hltL3NoFiltersNoVtxMuonsOIHit + hltL3NoFiltersNoVtxTkFromL2OICombination + hltPixelLayerTriplets + hltPixelLayerPairs + hltMixedLayerPairs + hltL3NoFiltersNoVtxTrajSeedIOHit + hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx + hltL3NoFiltersTkTracksFromL2IOHitNoVtx + hltL3NoFiltersNoVtxMuonsIOHit + hltL3NoFiltersNoVtxTrajectorySeed + hltL3NoFiltersTrackCandidateFromL2NoVtx ) -HLTL3NoFiltersNoVtxmuonrecoNocandSequence = cms.Sequence( HLTL3NoFiltersNoVtxmuonTkCandidateSequence + hltL3NoFiltersNoVtxTkTracksMergeStep1 + hltL3NoFiltersTkTracksFromL2Novtx + hltL3NoFiltersNoVtxMuonsLinksCombination + hltL3NoFiltersNoVtxMuons ) -HLTL3NoFiltersNoVtxmuonrecoSequence = cms.Sequence( HLTL3NoFiltersNoVtxmuonrecoNocandSequence + hltL3NoFiltersNoVtxMuonCandidates ) -HLTMulti5x5SuperClusterL1Seeded = cms.Sequence( hltMulti5x5BasicClustersL1Seeded + hltMulti5x5SuperClustersL1Seeded + hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded + hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded ) -HLTL1SeededEcalClustersSequence = cms.Sequence( hltHybridSuperClustersL1Seeded + hltCorrectedHybridSuperClustersL1Seeded + HLTMulti5x5SuperClusterL1Seeded ) -HLTDoEGammaStartupSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTL1SeededEcalClustersSequence + hltL1SeededRecoEcalCandidate ) -HLTDoEgammaClusterShapeSequence = cms.Sequence( hltL1SeededHLTClusterShape ) -HLTDoLocalHcalWithoutHOSequence = cms.Sequence( hltHcalDigis + hltHbhereco + hltHfreco ) -HLTDoEGammaHESequence = cms.Sequence( HLTDoLocalHcalWithoutHOSequence + hltL1SeededPhotonHcalForHE ) HLTPFClusteringForEgamma = cms.Sequence( hltRechitInRegionsECAL + hltRechitInRegionsES + hltParticleFlowRecHitECALL1Seeded + hltParticleFlowRecHitPSL1Seeded + hltParticleFlowClusterPSL1Seeded + hltParticleFlowClusterECALUncorrectedL1Seeded + hltParticleFlowClusterECALL1Seeded + hltParticleFlowSuperClusterECALL1Seeded ) HLTDoLocalHcalWithTowerSequence = cms.Sequence( hltHcalDigis + hltHbhereco + hltHfreco + hltHoreco + hltTowerMakerForAll ) HLTFastJetForEgamma = cms.Sequence( hltFixedGridRhoFastjetAllCaloForMuons ) @@ -25613,12 +24261,12 @@ HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1SingleEG35Filter + hltEG42EtL1Seed35EtFilter + hltEgammaR9ID + hltEG42R9Id65R9IdFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEG42HE10R9Id65HEFilter + cms.ignore(hltEG42R9Id85HE10R9Id65R9IdLastFilter) + hltEgammaClusterShape + cms.ignore(hltEG42CaloId24b40eHE10R9Id65ClusterShapeFilter) + hltEgammaEcalPFClusterIsoRhoCorr + cms.ignore(hltEG42Iso50T80LCaloId24b40eHE10R9Id65EcalIsoFilter) + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + cms.ignore(hltEG42Iso50T80LCaloId24b40eHE10R9Id65HcalIsoLastFilter) + hltEG42RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter + HLTPFClusteringForEgammaUnseeded + hltEgammaCandidatesUnseeded + hltEgammaCandidatesWrapperUnseeded + hltDiEG22EtUnseededFilter + hltEgammaR9IDUnseeded + hltDiEG22R9Id65R9IdUnseededFilter + hltEgammaHoverEUnseeded + hltDiEG22HE10R9Id65HEUnseededFilter + cms.ignore(hltEG22R9Id85HE10R9Id65R9IdUnseededLastFilter) + hltEgammaClusterShapeUnseeded + cms.ignore(hltEG22CaloId24b40eHE10R9Id65ClusterShapeUnseededFilter) + hltEgammaEcalPFClusterIsoUnseeded + cms.ignore(hltEG22Iso50T80LCaloId24b40eHE10R9Id65EcalIsoUnseededFilter) + HLTPFHcalClusteringForEgammaUnseeded + hltEgammaHcalPFClusterIsoUnseeded + cms.ignore(hltEG22Iso50T80LCaloId24b40eHE10R9Id65HcalIsoUnseededFilter) + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + HLTTrackReconstructionForIsoForPhotons + hltEgammaHollowTrackIsoUnseeded + cms.ignore(hltEG22Iso50T80LCaloId24b40eHE10R9Id65TrackIsoUnseededLastFilter) + hltDiEG22RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter ) HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence = cms.Sequence( hltEcalDigis + hltEcalUncalibRecHit + hltEcalDetIdToBeRecovered + hltEcalRecHit ) HLTDoCaloSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + HLTDoLocalHcalSequence + hltTowerMakerForAll ) -HLTAK4CaloJetsReconstructionSequence = cms.Sequence( HLTDoCaloSequence + hltAK4CaloJets + hltAK4CaloJetsIDPassed ) -HLTAK4CaloJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAllCalo + hltAK4CaloJetsCorrected + hltAK4CaloJetsCorrectedIDPassed ) -HLTAK4CaloJetsSequence = cms.Sequence( HLTAK4CaloJetsReconstructionSequence + HLTAK4CaloJetsCorrectionSequence ) +HLTAK8CaloJetsReconstructionSequence = cms.Sequence( HLTDoCaloSequence + hltAK8CaloJets + hltAK8CaloJetsIDPassed ) +HLTAK8CaloJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAllCalo + hltAK8CaloJetsCorrected + hltAK8CaloJetsCorrectedIDPassed ) +HLTAK8CaloJetsSequence = cms.Sequence( HLTAK8CaloJetsReconstructionSequence + HLTAK8CaloJetsCorrectionSequence ) HLTDoCaloSequencePF = cms.Sequence( HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + HLTDoLocalHcalSequence + hltTowerMakerForPF ) -HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( HLTDoCaloSequencePF + hltAK4CaloJetsPF ) -HLTPreAK4PFJetsRecoSequence = cms.Sequence( HLTAK4CaloJetsPrePFRecoSequence + hltAK4CaloJetsPFEt5 ) +HLTAK8CaloJetsPrePFRecoSequence = cms.Sequence( HLTDoCaloSequencePF + hltAK8CaloJetsPF + hltAK4CaloJetsPF ) +HLTPreAK8PFJetsRecoSequence = cms.Sequence( HLTAK8CaloJetsPrePFRecoSequence + hltAK8CaloJetsPFEt5 + hltAK4CaloJetsPFEt5 ) HLTRecopixelvertexingSequence = cms.Sequence( hltPixelLayerTriplets + hltPixelTracks + hltPixelVertices + hltTrimmedPixelVertices ) HLTIterativeTrackingIteration0 = cms.Sequence( hltIter0PFLowPixelSeedsFromPixelTracks + hltIter0PFlowCkfTrackCandidates + hltIter0PFlowCtfWithMaterialTracks + hltIter0PFlowTrackSelectionHighPurity ) HLTIter0TrackAndTauJet4Iter1Sequence = cms.Sequence( hltTrackIter0RefsForJets4Iter1 + hltAK4Iter0TrackJets4Iter1 + hltIter0TrackAndTauJets4Iter1 ) @@ -25629,17 +24277,10 @@ HLTTrackReconstructionForPF = cms.Sequence( HLTDoLocalPixelSequence + HLTRecopixelvertexingSequence + HLTDoLocalStripSequence + HLTIterativeTrackingIter02 + hltPFMuonMerging + hltMuonLinks + hltMuons ) HLTPreshowerSequence = cms.Sequence( hltEcalPreshowerDigis + hltEcalPreshowerRecHit ) HLTParticleFlowSequence = cms.Sequence( HLTPreshowerSequence + hltParticleFlowRecHitECALUnseeded + hltParticleFlowRecHitHCAL + hltParticleFlowRecHitPSUnseeded + hltParticleFlowClusterECALUncorrectedUnseeded + hltParticleFlowClusterPSUnseeded + hltParticleFlowClusterECALUnseeded + hltParticleFlowClusterHCAL + hltParticleFlowClusterHFEM + hltParticleFlowClusterHFHAD + hltLightPFTracks + hltParticleFlowBlock + hltParticleFlow ) -HLTAK4PFJetsReconstructionSequence = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequence + hltAK4PFJets ) -HLTAK4PFJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAll + hltAK4PFJetsCorrected ) -HLTAK4PFJetsSequence = cms.Sequence( HLTPreAK4PFJetsRecoSequence + HLTAK4PFJetsReconstructionSequence + HLTAK4PFJetsCorrectionSequence ) -HLTAK8CaloJetsReconstructionSequence = cms.Sequence( HLTDoCaloSequence + hltAK8CaloJets + hltAK8CaloJetsIDPassed ) -HLTAK8CaloJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAllCalo + hltAK8CaloJetsCorrected + hltAK8CaloJetsCorrectedIDPassed ) -HLTAK8CaloJetsSequence = cms.Sequence( HLTAK8CaloJetsReconstructionSequence + HLTAK8CaloJetsCorrectionSequence ) -HLTAK8CaloJetsPrePFRecoSequence = cms.Sequence( HLTDoCaloSequencePF + hltAK8CaloJetsPF + hltAK4CaloJetsPF ) -HLTPreAK8PFJetsRecoSequence = cms.Sequence( HLTAK8CaloJetsPrePFRecoSequence + hltAK8CaloJetsPFEt5 + hltAK4CaloJetsPFEt5 ) HLTAK8PFJetsReconstructionSequence = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequence + hltAK8PFJets ) HLTAK8PFJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAll + hltAK8PFJetsCorrected ) HLTAK8PFJetsSequence = cms.Sequence( HLTPreAK8PFJetsRecoSequence + HLTAK8PFJetsReconstructionSequence + HLTAK8PFJetsCorrectionSequence ) +HLTL2muonrecoSequenceNoVtx = cms.Sequence( HLTL2muonrecoNocandSequence + hltL2MuonCandidatesNoVtx ) HLTBeginSequenceAntiBPTX = cms.Sequence( hltTriggerType + HLTL1UnpackerSequence + hltBPTXAntiCoincidence + HLTBeamSpot ) HLTStoppedHSCPLocalHcalReco = cms.Sequence( hltHcalDigis + hltHbhereco ) HLTStoppedHSCPJetSequence = cms.Sequence( hltStoppedHSCPTowerMakerForAll + hltStoppedHSCPIterativeCone4CaloJets ) @@ -25649,9 +24290,9 @@ HLTPFTriggerSequenceMuTau = cms.Sequence( HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) HLTLooseIsoPFTauSequence = cms.Sequence( hltTauPFJets08Region + hltTauPFJetsRecoTauChargedHadrons + hltPFTauPiZeros + hltPFTausSansRef + hltPFTaus + hltPFTauTrackFindingDiscriminator + hltPFTauLooseAbsoluteIsolationDiscriminator + hltPFTauLooseRelativeIsolationDiscriminator + hltPFTauLooseAbsOrRelIsolationDiscriminator ) HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltPFTauAgainstMuonDiscriminator + hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + hltPFTau20TrackLooseIsoAgainstMuon + hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -HLTEle22WP85GsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP85ClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP85HEFilter + hltEgammaEcalPFClusterIso + hltEle22WP85EcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP85HcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP85PixelMatchFilter + HLTGsfElectronSequence + hltEle22WP85GsfOneOESuperMinusOneOPFilter + hltEle22WP85GsfMissingHitsFilter + hltEle22WP85GsfDetaFilter + hltEle22WP85GsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP85GsfTrackIsoFilter ) +HLTEle22WP90RhoGsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + hltEG22L1sIso18erOrIso20erOr22EtFilter + hltEgammaClusterShape + hltEle22WP90RhoClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle22WP90RhoHEFilter + hltEgammaEcalPFClusterIso + hltEle22WP90RhoEcalIsoFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle22WP90RhoHcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle22WP90RhoPixelMatchFilter + HLTGsfElectronSequence + hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + hltEle22WP90RhoGsfDetaFilter + hltEle22WP90RhoGsfDphiFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle22WP90RhoGsfTrackIsoFilter ) HLTPFTriggerSequenceForTaus = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequenceForTaus + hltAK4PFJetsForTaus ) -HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( HLTLooseIsoPFTauSequence + hltPFTau20 + hltSelectedPFTausTrackFinding + hltPFTau20Track + hltSelectedPFTausTrackFindingLooseIsolation + hltPFTau20TrackLooseIso + hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) HLTCaloTausCreatorRegionalSequence = cms.Sequence( HLTDoCaloSequence + hltCaloTowersTau1Regional + hltIconeTau1Regional + hltCaloTowersTau2Regional + hltIconeTau2Regional + hltCaloTowersTau3Regional + hltIconeTau3Regional + hltCaloTowersTau4Regional + hltIconeTau4Regional + hltCaloTowersCentral1Regional + hltIconeCentral1Regional + hltCaloTowersCentral2Regional + hltIconeCentral2Regional + hltCaloTowersCentral3Regional + hltIconeCentral3Regional + hltCaloTowersCentral4Regional + hltIconeCentral4Regional ) HLTL2TauJetsSequence = cms.Sequence( HLTCaloTausCreatorRegionalSequence + hltL2TauJets ) HLTDoLocalPixelSequenceRegL2Tau = cms.Sequence( hltSiPixelDigisReg + hltSiPixelClustersReg + hltSiPixelClustersRegCache + hltSiPixelRecHitsReg ) @@ -25671,11 +24312,22 @@ HLTMediumIsoPFTauSequenceReg = cms.Sequence( hltTauPFJets08RegionReg + hltTauPFJetsRecoTauChargedHadronsReg + hltPFTauPiZerosReg + hltPFTausSansRefReg + hltPFTausReg + hltPFTauTrackFindingDiscriminatorReg + hltPFTauMediumAbsoluteIsolationDiscriminatorReg + hltPFTauMediumRelativeIsolationDiscriminatorReg + hltPFTauMediumAbsOrRelIsolationDiscriminatorReg ) HLTRecoMETSequence = cms.Sequence( HLTDoCaloSequence + hltMet ) HLTHBHENoiseCleanerSequence = cms.Sequence( hltHcalNoiseInfoProducer + hltHcalTowerNoiseCleaner ) +HLTAK4CaloJetsReconstructionSequence = cms.Sequence( HLTDoCaloSequence + hltAK4CaloJets + hltAK4CaloJetsIDPassed ) +HLTAK4CaloJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAllCalo + hltAK4CaloJetsCorrected + hltAK4CaloJetsCorrectedIDPassed ) +HLTAK4CaloJetsSequence = cms.Sequence( HLTAK4CaloJetsReconstructionSequence + HLTAK4CaloJetsCorrectionSequence ) +HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( HLTDoCaloSequencePF + hltAK4CaloJetsPF ) +HLTPreAK4PFJetsRecoSequence = cms.Sequence( HLTAK4CaloJetsPrePFRecoSequence + hltAK4CaloJetsPFEt5 ) +HLTAK4PFJetsReconstructionSequence = cms.Sequence( HLTL2muonrecoSequence + HLTL3muonrecoSequence + HLTTrackReconstructionForPF + HLTParticleFlowSequence + hltAK4PFJets ) +HLTAK4PFJetsCorrectionSequence = cms.Sequence( hltFixedGridRhoFastjetAll + hltAK4PFJetsCorrected ) +HLTAK4PFJetsSequence = cms.Sequence( HLTPreAK4PFJetsRecoSequence + HLTAK4PFJetsReconstructionSequence + HLTAK4PFJetsCorrectionSequence ) HLTEle45CaloIdVTGsfTrkIdTGsfSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1SingleEG22Filter + hltEG45EtFilter + hltEgammaClusterShape + hltEG45CaloIdVTClusterShapeFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEG45CaloIdVTHEFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle45CaloIdVTPixelMatchFilter + HLTGsfElectronSequence + hltEle45CaloIdVTGsfTrkIdTGsfDetaFilter + hltEle45CaloIdVTGsfTrkIdTGsfDphiFilter ) HLTEle23Ele12CaloIdTrackIdIsoSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1DoubleEG137Filter + hltEle23Ele12CaloIdTrackIdIsoEtLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoEtLeg2Filter + hltEgammaClusterShape + hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg2Filter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle23Ele12CaloIdTrackIdIsoHELeg1Filter + hltEle23Ele12CaloIdTrackIdIsoHELeg2Filter + hltEgammaEcalPFClusterIso + hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg2Filter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg2Filter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg2Filter + HLTGsfElectronSequence + hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg2Filter + hltEle23Ele12CaloIdTrackIdIsoDetaLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoDetaLeg2Filter + hltEle23Ele12CaloIdTrackIdIsoDphiLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoDphiLeg2Filter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg1Filter + hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg2Filter ) HLTEle17Ele12Ele10CaloIdTrackIdSequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1EG12EG7EG5Filter + hltEle17Ele12Ele10CaloIdTrackIdEtLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdEtLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdEtLeg3Filter + hltEgammaClusterShape + hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg3Filter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltEle17Ele12Ele10CaloIdTrackIdHELeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdHELeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdHELeg3Filter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg3Filter + HLTGsfElectronSequence + hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg3Filter + hltEle17Ele12Ele10CaloIdTrackIdDetaLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdDetaLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdDetaLeg3Filter + hltEle17Ele12Ele10CaloIdTrackIdDphiLeg1Filter + hltEle17Ele12Ele10CaloIdTrackIdDphiLeg2Filter + hltEle17Ele12Ele10CaloIdTrackIdDphiLeg3Filter ) HLTMu23Ele12_Gsf = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1Mu12EG7Filter + hltMu23Ele12EtLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + hltEgammaClusterShape + hltMu23Ele12ClusterShapeLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltMu23Ele12HELegEle12GsfCaloIdTrackIdIsoMediumWPFilter + hltEgammaEcalPFClusterIso + hltMu23Ele12EcalIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltMu23Ele12HcalIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltMu23Ele12PixelMatchLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + HLTGsfElectronSequence + hltMu23Ele12GsfDetaLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + hltMu23Ele12GsfDphiLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltMu23Ele12GsfTrackIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter ) HLTMu8Ele23_Gsf = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgamma + hltEgammaCandidates + hltEGL1Mu3p5EG12ORL1MuOpenEG12Filter + hltMu8Ele23EtLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + hltEgammaClusterShape + hltMu8Ele23ClusterShapeLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + HLTDoLocalHcalWithTowerSequence + HLTFastJetForEgamma + hltEgammaHoverE + hltMu8Ele23HELegEle23GsfCaloIdTrackIdIsoMediumWPFilter + hltEgammaEcalPFClusterIso + hltMu8Ele23EcalIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + HLTPFHcalClusteringForEgamma + hltEgammaHcalPFClusterIso + hltMu8Ele23HcalIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + hltMixedLayerPairs + hltEgammaElectronPixelSeeds + hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + HLTGsfElectronSequence + hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + HLTTrackReconstructionForIsoElectronIter02 + hltEgammaEleGsfTrackIso + hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter ) +HLTMulti5x5SuperClusterL1Seeded = cms.Sequence( hltMulti5x5BasicClustersL1Seeded + hltMulti5x5SuperClustersL1Seeded + hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded + hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded ) +HLTL1SeededEcalClustersSequence = cms.Sequence( hltHybridSuperClustersL1Seeded + hltCorrectedHybridSuperClustersL1Seeded + HLTMulti5x5SuperClusterL1Seeded ) +HLTDoLocalHcalWithoutHOSequence = cms.Sequence( hltHcalDigis + hltHbhereco + hltHfreco ) HLTL1SeededEgammaRegionalRecoTrackerSequence = cms.Sequence( hltPixelLayerPairs + hltL1SeededEgammaRegionalPixelSeedGenerator + hltL1SeededEgammaRegionalCkfTrackCandidates + hltL1SeededEgammaRegionalCTFFinalFitWithMaterial ) HLTL1SeededEgammaRegionalRecoTrackerSequenceWithId = cms.Sequence( HLTL1SeededEgammaRegionalRecoTrackerSequence + hltL1SeededEgammaRegionalAnalyticalTrackSelectorHighPurity ) HLTPhoton22R9Id90HE10Iso40EBOnlySequence = cms.Sequence( HLTDoFullUnpackingEgammaEcalSequence + HLTL1SeededEcalClustersSequence + hltL1SeededRecoEcalCandidate + hltEGRegionalL1SingleEG22 + hltPhoton22R9Id90HE10Iso40EBOnlyEtFilter + HLTDoLocalHcalWithoutHOSequence + hltL1SeededPhotonHcalForHE + hltPhoton22R9Id90HE10Iso40EBOnlyHEFilter + hltL1SeededR9ID + hltPhoton22R9Id90HE10Iso40EBOnlyR9Filter + hltL1SeededPhotonEcalIso + hltPhoton22R9Id90HE10Iso40EBOnlyEcalIsoFilter + hltL1SeededPhotonHcalIso + hltPhoton22R9Id90HE10Iso40EBOnlyHcalIsoFilter + HLTDoLocalPixelSequence + HLTDoLocalStripSequence + HLTL1SeededEgammaRegionalRecoTrackerSequenceWithId + hltL1SeededPhotonHollowTrackIsoWithId + hltPhoton22R9Id90HE10Iso40EBOnlyTrackIsoLastFilter ) @@ -25722,15 +24374,10 @@ HLT_DoubleMu4_JpsiTrk_Displaced_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu33HighQ + hltPreDoubleMu4JpsiTrkDisplaced + hltDimuon33L1Filtered0 + HLTL2muonrecoSequence + hltDimuon33L2PreFiltered0 + HLTL3muonrecoSequence + hltDoubleMu4JpsiDisplacedL3Filtered + hltDisplacedmumuVtxProducerDoubleMu4Jpsi + hltDisplacedmumuFilterDoubleMu4Jpsi + HLTIterativeTrackingDisplacedJpsiIter02 + hltJpsiTkAllConeTracksIter + hltJpsiTkVertexProducer + hltJpsiTkVertexFilter + HLTEndSequence ) HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu33HighQ + hltPreDoubleMu4PsiPrimeTrkDisplaced + hltDimuon33L1Filtered0 + HLTL2muonrecoSequence + hltDimuon33L2PreFiltered0 + HLTL3muonrecoSequence + hltDoubleMu4PsiPrimeDisplacedL3Filtered + hltDisplacedmumuVtxProducerDoubleMu4PsiPrime + hltDisplacedmumuFilterDoubleMu4PsiPrime + HLTIterativeTrackingDisplacedPsiPrimeIter02 + hltPsiPrimeTkAllConeTracksIter + hltPsiPrimeTkVertexProducer + hltPsiPrimeTkVertexFilter + HLTEndSequence ) HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu33HighQ + hltPreDoubleMu4LowMassNonResonantTrkDisplaced + hltDimuon33L1Filtered0 + HLTL2muonrecoSequence + hltDimuon33L2PreFiltered0 + HLTL3muonrecoSequence + hltDoubleMu4LowMassNonResonantDisplacedL3Filtered + hltDisplacedmumuVtxProducerDoubleMu4LowMassNonResonant + hltDisplacedmumuFilterDoubleMu4LowMassNonResonant + HLTIterativeTrackingDisplacedNRMuMuIter02 + hltLowMassNonResonantTkAllConeTracksIter + hltLowMassNonResonantTkVertexProducer + hltLowMassNonResonantTkVertexFilter + HLTEndSequence ) -HLT_DoubleMu33NoFiltersNoVtx_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreDoubleMu33NoFiltersNoVtx + hltDimuonL1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltDimuonL2NoVtxFiltered10 + HLTL3NoFiltersNoVtxmuonrecoSequence + hltDimuonL3NoFiltersNoVtxFiltered33 + HLTEndSequence ) -HLT_DoubleMu38NoFiltersNoVtx_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreDoubleMu38NoFiltersNoVtx + hltDimuonL1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltDimuonL2NoVtxFiltered16 + HLTL3NoFiltersNoVtxmuonrecoSequence + hltDimuonL3NoFiltersNoVtxFiltered38 + HLTEndSequence ) -HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1 = cms.Path( HLTBeginSequence + hltL1sL1Mu3p5EG12 + hltPreMu38NoFiltersNoVtxPhoton38CaloIdL + hltL1Mu3p5EG12L1Filtered3p5 + HLTL2muonrecoSequenceNoVtx + hltL1Mu3p5EG12L2NoVtxFiltered16 + HLTL3NoFiltersNoVtxmuonrecoSequence + hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered38 + HLTDoEGammaStartupSequence + hltEGRegionalL1Mu3p5EG12 + hltEG38EtFilterL1Mu3p5EG12 + HLTDoEgammaClusterShapeSequence + hltMuNoFilters38Photon38CaloIdLClusterShapeFilter + HLTDoEGammaHESequence + hltMuNoFilters38Photon38CaloIdLHEFilter + HLTEndSequence ) -HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1 = cms.Path( HLTBeginSequence + hltL1sL1Mu3p5EG12 + hltPreMu42NoFiltersNoVtxPhoton42CaloIdL + hltL1Mu3p5EG12L1Filtered3p5 + HLTL2muonrecoSequenceNoVtx + hltL1Mu3p5EG12L2NoVtxFiltered12 + HLTL3NoFiltersNoVtxmuonrecoSequence + hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered42 + HLTDoEGammaStartupSequence + hltEGRegionalL1Mu3p5EG12 + hltEG42EtFilterL1Mu3p5EG12 + HLTDoEgammaClusterShapeSequence + hltMuNoFilters42Photon42CaloIdLClusterShapeFilter + HLTDoEGammaHESequence + hltMuNoFilters42Photon42CaloIdLHEFilter + HLTEndSequence ) HLT_Ele27_WP85_Gsf_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85Gsf + HLTEle27WP85GsfSequence + HLTEndSequence ) HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoubleEle33CaloIdLGsfTrkIdVL + HLTDoubleEle33CaloIdVLGsfTrkIdVLSequence + HLTEndSequence ) HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleEG2210 + hltPrePhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95 + HLTPhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95Sequence + HLTEndSequence ) HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG35 + hltPrePhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65 + HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence + HLTEndSequence ) -HLT_PFJet260_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleJet128 + hltPrePFJet260 + HLTAK4CaloJetsSequence + hltSingleCaloJet200 + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToCaloJets200 + hltSinglePFJet260 + HLTEndSequence ) HLT_AK8PFJet360TrimMod_Mass30_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleJet128 + hltPreAK8PFJet360TrimModMass30 + HLTAK8CaloJetsSequence + hltAK8SingleCaloJet260 + HLTAK8PFJetsSequence + hltAK8PFJetsCorrectedMatchedToCaloJets260 + hltAK8TrimModJets + hltAK8SinglePFJet360TrimModMass30 + HLTEndSequence ) HLT_L2Mu10_NoVertex_NoBPTX_v1 = cms.Path( HLTBeginSequence + hltL1sMu6NotBptxOR + hltPreL2Mu10NoVertexNoBPTX + hltL1fL1sMu6NotBptxORL1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2fL1sMu6NotBptxORL1f0L2Filtered10 + HLTEndSequence ) HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1 = cms.Path( HLTBeginSequenceAntiBPTX + hltL1sMu6NotBptxOR + hltL1BeamHaloAntiCoincidence3BX + hltPreL2Mu10NoVertexNoBPTX3BXNoHalo + hltL1fL1sMu6NotBptxORL1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2fL1sMu6NotBptxORL1f0L2Filtered10 + HLTEndSequence ) @@ -25741,17 +24388,17 @@ HLT_JetE50_NoBPTX3BX_NoHalo_v1 = cms.Path( HLTBeginSequenceAntiBPTX + hltL1sL1SingleJetC32NotBptxOR + hltL1BeamHaloAntiCoincidence3BX + hltPreJetE50NoBPTX3BXNoHalo + HLTStoppedHSCPLocalHcalReco + hltStoppedHSCPHpdFilter + HLTStoppedHSCPJetSequence + hltStoppedHSCP1CaloJetEnergy50 + HLTEndSequence ) HLT_JetE70_NoBPTX3BX_NoHalo_v1 = cms.Path( HLTBeginSequenceAntiBPTX + hltL1sL1SingleJetC32NotBptxOR + hltL1BeamHaloAntiCoincidence3BX + hltPreJetE70NoBPTX3BXNoHalo + HLTStoppedHSCPLocalHcalReco + hltStoppedHSCPHpdFilter + HLTStoppedHSCPJetSequence + hltStoppedHSCP1CaloJetEnergy70 + HLTEndSequence ) HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sMu14erORMu16er + hltPreIsoMu17eta2p1LooseIsoPFTau20 + hltL1fL1sMu14erORMu16erL1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + HLTL3muonrecoSequence + hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + HLTPFTriggerSequenceMuTau + HLTIsoMuLooseIsoPFTauSequence + HLTEndSequence ) -HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + HLTEle22WP85GsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22WP85GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + HLTEndSequence ) +HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + HLTEle22WP90RhoGsfSequence + HLTRecoJetSequenceAK4PrePF + hltTauJet5 + hltOverlapFilterIsoEle22GsfCaloJet5 + HLTPFTriggerSequenceForTaus + HLTIsoEle22GsfLooseIsoPFTau20Sequence + HLTEndSequence ) HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( HLTBeginSequence + hltL1sDoubleTauJet44erorDoubleJetC64 + hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + HLTL2TauJetsSequence + hltDoubleL2Tau35eta2p1 + HLTL2TauPixelIsolationSequence + hltL2DiTauIsoFilter + hltL2TauJetsIso + hltDoubleL2IsoTau35eta2p1 + HLTRecoJetSequenceAK4PrePF + HLTPFJetTriggerSequenceReg + HLTMediumIsoPFTauSequenceReg + hltDoublePFTau40Reg + hltPFTauTrackPt1DiscriminatorReg + hltSelectedPFTausTrackPt1Reg + hltDoublePFTau40TrackPt1Reg + hltSelectedPFTausTrackPt1MediumIsolationReg + hltDoublePFTau40TrackPt1MediumIsolationReg + hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + HLTEndSequence ) HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM70 + hltPreLooseIsoPFTau50Trk30eta2p1MET120 + HLTL2TauJetsSequence + hltSingleL2Tau35eta2p1 + HLTRecoMETSequence + hltMET120 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean120 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID120 + HLTRecoJetSequenceAK4PrePF + HLTPFTriggerSequenceForTaus + HLTLooseIsoPFTauSequence + hltPFTau50 + hltSelectedPFTausTrackFinding + hltPFTau50Track + hltPFTauTrackPt30Discriminator + hltSelectedPFTausTrackPt30 + hltPFTau50TrackPt30 + hltPFTauLooseRelativeIsolationDiscriminator0p06 + hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + hltSelectedPFTausTrackPt30AbsOrRelIsolation + hltPFTau50TrackPt30LooseAbsOrRelIso + HLTEndSequence ) HLT_ReducedIterativeTracking_v1 = cms.Path( HLTBeginSequence + hltPreReducedIterativeTracking + HLTRecoJetSequenceAK4PrePF + HLTDoLocalPixelSequence + HLTRecopixelvertexingSequence + HLTDoLocalStripSequence + HLTIterativeTrackingIter02 + HLTEndSequence ) HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet605035 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet35MuCleaned + hltIsoMu24Trk02DiCentralPFJet50MuCleaned + hltIsoMu24Trk02CentralPFJet60MuCleaned + HLTEndSequence ) HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02TriCentralPFJet40 + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + hltIsoMu24Trk02TriCentralPFJet40MuCleaned + HLTEndSequence ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet40EleCleaned + HLTEndSequence ) -HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltEle27JetCollectionsForLeptonPlusPFJets + hltEle27TriCentralPFJet35EleCleaned + hltEle27DiCentralPFJet50EleCleaned + hltEle27CentralPFJet60EleCleaned + HLTEndSequence ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet40 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet40 + HLTEndSequence ) +HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfTriCentralPFJet605035 + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hlt3PFJet35 + hlt2PFJet50 + hlt1PFJet60 + HLTEndSequence ) HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + hltL1fL1sMu16L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + HLTL3muoncaloisorecoSequenceNoBools + HLTTrackReconstructionForIsoL3MuonIter02 + hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopIsoMu24 + hltJetFilterSingleTopIsoMu24 + hltCentralJets30SingleTopIsoMu24 + hltLeadingCentralJets30SingleTopIsoMu24 + hltJetTrackAssociationSingleTopIsoMu24 + hltTrackIPTagInfosSingleTopIsoMu24 + hltSecondaryVertexSingleTopIsoMu24 + hltCSVJetTagSingleTopIsoMu24 + hltCSVFilterSingleTopIsoMu24 + HLTEndSequence ) HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sMu16 + hltPreMu40eta2p1PFJet200PFJet50 + hltL1fL1sMu16Eta2p1L1Filtered0 + HLTL2muonrecoSequence + hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + HLTL3muonrecoSequence + hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltMu40eta2p1CleanAK4PFJet + hltMu40eta2p1DiCentralPFJet50MuCleaned + hltMu40eta2p1CentralPFJet200MuCleaned + HLTEndSequence ) -HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetsNoLeptonsSingleTopEle27 + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + HLTEndSequence ) +HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle27WP85GsfCentralPFJet30BTagCSV + HLTEle27WP85GsfSequence + HLTAK4PFJetsSequence + hltOnlinePrimaryVertices + hltGoodOnlinePVs + hltGoodOnlinePVSelector + hltJetFilterSingleTopEle27 + hltCentralJets30SingleTopEle27 + hltLeadingCentralJets30SingleTopEle27 + hltJetTrackAssociationSingleTopEle27 + hltTrackIPTagInfosSingleTopEle27 + hltSecondaryVertexSingleTopEle27 + hltCSVJetTagSingleTopEle27 + hltCSVFilterSingleTopEle27 + HLTEndSequence ) HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + HLTEle45CaloIdVTGsfTrkIdTGsfSequence + HLTAK4PFJetsSequence + hltPFJetsCorrectedMatchedToL1 + hltDiPFJet50 + hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + HLTEndSequence ) HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleEG137 + hltPreEle23Ele12CaloIdTrackIdIso + HLTEle23Ele12CaloIdTrackIdIsoSequence + HLTEndSequence ) HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( HLTBeginSequence + hltL1sL1EG12EG7EG5 + hltPreEle17Ele12Ele10CaloIdTrackId + HLTEle17Ele12Ele10CaloIdTrackIdSequence + HLTEndSequence ) @@ -25779,13 +24426,10 @@ HLT_Photon300_NoHE_VBF_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG30 + hltPrePhoton300NoHEVBF + HLTSinglePhoton300NoHESequence + HLTAK4CaloJetsSequence + hltDiCaloJet20MJJ400AllJetsDEta3Filter + HLTEndSequence ) HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + hltDiEle33CaloIdLNewPixelMatchUnseededFilter + HLTEndSequence ) HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreEle95CaloIdVTGsfTrkIdT + HLTEle95CaloIdVTGsfTrkIdTGsfSequence + HLTEndSequence ) -HLT_DoublePhoton85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePhoton85 + HLTDoublePho85Sequence + HLTEndSequence ) +HLT_DoublePho85_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPreDoublePho85 + HLTDoublePho85Sequence + HLTEndSequence ) HLT_Photon155_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG22 + hltPrePhoton155 + HLTPhoton155Sequence + HLTEndSequence ) HLT_Ele20WP60_Ele8_Mass55_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle20WP60Ele8Mass55 + HLTEle20WP60Ele8Mass55Sequence + HLTEndSequence ) HLT_Ele25WP60_SC4_Mass55_v1 = cms.Path( HLTBeginSequence + hltL1sL1SingleEG20ORL1SingleEG22 + hltPreEle25WP60SC4Mass55 + HLTEle25WP60SC4Mass55Sequence + HLTEndSequence ) -HLT_L2DoubleMu23_NoVertex_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreL2DoubleMu23NoVertex + hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2DoubleMu23NoVertexL2PreFiltered + HLTEndSequence ) -HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 + hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2DoubleMu28NoVertexL2PreFiltered + hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 + HLTEndSequence ) -HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( HLTBeginSequence + hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 + hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + HLTL2muonrecoSequenceNoVtx + hltL2DoubleMu38NoVertexL2PreFiltered + hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 + HLTEndSequence ) HLT_PFMET170_NoiseCleaned_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM36ORETM40 + hltPrePFMET170NoiseCleaned + HLTRecoMETSequence + hltMET90 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean80 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID80 + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET170Filter + HLTEndSequence ) HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( HLTBeginSequence + hltL1sL1ETM36ORETM40 + hltPrePFMET120NoiseCleanedBTagCSV07 + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean70 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID70 + hltSusyPreBtagJetFilter + HLTFastPrimaryVertexSequence + hltFastPVPixelVertexSelector + HLTBtagCSVSequenceL3 + hltBLifetimeL3FilterCSVsusy + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + HLTEndSequence ) HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( HLTBeginSequence + hltL1sL1HTT150OrHTT175 + hltPrePFHT350PFMET120NoiseCleaned + HLTRecoMETSequence + hltMET70 + HLTHBHENoiseCleanerSequence + hltMetClean + hltMETClean60 + HLTAK4CaloJetsSequence + hltMetCleanUsingJetID + hltMETCleanUsingJetID60 + hltHtMht + hltHt280 + HLTAK4PFJetsSequence + hltPFMETProducer + hltPFMET120Filter + hltPFHT + hltPFHT350 + HLTEndSequence ) @@ -25795,11 +24439,14 @@ HLTAnalyzerEndpath = cms.EndPath( hltL1GtTrigReport + hltTrigReport ) -HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_DoubleMu33NoFiltersNoVtx_v1, HLT_DoubleMu38NoFiltersNoVtx_v1, HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1, HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1, HLT_Ele27_WP85_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_PFJet260_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_L2Mu10_NoVertex_NoBPTX_v1, HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1, HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_L2Mu30_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_JetE30_NoBPTX_v1, HLT_JetE30_NoBPTX3BX_NoHalo_v1, HLT_JetE50_NoBPTX3BX_NoHalo_v1, HLT_JetE70_NoBPTX3BX_NoHalo_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePhoton85_v1, HLT_Photon155_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_L2DoubleMu23_NoVertex_v1, HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_Physics_v1, HLTriggerFinalPath, HLTAnalyzerEndpath )) +HLTSchedule = cms.Schedule( *(HLTriggerFirstPath, HLT_Mu40_v1, HLT_IsoMu24_IterTrk02_v1, HLT_IsoTkMu24_IterTrk02_v1, HLT_Mu17_Mu8_v1, HLT_Mu17_TkMu8_v1, HLT_Mu30_TkMu11_v1, HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1, HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1, HLT_DoubleMu4_3_Bs_v1, HLT_DoubleMu4_3_Jpsi_Displaced_v1, HLT_Dimuon20_Jpsi_v1, HLT_Dimuon13_PsiPrime_v1, HLT_Dimuon13_Upsilon_v1, HLT_Mu25_TkMu0_dEta18_Onia_v1, HLT_DoubleMu4_JpsiTrk_Displaced_v1, HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1, HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1, HLT_Ele27_WP85_Gsf_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1, HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1, HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1, HLT_AK8PFJet360TrimMod_Mass30_v1, HLT_L2Mu10_NoVertex_NoBPTX_v1, HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1, HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_L2Mu30_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1, HLT_JetE30_NoBPTX_v1, HLT_JetE30_NoBPTX3BX_NoHalo_v1, HLT_JetE50_NoBPTX3BX_NoHalo_v1, HLT_JetE70_NoBPTX3BX_NoHalo_v1, HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1, HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1, HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1, HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1, HLT_ReducedIterativeTracking_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1, HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1, HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1, HLT_Mu40_eta2p1_PFJet200_PFJet50_v1, HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1, HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1, HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1, HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1, HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1, HLT_Photon135_PFMET40_v1, HLT_Photon150_PFMET40_v1, HLT_Photon160_PFMET40_v1, HLT_Photon250_NoHE_PFMET40_v1, HLT_Photon300_NoHE_PFMET40_v1, HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1, HLT_Photon135_VBF_v1, HLT_Photon150_VBF_v1, HLT_Photon160_VBF_v1, HLT_Photon250_NoHE_VBF_v1, HLT_Photon300_NoHE_VBF_v1, HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1, HLT_Ele95_CaloIdVT_GsfTrkIdT_v1, HLT_DoublePho85_v1, HLT_Photon155_v1, HLT_Ele20WP60_Ele8_Mass55_v1, HLT_Ele25WP60_SC4_Mass55_v1, HLT_PFMET170_NoiseCleaned_v1, HLT_PFMET120_NoiseCleaned_BTagCSV07_v1, HLT_PFHT350_PFMET120_NoiseCleaned_v1, HLT_PFHT900_v1, HLT_Physics_v1, HLTriggerFinalPath, HLTAnalyzerEndpath )) # CMSSW version specific customizations import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_HIon_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_HIon_cff.py index ad501183ae28d..a8da03ce6f81a 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,10 +1,10 @@ -# /dev/CMSSW_7_2_0/HIon/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/HIon/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/HIon/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/HIon/V15') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -747,11 +747,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -773,7 +773,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1283,22 +1283,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -1936,6 +1928,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -1950,14 +1943,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -1967,24 +1960,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -1994,7 +1984,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2007,11 +1997,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -4286,11 +4275,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -7778,5 +7767,8 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_PIon_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_PIon_cff.py index 28432d8dd1c34..617b6009c76b7 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,10 +1,10 @@ -# /dev/CMSSW_7_2_0/PIon/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/PIon/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/PIon/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/PIon/V15') ) HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -747,11 +747,11 @@ 'HcalCellDead' ) ) hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -773,7 +773,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1283,22 +1283,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -1936,6 +1928,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -1950,14 +1943,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -1967,24 +1960,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -1994,7 +1984,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2007,11 +1997,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -4286,11 +4275,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -7778,5 +7767,8 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in locals(): + hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py b/branches/withNewDZ/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py index b77e4f0321043..e839c628adec4 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py @@ -16,17 +16,15 @@ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1', 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1', 'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1', - 'HLT_DoubleMu33NoFiltersNoVtx_v1', - 'HLT_DoubleMu38NoFiltersNoVtx_v1', 'HLT_DoubleMu4_3_Bs_v1', 'HLT_DoubleMu4_3_Jpsi_Displaced_v1', 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -45,9 +43,6 @@ 'HLT_JetE30_NoBPTX_v1', 'HLT_JetE50_NoBPTX3BX_NoHalo_v1', 'HLT_JetE70_NoBPTX3BX_NoHalo_v1', - 'HLT_L2DoubleMu23_NoVertex_v1', - 'HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1', - 'HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1', 'HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1', 'HLT_L2Mu10_NoVertex_NoBPTX_v1', 'HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1', @@ -60,10 +55,8 @@ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_Mu25_TkMu0_dEta18_Onia_v1', 'HLT_Mu30_TkMu11_v1', - 'HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1', 'HLT_Mu40_eta2p1_PFJet200_PFJet50_v1', 'HLT_Mu40_v1', - 'HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1', 'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_PFHT350_PFMET120_NoiseCleaned_v1', 'HLT_PFHT900_v1', @@ -98,6 +91,5 @@ streamA_datasetTemplates_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT') streamA_datasetTemplates_selector.l1tResults = cms.InputTag('') streamA_datasetTemplates_selector.throw = cms.bool(False) -streamA_datasetTemplates_selector.triggerConditions = cms.vstring('HLT_PFJet260_v1', - 'HLT_ReducedIterativeTracking_v1') +streamA_datasetTemplates_selector.triggerConditions = cms.vstring('HLT_ReducedIterativeTracking_v1') diff --git a/branches/withNewDZ/HLTrigger/Configuration/python/Tools/confdb.py b/branches/withNewDZ/HLTrigger/Configuration/python/Tools/confdb.py index f024b20ec0f00..edd3ee14ddf81 100755 --- a/branches/withNewDZ/HLTrigger/Configuration/python/Tools/confdb.py +++ b/branches/withNewDZ/HLTrigger/Configuration/python/Tools/confdb.py @@ -190,13 +190,11 @@ def releaseSpecificCustomize(self): import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now -""" - # from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) -#if cmsswVersion >= "CMSSW_7_2": -# if 'hltESPStripCPEfromTrackAngle' in %(dict)s: -# %(process)shltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in %(dict)s: + %(process)shltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) +""" # customize the configuration according to the options def customize(self): diff --git a/branches/withNewDZ/HLTrigger/Configuration/tables/GRun.txt b/branches/withNewDZ/HLTrigger/Configuration/tables/GRun.txt index a210f1a03c78e..438f6486ba30a 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/tables/GRun.txt +++ b/branches/withNewDZ/HLTrigger/Configuration/tables/GRun.txt @@ -1,6 +1,6 @@ # "GRun" menu -HLT_Ele27_WP85_Gsf_v* # JIRA: CMSHLT-63, updated by CMSHLT-71 and CMSHLT-91 and CMSHLT-111 +HLT_Ele27_WP85_Gsf_v* # JIRA: CMSHLT-63, updated by CMSHLT-71 and CMSHLT-91 #HLT_Ele17_Ele8_Gsf_v* # JIRA: CMSHLT-63, updated by CMSHLT-71 -> TEMPLATE PATH, not for GRun HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v* # JIRA: CMSHLT-63, updated by CMSHLT-71 #HLT_Photon20_CaloIdVL_IsoL_v* # JIRA: CMSHLT-63, updated by CMSHLT-71 -> TEMPLATE PATH, not for GRun @@ -21,13 +21,13 @@ HLT_IsoTkMu24_IterTrk02_v* # JIRA: CMSHLT-72 #HLT_BTagCSV07_v* # JIRA: CMSHLT-66 -> TEMPLATE PATH, not for GRun HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v* # JIRA: CMSHLT-65, updated by CMSHLT-73 -HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-110 +HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-73 #HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v* # JIRA: CMSHLT-73 -> TEMPLATE PATH, not for GRun HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-73 HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v* # JIRA: CMSHLT-99 #HLT_PFJet40_v* # JIRA: CMSHLT-67 -> TEMPLATE PATH, not for GRun -HLT_PFJet260_v* # JIRA: CMSHLT-67 -> TEMPLATE PATH, allowed in GRun by CMSHLT-109 +#HLT_PFJet260_v* # JIRA: CMSHLT-67 -> TEMPLATE PATH, not for GRun #HLT_CaloJet260_v* # JIRA: CMSHLT-67 -> TEMPLATE PATH, not for GRun #HLT_HT650_v* # JIRA: CMSHLT-67 -> TEMPLATE PATH, not for GRun #HLT_PFHT650_v* # JIRA: CMSHLT-67 -> TEMPLATE PATH, not for GRun @@ -35,12 +35,12 @@ HLT_PFJet260_v* # JIRA: CMSHLT-67 -> TEMPLATE PATH, allowed in GRun by CMSH #HLT_IterativeTracking_v* # JIRA: CMSHLT-68 -> TEMPLATE PATH, not for GRun HLT_ReducedIterativeTracking_v* # JIRA: CMSHLT-68, updated by CMSHLT-107 -> TEMPLATE PATH, in GRun but prescaled to 0 -HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v* # JIRA: CMSHLT-77, updated by CMSHLT-111 -HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v* # JIRA: CMSHLT-77, updated by CMSHLT-111 -HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v* # JIRA: CMSHLT-77, updated by CMSHLT-91 and by CMSHLT-111 -HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v* # JIRA: CMSHLT-77, updated by CMSHLT-91 and by CMSHLT-111 -HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v* # JIRA: CMSHLT-77, updated by CMSHLT-111 -HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v* # JIRA: CMSHLT-77, updated by CMSHLT-91 and by CMSHLT-111 +HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v* # JIRA: CMSHLT-77 +HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v* # JIRA: CMSHLT-77 +HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v* # JIRA: CMSHLT-77, updated by CMSHLT-91 +HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v* # JIRA: CMSHLT-77, updated by CMSHLT-91 +HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v* # JIRA: CMSHLT-77 +HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v* # JIRA: CMSHLT-77, updated by CMSHLT-91 HLT_Ele23_Ele12_CaloId_TrackId_Iso_v* # JIRA: CMSHLT-78 HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v* # JIRA: CMSHLT-78 @@ -94,7 +94,7 @@ HLT_JetE70_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-87 HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v* # JIRA: CMSHLT-88 HLT_Ele95_CaloIdVT_GsfTrkIdT_v* # JIRA: CMSHLT-88 -HLT_DoublePhoton85_v* # JIRA: CMSHLT-88 +HLT_DoublePho85_v* # JIRA: CMSHLT-88 HLT_Photon155_v* # JIRA: CMSHLT-88 #HLT_PFHT750_4Jet_v* # JIRA: CMSHLT-90 (PFnoPU version was from CMSHLT-89) @@ -105,19 +105,19 @@ HLT_Ele25WP60_SC4_Mass55_v* # JIRA: CMSHLT-95 #HLT_PFHT550_4Jet_v* # JIRA: CMSHLT-96 #HLT_PFHT650_4Jet_v* # JIRA: CMSHLT-96 -HLT_DoubleMu33NoFiltersNoVtx_v* # JIRA: CMSHLT-97 -HLT_DoubleMu38NoFiltersNoVtx_v* # JIRA: CMSHLT-97 -HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v* # JIRA: CMSHLT-97 -HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v* # JIRA: CMSHLT-97 +#HLT_DoubleMu33NoFiltersNoVtx_v* # JIRA: CMSHLT-97 +#HLT_DoubleMu38NoFiltersNoVtx_v* # JIRA: CMSHLT-97 +#HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v* # JIRA: CMSHLT-97 +#HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v* # JIRA: CMSHLT-97 HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v* # JIRA: CMSHLT-98 HLT_Mu40_eta2p1_PFJet200_PFJet50_v* # JIRA: CMSHLT-98 HLT_AK8PFJet360TrimMod_Mass30_v* # JIRA: CMSHLT-101 -HLT_L2DoubleMu23_NoVertex_v* # JIRA: CMSHLT-103 -HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v* # JIRA: CMSHLT-103 -HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v* # JIRA: CMSHLT-103 +#HLT_L2DoubleMu23_NoVertex_v* # JIRA: CMSHLT-103 +#HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v* # JIRA: CMSHLT-103 +#HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v* # JIRA: CMSHLT-103 #HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v* # JIRA: CMSHLT-104 diff --git a/branches/withNewDZ/HLTrigger/Configuration/tables/makeSubTables b/branches/withNewDZ/HLTrigger/Configuration/tables/makeSubTables index 930aefa6a2fbe..dfe462e5cd51f 100755 --- a/branches/withNewDZ/HLTrigger/Configuration/tables/makeSubTables +++ b/branches/withNewDZ/HLTrigger/Configuration/tables/makeSubTables @@ -3,8 +3,8 @@ # generate HLT tables from master table in ConfDB # -MASTER="/dev/CMSSW_7_2_0/HLT" # no version, take the latest one -TARGET="/dev/CMSSW_7_2_0/TABLE" # directory where to store the sub-tables +MASTER="/dev/CMSSW_7_1_2/HLT" # no version, take the latest one +TARGET="/dev/CMSSW_7_1_2/TABLE" # directory where to store the sub-tables TABLES="GRun HIon PIon" # which sub-tables to create source subtables.sh diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_2014.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_2014.py index 60beacc648ba2..41e83c92dcbed 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_2014.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_2014.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/2014/V5 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_0/GRun/V63 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLT2014" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/2014/V5') + tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V63') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -2935,11 +2935,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -2961,7 +2961,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -3590,22 +3590,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -5064,6 +5056,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -5078,14 +5071,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -5095,24 +5088,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -5122,7 +5112,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -5135,11 +5125,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -11977,19 +11966,15 @@ ) process.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltIter4Merged" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltIter4Merged" ) ) process.hltDeDxFilter50DEDX3p6 = cms.EDFilter( "HLTDeDxFilter", @@ -14717,19 +14702,15 @@ ) process.hltDeDxEstimatorProducerL3Tk = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltL3TkTracksFromL2OIState" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltL3TkTracksFromL2OIState" ) ) process.hltDeDxFilter50DEDX3p6Mu = cms.EDFilter( "HLTDeDxFilter", @@ -28544,9 +28525,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -29868,9 +29847,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltDoublePFTau30 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -32301,9 +32278,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltDoublePFTau30Reg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -54945,7 +54920,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_FULL.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_FULL.py index a13907027247d..d001f88528ec8 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_FULL.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_FULL.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/HLT/V4 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/HLT/V23 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFULL" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V4') + tableName = cms.string('/dev/CMSSW_7_1_2/HLT/V23') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -480,10 +480,10 @@ 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -1221,11 +1221,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1247,7 +1247,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1762,22 +1762,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2556,6 +2548,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2570,14 +2563,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2587,24 +2580,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2614,7 +2604,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2627,11 +2617,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -12988,11 +12977,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -19312,9 +19301,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -19376,9 +19363,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -19524,13 +19509,13 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -19553,17 +19538,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -process.hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -19571,61 +19556,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +process.hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -19635,7 +19620,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -19650,79 +19635,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -process.hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -19737,10 +19704,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +process.hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -19753,14 +19720,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -19773,7 +19740,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -20608,9 +20575,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -20672,9 +20637,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -22290,9 +22253,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -22354,9 +22315,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -22734,9 +22693,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -24487,11 +24444,10 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -24537,51 +24493,49 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), @@ -24640,11 +24594,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -24837,20 +24790,15 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) process.hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -27470,7 +27418,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +process.hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) @@ -28339,32 +28287,10 @@ htLabels = cms.VInputTag( 'hltPFHT' ), minHt = cms.vdouble( 900.0 ) ) -process.hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_ETM40" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) process.hltPrePFMHT100SingleCentralJet60BTagCSV0p6 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltMET80 = cms.EDFilter( "HLT1CaloMET", - saveTags = cms.bool( True ), - MinPt = cms.double( 80.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( -1.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltMet" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 87 ) -) process.hltSingleCentralJet60L1FastJetCorrected = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), MinPt = cms.double( 60.0 ), @@ -28612,11 +28538,6 @@ mhtLabels = cms.VInputTag( 'hltPFMhtIDLoose' ), minMht = cms.vdouble( 100.0 ) ) -process.hltPFMET100Filter = cms.EDFilter( "HLTMhtFilter", - saveTags = cms.bool( True ), - mhtLabels = cms.VInputTag( 'hltPFMETProducer' ), - minMht = cms.vdouble( 100.0 ) -) process.hltPrePhysics = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) @@ -28675,11 +28596,11 @@ 'HLT_DoubleMu4_Jpsi_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele17_Ele8_Gsf_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -28900,9 +28821,9 @@ process.HLTPFTriggerSequenceMuTau = cms.Sequence( process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) process.HLTLooseIsoPFTauSequence = cms.Sequence( process.hltTauPFJets08Region + process.hltTauPFJetsRecoTauChargedHadrons + process.hltPFTauPiZeros + process.hltPFTausSansRef + process.hltPFTaus + process.hltPFTauTrackFindingDiscriminator + process.hltPFTauLooseAbsoluteIsolationDiscriminator + process.hltPFTauLooseRelativeIsolationDiscriminator + process.hltPFTauLooseAbsOrRelIsolationDiscriminator ) process.HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltPFTauAgainstMuonDiscriminator + process.hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + process.hltPFTau20TrackLooseIsoAgainstMuon + process.hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -process.HLTEle22WP85GsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP85ClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP85HEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP85EcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP85HcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP85PixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP85GsfOneOESuperMinusOneOPFilter + process.hltEle22WP85GsfMissingHitsFilter + process.hltEle22WP85GsfDetaFilter + process.hltEle22WP85GsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP85GsfTrackIsoFilter ) +process.HLTEle22WP90RhoGsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP90RhoClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP90RhoHEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP90RhoEcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP90RhoHcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP90RhoPixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + process.hltEle22WP90RhoGsfDetaFilter + process.hltEle22WP90RhoGsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP90RhoGsfTrackIsoFilter ) process.HLTPFTriggerSequenceForTaus = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) -process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +process.HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) process.HLTCaloTausCreatorRegionalSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltCaloTowersTau1Regional + process.hltIconeTau1Regional + process.hltCaloTowersTau2Regional + process.hltIconeTau2Regional + process.hltCaloTowersTau3Regional + process.hltIconeTau3Regional + process.hltCaloTowersTau4Regional + process.hltIconeTau4Regional + process.hltCaloTowersCentral1Regional + process.hltIconeCentral1Regional + process.hltCaloTowersCentral2Regional + process.hltIconeCentral2Regional + process.hltCaloTowersCentral3Regional + process.hltIconeCentral3Regional + process.hltCaloTowersCentral4Regional + process.hltIconeCentral4Regional ) process.HLTL2TauJetsSequence = cms.Sequence( process.HLTCaloTausCreatorRegionalSequence + process.hltL2TauJets ) process.HLTDoLocalPixelSequenceRegL2Tau = cms.Sequence( process.hltSiPixelDigisReg + process.hltSiPixelClustersReg + process.hltSiPixelClustersRegCache + process.hltSiPixelRecHitsReg ) @@ -29009,7 +28930,7 @@ process.HLT_JetE50_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE50NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy50 + process.HLTEndSequence ) process.HLT_JetE70_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE70NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy70 + process.HLTEndSequence ) process.HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu14erORMu16er + process.hltPreIsoMu17eta2p1LooseIsoPFTau20 + process.hltL1fL1sMu14erORMu16erL1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.HLTPFTriggerSequenceMuTau + process.HLTIsoMuLooseIsoPFTauSequence + process.HLTEndSequence ) -process.HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + process.HLTEle22WP85GsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) +process.HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + process.HLTEle22WP90RhoGsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) process.HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sDoubleTauJet44erorDoubleJetC64 + process.hltPreDoubleMediumIsoPFTau40Trk1eta2p1 + process.HLTL2TauJetsSequence + process.hltDoubleL2Tau35eta2p1 + process.HLTL2TauPixelIsolationSequence + process.hltL2DiTauIsoFilter + process.hltL2TauJetsIso + process.hltDoubleL2IsoTau35eta2p1 + process.HLTPFReconstructionSequenceForTaus + process.HLTMediumIsoPFTauSequence + process.hltDoublePFTau40 + process.hltPFTauTrackPt1Discriminator + process.hltSelectedPFTausTrackPt1 + process.hltDoublePFTau40TrackPt1 + process.hltSelectedPFTausTrackPt1MediumIsolation + process.hltDoublePFTau40TrackPt1MediumIsolation + process.hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatch + process.hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatched + process.hltDoublePFTau40TrackPt1MediumIsolationDz02 + process.HLTEndSequence ) process.HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sDoubleTauJet44erorDoubleJetC64 + process.hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + process.HLTL2TauJetsSequence + process.hltDoubleL2Tau35eta2p1 + process.HLTL2TauPixelIsolationSequence + process.hltL2DiTauIsoFilter + process.hltL2TauJetsIso + process.hltDoubleL2IsoTau35eta2p1 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFJetTriggerSequenceReg + process.HLTMediumIsoPFTauSequenceReg + process.hltDoublePFTau40Reg + process.hltPFTauTrackPt1DiscriminatorReg + process.hltSelectedPFTausTrackPt1Reg + process.hltDoublePFTau40TrackPt1Reg + process.hltSelectedPFTausTrackPt1MediumIsolationReg + process.hltDoublePFTau40TrackPt1MediumIsolationReg + process.hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + process.hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + process.hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + process.HLTEndSequence ) process.HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM70 + process.hltPreLooseIsoPFTau50Trk30eta2p1MET120 + process.HLTL2TauJetsSequence + process.hltSingleL2Tau35eta2p1 + process.HLTRecoMETSequence + process.hltMET120 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean120 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID120 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFTriggerSequenceForTaus + process.HLTLooseIsoPFTauSequence + process.hltPFTau50 + process.hltSelectedPFTausTrackFinding + process.hltPFTau50Track + process.hltPFTauTrackPt30Discriminator + process.hltSelectedPFTausTrackPt30 + process.hltPFTau50TrackPt30 + process.hltPFTauLooseRelativeIsolationDiscriminator0p06 + process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + process.hltSelectedPFTausTrackPt30AbsOrRelIsolation + process.hltPFTau50TrackPt30LooseAbsOrRelIso + process.HLTEndSequence ) @@ -29019,11 +28940,11 @@ process.HLT_ReducedIterativeTracking_v1 = cms.Path( process.HLTBeginSequence + process.hltPreReducedIterativeTracking + process.HLTRecoJetSequenceAK4PrePF + process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned + process.hltIsoMu24Trk02DiCentralPFJet50MuCleaned + process.hltIsoMu24Trk02CentralPFJet60MuCleaned + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet40 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet40MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet40EleCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet35EleCleaned + process.hltEle27DiCentralPFJet50EleCleaned + process.hltEle27CentralPFJet60EleCleaned + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet40 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet35 + process.hlt2PFJet50 + process.hlt1PFJet60 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopIsoMu24 + process.hltJetFilterSingleTopIsoMu24 + process.hltCentralJets30SingleTopIsoMu24 + process.hltLeadingCentralJets30SingleTopIsoMu24 + process.hltJetTrackAssociationSingleTopIsoMu24 + process.hltTrackIPTagInfosSingleTopIsoMu24 + process.hltSecondaryVertexSingleTopIsoMu24 + process.hltCSVJetTagSingleTopIsoMu24 + process.hltCSVFilterSingleTopIsoMu24 + process.HLTEndSequence ) process.HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreMu40eta2p1PFJet200PFJet50 + process.hltL1fL1sMu16Eta2p1L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltMu40eta2p1CleanAK4PFJet + process.hltMu40eta2p1DiCentralPFJet50MuCleaned + process.hltMu40eta2p1CentralPFJet200MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopEle27 + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) process.HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + process.HLTEle45CaloIdVTGsfTrkIdTGsfSequence + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltDiPFJet50 + process.hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + process.hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + process.hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + process.HLTEndSequence ) process.HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleEG137 + process.hltPreEle23Ele12CaloIdTrackIdIso + process.HLTEle23Ele12CaloIdTrackIdIsoSequence + process.HLTEndSequence ) process.HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1EG12EG7EG5 + process.hltPreEle17Ele12Ele10CaloIdTrackId + process.HLTEle17Ele12Ele10CaloIdTrackIdSequence + process.HLTEndSequence ) @@ -29051,7 +28972,7 @@ process.HLT_Photon300_NoHE_VBF_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG30 + process.hltPrePhoton300NoHEVBF + process.HLTSinglePhoton300NoHESequence + process.HLTAK4CaloJetsSequence + process.hltDiCaloJet20MJJ400AllJetsDEta3Filter + process.HLTEndSequence ) process.HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + process.HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + process.hltDiEle33CaloIdLNewPixelMatchUnseededFilter + process.HLTEndSequence ) process.HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle95CaloIdVTGsfTrkIdT + process.HLTEle95CaloIdVTGsfTrkIdTGsfSequence + process.HLTEndSequence ) -process.HLT_DoublePhoton85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePhoton85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) +process.HLT_DoublePho85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePho85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) process.HLT_Photon155_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPrePhoton155 + process.HLTPhoton155Sequence + process.HLTEndSequence ) process.HLT_PFHT550_4Jet_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT5504Jet + process.HLTAK4CaloJetsSequence + process.hltHtMht4Jet + process.hlt4JetHt450 + process.HLTAK4PFJetsSequence + process.hltPFHT4Jet + process.hltPF4JetHT550 + process.HLTEndSequence ) process.HLT_PFHT650_4Jet_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT6504Jet + process.HLTAK4CaloJetsSequence + process.hltHtMht4Jet + process.hlt4JetHt550 + process.HLTAK4PFJetsSequence + process.hltPFHT4Jet + process.hltPF4JetHT650 + process.HLTEndSequence ) @@ -29065,7 +28986,7 @@ process.HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM36ORETM40 + process.hltPrePFMET120NoiseCleanedBTagCSV07 + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean70 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID70 + process.hltSusyPreBtagJetFilter + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSVsusy + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.HLTEndSequence ) process.HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT350PFMET120NoiseCleaned + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean60 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID60 + process.hltHtMht + process.hltHt280 + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.hltPFHT + process.hltPFHT350 + process.HLTEndSequence ) process.HLT_PFHT900_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT900 + process.HLTAK4CaloJetsSequence + process.hltHtMht + process.hltHt700 + process.HLTAK4PFJetsSequence + process.hltPFHT + process.hltPFHT900 + process.HLTEndSequence ) -process.HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 + process.hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + process.HLTRecoMETSequence + process.hltMET80 + process.HLTAK4CaloJetsSequence + process.hltSingleCentralJet60L1FastJetCorrected + process.hltDiCentralJet20L1FastJetCorrected + process.hltSelectorJets20L1FastJetForNoPU + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTNoPUSequence + process.hltMhtProducerNoPU20 + process.hltMhtNoPU80Filter + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSV0p6 + process.HLTAK4PFJetsSequence + process.HLTPFJetIDProducerLoose + process.hltPFMhtIDLoose + process.hltPFMHTIDLoose100Filter + process.hltPFMETProducer + process.hltPFMET100Filter + process.HLTEndSequence ) +process.HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( process.HLTBeginSequence + process.hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + process.HLTAK4CaloJetsSequence + process.hltSingleCentralJet60L1FastJetCorrected + process.hltDiCentralJet20L1FastJetCorrected + process.hltSelectorJets20L1FastJetForNoPU + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTNoPUSequence + process.hltMhtProducerNoPU20 + process.hltMhtNoPU80Filter + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSV0p6 + process.HLTAK4PFJetsSequence + process.HLTPFJetIDProducerLoose + process.hltPFMhtIDLoose + process.hltPFMHTIDLoose100Filter + process.HLTEndSequence ) process.HLT_Physics_v1 = cms.Path( process.HLTBeginSequence + process.hltPrePhysics + process.HLTEndSequence ) process.HLTriggerFinalPath = cms.Path( process.hltGtDigis + process.hltScalersRawToDigi + process.hltFEDSelector + process.hltTriggerSummaryAOD + process.hltTriggerSummaryRAW ) process.HLTAnalyzerEndpath = cms.EndPath( process.hltL1GtTrigReport + process.hltTrigReport ) @@ -29098,7 +29019,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_GRun.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_GRun.py index 40a949c24a948..7aef7bbe2985a 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_GRun.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_GRun.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/GRun/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/GRun/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTGRun" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/GRun/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/GRun/V15') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -461,17 +461,15 @@ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1', 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1', 'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1', - 'HLT_DoubleMu33NoFiltersNoVtx_v1', - 'HLT_DoubleMu38NoFiltersNoVtx_v1', 'HLT_DoubleMu4_3_Bs_v1', 'HLT_DoubleMu4_3_Jpsi_Displaced_v1', 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -490,9 +488,6 @@ 'HLT_JetE30_NoBPTX_v1', 'HLT_JetE50_NoBPTX3BX_NoHalo_v1', 'HLT_JetE70_NoBPTX3BX_NoHalo_v1', - 'HLT_L2DoubleMu23_NoVertex_v1', - 'HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1', - 'HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1', 'HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1', 'HLT_L2Mu10_NoVertex_NoBPTX_v1', 'HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1', @@ -505,10 +500,8 @@ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_Mu25_TkMu0_dEta18_Onia_v1', 'HLT_Mu30_TkMu11_v1', - 'HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1', 'HLT_Mu40_eta2p1_PFJet200_PFJet50_v1', 'HLT_Mu40_v1', - 'HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1', 'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_PFHT350_PFMET120_NoiseCleaned_v1', 'HLT_PFHT900_v1', @@ -538,8 +531,7 @@ 'HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1', 'HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1', 'HLT_Physics_v1' ), - Templates = cms.vstring( 'HLT_PFJet260_v1', - 'HLT_ReducedIterativeTracking_v1' ) + Templates = cms.vstring( 'HLT_ReducedIterativeTracking_v1' ) ) process.magfield = cms.ESSource( "XMLIdealGeometryESSource", @@ -1188,11 +1180,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1214,7 +1206,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1729,22 +1721,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2523,6 +2507,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2537,14 +2522,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2554,24 +2539,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2581,7 +2563,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2594,11 +2576,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -10161,1409 +10142,98 @@ MuMuTkVertexTag = cms.InputTag( "hltLowMassNonResonantTkVertexProducer" ), MinPt = cms.double( 0.0 ) ) -process.hltPreDoubleMu33NoFiltersNoVtx = cms.EDFilter( "HLTPrescaler", +process.hltL1sL1SingleEG20ORL1SingleEG22 = cms.EDFilter( "HLTLevel1GTSeed", + L1SeedsLogicalExpression = cms.string( "L1_SingleEG20 OR L1_SingleEG22" ), + saveTags = cms.bool( True ), + L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), + L1UseL1TriggerObjectMaps = cms.bool( True ), + L1UseAliasesForSeeding = cms.bool( True ), L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) + L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), + L1NrBxInEvent = cms.int32( 3 ), + L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), + L1TechTriggerSeeding = cms.bool( False ) ) -process.hltDimuonL1Filtered0 = cms.EDFilter( "HLTMuonL1Filter", - saveTags = cms.bool( True ), - CSCTFtag = cms.InputTag( "unused" ), - PreviousCandTag = cms.InputTag( "hltL1sL1DoubleMu10MuOpenORDoubleMu103p5" ), - MinPt = cms.double( 0.0 ), - MinN = cms.int32( 2 ), - MaxEta = cms.double( 2.5 ), - SelectQualities = cms.vint32( ), - CandTag = cms.InputTag( "hltL1extraParticles" ), - ExcludeSingleSegmentCSC = cms.bool( False ) +process.hltPreEle27WP85Gsf = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) ) -process.hltL2MuonCandidatesNoVtx = cms.EDProducer( "L2MuonCandidateProducer", - InputObjects = cms.InputTag( "hltL2Muons" ) +process.hltRechitInRegionsECAL = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + useUncalib = cms.bool( False ), + regionEtaMargin = cms.double( 0.14 ), + ecalhitLabels = cms.VInputTag( 'hltEcalRecHit:EcalRecHitsEB','hltEcalRecHit:EcalRecHitsEE' ), + regionPhiMargin = cms.double( 0.4 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1UpperThr = cms.double( 999.0 ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + productLabels = cms.vstring( 'EcalRecHitsEB', + 'EcalRecHitsEE' ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) ) -process.hltDimuonL2NoVtxFiltered10 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL1Filtered0" ), - MinPt = cms.double( 10.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) +process.hltRechitInRegionsES = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + useUncalib = cms.bool( False ), + regionEtaMargin = cms.double( 0.14 ), + ecalhitLabels = cms.VInputTag( 'hltEcalPreshowerRecHit:EcalRecHitsES' ), + regionPhiMargin = cms.double( 0.4 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1UpperThr = cms.double( 999.0 ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + productLabels = cms.vstring( 'EcalRecHitsES' ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) ) -process.hltL3TrajSeedOIStateNoVtx = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - propagatorCompatibleName = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - option = cms.uint32( 3 ), - maxChi2 = cms.double( 40.0 ), - errorMatrixPset = cms.PSet( - atIP = cms.bool( True ), - action = cms.string( "use" ), - errorMatrixValuesPSet = cms.PSet( - pf3_V12 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V13 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V11 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V14 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V15 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - yAxis = cms.vdouble( 0.0, 1.0, 1.4, 10.0 ), - pf3_V33 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - zAxis = cms.vdouble( -3.14159, 3.14159 ), - pf3_V44 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - xAxis = cms.vdouble( 0.0, 13.0, 30.0, 70.0, 1000.0 ), - pf3_V22 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V23 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V45 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V55 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V34 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V35 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V25 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) +process.hltParticleFlowRecHitECALL1Seeded = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEB' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.08 ), + name = cms.string( "PFRecHitQTestThreshold" ) ), - pf3_V24 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) ) - ) + ), + name = cms.string( "PFEBRecHitCreator" ) ), - propagatorName = cms.string( "hltESPSteppingHelixPropagatorAlong" ), - manySeeds = cms.bool( False ), - copyMuonRecHit = cms.bool( False ), - ComponentName = cms.string( "TSGForRoadSearch" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSteppingHelixPropagatorOpposite', - 'hltESPSteppingHelixPropagatorAlong' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEE' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.3 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ), + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) + ) + ), + name = cms.string( "PFEERecHitCreator" ) + ) ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( ), - PtCut = cms.double( 1.0 ) + navigator = cms.PSet( + barrel = cms.PSet( ), + endcap = cms.PSet( ), + name = cms.string( "PFRecHitECALNavigator" ) + ) ) -process.hltL3TrackCandidateFromL2OIStateNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3TrajSeedOIStateNoVtx" ), - reverseTrajectories = cms.bool( True ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) +process.hltParticleFlowRecHitPSL1Seeded = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsES','EcalRecHitsES' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 7.0E-6 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ) + ), + name = cms.string( "PFPSRecHitCreator" ) + ) ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilderSeedHit" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilderSeedHit" ), - maxNSeeds = cms.uint32( 100000 ) -) -process.hltL3TkTracksFromL2OIStateNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3TrackCandidateFromL2OIStateNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -process.hltL3NoFiltersNoVtxMuonsOIState = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2OIStateNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -process.hltL3NoFiltersNoVtxTrajSeedOIHit = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - PSetNames = cms.vstring( 'skipTSG', - 'iterativeTSG' ), - L3TkCollectionA = cms.InputTag( "hltL3NoFiltersNoVtxMuonsOIState" ), - iterativeTSG = cms.PSet( - ErrorRescaling = cms.double( 3.0 ), - beamSpot = cms.InputTag( "unused" ), - MaxChi2 = cms.double( 40.0 ), - errorMatrixPset = cms.PSet( - atIP = cms.bool( True ), - action = cms.string( "use" ), - errorMatrixValuesPSet = cms.PSet( - pf3_V12 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V13 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V11 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V14 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V15 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - yAxis = cms.vdouble( 0.0, 1.0, 1.4, 10.0 ), - pf3_V33 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - zAxis = cms.vdouble( -3.14159, 3.14159 ), - pf3_V44 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - xAxis = cms.vdouble( 0.0, 13.0, 30.0, 70.0, 1000.0 ), - pf3_V22 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V23 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V45 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V55 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V34 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V35 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V25 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V24 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ) - ) - ), - UpdateState = cms.bool( True ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - SelectState = cms.bool( False ), - SigmaZ = cms.double( 25.0 ), - ResetMethod = cms.string( "matrix" ), - ComponentName = cms.string( "TSGFromPropagation" ), - UseVertexState = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAnyOpposite" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ) - ), - skipTSG = cms.PSet( ), - ComponentName = cms.string( "DualByL2TSG" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'PropagatorWithMaterial', - 'hltESPSmartPropagatorAnyOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( - cleanerFromSharedHits = cms.bool( True ), - ptCleaner = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - directionCleaner = cms.bool( True ) - ), - PtCut = cms.double( 1.0 ) -) -process.hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3NoFiltersNoVtxTrajSeedOIHit" ), - reverseTrajectories = cms.bool( True ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) - ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilder" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilder" ), - maxNSeeds = cms.uint32( 100000 ) -) -process.hltL3NoFiltersTkTracksFromL2OIHitNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -process.hltL3NoFiltersNoVtxMuonsOIHit = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3NoFiltersTkTracksFromL2OIHitNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -process.hltL3NoFiltersNoVtxTkFromL2OICombination = cms.EDProducer( "L3TrackCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit' ) -) -process.hltL3NoFiltersNoVtxTrajSeedIOHit = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - PSetNames = cms.vstring( 'skipTSG', - 'iterativeTSG' ), - L3TkCollectionA = cms.InputTag( "hltL3NoFiltersNoVtxTkFromL2OICombination" ), - iterativeTSG = cms.PSet( - firstTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - ComponentName = cms.string( "StandardHitTripletGenerator" ), - GeneratorPSet = cms.PSet( - useBending = cms.bool( True ), - useFixedPreFiltering = cms.bool( False ), - maxElement = cms.uint32( 0 ), - phiPreFiltering = cms.double( 0.3 ), - extraHitRPhitolerance = cms.double( 0.06 ), - useMultScattering = cms.bool( True ), - ComponentName = cms.string( "PixelTripletHLTGenerator" ), - extraHitRZtolerance = cms.double( 0.06 ), - SeedComparitorPSet = cms.PSet( ComponentName = cms.string( "none" ) ) - ), - SeedingLayers = cms.InputTag( "hltPixelLayerTriplets" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ), - PSetNames = cms.vstring( 'firstTSG', - 'secondTSG' ), - ComponentName = cms.string( "CombinedTSG" ), - thirdTSG = cms.PSet( - PSetNames = cms.vstring( 'endcapTSG', - 'barrelTSG' ), - barrelTSG = cms.PSet( ), - endcapTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - maxElement = cms.uint32( 0 ), - ComponentName = cms.string( "StandardHitPairGenerator" ), - useOnDemandTracker = cms.untracked.int32( 0 ), - SeedingLayers = cms.InputTag( "hltMixedLayerPairs" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ), - etaSeparation = cms.double( 2.0 ), - ComponentName = cms.string( "DualByEtaTSG" ) - ), - secondTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - maxElement = cms.uint32( 0 ), - ComponentName = cms.string( "StandardHitPairGenerator" ), - useOnDemandTracker = cms.untracked.int32( 0 ), - SeedingLayers = cms.InputTag( "hltPixelLayerPairs" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ) - ), - skipTSG = cms.PSet( ), - ComponentName = cms.string( "DualByL2TSG" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'PropagatorWithMaterial' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.1 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.1 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( - cleanerFromSharedHits = cms.bool( True ), - ptCleaner = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - directionCleaner = cms.bool( True ) - ), - PtCut = cms.double( 1.0 ) -) -process.hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3NoFiltersNoVtxTrajSeedIOHit" ), - reverseTrajectories = cms.bool( False ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) - ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilder" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilder" ), - maxNSeeds = cms.uint32( 100000 ) -) -process.hltL3NoFiltersTkTracksFromL2IOHitNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -process.hltL3NoFiltersNoVtxMuonsIOHit = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3NoFiltersTkTracksFromL2IOHitNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -process.hltL3NoFiltersNoVtxTrajectorySeed = cms.EDProducer( "L3MuonTrajectorySeedCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxTrajSeedIOHit','hltL3TrajSeedOIStateNoVtx','hltL3NoFiltersNoVtxTrajSeedOIHit' ) -) -process.hltL3NoFiltersTrackCandidateFromL2NoVtx = cms.EDProducer( "L3TrackCandCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx','hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx','hltL3TrackCandidateFromL2OIStateNoVtx' ) -) -process.hltL3NoFiltersNoVtxTkTracksMergeStep1 = cms.EDProducer( "SimpleTrackListMerger", - ShareFrac = cms.double( 0.19 ), - promoteTrackQuality = cms.bool( True ), - MinPT = cms.double( 0.05 ), - copyExtras = cms.untracked.bool( True ), - Epsilon = cms.double( -0.001 ), - allowFirstHitShare = cms.bool( True ), - newQuality = cms.string( "confirmed" ), - MaxNormalizedChisq = cms.double( 1000.0 ), - TrackProducer1 = cms.string( "hltL3TkTracksFromL2OIStateNoVtx" ), - MinFound = cms.int32( 3 ), - TrackProducer2 = cms.string( "hltL3NoFiltersTkTracksFromL2OIHitNoVtx" ), - LostHitPenalty = cms.double( 0.0 ), - FoundHitBonus = cms.double( 100.0 ) -) -process.hltL3NoFiltersTkTracksFromL2Novtx = cms.EDProducer( "SimpleTrackListMerger", - ShareFrac = cms.double( 0.19 ), - promoteTrackQuality = cms.bool( True ), - MinPT = cms.double( 0.05 ), - copyExtras = cms.untracked.bool( True ), - Epsilon = cms.double( -0.001 ), - allowFirstHitShare = cms.bool( True ), - newQuality = cms.string( "confirmed" ), - MaxNormalizedChisq = cms.double( 1000.0 ), - TrackProducer1 = cms.string( "hltL3NoFiltersNoVtxTkTracksMergeStep1" ), - MinFound = cms.int32( 3 ), - TrackProducer2 = cms.string( "hltL3NoFiltersTkTracksFromL2IOHitNoVtx" ), - LostHitPenalty = cms.double( 0.0 ), - FoundHitBonus = cms.double( 100.0 ) -) -process.hltL3NoFiltersNoVtxMuonsLinksCombination = cms.EDProducer( "L3TrackLinksCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit','hltL3NoFiltersNoVtxMuonsIOHit' ) -) -process.hltL3NoFiltersNoVtxMuons = cms.EDProducer( "L3TrackCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit','hltL3NoFiltersNoVtxMuonsIOHit' ) -) -process.hltL3NoFiltersNoVtxMuonCandidates = cms.EDProducer( "L3MuonCandidateProducer", - InputLinksObjects = cms.InputTag( "hltL3NoFiltersNoVtxMuonsLinksCombination" ), - InputObjects = cms.InputTag( "hltL3NoFiltersNoVtxMuons" ), - MuonPtOption = cms.string( "Tracker" ) -) -process.hltDimuonL3NoFiltersNoVtxFiltered33 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL2NoVtxFiltered10" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 2 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 33.0 ) -) -process.hltPreDoubleMu38NoFiltersNoVtx = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltDimuonL2NoVtxFiltered16 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL1Filtered0" ), - MinPt = cms.double( 16.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltDimuonL3NoFiltersNoVtxFiltered38 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL2NoVtxFiltered16" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 2 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 38.0 ) -) -process.hltL1sL1Mu3p5EG12 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_Mu3p5_EG12" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) -process.hltPreMu38NoFiltersNoVtxPhoton38CaloIdL = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL1Mu3p5EG12L1Filtered3p5 = cms.EDFilter( "HLTMuonL1Filter", - saveTags = cms.bool( False ), - CSCTFtag = cms.InputTag( "unused" ), - PreviousCandTag = cms.InputTag( "hltL1sL1Mu3p5EG12" ), - MinPt = cms.double( 3.5 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 2.5 ), - SelectQualities = cms.vint32( ), - CandTag = cms.InputTag( "hltL1extraParticles" ), - ExcludeSingleSegmentCSC = cms.bool( False ) -) -process.hltL1Mu3p5EG12L2NoVtxFiltered16 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( False ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L1Filtered3p5" ), - MinPt = cms.double( 16.0 ), - MinN = cms.int32( 1 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered38 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L2NoVtxFiltered16" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 1 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 38.0 ) -) -process.hltHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaHLTHybridClusterProducer", - xi = cms.double( 0.0 ), - regionEtaMargin = cms.double( 0.14 ), - regionPhiMargin = cms.double( 0.4 ), - severityRecHitThreshold = cms.double( 4.0 ), - RecHitFlagToBeExcluded = cms.vstring( ), - ecalhitcollection = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - eThreshA = cms.double( 0.003 ), - basicclusterCollection = cms.string( "" ), - eThreshB = cms.double( 0.1 ), - dynamicPhiRoad = cms.bool( False ), - useEtForXi = cms.bool( True ), - l1UpperThr = cms.double( 999.0 ), - excludeFlagged = cms.bool( True ), - posCalcParameters = cms.PSet( - T0_barl = cms.double( 7.4 ), - LogWeighted = cms.bool( True ), - T0_endc = cms.double( 3.1 ), - T0_endcPresh = cms.double( 1.2 ), - W0 = cms.double( 4.2 ), - X0 = cms.double( 0.89 ) - ), - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - eseed = cms.double( 0.35 ), - ethresh = cms.double( 0.1 ), - ewing = cms.double( 0.0 ), - RecHitSeverityToBeExcluded = cms.vstring( 'kWeird' ), - step = cms.int32( 17 ), - debugLevel = cms.string( "INFO" ), - dynamicEThresh = cms.bool( False ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), - superclusterCollection = cms.string( "" ), - HybridBarrelSeedThr = cms.double( 1.5 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ) -) -process.hltCorrectedHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", - corectedSuperClusterCollection = cms.string( "" ), - sigmaElectronicNoise = cms.double( 0.03 ), - superClusterAlgo = cms.string( "Hybrid" ), - etThresh = cms.double( 1.0 ), - rawSuperClusterProducer = cms.InputTag( "hltHybridSuperClustersL1Seeded" ), - applyEnergyCorrection = cms.bool( True ), - isl_fCorrPset = cms.PSet( ), - VerbosityLevel = cms.string( "ERROR" ), - recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - fix_fCorrPset = cms.PSet( ), - modeEE = cms.int32( 0 ), - modeEB = cms.int32( 0 ), - dyn_fCorrPset = cms.PSet( ), - energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), - applyLocalContCorrection = cms.bool( False ), - localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), - crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), - applyCrackCorrection = cms.bool( False ), - hyb_fCorrPset = cms.PSet( - brLinearLowThr = cms.double( 1.1 ), - fBremVec = cms.vdouble( -0.05208, 0.1331, 0.9196, -5.735E-4, 1.343 ), - brLinearHighThr = cms.double( 8.0 ), - fEtEtaVec = cms.vdouble( 1.0012, -0.5714, 0.0, 0.0, 0.0, 0.5549, 12.74, 1.0448, 0.0, 0.0, 0.0, 0.0, 8.0, 1.023, -0.00181, 0.0, 0.0 ) - ) -) -process.hltMulti5x5BasicClustersL1Seeded = cms.EDProducer( "EgammaHLTMulti5x5ClusterProducer", - l1LowerThr = cms.double( 5.0 ), - Multi5x5BarrelSeedThr = cms.double( 0.5 ), - Multi5x5EndcapSeedThr = cms.double( 0.18 ), - endcapHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - barrelClusterCollection = cms.string( "notused" ), - regionEtaMargin = cms.double( 0.3 ), - regionPhiMargin = cms.double( 0.4 ), - RecHitFlagToBeExcluded = cms.vstring( ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - posCalcParameters = cms.PSet( - T0_barl = cms.double( 7.4 ), - LogWeighted = cms.bool( True ), - T0_endc = cms.double( 3.1 ), - T0_endcPresh = cms.double( 1.2 ), - W0 = cms.double( 4.2 ), - X0 = cms.double( 0.89 ) - ), - VerbosityLevel = cms.string( "ERROR" ), - doIsolated = cms.bool( True ), - barrelHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), - doEndcaps = cms.bool( True ), - doBarrel = cms.bool( False ), - endcapClusterCollection = cms.string( "multi5x5EndcapBasicClusters" ), - l1UpperThr = cms.double( 999.0 ) -) -process.hltMulti5x5SuperClustersL1Seeded = cms.EDProducer( "Multi5x5SuperClusterProducer", - barrelSuperclusterCollection = cms.string( "multi5x5BarrelSuperClusters" ), - endcapEtaSearchRoad = cms.double( 0.14 ), - dynamicPhiRoad = cms.bool( False ), - endcapClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5EndcapBasicClusters' ), - barrelPhiSearchRoad = cms.double( 0.8 ), - endcapPhiSearchRoad = cms.double( 0.6 ), - seedTransverseEnergyThreshold = cms.double( 1.0 ), - endcapSuperclusterCollection = cms.string( "multi5x5EndcapSuperClusters" ), - barrelEtaSearchRoad = cms.double( 0.06 ), - barrelClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5BarrelBasicClusters' ), - doBarrel = cms.bool( False ), - doEndcaps = cms.bool( True ), - bremRecoveryPset = cms.PSet( - barrel = cms.PSet( ), - endcap = cms.PSet( - a = cms.double( 47.85 ), - c = cms.double( 0.1201 ), - b = cms.double( 108.8 ) - ), - doEndcaps = cms.bool( True ), - doBarrel = cms.bool( False ) - ), - endcapClusterProducer = cms.string( "hltMulti5x5BasicClustersL1Seeded" ) -) -process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "PreshowerClusterProducer", - assocSClusterCollection = cms.string( "" ), - preshStripEnergyCut = cms.double( 0.0 ), - preshClusterCollectionY = cms.string( "preshowerYClusters" ), - preshClusterCollectionX = cms.string( "preshowerXClusters" ), - etThresh = cms.double( 5.0 ), - preshRecHitProducer = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), - endcapSClusterProducer = cms.InputTag( 'hltMulti5x5SuperClustersL1Seeded','multi5x5EndcapSuperClusters' ), - preshNclust = cms.int32( 4 ), - debugLevel = cms.string( "" ), - preshClusterEnergyCut = cms.double( 0.0 ), - preshSeededNstrip = cms.int32( 15 ) -) -process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", - corectedSuperClusterCollection = cms.string( "" ), - sigmaElectronicNoise = cms.double( 0.15 ), - superClusterAlgo = cms.string( "Multi5x5" ), - etThresh = cms.double( 1.0 ), - rawSuperClusterProducer = cms.InputTag( "hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), - applyEnergyCorrection = cms.bool( True ), - isl_fCorrPset = cms.PSet( ), - VerbosityLevel = cms.string( "ERROR" ), - recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - fix_fCorrPset = cms.PSet( - brLinearLowThr = cms.double( 0.6 ), - fBremVec = cms.vdouble( -0.04163, 0.08552, 0.95048, -0.002308, 1.077 ), - brLinearHighThr = cms.double( 6.0 ), - fEtEtaVec = cms.vdouble( 0.9746, -6.512, 0.0, 0.0, 0.02771, 4.983, 0.0, 0.0, -0.007288, -0.9446, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0 ) - ), - modeEE = cms.int32( 0 ), - modeEB = cms.int32( 0 ), - dyn_fCorrPset = cms.PSet( ), - energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), - applyLocalContCorrection = cms.bool( False ), - localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), - crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), - applyCrackCorrection = cms.bool( False ), - hyb_fCorrPset = cms.PSet( ) -) -process.hltL1SeededRecoEcalCandidate = cms.EDProducer( "EgammaHLTRecoEcalCandidateProducers", - scIslandEndcapProducer = cms.InputTag( "hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), - scHybridBarrelProducer = cms.InputTag( "hltCorrectedHybridSuperClustersL1Seeded" ), - recoEcalCandidateCollection = cms.string( "" ) -) -process.hltEGRegionalL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", - doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.65 ), - saveTags = cms.bool( False ), - region_eta_size_ecap = cms.double( 1.0 ), - barrel_end = cms.double( 1.4791 ), - l1IsolatedTag = cms.InputTag( 'hltL1extraParticles','Isolated' ), - candIsolatedTag = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - region_phi_size = cms.double( 1.044 ), - region_eta_size = cms.double( 0.522 ), - L1SeedFilterTag = cms.InputTag( "hltL1sL1Mu3p5EG12" ), - candNonIsolatedTag = cms.InputTag( "" ), - l1NonIsolatedTag = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - ncandcut = cms.int32( 1 ) -) -process.hltEG38EtFilterL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaEtFilter", - saveTags = cms.bool( False ), - L1NonIsoCand = cms.InputTag( "" ), - relaxed = cms.untracked.bool( False ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - inputTag = cms.InputTag( "hltEGRegionalL1Mu3p5EG12" ), - etcutEB = cms.double( 38.0 ), - etcutEE = cms.double( 38.0 ), - ncandcut = cms.int32( 1 ) -) -process.hltL1SeededHLTClusterShape = cms.EDProducer( "EgammaHLTClusterShapeProducer", - recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - ecalRechitEB = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ecalRechitEE = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - isIeta = cms.bool( True ) -) -process.hltMuNoFilters38Photon38CaloIdLClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.035 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.014 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededHLTClusterShape" ), - candTag = cms.InputTag( "hltEG38EtFilterL1Mu3p5EG12" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltL1SeededPhotonHcalForHE = cms.EDProducer( "EgammaHLTHcalIsolationProducersRegional", - eMinHE = cms.double( 0.8 ), - hbheRecHitProducer = cms.InputTag( "hltHbhereco" ), - effectiveAreaBarrel = cms.double( 0.105 ), - outerCone = cms.double( 0.14 ), - eMinHB = cms.double( 0.7 ), - innerCone = cms.double( 0.0 ), - etMinHE = cms.double( -1.0 ), - etMinHB = cms.double( -1.0 ), - rhoProducer = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ), - depth = cms.int32( -1 ), - doRhoCorrection = cms.bool( False ), - effectiveAreaEndcap = cms.double( 0.17 ), - recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - rhoMax = cms.double( 9.9999999E7 ), - rhoScale = cms.double( 1.0 ), - doEtSum = cms.bool( False ) -) -process.hltMuNoFilters38Photon38CaloIdLHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( 0.15 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededPhotonHcalForHE" ), - candTag = cms.InputTag( "hltMuNoFilters38Photon38CaloIdLClusterShapeFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltPreMu42NoFiltersNoVtxPhoton42CaloIdL = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL1Mu3p5EG12L2NoVtxFiltered12 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( False ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L1Filtered3p5" ), - MinPt = cms.double( 12.0 ), - MinN = cms.int32( 1 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered42 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L2NoVtxFiltered12" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 1 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 42.0 ) -) -process.hltEG42EtFilterL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaEtFilter", - saveTags = cms.bool( False ), - L1NonIsoCand = cms.InputTag( "" ), - relaxed = cms.untracked.bool( False ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - inputTag = cms.InputTag( "hltEGRegionalL1Mu3p5EG12" ), - etcutEB = cms.double( 42.0 ), - etcutEE = cms.double( 42.0 ), - ncandcut = cms.int32( 1 ) -) -process.hltMuNoFilters42Photon42CaloIdLClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.035 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.014 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededHLTClusterShape" ), - candTag = cms.InputTag( "hltEG42EtFilterL1Mu3p5EG12" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltMuNoFilters42Photon42CaloIdLHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( 0.15 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededPhotonHcalForHE" ), - candTag = cms.InputTag( "hltMuNoFilters42Photon42CaloIdLClusterShapeFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltL1sL1SingleEG20ORL1SingleEG22 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_SingleEG20 OR L1_SingleEG22" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) -process.hltPreEle27WP85Gsf = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltRechitInRegionsECAL = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - useUncalib = cms.bool( False ), - regionEtaMargin = cms.double( 0.14 ), - ecalhitLabels = cms.VInputTag( 'hltEcalRecHit:EcalRecHitsEB','hltEcalRecHit:EcalRecHitsEE' ), - regionPhiMargin = cms.double( 0.4 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1UpperThr = cms.double( 999.0 ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - productLabels = cms.vstring( 'EcalRecHitsEB', - 'EcalRecHitsEE' ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) -) -process.hltRechitInRegionsES = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - useUncalib = cms.bool( False ), - regionEtaMargin = cms.double( 0.14 ), - ecalhitLabels = cms.VInputTag( 'hltEcalPreshowerRecHit:EcalRecHitsES' ), - regionPhiMargin = cms.double( 0.4 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1UpperThr = cms.double( 999.0 ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - productLabels = cms.vstring( 'EcalRecHitsES' ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) -) -process.hltParticleFlowRecHitECALL1Seeded = cms.EDProducer( "PFRecHitProducer", - producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEB' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 0.08 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ), - cms.PSet( timingCleaning = cms.bool( True ), - topologicalCleaning = cms.bool( True ), - cleaningThreshold = cms.double( 2.0 ), - skipTTRecoveredHits = cms.bool( True ), - name = cms.string( "PFRecHitQTestECAL" ) - ) - ), - name = cms.string( "PFEBRecHitCreator" ) - ), - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEE' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 0.3 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ), - cms.PSet( timingCleaning = cms.bool( True ), - topologicalCleaning = cms.bool( True ), - cleaningThreshold = cms.double( 2.0 ), - skipTTRecoveredHits = cms.bool( True ), - name = cms.string( "PFRecHitQTestECAL" ) - ) - ), - name = cms.string( "PFEERecHitCreator" ) - ) - ), - navigator = cms.PSet( - barrel = cms.PSet( ), - endcap = cms.PSet( ), - name = cms.string( "PFRecHitECALNavigator" ) - ) -) -process.hltParticleFlowRecHitPSL1Seeded = cms.EDProducer( "PFRecHitProducer", - producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsES','EcalRecHitsES' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 7.0E-6 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ) - ), - name = cms.string( "PFPSRecHitCreator" ) - ) - ), - navigator = cms.PSet( name = cms.string( "PFRecHitPreshowerNavigator" ) ) + navigator = cms.PSet( name = cms.string( "PFRecHitPreshowerNavigator" ) ) ) process.hltParticleFlowClusterPSL1Seeded = cms.EDProducer( "PFClusterProducer", pfClusterBuilder = cms.PSet( @@ -12207,11 +10877,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -14962,11 +13632,11 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -process.hltPrePFJet260 = cms.EDFilter( "HLTPrescaler", +process.hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", +process.hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), voronoiRfact = cms.double( 0.9 ), @@ -14985,7 +13655,7 @@ useDeterministicSeed = cms.bool( True ), doPVCorrection = cms.bool( False ), maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), + rParam = cms.double( 0.8 ), maxProblematicHcalCells = cms.uint32( 9999999 ), doOutputJets = cms.bool( True ), src = cms.InputTag( "hltTowerMakerForAll" ), @@ -14993,7 +13663,7 @@ puPtMin = cms.double( 10.0 ), srcPVs = cms.InputTag( "NotUsed" ), jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.4 ), + radiusPU = cms.double( 0.8 ), maxProblematicEcalCells = cms.uint32( 9999999 ), doPUOffsetCorr = cms.bool( False ), inputEMin = cms.double( 0.0 ), @@ -15026,11 +13696,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) -process.hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", +process.hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", min_N90 = cms.int32( -2 ), min_N90hits = cms.int32( 2 ), min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK4CaloJets" ), + jetsInput = cms.InputTag( "hltAK8CaloJets" ), JetIDParams = cms.PSet( useRecHits = cms.bool( True ), hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), @@ -15046,21 +13716,21 @@ maxRapidity = cms.double( 5.0 ), pfCandidatesTag = cms.InputTag( "hltTowerMakerForAll" ) ) -process.hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJets" ), +process.hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJets" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -process.hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), +process.hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -process.hltSingleCaloJet200 = cms.EDFilter( "HLT1CaloJet", +process.hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), - MinPt = cms.double( 200.0 ), + MinPt = cms.double( 260.0 ), MinN = cms.int32( 1 ), MaxEta = cms.double( 5.0 ), MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK4CaloJetsCorrectedIDPassed" ), + inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), MinE = cms.double( -1.0 ), triggerType = cms.int32( 85 ) ) @@ -15132,6 +13802,66 @@ HOGrid = cms.vdouble( ), EBGrid = cms.vdouble( ) ) +process.hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( False ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.8 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForPF" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.8 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) process.hltAK4CaloJetsPF = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), @@ -15192,6 +13922,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) +process.hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", + filter = cms.bool( False ), + src = cms.InputTag( "hltAK8CaloJetsPF" ), + etMin = cms.double( 5.0 ) +) process.hltAK4CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", filter = cms.bool( False ), src = cms.InputTag( "hltAK4CaloJetsPF" ), @@ -16588,279 +15323,32 @@ maxHcalEOverEcalE = cms.double( 0.1 ), maxEcalEOverP_1 = cms.double( 0.5 ), maxHcalEOverP = cms.double( 1.0 ), - maxEcalEOverPRes = cms.double( 0.2 ), - maxHcalE = cms.double( 10.0 ), - maxEeleOverPout = cms.double( 0.2 ), - maxNtracks = cms.double( 3.0 ), - maxEleHcalEOverEcalE = cms.double( 0.1 ), - maxDPhiIN = cms.double( 0.1 ), - maxEeleOverPoutRes = cms.double( 0.5 ) - ), - electron_iso_pt = cms.double( 10.0 ), - isolatedElectronID_mvaWeightFile = cms.string( "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml" ), - vertexCollection = cms.InputTag( "hltPixelVertices" ), - X0_Map = cms.string( "RecoParticleFlow/PFProducer/data/allX0histos.root" ), - calibPFSCEle_Fbrem_barrel = cms.vdouble( 0.6, 6.0, -0.0255975, 0.0576727, 0.975442, -5.46394E-4, 1.26147, 25.0, -0.02025, 0.04537, 0.9728, -8.962E-4, 1.172 ), - blocks = cms.InputTag( "hltParticleFlowBlock" ), - punchThroughMETFactor = cms.double( 4.0 ), - metSignificanceForRejection = cms.double( 4.0 ), - photon_protectionsForJetMET = cms.PSet( - sumPtTrackIsoSlope = cms.double( 0.001 ), - sumPtTrackIso = cms.double( 2.0 ) - ), - usePhotonReg = cms.bool( False ), - dzPV = cms.double( 0.2 ), - calibHF_a_EMHAD = cms.vdouble( 1.42215, 1.00496, 0.68961, 0.81656, 0.98504, 0.98504, 1.00802, 1.0593, 1.4576, 1.4576 ), - useRegressionFromDB = cms.bool( False ), - muon_ECAL = cms.vdouble( 0.5, 0.5 ), - usePFSCEleCalib = cms.bool( True ) -) -process.hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "PFJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltParticleFlow" ), - inputEtMin = cms.double( 0.0 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "hltPixelVertices" ), - jetPtMin = cms.double( 0.0 ), - radiusPU = cms.double( 0.4 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 0 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -process.hltFixedGridRhoFastjetAll = cms.EDProducer( "FixedGridRhoProducerFastjet", - gridSpacing = cms.double( 0.55 ), - maxRapidity = cms.double( 5.0 ), - pfCandidatesTag = cms.InputTag( "hltParticleFlow" ) -) -process.hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", - src = cms.InputTag( "hltAK4PFJets" ), - correctors = cms.vstring( 'hltESPAK4PFCorrection' ) -) -process.hltPFJetsCorrectedMatchedToCaloJets200 = cms.EDProducer( "PFJetsMatchedToFilteredCaloJetsProducer", - DeltaR = cms.double( 0.5 ), - CaloJetFilter = cms.InputTag( "hltSingleCaloJet200" ), - TriggerType = cms.int32( 85 ), - PFJetSrc = cms.InputTag( "hltAK4PFJetsCorrected" ) -) -process.hltSinglePFJet260 = cms.EDFilter( "HLT1PFJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltPFJetsCorrectedMatchedToCaloJets200" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -process.hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( 0.9 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), - minSeed = cms.uint32( 14327 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForAll" ), - inputEtMin = cms.double( 0.3 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -process.hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", - min_N90 = cms.int32( -2 ), - min_N90hits = cms.int32( 2 ), - min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK8CaloJets" ), - JetIDParams = cms.PSet( - useRecHits = cms.bool( True ), - hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), - hoRecHitsColl = cms.InputTag( "hltHoreco" ), - hfRecHitsColl = cms.InputTag( "hltHfreco" ), - ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) + maxEcalEOverPRes = cms.double( 0.2 ), + maxHcalE = cms.double( 10.0 ), + maxEeleOverPout = cms.double( 0.2 ), + maxNtracks = cms.double( 3.0 ), + maxEleHcalEOverEcalE = cms.double( 0.1 ), + maxDPhiIN = cms.double( 0.1 ), + maxEeleOverPoutRes = cms.double( 0.5 ) ), - max_EMF = cms.double( 999.0 ) -) -process.hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJets" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -process.hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -process.hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -process.hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( False ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForPF" ), - inputEtMin = cms.double( 0.3 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -process.hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", - filter = cms.bool( False ), - src = cms.InputTag( "hltAK8CaloJetsPF" ), - etMin = cms.double( 5.0 ) + electron_iso_pt = cms.double( 10.0 ), + isolatedElectronID_mvaWeightFile = cms.string( "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml" ), + vertexCollection = cms.InputTag( "hltPixelVertices" ), + X0_Map = cms.string( "RecoParticleFlow/PFProducer/data/allX0histos.root" ), + calibPFSCEle_Fbrem_barrel = cms.vdouble( 0.6, 6.0, -0.0255975, 0.0576727, 0.975442, -5.46394E-4, 1.26147, 25.0, -0.02025, 0.04537, 0.9728, -8.962E-4, 1.172 ), + blocks = cms.InputTag( "hltParticleFlowBlock" ), + punchThroughMETFactor = cms.double( 4.0 ), + metSignificanceForRejection = cms.double( 4.0 ), + photon_protectionsForJetMET = cms.PSet( + sumPtTrackIsoSlope = cms.double( 0.001 ), + sumPtTrackIso = cms.double( 2.0 ) + ), + usePhotonReg = cms.bool( False ), + dzPV = cms.double( 0.2 ), + calibHF_a_EMHAD = cms.vdouble( 1.42215, 1.00496, 0.68961, 0.81656, 0.98504, 0.98504, 1.00802, 1.0593, 1.4576, 1.4576 ), + useRegressionFromDB = cms.bool( False ), + muon_ECAL = cms.vdouble( 0.5, 0.5 ), + usePFSCEleCalib = cms.bool( True ) ) process.hltAK8PFJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -16922,6 +15410,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) +process.hltFixedGridRhoFastjetAll = cms.EDProducer( "FixedGridRhoProducerFastjet", + gridSpacing = cms.double( 0.55 ), + maxRapidity = cms.double( 5.0 ), + pfCandidatesTag = cms.InputTag( "hltParticleFlow" ) +) process.hltAK8PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", src = cms.InputTag( "hltAK8PFJets" ), correctors = cms.vstring( 'hltESPAK4PFCorrection' ) @@ -17029,6 +15522,9 @@ CandTag = cms.InputTag( "hltL1extraParticles" ), ExcludeSingleSegmentCSC = cms.bool( False ) ) +process.hltL2MuonCandidatesNoVtx = cms.EDProducer( "L2MuonCandidateProducer", + InputObjects = cms.InputTag( "hltL2Muons" ) +) process.hltL2fL1sMu6NotBptxORL1f0L2Filtered10 = cms.EDFilter( "HLTMuonL2PreFilter", saveTags = cms.bool( True ), MaxDr = cms.double( 9999.0 ), @@ -17905,9 +16401,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -17969,9 +16463,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -18117,13 +16609,13 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -18146,17 +16638,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -process.hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -18164,61 +16656,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +process.hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -18228,7 +16720,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -18243,79 +16735,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -process.hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -18330,10 +16804,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +process.hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -18346,14 +16820,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -18366,7 +16840,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -20654,9 +19128,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -20718,9 +19190,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -20975,6 +19445,89 @@ MinE = cms.double( -1.0 ), triggerType = cms.int32( 87 ) ) +process.hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( 0.9 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 14327 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForAll" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +process.hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", + min_N90 = cms.int32( -2 ), + min_N90hits = cms.int32( 2 ), + min_EMF = cms.double( 1.0E-6 ), + jetsInput = cms.InputTag( "hltAK4CaloJets" ), + JetIDParams = cms.PSet( + useRecHits = cms.bool( True ), + hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), + hoRecHitsColl = cms.InputTag( "hltHoreco" ), + hfRecHitsColl = cms.InputTag( "hltHfreco" ), + ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) + ), + max_EMF = cms.double( 999.0 ) +) +process.hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJets" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) +process.hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) process.hltMetCleanUsingJetID = cms.EDProducer( "HLTMETCleanerUsingJetID", minPt = cms.double( 20.0 ), maxEta = cms.double( 5.0 ), @@ -21098,9 +19651,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -21144,15 +19695,78 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) +process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) +) +process.hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "PFJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltParticleFlow" ), + inputEtMin = cms.double( 0.0 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "hltPixelVertices" ), + jetPtMin = cms.double( 0.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 0 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +process.hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", + src = cms.InputTag( "hltAK4PFJets" ), + correctors = cms.vstring( 'hltESPAK4PFCorrection' ) ) -process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -21198,51 +19812,49 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), @@ -21301,11 +19913,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -21505,20 +20116,15 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) process.hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -23007,63 +21613,223 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -process.hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.02 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.015 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +process.hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( 0.02 ), + thrOverEEE = cms.double( -1.0 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( -1.0 ), + thrRegularEB = cms.double( 0.015 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), + candTag = cms.InputTag( "hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +process.hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( 0.04 ), + thrOverEEE = cms.double( -1.0 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( -1.0 ), + thrRegularEB = cms.double( 0.015 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), + candTag = cms.InputTag( "hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +process.hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( -1.0 ), + thrOverEEE = cms.double( 0.1 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( 0.1 ), + thrRegularEB = cms.double( -1.0 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), + candTag = cms.InputTag( "hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +process.hltPrePhoton22R9Id90HE10Iso40EBOnlyPFMET40 = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) +) +process.hltHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaHLTHybridClusterProducer", + xi = cms.double( 0.0 ), + regionEtaMargin = cms.double( 0.14 ), + regionPhiMargin = cms.double( 0.4 ), + severityRecHitThreshold = cms.double( 4.0 ), + RecHitFlagToBeExcluded = cms.vstring( ), + ecalhitcollection = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + eThreshA = cms.double( 0.003 ), + basicclusterCollection = cms.string( "" ), + eThreshB = cms.double( 0.1 ), + dynamicPhiRoad = cms.bool( False ), + useEtForXi = cms.bool( True ), + l1UpperThr = cms.double( 999.0 ), + excludeFlagged = cms.bool( True ), + posCalcParameters = cms.PSet( + T0_barl = cms.double( 7.4 ), + LogWeighted = cms.bool( True ), + T0_endc = cms.double( 3.1 ), + T0_endcPresh = cms.double( 1.2 ), + W0 = cms.double( 4.2 ), + X0 = cms.double( 0.89 ) + ), + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + eseed = cms.double( 0.35 ), + ethresh = cms.double( 0.1 ), + ewing = cms.double( 0.0 ), + RecHitSeverityToBeExcluded = cms.vstring( 'kWeird' ), + step = cms.int32( 17 ), + debugLevel = cms.string( "INFO" ), + dynamicEThresh = cms.bool( False ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), + superclusterCollection = cms.string( "" ), + HybridBarrelSeedThr = cms.double( 1.5 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ) +) +process.hltCorrectedHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", + corectedSuperClusterCollection = cms.string( "" ), + sigmaElectronicNoise = cms.double( 0.03 ), + superClusterAlgo = cms.string( "Hybrid" ), + etThresh = cms.double( 1.0 ), + rawSuperClusterProducer = cms.InputTag( "hltHybridSuperClustersL1Seeded" ), + applyEnergyCorrection = cms.bool( True ), + isl_fCorrPset = cms.PSet( ), + VerbosityLevel = cms.string( "ERROR" ), + recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + fix_fCorrPset = cms.PSet( ), + modeEE = cms.int32( 0 ), + modeEB = cms.int32( 0 ), + dyn_fCorrPset = cms.PSet( ), + energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), + applyLocalContCorrection = cms.bool( False ), + localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), + crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), + applyCrackCorrection = cms.bool( False ), + hyb_fCorrPset = cms.PSet( + brLinearLowThr = cms.double( 1.1 ), + fBremVec = cms.vdouble( -0.05208, 0.1331, 0.9196, -5.735E-4, 1.343 ), + brLinearHighThr = cms.double( 8.0 ), + fEtEtaVec = cms.vdouble( 1.0012, -0.5714, 0.0, 0.0, 0.0, 0.5549, 12.74, 1.0448, 0.0, 0.0, 0.0, 0.0, 8.0, 1.023, -0.00181, 0.0, 0.0 ) + ) +) +process.hltMulti5x5BasicClustersL1Seeded = cms.EDProducer( "EgammaHLTMulti5x5ClusterProducer", + l1LowerThr = cms.double( 5.0 ), + Multi5x5BarrelSeedThr = cms.double( 0.5 ), + Multi5x5EndcapSeedThr = cms.double( 0.18 ), + endcapHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + barrelClusterCollection = cms.string( "notused" ), + regionEtaMargin = cms.double( 0.3 ), + regionPhiMargin = cms.double( 0.4 ), + RecHitFlagToBeExcluded = cms.vstring( ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + posCalcParameters = cms.PSet( + T0_barl = cms.double( 7.4 ), + LogWeighted = cms.bool( True ), + T0_endc = cms.double( 3.1 ), + T0_endcPresh = cms.double( 1.2 ), + W0 = cms.double( 4.2 ), + X0 = cms.double( 0.89 ) + ), + VerbosityLevel = cms.string( "ERROR" ), + doIsolated = cms.bool( True ), + barrelHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), + doEndcaps = cms.bool( True ), + doBarrel = cms.bool( False ), + endcapClusterCollection = cms.string( "multi5x5EndcapBasicClusters" ), + l1UpperThr = cms.double( 999.0 ) +) +process.hltMulti5x5SuperClustersL1Seeded = cms.EDProducer( "Multi5x5SuperClusterProducer", + barrelSuperclusterCollection = cms.string( "multi5x5BarrelSuperClusters" ), + endcapEtaSearchRoad = cms.double( 0.14 ), + dynamicPhiRoad = cms.bool( False ), + endcapClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5EndcapBasicClusters' ), + barrelPhiSearchRoad = cms.double( 0.8 ), + endcapPhiSearchRoad = cms.double( 0.6 ), + seedTransverseEnergyThreshold = cms.double( 1.0 ), + endcapSuperclusterCollection = cms.string( "multi5x5EndcapSuperClusters" ), + barrelEtaSearchRoad = cms.double( 0.06 ), + barrelClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5BarrelBasicClusters' ), + doBarrel = cms.bool( False ), + doEndcaps = cms.bool( True ), + bremRecoveryPset = cms.PSet( + barrel = cms.PSet( ), + endcap = cms.PSet( + a = cms.double( 47.85 ), + c = cms.double( 0.1201 ), + b = cms.double( 108.8 ) + ), + doEndcaps = cms.bool( True ), + doBarrel = cms.bool( False ) + ), + endcapClusterProducer = cms.string( "hltMulti5x5BasicClustersL1Seeded" ) ) -process.hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.04 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.015 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "PreshowerClusterProducer", + assocSClusterCollection = cms.string( "" ), + preshStripEnergyCut = cms.double( 0.0 ), + preshClusterCollectionY = cms.string( "preshowerYClusters" ), + preshClusterCollectionX = cms.string( "preshowerXClusters" ), + etThresh = cms.double( 5.0 ), + preshRecHitProducer = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), + endcapSClusterProducer = cms.InputTag( 'hltMulti5x5SuperClustersL1Seeded','multi5x5EndcapSuperClusters' ), + preshNclust = cms.int32( 4 ), + debugLevel = cms.string( "" ), + preshClusterEnergyCut = cms.double( 0.0 ), + preshSeededNstrip = cms.int32( 15 ) ) -process.hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.1 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", + corectedSuperClusterCollection = cms.string( "" ), + sigmaElectronicNoise = cms.double( 0.15 ), + superClusterAlgo = cms.string( "Multi5x5" ), + etThresh = cms.double( 1.0 ), + rawSuperClusterProducer = cms.InputTag( "hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), + applyEnergyCorrection = cms.bool( True ), + isl_fCorrPset = cms.PSet( ), + VerbosityLevel = cms.string( "ERROR" ), + recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + fix_fCorrPset = cms.PSet( + brLinearLowThr = cms.double( 0.6 ), + fBremVec = cms.vdouble( -0.04163, 0.08552, 0.95048, -0.002308, 1.077 ), + brLinearHighThr = cms.double( 6.0 ), + fEtEtaVec = cms.vdouble( 0.9746, -6.512, 0.0, 0.0, 0.02771, 4.983, 0.0, 0.0, -0.007288, -0.9446, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0 ) + ), + modeEE = cms.int32( 0 ), + modeEB = cms.int32( 0 ), + dyn_fCorrPset = cms.PSet( ), + energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), + applyLocalContCorrection = cms.bool( False ), + localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), + crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), + applyCrackCorrection = cms.bool( False ), + hyb_fCorrPset = cms.PSet( ) ) -process.hltPrePhoton22R9Id90HE10Iso40EBOnlyPFMET40 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) +process.hltL1SeededRecoEcalCandidate = cms.EDProducer( "EgammaHLTRecoEcalCandidateProducers", + scIslandEndcapProducer = cms.InputTag( "hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), + scHybridBarrelProducer = cms.InputTag( "hltCorrectedHybridSuperClustersL1Seeded" ), + recoEcalCandidateCollection = cms.string( "" ) ) process.hltEGRegionalL1SingleEG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), @@ -23090,6 +21856,24 @@ etcutEE = cms.double( 999999.0 ), ncandcut = cms.int32( 1 ) ) +process.hltL1SeededPhotonHcalForHE = cms.EDProducer( "EgammaHLTHcalIsolationProducersRegional", + eMinHE = cms.double( 0.8 ), + hbheRecHitProducer = cms.InputTag( "hltHbhereco" ), + effectiveAreaBarrel = cms.double( 0.105 ), + outerCone = cms.double( 0.14 ), + eMinHB = cms.double( 0.7 ), + innerCone = cms.double( 0.0 ), + etMinHE = cms.double( -1.0 ), + etMinHB = cms.double( -1.0 ), + rhoProducer = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ), + depth = cms.int32( -1 ), + doRhoCorrection = cms.bool( False ), + effectiveAreaEndcap = cms.double( 0.17 ), + recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), + rhoMax = cms.double( 9.9999999E7 ), + rhoScale = cms.double( 1.0 ), + doEtSum = cms.bool( False ) +) process.hltPhoton22R9Id90HE10Iso40EBOnlyHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), @@ -24165,7 +22949,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +process.hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) @@ -24696,132 +23480,6 @@ reqOppCharge = cms.untracked.bool( False ), nZcandcut = cms.int32( 1 ) ) -process.hltPreL2DoubleMu23NoVertex = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL2DoubleMu23NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 23.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL2DoubleMu28NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 28.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 28.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 28.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) -process.hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL2DoubleMu38NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 38.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 38.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 38.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) process.hltL1sL1ETM36ORETM40 = cms.EDFilter( "HLTLevel1GTSeed", L1SeedsLogicalExpression = cms.string( "L1_ETM36 OR L1_ETM40" ), saveTags = cms.bool( True ), @@ -26046,17 +24704,15 @@ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1', 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1', 'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1', - 'HLT_DoubleMu33NoFiltersNoVtx_v1', - 'HLT_DoubleMu38NoFiltersNoVtx_v1', 'HLT_DoubleMu4_3_Bs_v1', 'HLT_DoubleMu4_3_Jpsi_Displaced_v1', 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -26075,9 +24731,6 @@ 'HLT_JetE30_NoBPTX_v1', 'HLT_JetE50_NoBPTX3BX_NoHalo_v1', 'HLT_JetE70_NoBPTX3BX_NoHalo_v1', - 'HLT_L2DoubleMu23_NoVertex_v1', - 'HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1', - 'HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1', 'HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1', 'HLT_L2Mu10_NoVertex_NoBPTX_v1', 'HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1', @@ -26090,14 +24743,11 @@ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_Mu25_TkMu0_dEta18_Onia_v1', 'HLT_Mu30_TkMu11_v1', - 'HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1', 'HLT_Mu40_eta2p1_PFJet200_PFJet50_v1', 'HLT_Mu40_v1', - 'HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1', 'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_PFHT350_PFMET120_NoiseCleaned_v1', 'HLT_PFHT900_v1', - 'HLT_PFJet260_v1', 'HLT_PFMET120_NoiseCleaned_BTagCSV07_v1', 'HLT_PFMET170_NoiseCleaned_v1', 'HLT_Photon135_PFMET40_v1', @@ -26187,16 +24837,6 @@ process.HLTIterativeTrackingDisplacedNRMuMuIteration1 = cms.Sequence( process.hltIter1DisplacedNRMuMuClustersRefRemoval + process.hltIter1DisplacedNRMuMuMaskedMeasurementTrackerEvent + process.hltIter1DisplacedNRMuMuPixelLayerTriplets + process.hltIter1DisplacedNRMuMuPixelSeeds + process.hltIter1DisplacedNRMuMuCkfTrackCandidates + process.hltIter1DisplacedNRMuMuCtfWithMaterialTracks + process.hltIter1DisplacedNRMuMuTrackSelectionHighPurityLoose + process.hltIter1DisplacedNRMuMuTrackSelectionHighPurityTight + process.hltIter1DisplacedNRMuMuTrackSelectionHighPurity ) process.HLTIterativeTrackingDisplacedNRMuMuIteration2 = cms.Sequence( process.hltIter2DisplacedNRMuMuClustersRefRemoval + process.hltIter2DisplacedNRMuMuMaskedMeasurementTrackerEvent + process.hltIter2DisplacedNRMuMuPixelLayerPairs + process.hltIter2DisplacedNRMuMuPixelSeeds + process.hltIter2DisplacedNRMuMuCkfTrackCandidates + process.hltIter2DisplacedNRMuMuCtfWithMaterialTracks + process.hltIter2DisplacedNRMuMuTrackSelectionHighPurity ) process.HLTIterativeTrackingDisplacedNRMuMuIter02 = cms.Sequence( process.HLTIterativeTrackingDisplacedNRMuMuIteration0 + process.HLTIterativeTrackingDisplacedNRMuMuIteration1 + process.hltIter1DisplacedNRMuMuMerged + process.HLTIterativeTrackingDisplacedNRMuMuIteration2 + process.hltIter2DisplacedNRMuMuMerged ) -process.HLTL2muonrecoSequenceNoVtx = cms.Sequence( process.HLTL2muonrecoNocandSequence + process.hltL2MuonCandidatesNoVtx ) -process.HLTL3NoFiltersNoVtxmuonTkCandidateSequence = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltL3TrajSeedOIStateNoVtx + process.hltL3TrackCandidateFromL2OIStateNoVtx + process.hltL3TkTracksFromL2OIStateNoVtx + process.hltL3NoFiltersNoVtxMuonsOIState + process.hltL3NoFiltersNoVtxTrajSeedOIHit + process.hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx + process.hltL3NoFiltersTkTracksFromL2OIHitNoVtx + process.hltL3NoFiltersNoVtxMuonsOIHit + process.hltL3NoFiltersNoVtxTkFromL2OICombination + process.hltPixelLayerTriplets + process.hltPixelLayerPairs + process.hltMixedLayerPairs + process.hltL3NoFiltersNoVtxTrajSeedIOHit + process.hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx + process.hltL3NoFiltersTkTracksFromL2IOHitNoVtx + process.hltL3NoFiltersNoVtxMuonsIOHit + process.hltL3NoFiltersNoVtxTrajectorySeed + process.hltL3NoFiltersTrackCandidateFromL2NoVtx ) -process.HLTL3NoFiltersNoVtxmuonrecoNocandSequence = cms.Sequence( process.HLTL3NoFiltersNoVtxmuonTkCandidateSequence + process.hltL3NoFiltersNoVtxTkTracksMergeStep1 + process.hltL3NoFiltersTkTracksFromL2Novtx + process.hltL3NoFiltersNoVtxMuonsLinksCombination + process.hltL3NoFiltersNoVtxMuons ) -process.HLTL3NoFiltersNoVtxmuonrecoSequence = cms.Sequence( process.HLTL3NoFiltersNoVtxmuonrecoNocandSequence + process.hltL3NoFiltersNoVtxMuonCandidates ) -process.HLTMulti5x5SuperClusterL1Seeded = cms.Sequence( process.hltMulti5x5BasicClustersL1Seeded + process.hltMulti5x5SuperClustersL1Seeded + process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded + process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded ) -process.HLTL1SeededEcalClustersSequence = cms.Sequence( process.hltHybridSuperClustersL1Seeded + process.hltCorrectedHybridSuperClustersL1Seeded + process.HLTMulti5x5SuperClusterL1Seeded ) -process.HLTDoEGammaStartupSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTL1SeededEcalClustersSequence + process.hltL1SeededRecoEcalCandidate ) -process.HLTDoEgammaClusterShapeSequence = cms.Sequence( process.hltL1SeededHLTClusterShape ) -process.HLTDoLocalHcalWithoutHOSequence = cms.Sequence( process.hltHcalDigis + process.hltHbhereco + process.hltHfreco ) -process.HLTDoEGammaHESequence = cms.Sequence( process.HLTDoLocalHcalWithoutHOSequence + process.hltL1SeededPhotonHcalForHE ) process.HLTPFClusteringForEgamma = cms.Sequence( process.hltRechitInRegionsECAL + process.hltRechitInRegionsES + process.hltParticleFlowRecHitECALL1Seeded + process.hltParticleFlowRecHitPSL1Seeded + process.hltParticleFlowClusterPSL1Seeded + process.hltParticleFlowClusterECALUncorrectedL1Seeded + process.hltParticleFlowClusterECALL1Seeded + process.hltParticleFlowSuperClusterECALL1Seeded ) process.HLTDoLocalHcalWithTowerSequence = cms.Sequence( process.hltHcalDigis + process.hltHbhereco + process.hltHfreco + process.hltHoreco + process.hltTowerMakerForAll ) process.HLTFastJetForEgamma = cms.Sequence( process.hltFixedGridRhoFastjetAllCaloForMuons ) @@ -26225,12 +24865,12 @@ process.HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1SingleEG35Filter + process.hltEG42EtL1Seed35EtFilter + process.hltEgammaR9ID + process.hltEG42R9Id65R9IdFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEG42HE10R9Id65HEFilter + cms.ignore(process.hltEG42R9Id85HE10R9Id65R9IdLastFilter) + process.hltEgammaClusterShape + cms.ignore(process.hltEG42CaloId24b40eHE10R9Id65ClusterShapeFilter) + process.hltEgammaEcalPFClusterIsoRhoCorr + cms.ignore(process.hltEG42Iso50T80LCaloId24b40eHE10R9Id65EcalIsoFilter) + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + cms.ignore(process.hltEG42Iso50T80LCaloId24b40eHE10R9Id65HcalIsoLastFilter) + process.hltEG42RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter + process.HLTPFClusteringForEgammaUnseeded + process.hltEgammaCandidatesUnseeded + process.hltEgammaCandidatesWrapperUnseeded + process.hltDiEG22EtUnseededFilter + process.hltEgammaR9IDUnseeded + process.hltDiEG22R9Id65R9IdUnseededFilter + process.hltEgammaHoverEUnseeded + process.hltDiEG22HE10R9Id65HEUnseededFilter + cms.ignore(process.hltEG22R9Id85HE10R9Id65R9IdUnseededLastFilter) + process.hltEgammaClusterShapeUnseeded + cms.ignore(process.hltEG22CaloId24b40eHE10R9Id65ClusterShapeUnseededFilter) + process.hltEgammaEcalPFClusterIsoUnseeded + cms.ignore(process.hltEG22Iso50T80LCaloId24b40eHE10R9Id65EcalIsoUnseededFilter) + process.HLTPFHcalClusteringForEgammaUnseeded + process.hltEgammaHcalPFClusterIsoUnseeded + cms.ignore(process.hltEG22Iso50T80LCaloId24b40eHE10R9Id65HcalIsoUnseededFilter) + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.HLTTrackReconstructionForIsoForPhotons + process.hltEgammaHollowTrackIsoUnseeded + cms.ignore(process.hltEG22Iso50T80LCaloId24b40eHE10R9Id65TrackIsoUnseededLastFilter) + process.hltDiEG22RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter ) process.HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence = cms.Sequence( process.hltEcalDigis + process.hltEcalUncalibRecHit + process.hltEcalDetIdToBeRecovered + process.hltEcalRecHit ) process.HLTDoCaloSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + process.HLTDoLocalHcalSequence + process.hltTowerMakerForAll ) -process.HLTAK4CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK4CaloJets + process.hltAK4CaloJetsIDPassed ) -process.HLTAK4CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK4CaloJetsCorrected + process.hltAK4CaloJetsCorrectedIDPassed ) -process.HLTAK4CaloJetsSequence = cms.Sequence( process.HLTAK4CaloJetsReconstructionSequence + process.HLTAK4CaloJetsCorrectionSequence ) +process.HLTAK8CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK8CaloJets + process.hltAK8CaloJetsIDPassed ) +process.HLTAK8CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK8CaloJetsCorrected + process.hltAK8CaloJetsCorrectedIDPassed ) +process.HLTAK8CaloJetsSequence = cms.Sequence( process.HLTAK8CaloJetsReconstructionSequence + process.HLTAK8CaloJetsCorrectionSequence ) process.HLTDoCaloSequencePF = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + process.HLTDoLocalHcalSequence + process.hltTowerMakerForPF ) -process.HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK4CaloJetsPF ) -process.HLTPreAK4PFJetsRecoSequence = cms.Sequence( process.HLTAK4CaloJetsPrePFRecoSequence + process.hltAK4CaloJetsPFEt5 ) +process.HLTAK8CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK8CaloJetsPF + process.hltAK4CaloJetsPF ) +process.HLTPreAK8PFJetsRecoSequence = cms.Sequence( process.HLTAK8CaloJetsPrePFRecoSequence + process.hltAK8CaloJetsPFEt5 + process.hltAK4CaloJetsPFEt5 ) process.HLTRecopixelvertexingSequence = cms.Sequence( process.hltPixelLayerTriplets + process.hltPixelTracks + process.hltPixelVertices + process.hltTrimmedPixelVertices ) process.HLTIterativeTrackingIteration0 = cms.Sequence( process.hltIter0PFLowPixelSeedsFromPixelTracks + process.hltIter0PFlowCkfTrackCandidates + process.hltIter0PFlowCtfWithMaterialTracks + process.hltIter0PFlowTrackSelectionHighPurity ) process.HLTIter0TrackAndTauJet4Iter1Sequence = cms.Sequence( process.hltTrackIter0RefsForJets4Iter1 + process.hltAK4Iter0TrackJets4Iter1 + process.hltIter0TrackAndTauJets4Iter1 ) @@ -26241,17 +24881,10 @@ process.HLTTrackReconstructionForPF = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.hltPFMuonMerging + process.hltMuonLinks + process.hltMuons ) process.HLTPreshowerSequence = cms.Sequence( process.hltEcalPreshowerDigis + process.hltEcalPreshowerRecHit ) process.HLTParticleFlowSequence = cms.Sequence( process.HLTPreshowerSequence + process.hltParticleFlowRecHitECALUnseeded + process.hltParticleFlowRecHitHCAL + process.hltParticleFlowRecHitPSUnseeded + process.hltParticleFlowClusterECALUncorrectedUnseeded + process.hltParticleFlowClusterPSUnseeded + process.hltParticleFlowClusterECALUnseeded + process.hltParticleFlowClusterHCAL + process.hltParticleFlowClusterHFEM + process.hltParticleFlowClusterHFHAD + process.hltLightPFTracks + process.hltParticleFlowBlock + process.hltParticleFlow ) -process.HLTAK4PFJetsReconstructionSequence = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequence + process.hltAK4PFJets ) -process.HLTAK4PFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAll + process.hltAK4PFJetsCorrected ) -process.HLTAK4PFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PFJetsReconstructionSequence + process.HLTAK4PFJetsCorrectionSequence ) -process.HLTAK8CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK8CaloJets + process.hltAK8CaloJetsIDPassed ) -process.HLTAK8CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK8CaloJetsCorrected + process.hltAK8CaloJetsCorrectedIDPassed ) -process.HLTAK8CaloJetsSequence = cms.Sequence( process.HLTAK8CaloJetsReconstructionSequence + process.HLTAK8CaloJetsCorrectionSequence ) -process.HLTAK8CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK8CaloJetsPF + process.hltAK4CaloJetsPF ) -process.HLTPreAK8PFJetsRecoSequence = cms.Sequence( process.HLTAK8CaloJetsPrePFRecoSequence + process.hltAK8CaloJetsPFEt5 + process.hltAK4CaloJetsPFEt5 ) process.HLTAK8PFJetsReconstructionSequence = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequence + process.hltAK8PFJets ) process.HLTAK8PFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAll + process.hltAK8PFJetsCorrected ) process.HLTAK8PFJetsSequence = cms.Sequence( process.HLTPreAK8PFJetsRecoSequence + process.HLTAK8PFJetsReconstructionSequence + process.HLTAK8PFJetsCorrectionSequence ) +process.HLTL2muonrecoSequenceNoVtx = cms.Sequence( process.HLTL2muonrecoNocandSequence + process.hltL2MuonCandidatesNoVtx ) process.HLTBeginSequenceAntiBPTX = cms.Sequence( process.hltTriggerType + process.HLTL1UnpackerSequence + process.hltBPTXAntiCoincidence + process.HLTBeamSpot ) process.HLTStoppedHSCPLocalHcalReco = cms.Sequence( process.hltHcalDigis + process.hltHbhereco ) process.HLTStoppedHSCPJetSequence = cms.Sequence( process.hltStoppedHSCPTowerMakerForAll + process.hltStoppedHSCPIterativeCone4CaloJets ) @@ -26261,9 +24894,9 @@ process.HLTPFTriggerSequenceMuTau = cms.Sequence( process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) process.HLTLooseIsoPFTauSequence = cms.Sequence( process.hltTauPFJets08Region + process.hltTauPFJetsRecoTauChargedHadrons + process.hltPFTauPiZeros + process.hltPFTausSansRef + process.hltPFTaus + process.hltPFTauTrackFindingDiscriminator + process.hltPFTauLooseAbsoluteIsolationDiscriminator + process.hltPFTauLooseRelativeIsolationDiscriminator + process.hltPFTauLooseAbsOrRelIsolationDiscriminator ) process.HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltPFTauAgainstMuonDiscriminator + process.hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + process.hltPFTau20TrackLooseIsoAgainstMuon + process.hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -process.HLTEle22WP85GsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP85ClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP85HEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP85EcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP85HcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP85PixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP85GsfOneOESuperMinusOneOPFilter + process.hltEle22WP85GsfMissingHitsFilter + process.hltEle22WP85GsfDetaFilter + process.hltEle22WP85GsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP85GsfTrackIsoFilter ) +process.HLTEle22WP90RhoGsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP90RhoClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP90RhoHEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP90RhoEcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP90RhoHcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP90RhoPixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + process.hltEle22WP90RhoGsfDetaFilter + process.hltEle22WP90RhoGsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP90RhoGsfTrackIsoFilter ) process.HLTPFTriggerSequenceForTaus = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) -process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +process.HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) process.HLTCaloTausCreatorRegionalSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltCaloTowersTau1Regional + process.hltIconeTau1Regional + process.hltCaloTowersTau2Regional + process.hltIconeTau2Regional + process.hltCaloTowersTau3Regional + process.hltIconeTau3Regional + process.hltCaloTowersTau4Regional + process.hltIconeTau4Regional + process.hltCaloTowersCentral1Regional + process.hltIconeCentral1Regional + process.hltCaloTowersCentral2Regional + process.hltIconeCentral2Regional + process.hltCaloTowersCentral3Regional + process.hltIconeCentral3Regional + process.hltCaloTowersCentral4Regional + process.hltIconeCentral4Regional ) process.HLTL2TauJetsSequence = cms.Sequence( process.HLTCaloTausCreatorRegionalSequence + process.hltL2TauJets ) process.HLTDoLocalPixelSequenceRegL2Tau = cms.Sequence( process.hltSiPixelDigisReg + process.hltSiPixelClustersReg + process.hltSiPixelClustersRegCache + process.hltSiPixelRecHitsReg ) @@ -26283,11 +24916,22 @@ process.HLTMediumIsoPFTauSequenceReg = cms.Sequence( process.hltTauPFJets08RegionReg + process.hltTauPFJetsRecoTauChargedHadronsReg + process.hltPFTauPiZerosReg + process.hltPFTausSansRefReg + process.hltPFTausReg + process.hltPFTauTrackFindingDiscriminatorReg + process.hltPFTauMediumAbsoluteIsolationDiscriminatorReg + process.hltPFTauMediumRelativeIsolationDiscriminatorReg + process.hltPFTauMediumAbsOrRelIsolationDiscriminatorReg ) process.HLTRecoMETSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltMet ) process.HLTHBHENoiseCleanerSequence = cms.Sequence( process.hltHcalNoiseInfoProducer + process.hltHcalTowerNoiseCleaner ) +process.HLTAK4CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK4CaloJets + process.hltAK4CaloJetsIDPassed ) +process.HLTAK4CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK4CaloJetsCorrected + process.hltAK4CaloJetsCorrectedIDPassed ) +process.HLTAK4CaloJetsSequence = cms.Sequence( process.HLTAK4CaloJetsReconstructionSequence + process.HLTAK4CaloJetsCorrectionSequence ) +process.HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK4CaloJetsPF ) +process.HLTPreAK4PFJetsRecoSequence = cms.Sequence( process.HLTAK4CaloJetsPrePFRecoSequence + process.hltAK4CaloJetsPFEt5 ) +process.HLTAK4PFJetsReconstructionSequence = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequence + process.hltAK4PFJets ) +process.HLTAK4PFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAll + process.hltAK4PFJetsCorrected ) +process.HLTAK4PFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PFJetsReconstructionSequence + process.HLTAK4PFJetsCorrectionSequence ) process.HLTEle45CaloIdVTGsfTrkIdTGsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1SingleEG22Filter + process.hltEG45EtFilter + process.hltEgammaClusterShape + process.hltEG45CaloIdVTClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEG45CaloIdVTHEFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle45CaloIdVTPixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle45CaloIdVTGsfTrkIdTGsfDetaFilter + process.hltEle45CaloIdVTGsfTrkIdTGsfDphiFilter ) process.HLTEle23Ele12CaloIdTrackIdIsoSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1DoubleEG137Filter + process.hltEle23Ele12CaloIdTrackIdIsoEtLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoEtLeg2Filter + process.hltEgammaClusterShape + process.hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg2Filter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle23Ele12CaloIdTrackIdIsoHELeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoHELeg2Filter + process.hltEgammaEcalPFClusterIso + process.hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg2Filter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg2Filter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg2Filter + process.HLTGsfElectronSequence + process.hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg2Filter + process.hltEle23Ele12CaloIdTrackIdIsoDetaLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoDetaLeg2Filter + process.hltEle23Ele12CaloIdTrackIdIsoDphiLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoDphiLeg2Filter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg2Filter ) process.HLTEle17Ele12Ele10CaloIdTrackIdSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1EG12EG7EG5Filter + process.hltEle17Ele12Ele10CaloIdTrackIdEtLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdEtLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdEtLeg3Filter + process.hltEgammaClusterShape + process.hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg3Filter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle17Ele12Ele10CaloIdTrackIdHELeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdHELeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdHELeg3Filter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg3Filter + process.HLTGsfElectronSequence + process.hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg3Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDetaLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDetaLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDetaLeg3Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDphiLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDphiLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDphiLeg3Filter ) process.HLTMu23Ele12_Gsf = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1Mu12EG7Filter + process.hltMu23Ele12EtLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaClusterShape + process.hltMu23Ele12ClusterShapeLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltMu23Ele12HELegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaEcalPFClusterIso + process.hltMu23Ele12EcalIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltMu23Ele12HcalIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltMu23Ele12PixelMatchLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTGsfElectronSequence + process.hltMu23Ele12GsfDetaLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.hltMu23Ele12GsfDphiLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltMu23Ele12GsfTrackIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter ) process.HLTMu8Ele23_Gsf = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1Mu3p5EG12ORL1MuOpenEG12Filter + process.hltMu8Ele23EtLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaClusterShape + process.hltMu8Ele23ClusterShapeLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltMu8Ele23HELegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaEcalPFClusterIso + process.hltMu8Ele23EcalIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltMu8Ele23HcalIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTGsfElectronSequence + process.hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter ) +process.HLTMulti5x5SuperClusterL1Seeded = cms.Sequence( process.hltMulti5x5BasicClustersL1Seeded + process.hltMulti5x5SuperClustersL1Seeded + process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded + process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded ) +process.HLTL1SeededEcalClustersSequence = cms.Sequence( process.hltHybridSuperClustersL1Seeded + process.hltCorrectedHybridSuperClustersL1Seeded + process.HLTMulti5x5SuperClusterL1Seeded ) +process.HLTDoLocalHcalWithoutHOSequence = cms.Sequence( process.hltHcalDigis + process.hltHbhereco + process.hltHfreco ) process.HLTL1SeededEgammaRegionalRecoTrackerSequence = cms.Sequence( process.hltPixelLayerPairs + process.hltL1SeededEgammaRegionalPixelSeedGenerator + process.hltL1SeededEgammaRegionalCkfTrackCandidates + process.hltL1SeededEgammaRegionalCTFFinalFitWithMaterial ) process.HLTL1SeededEgammaRegionalRecoTrackerSequenceWithId = cms.Sequence( process.HLTL1SeededEgammaRegionalRecoTrackerSequence + process.hltL1SeededEgammaRegionalAnalyticalTrackSelectorHighPurity ) process.HLTPhoton22R9Id90HE10Iso40EBOnlySequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTL1SeededEcalClustersSequence + process.hltL1SeededRecoEcalCandidate + process.hltEGRegionalL1SingleEG22 + process.hltPhoton22R9Id90HE10Iso40EBOnlyEtFilter + process.HLTDoLocalHcalWithoutHOSequence + process.hltL1SeededPhotonHcalForHE + process.hltPhoton22R9Id90HE10Iso40EBOnlyHEFilter + process.hltL1SeededR9ID + process.hltPhoton22R9Id90HE10Iso40EBOnlyR9Filter + process.hltL1SeededPhotonEcalIso + process.hltPhoton22R9Id90HE10Iso40EBOnlyEcalIsoFilter + process.hltL1SeededPhotonHcalIso + process.hltPhoton22R9Id90HE10Iso40EBOnlyHcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.HLTL1SeededEgammaRegionalRecoTrackerSequenceWithId + process.hltL1SeededPhotonHollowTrackIsoWithId + process.hltPhoton22R9Id90HE10Iso40EBOnlyTrackIsoLastFilter ) @@ -26334,15 +24978,10 @@ process.HLT_DoubleMu4_JpsiTrk_Displaced_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu33HighQ + process.hltPreDoubleMu4JpsiTrkDisplaced + process.hltDimuon33L1Filtered0 + process.HLTL2muonrecoSequence + process.hltDimuon33L2PreFiltered0 + process.HLTL3muonrecoSequence + process.hltDoubleMu4JpsiDisplacedL3Filtered + process.hltDisplacedmumuVtxProducerDoubleMu4Jpsi + process.hltDisplacedmumuFilterDoubleMu4Jpsi + process.HLTIterativeTrackingDisplacedJpsiIter02 + process.hltJpsiTkAllConeTracksIter + process.hltJpsiTkVertexProducer + process.hltJpsiTkVertexFilter + process.HLTEndSequence ) process.HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu33HighQ + process.hltPreDoubleMu4PsiPrimeTrkDisplaced + process.hltDimuon33L1Filtered0 + process.HLTL2muonrecoSequence + process.hltDimuon33L2PreFiltered0 + process.HLTL3muonrecoSequence + process.hltDoubleMu4PsiPrimeDisplacedL3Filtered + process.hltDisplacedmumuVtxProducerDoubleMu4PsiPrime + process.hltDisplacedmumuFilterDoubleMu4PsiPrime + process.HLTIterativeTrackingDisplacedPsiPrimeIter02 + process.hltPsiPrimeTkAllConeTracksIter + process.hltPsiPrimeTkVertexProducer + process.hltPsiPrimeTkVertexFilter + process.HLTEndSequence ) process.HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu33HighQ + process.hltPreDoubleMu4LowMassNonResonantTrkDisplaced + process.hltDimuon33L1Filtered0 + process.HLTL2muonrecoSequence + process.hltDimuon33L2PreFiltered0 + process.HLTL3muonrecoSequence + process.hltDoubleMu4LowMassNonResonantDisplacedL3Filtered + process.hltDisplacedmumuVtxProducerDoubleMu4LowMassNonResonant + process.hltDisplacedmumuFilterDoubleMu4LowMassNonResonant + process.HLTIterativeTrackingDisplacedNRMuMuIter02 + process.hltLowMassNonResonantTkAllConeTracksIter + process.hltLowMassNonResonantTkVertexProducer + process.hltLowMassNonResonantTkVertexFilter + process.HLTEndSequence ) -process.HLT_DoubleMu33NoFiltersNoVtx_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreDoubleMu33NoFiltersNoVtx + process.hltDimuonL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltDimuonL2NoVtxFiltered10 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltDimuonL3NoFiltersNoVtxFiltered33 + process.HLTEndSequence ) -process.HLT_DoubleMu38NoFiltersNoVtx_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreDoubleMu38NoFiltersNoVtx + process.hltDimuonL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltDimuonL2NoVtxFiltered16 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltDimuonL3NoFiltersNoVtxFiltered38 + process.HLTEndSequence ) -process.HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1Mu3p5EG12 + process.hltPreMu38NoFiltersNoVtxPhoton38CaloIdL + process.hltL1Mu3p5EG12L1Filtered3p5 + process.HLTL2muonrecoSequenceNoVtx + process.hltL1Mu3p5EG12L2NoVtxFiltered16 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered38 + process.HLTDoEGammaStartupSequence + process.hltEGRegionalL1Mu3p5EG12 + process.hltEG38EtFilterL1Mu3p5EG12 + process.HLTDoEgammaClusterShapeSequence + process.hltMuNoFilters38Photon38CaloIdLClusterShapeFilter + process.HLTDoEGammaHESequence + process.hltMuNoFilters38Photon38CaloIdLHEFilter + process.HLTEndSequence ) -process.HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1Mu3p5EG12 + process.hltPreMu42NoFiltersNoVtxPhoton42CaloIdL + process.hltL1Mu3p5EG12L1Filtered3p5 + process.HLTL2muonrecoSequenceNoVtx + process.hltL1Mu3p5EG12L2NoVtxFiltered12 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered42 + process.HLTDoEGammaStartupSequence + process.hltEGRegionalL1Mu3p5EG12 + process.hltEG42EtFilterL1Mu3p5EG12 + process.HLTDoEgammaClusterShapeSequence + process.hltMuNoFilters42Photon42CaloIdLClusterShapeFilter + process.HLTDoEGammaHESequence + process.hltMuNoFilters42Photon42CaloIdLHEFilter + process.HLTEndSequence ) process.HLT_Ele27_WP85_Gsf_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85Gsf + process.HLTEle27WP85GsfSequence + process.HLTEndSequence ) process.HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoubleEle33CaloIdLGsfTrkIdVL + process.HLTDoubleEle33CaloIdVLGsfTrkIdVLSequence + process.HLTEndSequence ) process.HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleEG2210 + process.hltPrePhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95 + process.HLTPhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95Sequence + process.HLTEndSequence ) process.HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG35 + process.hltPrePhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65 + process.HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence + process.HLTEndSequence ) -process.HLT_PFJet260_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleJet128 + process.hltPrePFJet260 + process.HLTAK4CaloJetsSequence + process.hltSingleCaloJet200 + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToCaloJets200 + process.hltSinglePFJet260 + process.HLTEndSequence ) process.HLT_AK8PFJet360TrimMod_Mass30_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleJet128 + process.hltPreAK8PFJet360TrimModMass30 + process.HLTAK8CaloJetsSequence + process.hltAK8SingleCaloJet260 + process.HLTAK8PFJetsSequence + process.hltAK8PFJetsCorrectedMatchedToCaloJets260 + process.hltAK8TrimModJets + process.hltAK8SinglePFJet360TrimModMass30 + process.HLTEndSequence ) process.HLT_L2Mu10_NoVertex_NoBPTX_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu6NotBptxOR + process.hltPreL2Mu10NoVertexNoBPTX + process.hltL1fL1sMu6NotBptxORL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2fL1sMu6NotBptxORL1f0L2Filtered10 + process.HLTEndSequence ) process.HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sMu6NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreL2Mu10NoVertexNoBPTX3BXNoHalo + process.hltL1fL1sMu6NotBptxORL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2fL1sMu6NotBptxORL1f0L2Filtered10 + process.HLTEndSequence ) @@ -26353,17 +24992,17 @@ process.HLT_JetE50_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE50NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy50 + process.HLTEndSequence ) process.HLT_JetE70_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE70NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy70 + process.HLTEndSequence ) process.HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu14erORMu16er + process.hltPreIsoMu17eta2p1LooseIsoPFTau20 + process.hltL1fL1sMu14erORMu16erL1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.HLTPFTriggerSequenceMuTau + process.HLTIsoMuLooseIsoPFTauSequence + process.HLTEndSequence ) -process.HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + process.HLTEle22WP85GsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) +process.HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + process.HLTEle22WP90RhoGsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) process.HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sDoubleTauJet44erorDoubleJetC64 + process.hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + process.HLTL2TauJetsSequence + process.hltDoubleL2Tau35eta2p1 + process.HLTL2TauPixelIsolationSequence + process.hltL2DiTauIsoFilter + process.hltL2TauJetsIso + process.hltDoubleL2IsoTau35eta2p1 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFJetTriggerSequenceReg + process.HLTMediumIsoPFTauSequenceReg + process.hltDoublePFTau40Reg + process.hltPFTauTrackPt1DiscriminatorReg + process.hltSelectedPFTausTrackPt1Reg + process.hltDoublePFTau40TrackPt1Reg + process.hltSelectedPFTausTrackPt1MediumIsolationReg + process.hltDoublePFTau40TrackPt1MediumIsolationReg + process.hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + process.hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + process.hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + process.HLTEndSequence ) process.HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM70 + process.hltPreLooseIsoPFTau50Trk30eta2p1MET120 + process.HLTL2TauJetsSequence + process.hltSingleL2Tau35eta2p1 + process.HLTRecoMETSequence + process.hltMET120 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean120 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID120 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFTriggerSequenceForTaus + process.HLTLooseIsoPFTauSequence + process.hltPFTau50 + process.hltSelectedPFTausTrackFinding + process.hltPFTau50Track + process.hltPFTauTrackPt30Discriminator + process.hltSelectedPFTausTrackPt30 + process.hltPFTau50TrackPt30 + process.hltPFTauLooseRelativeIsolationDiscriminator0p06 + process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + process.hltSelectedPFTausTrackPt30AbsOrRelIsolation + process.hltPFTau50TrackPt30LooseAbsOrRelIso + process.HLTEndSequence ) process.HLT_ReducedIterativeTracking_v1 = cms.Path( process.HLTBeginSequence + process.hltPreReducedIterativeTracking + process.HLTRecoJetSequenceAK4PrePF + process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned + process.hltIsoMu24Trk02DiCentralPFJet50MuCleaned + process.hltIsoMu24Trk02CentralPFJet60MuCleaned + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet40 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet40MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet40EleCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet35EleCleaned + process.hltEle27DiCentralPFJet50EleCleaned + process.hltEle27CentralPFJet60EleCleaned + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet40 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet35 + process.hlt2PFJet50 + process.hlt1PFJet60 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopIsoMu24 + process.hltJetFilterSingleTopIsoMu24 + process.hltCentralJets30SingleTopIsoMu24 + process.hltLeadingCentralJets30SingleTopIsoMu24 + process.hltJetTrackAssociationSingleTopIsoMu24 + process.hltTrackIPTagInfosSingleTopIsoMu24 + process.hltSecondaryVertexSingleTopIsoMu24 + process.hltCSVJetTagSingleTopIsoMu24 + process.hltCSVFilterSingleTopIsoMu24 + process.HLTEndSequence ) process.HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreMu40eta2p1PFJet200PFJet50 + process.hltL1fL1sMu16Eta2p1L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltMu40eta2p1CleanAK4PFJet + process.hltMu40eta2p1DiCentralPFJet50MuCleaned + process.hltMu40eta2p1CentralPFJet200MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopEle27 + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) process.HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + process.HLTEle45CaloIdVTGsfTrkIdTGsfSequence + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltDiPFJet50 + process.hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + process.hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + process.hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + process.HLTEndSequence ) process.HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleEG137 + process.hltPreEle23Ele12CaloIdTrackIdIso + process.HLTEle23Ele12CaloIdTrackIdIsoSequence + process.HLTEndSequence ) process.HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1EG12EG7EG5 + process.hltPreEle17Ele12Ele10CaloIdTrackId + process.HLTEle17Ele12Ele10CaloIdTrackIdSequence + process.HLTEndSequence ) @@ -26391,13 +25030,10 @@ process.HLT_Photon300_NoHE_VBF_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG30 + process.hltPrePhoton300NoHEVBF + process.HLTSinglePhoton300NoHESequence + process.HLTAK4CaloJetsSequence + process.hltDiCaloJet20MJJ400AllJetsDEta3Filter + process.HLTEndSequence ) process.HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + process.HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + process.hltDiEle33CaloIdLNewPixelMatchUnseededFilter + process.HLTEndSequence ) process.HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle95CaloIdVTGsfTrkIdT + process.HLTEle95CaloIdVTGsfTrkIdTGsfSequence + process.HLTEndSequence ) -process.HLT_DoublePhoton85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePhoton85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) +process.HLT_DoublePho85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePho85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) process.HLT_Photon155_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPrePhoton155 + process.HLTPhoton155Sequence + process.HLTEndSequence ) process.HLT_Ele20WP60_Ele8_Mass55_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle20WP60Ele8Mass55 + process.HLTEle20WP60Ele8Mass55Sequence + process.HLTEndSequence ) process.HLT_Ele25WP60_SC4_Mass55_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle25WP60SC4Mass55 + process.HLTEle25WP60SC4Mass55Sequence + process.HLTEndSequence ) -process.HLT_L2DoubleMu23_NoVertex_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreL2DoubleMu23NoVertex + process.hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2DoubleMu23NoVertexL2PreFiltered + process.HLTEndSequence ) -process.HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 + process.hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2DoubleMu28NoVertexL2PreFiltered + process.hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 + process.HLTEndSequence ) -process.HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 + process.hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2DoubleMu38NoVertexL2PreFiltered + process.hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 + process.HLTEndSequence ) process.HLT_PFMET170_NoiseCleaned_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM36ORETM40 + process.hltPrePFMET170NoiseCleaned + process.HLTRecoMETSequence + process.hltMET90 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean80 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID80 + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET170Filter + process.HLTEndSequence ) process.HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM36ORETM40 + process.hltPrePFMET120NoiseCleanedBTagCSV07 + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean70 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID70 + process.hltSusyPreBtagJetFilter + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSVsusy + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.HLTEndSequence ) process.HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT350PFMET120NoiseCleaned + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean60 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID60 + process.hltHtMht + process.hltHt280 + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.hltPFHT + process.hltPFHT350 + process.HLTEndSequence ) @@ -26434,7 +25070,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_HIon.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_HIon.py index e8c4016769b8a..226601c053dac 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_HIon.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_HIon.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/HIon/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/HIon/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTHIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/HIon/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/HIon/V15') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -1108,11 +1108,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1134,7 +1134,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1649,22 +1649,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2443,6 +2435,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2457,14 +2450,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2474,24 +2467,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2501,7 +2491,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2514,11 +2504,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -4793,11 +4782,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -8331,7 +8320,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_PIon.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_PIon.py index 9effb56b037d4..2551f77b9c85a 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_PIon.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnData_HLT_PIon.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/PIon/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/PIon/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/PIon/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/PIon/V15') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -1108,11 +1108,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1134,7 +1134,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1649,22 +1649,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2443,6 +2435,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2457,14 +2450,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2474,24 +2467,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2501,7 +2491,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2514,11 +2504,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -4793,11 +4782,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -8331,7 +8320,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_2014.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_2014.py index 1a212c9e35cea..01f000db19bae 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_2014.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_2014.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/2014/V5 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_0/GRun/V63 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLT2014" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/2014/V5') + tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V63') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -2935,11 +2935,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -2961,7 +2961,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -3590,22 +3590,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -5064,6 +5056,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -5078,14 +5071,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -5095,24 +5088,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -5122,7 +5112,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -5135,11 +5125,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -11977,19 +11966,15 @@ ) process.hltDeDxEstimatorProducer = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltIter4Merged" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltIter4Merged" ) ) process.hltDeDxFilter50DEDX3p6 = cms.EDFilter( "HLTDeDxFilter", @@ -14717,19 +14702,15 @@ ) process.hltDeDxEstimatorProducerL3Tk = cms.EDProducer( "DeDxEstimatorProducer", UseStrip = cms.bool( True ), - exponent = cms.double( -2.0 ), + MeVperADCPixel = cms.double( 3.61E-6 ), UseCalibration = cms.bool( False ), calibrationPath = cms.string( "" ), - ProbabilityMode = cms.string( "Accumulation" ), tracks = cms.InputTag( "hltL3TkTracksFromL2OIState" ), - UsePixel = cms.bool( True ), + estimator = cms.string( "generic" ), ShapeTest = cms.bool( False ), - fraction = cms.double( 0.4 ), MeVperADCStrip = cms.double( 9.5665E-4 ), - MeVperADCPixel = cms.double( 3.61E-6 ), - UseTrajectory = cms.bool( True ), - estimator = cms.string( "generic" ), - Reccord = cms.string( "SiStripDeDxMip_3D_Rcd" ), + UsePixel = cms.bool( True ), + exponent = cms.double( -2.0 ), trajectoryTrackAssociation = cms.InputTag( "hltL3TkTracksFromL2OIState" ) ) process.hltDeDxFilter50DEDX3p6Mu = cms.EDFilter( "HLTDeDxFilter", @@ -28544,9 +28525,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTau35 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -29868,9 +29847,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltDoublePFTau30 = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -32301,9 +32278,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltDoublePFTau30Reg = cms.EDFilter( "HLT1PFTau", saveTags = cms.bool( True ), @@ -54949,7 +54924,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index ae6128c558a30..de9892ef33fd1 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/HLT/V4 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/HLT/V23 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFULL" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V4') + tableName = cms.string('/dev/CMSSW_7_1_2/HLT/V23') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -480,10 +480,10 @@ 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -1221,11 +1221,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1247,7 +1247,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1762,22 +1762,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2556,6 +2548,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2570,14 +2563,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2587,24 +2580,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2614,7 +2604,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2627,11 +2617,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -12988,11 +12977,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -19312,9 +19301,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -19376,9 +19363,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -19524,13 +19509,13 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -19553,17 +19538,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -process.hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -19571,61 +19556,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +process.hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -19635,7 +19620,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -19650,79 +19635,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -process.hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -19737,10 +19704,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +process.hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -19753,14 +19720,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -19773,7 +19740,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -20608,9 +20575,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -20672,9 +20637,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -22290,9 +22253,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -22354,9 +22315,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -22734,9 +22693,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -24487,11 +24444,10 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -24537,51 +24493,49 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), @@ -24640,11 +24594,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -24837,20 +24790,15 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) process.hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -27470,7 +27418,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +process.hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) @@ -28339,32 +28287,10 @@ htLabels = cms.VInputTag( 'hltPFHT' ), minHt = cms.vdouble( 900.0 ) ) -process.hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_ETM40" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) process.hltPrePFMHT100SingleCentralJet60BTagCSV0p6 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltMET80 = cms.EDFilter( "HLT1CaloMET", - saveTags = cms.bool( True ), - MinPt = cms.double( 80.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( -1.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltMet" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 87 ) -) process.hltSingleCentralJet60L1FastJetCorrected = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), MinPt = cms.double( 60.0 ), @@ -28612,11 +28538,6 @@ mhtLabels = cms.VInputTag( 'hltPFMhtIDLoose' ), minMht = cms.vdouble( 100.0 ) ) -process.hltPFMET100Filter = cms.EDFilter( "HLTMhtFilter", - saveTags = cms.bool( True ), - mhtLabels = cms.VInputTag( 'hltPFMETProducer' ), - minMht = cms.vdouble( 100.0 ) -) process.hltPrePhysics = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) @@ -28675,11 +28596,11 @@ 'HLT_DoubleMu4_Jpsi_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele17_Ele8_Gsf_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -28900,9 +28821,9 @@ process.HLTPFTriggerSequenceMuTau = cms.Sequence( process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) process.HLTLooseIsoPFTauSequence = cms.Sequence( process.hltTauPFJets08Region + process.hltTauPFJetsRecoTauChargedHadrons + process.hltPFTauPiZeros + process.hltPFTausSansRef + process.hltPFTaus + process.hltPFTauTrackFindingDiscriminator + process.hltPFTauLooseAbsoluteIsolationDiscriminator + process.hltPFTauLooseRelativeIsolationDiscriminator + process.hltPFTauLooseAbsOrRelIsolationDiscriminator ) process.HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltPFTauAgainstMuonDiscriminator + process.hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + process.hltPFTau20TrackLooseIsoAgainstMuon + process.hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -process.HLTEle22WP85GsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP85ClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP85HEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP85EcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP85HcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP85PixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP85GsfOneOESuperMinusOneOPFilter + process.hltEle22WP85GsfMissingHitsFilter + process.hltEle22WP85GsfDetaFilter + process.hltEle22WP85GsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP85GsfTrackIsoFilter ) +process.HLTEle22WP90RhoGsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP90RhoClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP90RhoHEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP90RhoEcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP90RhoHcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP90RhoPixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + process.hltEle22WP90RhoGsfDetaFilter + process.hltEle22WP90RhoGsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP90RhoGsfTrackIsoFilter ) process.HLTPFTriggerSequenceForTaus = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) -process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +process.HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) process.HLTCaloTausCreatorRegionalSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltCaloTowersTau1Regional + process.hltIconeTau1Regional + process.hltCaloTowersTau2Regional + process.hltIconeTau2Regional + process.hltCaloTowersTau3Regional + process.hltIconeTau3Regional + process.hltCaloTowersTau4Regional + process.hltIconeTau4Regional + process.hltCaloTowersCentral1Regional + process.hltIconeCentral1Regional + process.hltCaloTowersCentral2Regional + process.hltIconeCentral2Regional + process.hltCaloTowersCentral3Regional + process.hltIconeCentral3Regional + process.hltCaloTowersCentral4Regional + process.hltIconeCentral4Regional ) process.HLTL2TauJetsSequence = cms.Sequence( process.HLTCaloTausCreatorRegionalSequence + process.hltL2TauJets ) process.HLTDoLocalPixelSequenceRegL2Tau = cms.Sequence( process.hltSiPixelDigisReg + process.hltSiPixelClustersReg + process.hltSiPixelClustersRegCache + process.hltSiPixelRecHitsReg ) @@ -29009,7 +28930,7 @@ process.HLT_JetE50_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE50NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy50 + process.HLTEndSequence ) process.HLT_JetE70_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE70NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy70 + process.HLTEndSequence ) process.HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu14erORMu16er + process.hltPreIsoMu17eta2p1LooseIsoPFTau20 + process.hltL1fL1sMu14erORMu16erL1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.HLTPFTriggerSequenceMuTau + process.HLTIsoMuLooseIsoPFTauSequence + process.HLTEndSequence ) -process.HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + process.HLTEle22WP85GsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) +process.HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + process.HLTEle22WP90RhoGsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) process.HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sDoubleTauJet44erorDoubleJetC64 + process.hltPreDoubleMediumIsoPFTau40Trk1eta2p1 + process.HLTL2TauJetsSequence + process.hltDoubleL2Tau35eta2p1 + process.HLTL2TauPixelIsolationSequence + process.hltL2DiTauIsoFilter + process.hltL2TauJetsIso + process.hltDoubleL2IsoTau35eta2p1 + process.HLTPFReconstructionSequenceForTaus + process.HLTMediumIsoPFTauSequence + process.hltDoublePFTau40 + process.hltPFTauTrackPt1Discriminator + process.hltSelectedPFTausTrackPt1 + process.hltDoublePFTau40TrackPt1 + process.hltSelectedPFTausTrackPt1MediumIsolation + process.hltDoublePFTau40TrackPt1MediumIsolation + process.hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatch + process.hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatched + process.hltDoublePFTau40TrackPt1MediumIsolationDz02 + process.HLTEndSequence ) process.HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sDoubleTauJet44erorDoubleJetC64 + process.hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + process.HLTL2TauJetsSequence + process.hltDoubleL2Tau35eta2p1 + process.HLTL2TauPixelIsolationSequence + process.hltL2DiTauIsoFilter + process.hltL2TauJetsIso + process.hltDoubleL2IsoTau35eta2p1 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFJetTriggerSequenceReg + process.HLTMediumIsoPFTauSequenceReg + process.hltDoublePFTau40Reg + process.hltPFTauTrackPt1DiscriminatorReg + process.hltSelectedPFTausTrackPt1Reg + process.hltDoublePFTau40TrackPt1Reg + process.hltSelectedPFTausTrackPt1MediumIsolationReg + process.hltDoublePFTau40TrackPt1MediumIsolationReg + process.hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + process.hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + process.hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + process.HLTEndSequence ) process.HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM70 + process.hltPreLooseIsoPFTau50Trk30eta2p1MET120 + process.HLTL2TauJetsSequence + process.hltSingleL2Tau35eta2p1 + process.HLTRecoMETSequence + process.hltMET120 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean120 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID120 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFTriggerSequenceForTaus + process.HLTLooseIsoPFTauSequence + process.hltPFTau50 + process.hltSelectedPFTausTrackFinding + process.hltPFTau50Track + process.hltPFTauTrackPt30Discriminator + process.hltSelectedPFTausTrackPt30 + process.hltPFTau50TrackPt30 + process.hltPFTauLooseRelativeIsolationDiscriminator0p06 + process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + process.hltSelectedPFTausTrackPt30AbsOrRelIsolation + process.hltPFTau50TrackPt30LooseAbsOrRelIso + process.HLTEndSequence ) @@ -29019,11 +28940,11 @@ process.HLT_ReducedIterativeTracking_v1 = cms.Path( process.HLTBeginSequence + process.hltPreReducedIterativeTracking + process.HLTRecoJetSequenceAK4PrePF + process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned + process.hltIsoMu24Trk02DiCentralPFJet50MuCleaned + process.hltIsoMu24Trk02CentralPFJet60MuCleaned + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet40 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet40MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet40EleCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet35EleCleaned + process.hltEle27DiCentralPFJet50EleCleaned + process.hltEle27CentralPFJet60EleCleaned + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet40 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet35 + process.hlt2PFJet50 + process.hlt1PFJet60 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopIsoMu24 + process.hltJetFilterSingleTopIsoMu24 + process.hltCentralJets30SingleTopIsoMu24 + process.hltLeadingCentralJets30SingleTopIsoMu24 + process.hltJetTrackAssociationSingleTopIsoMu24 + process.hltTrackIPTagInfosSingleTopIsoMu24 + process.hltSecondaryVertexSingleTopIsoMu24 + process.hltCSVJetTagSingleTopIsoMu24 + process.hltCSVFilterSingleTopIsoMu24 + process.HLTEndSequence ) process.HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreMu40eta2p1PFJet200PFJet50 + process.hltL1fL1sMu16Eta2p1L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltMu40eta2p1CleanAK4PFJet + process.hltMu40eta2p1DiCentralPFJet50MuCleaned + process.hltMu40eta2p1CentralPFJet200MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopEle27 + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) process.HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + process.HLTEle45CaloIdVTGsfTrkIdTGsfSequence + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltDiPFJet50 + process.hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + process.hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + process.hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + process.HLTEndSequence ) process.HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleEG137 + process.hltPreEle23Ele12CaloIdTrackIdIso + process.HLTEle23Ele12CaloIdTrackIdIsoSequence + process.HLTEndSequence ) process.HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1EG12EG7EG5 + process.hltPreEle17Ele12Ele10CaloIdTrackId + process.HLTEle17Ele12Ele10CaloIdTrackIdSequence + process.HLTEndSequence ) @@ -29051,7 +28972,7 @@ process.HLT_Photon300_NoHE_VBF_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG30 + process.hltPrePhoton300NoHEVBF + process.HLTSinglePhoton300NoHESequence + process.HLTAK4CaloJetsSequence + process.hltDiCaloJet20MJJ400AllJetsDEta3Filter + process.HLTEndSequence ) process.HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + process.HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + process.hltDiEle33CaloIdLNewPixelMatchUnseededFilter + process.HLTEndSequence ) process.HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle95CaloIdVTGsfTrkIdT + process.HLTEle95CaloIdVTGsfTrkIdTGsfSequence + process.HLTEndSequence ) -process.HLT_DoublePhoton85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePhoton85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) +process.HLT_DoublePho85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePho85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) process.HLT_Photon155_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPrePhoton155 + process.HLTPhoton155Sequence + process.HLTEndSequence ) process.HLT_PFHT550_4Jet_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT5504Jet + process.HLTAK4CaloJetsSequence + process.hltHtMht4Jet + process.hlt4JetHt450 + process.HLTAK4PFJetsSequence + process.hltPFHT4Jet + process.hltPF4JetHT550 + process.HLTEndSequence ) process.HLT_PFHT650_4Jet_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT6504Jet + process.HLTAK4CaloJetsSequence + process.hltHtMht4Jet + process.hlt4JetHt550 + process.HLTAK4PFJetsSequence + process.hltPFHT4Jet + process.hltPF4JetHT650 + process.HLTEndSequence ) @@ -29065,7 +28986,7 @@ process.HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM36ORETM40 + process.hltPrePFMET120NoiseCleanedBTagCSV07 + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean70 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID70 + process.hltSusyPreBtagJetFilter + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSVsusy + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.HLTEndSequence ) process.HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT350PFMET120NoiseCleaned + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean60 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID60 + process.hltHtMht + process.hltHt280 + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.hltPFHT + process.hltPFHT350 + process.HLTEndSequence ) process.HLT_PFHT900_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT900 + process.HLTAK4CaloJetsSequence + process.hltHtMht + process.hltHt700 + process.HLTAK4PFJetsSequence + process.hltPFHT + process.hltPFHT900 + process.HLTEndSequence ) -process.HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM70ORL1ETM60NotJet52WdPhi2RL1DoubleJetC56ETM60 + process.hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + process.HLTRecoMETSequence + process.hltMET80 + process.HLTAK4CaloJetsSequence + process.hltSingleCentralJet60L1FastJetCorrected + process.hltDiCentralJet20L1FastJetCorrected + process.hltSelectorJets20L1FastJetForNoPU + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTNoPUSequence + process.hltMhtProducerNoPU20 + process.hltMhtNoPU80Filter + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSV0p6 + process.HLTAK4PFJetsSequence + process.HLTPFJetIDProducerLoose + process.hltPFMhtIDLoose + process.hltPFMHTIDLoose100Filter + process.hltPFMETProducer + process.hltPFMET100Filter + process.HLTEndSequence ) +process.HLT_PFMHT100_SingleCentralJet60_BTagCSV0p6_v1 = cms.Path( process.HLTBeginSequence + process.hltPrePFMHT100SingleCentralJet60BTagCSV0p6 + process.HLTAK4CaloJetsSequence + process.hltSingleCentralJet60L1FastJetCorrected + process.hltDiCentralJet20L1FastJetCorrected + process.hltSelectorJets20L1FastJetForNoPU + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTNoPUSequence + process.hltMhtProducerNoPU20 + process.hltMhtNoPU80Filter + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSV0p6 + process.HLTAK4PFJetsSequence + process.HLTPFJetIDProducerLoose + process.hltPFMhtIDLoose + process.hltPFMHTIDLoose100Filter + process.HLTEndSequence ) process.HLT_Physics_v1 = cms.Path( process.HLTBeginSequence + process.hltPrePhysics + process.HLTEndSequence ) process.HLTriggerFinalPath = cms.Path( process.hltGtDigis + process.hltScalersRawToDigi + process.hltFEDSelector + process.hltTriggerSummaryAOD + process.hltTriggerSummaryRAW ) process.HLTAnalyzerEndpath = cms.EndPath( process.hltL1GtTrigReport + process.hltTrigReport ) @@ -29102,7 +29023,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index 7e0dc6d22f4cd..82da84fdabb60 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/GRun/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/GRun/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTGRun" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/GRun/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/GRun/V15') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -461,17 +461,15 @@ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1', 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1', 'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1', - 'HLT_DoubleMu33NoFiltersNoVtx_v1', - 'HLT_DoubleMu38NoFiltersNoVtx_v1', 'HLT_DoubleMu4_3_Bs_v1', 'HLT_DoubleMu4_3_Jpsi_Displaced_v1', 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -490,9 +488,6 @@ 'HLT_JetE30_NoBPTX_v1', 'HLT_JetE50_NoBPTX3BX_NoHalo_v1', 'HLT_JetE70_NoBPTX3BX_NoHalo_v1', - 'HLT_L2DoubleMu23_NoVertex_v1', - 'HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1', - 'HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1', 'HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1', 'HLT_L2Mu10_NoVertex_NoBPTX_v1', 'HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1', @@ -505,10 +500,8 @@ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_Mu25_TkMu0_dEta18_Onia_v1', 'HLT_Mu30_TkMu11_v1', - 'HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1', 'HLT_Mu40_eta2p1_PFJet200_PFJet50_v1', 'HLT_Mu40_v1', - 'HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1', 'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_PFHT350_PFMET120_NoiseCleaned_v1', 'HLT_PFHT900_v1', @@ -538,8 +531,7 @@ 'HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1', 'HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v1', 'HLT_Physics_v1' ), - Templates = cms.vstring( 'HLT_PFJet260_v1', - 'HLT_ReducedIterativeTracking_v1' ) + Templates = cms.vstring( 'HLT_ReducedIterativeTracking_v1' ) ) process.magfield = cms.ESSource( "XMLIdealGeometryESSource", @@ -1188,11 +1180,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1214,7 +1206,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1729,22 +1721,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2523,6 +2507,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2537,14 +2522,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2554,24 +2539,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2581,7 +2563,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2594,11 +2576,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -10161,1409 +10142,98 @@ MuMuTkVertexTag = cms.InputTag( "hltLowMassNonResonantTkVertexProducer" ), MinPt = cms.double( 0.0 ) ) -process.hltPreDoubleMu33NoFiltersNoVtx = cms.EDFilter( "HLTPrescaler", +process.hltL1sL1SingleEG20ORL1SingleEG22 = cms.EDFilter( "HLTLevel1GTSeed", + L1SeedsLogicalExpression = cms.string( "L1_SingleEG20 OR L1_SingleEG22" ), + saveTags = cms.bool( True ), + L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), + L1UseL1TriggerObjectMaps = cms.bool( True ), + L1UseAliasesForSeeding = cms.bool( True ), L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) + L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), + L1NrBxInEvent = cms.int32( 3 ), + L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), + L1TechTriggerSeeding = cms.bool( False ) ) -process.hltDimuonL1Filtered0 = cms.EDFilter( "HLTMuonL1Filter", - saveTags = cms.bool( True ), - CSCTFtag = cms.InputTag( "unused" ), - PreviousCandTag = cms.InputTag( "hltL1sL1DoubleMu10MuOpenORDoubleMu103p5" ), - MinPt = cms.double( 0.0 ), - MinN = cms.int32( 2 ), - MaxEta = cms.double( 2.5 ), - SelectQualities = cms.vint32( ), - CandTag = cms.InputTag( "hltL1extraParticles" ), - ExcludeSingleSegmentCSC = cms.bool( False ) +process.hltPreEle27WP85Gsf = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) ) -process.hltL2MuonCandidatesNoVtx = cms.EDProducer( "L2MuonCandidateProducer", - InputObjects = cms.InputTag( "hltL2Muons" ) +process.hltRechitInRegionsECAL = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + useUncalib = cms.bool( False ), + regionEtaMargin = cms.double( 0.14 ), + ecalhitLabels = cms.VInputTag( 'hltEcalRecHit:EcalRecHitsEB','hltEcalRecHit:EcalRecHitsEE' ), + regionPhiMargin = cms.double( 0.4 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1UpperThr = cms.double( 999.0 ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + productLabels = cms.vstring( 'EcalRecHitsEB', + 'EcalRecHitsEE' ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) ) -process.hltDimuonL2NoVtxFiltered10 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL1Filtered0" ), - MinPt = cms.double( 10.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) +process.hltRechitInRegionsES = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + useUncalib = cms.bool( False ), + regionEtaMargin = cms.double( 0.14 ), + ecalhitLabels = cms.VInputTag( 'hltEcalPreshowerRecHit:EcalRecHitsES' ), + regionPhiMargin = cms.double( 0.4 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1UpperThr = cms.double( 999.0 ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + productLabels = cms.vstring( 'EcalRecHitsES' ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) ) -process.hltL3TrajSeedOIStateNoVtx = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - propagatorCompatibleName = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - option = cms.uint32( 3 ), - maxChi2 = cms.double( 40.0 ), - errorMatrixPset = cms.PSet( - atIP = cms.bool( True ), - action = cms.string( "use" ), - errorMatrixValuesPSet = cms.PSet( - pf3_V12 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V13 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V11 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V14 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V15 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - yAxis = cms.vdouble( 0.0, 1.0, 1.4, 10.0 ), - pf3_V33 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - zAxis = cms.vdouble( -3.14159, 3.14159 ), - pf3_V44 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - xAxis = cms.vdouble( 0.0, 13.0, 30.0, 70.0, 1000.0 ), - pf3_V22 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V23 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V45 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V55 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V34 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V35 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V25 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) +process.hltParticleFlowRecHitECALL1Seeded = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEB' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.08 ), + name = cms.string( "PFRecHitQTestThreshold" ) ), - pf3_V24 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) ) - ) + ), + name = cms.string( "PFEBRecHitCreator" ) ), - propagatorName = cms.string( "hltESPSteppingHelixPropagatorAlong" ), - manySeeds = cms.bool( False ), - copyMuonRecHit = cms.bool( False ), - ComponentName = cms.string( "TSGForRoadSearch" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSteppingHelixPropagatorOpposite', - 'hltESPSteppingHelixPropagatorAlong' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEE' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 0.3 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ), + cms.PSet( timingCleaning = cms.bool( True ), + topologicalCleaning = cms.bool( True ), + cleaningThreshold = cms.double( 2.0 ), + skipTTRecoveredHits = cms.bool( True ), + name = cms.string( "PFRecHitQTestECAL" ) + ) + ), + name = cms.string( "PFEERecHitCreator" ) + ) ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( ), - PtCut = cms.double( 1.0 ) + navigator = cms.PSet( + barrel = cms.PSet( ), + endcap = cms.PSet( ), + name = cms.string( "PFRecHitECALNavigator" ) + ) ) -process.hltL3TrackCandidateFromL2OIStateNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3TrajSeedOIStateNoVtx" ), - reverseTrajectories = cms.bool( True ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) +process.hltParticleFlowRecHitPSL1Seeded = cms.EDProducer( "PFRecHitProducer", + producers = cms.VPSet( + cms.PSet( src = cms.InputTag( 'hltRechitInRegionsES','EcalRecHitsES' ), + qualityTests = cms.VPSet( + cms.PSet( threshold = cms.double( 7.0E-6 ), + name = cms.string( "PFRecHitQTestThreshold" ) + ) + ), + name = cms.string( "PFPSRecHitCreator" ) + ) ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilderSeedHit" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilderSeedHit" ), - maxNSeeds = cms.uint32( 100000 ) -) -process.hltL3TkTracksFromL2OIStateNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3TrackCandidateFromL2OIStateNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -process.hltL3NoFiltersNoVtxMuonsOIState = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3TkTracksFromL2OIStateNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -process.hltL3NoFiltersNoVtxTrajSeedOIHit = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - PSetNames = cms.vstring( 'skipTSG', - 'iterativeTSG' ), - L3TkCollectionA = cms.InputTag( "hltL3NoFiltersNoVtxMuonsOIState" ), - iterativeTSG = cms.PSet( - ErrorRescaling = cms.double( 3.0 ), - beamSpot = cms.InputTag( "unused" ), - MaxChi2 = cms.double( 40.0 ), - errorMatrixPset = cms.PSet( - atIP = cms.bool( True ), - action = cms.string( "use" ), - errorMatrixValuesPSet = cms.PSet( - pf3_V12 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V13 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V11 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V14 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V15 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - yAxis = cms.vdouble( 0.0, 1.0, 1.4, 10.0 ), - pf3_V33 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - zAxis = cms.vdouble( -3.14159, 3.14159 ), - pf3_V44 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - xAxis = cms.vdouble( 0.0, 13.0, 30.0, 70.0, 1000.0 ), - pf3_V22 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V23 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V45 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V55 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 3.0, 3.0, 3.0, 5.0, 4.0, 5.0, 10.0, 7.0, 10.0, 10.0, 10.0, 10.0 ) - ), - pf3_V34 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V35 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V25 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ), - pf3_V24 = cms.PSet( - action = cms.string( "scale" ), - values = cms.vdouble( 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ) - ) - ) - ), - UpdateState = cms.bool( True ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - SelectState = cms.bool( False ), - SigmaZ = cms.double( 25.0 ), - ResetMethod = cms.string( "matrix" ), - ComponentName = cms.string( "TSGFromPropagation" ), - UseVertexState = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAnyOpposite" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ) - ), - skipTSG = cms.PSet( ), - ComponentName = cms.string( "DualByL2TSG" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'PropagatorWithMaterial', - 'hltESPSmartPropagatorAnyOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( - cleanerFromSharedHits = cms.bool( True ), - ptCleaner = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - directionCleaner = cms.bool( True ) - ), - PtCut = cms.double( 1.0 ) -) -process.hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3NoFiltersNoVtxTrajSeedOIHit" ), - reverseTrajectories = cms.bool( True ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) - ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilder" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilder" ), - maxNSeeds = cms.uint32( 100000 ) -) -process.hltL3NoFiltersTkTracksFromL2OIHitNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -process.hltL3NoFiltersNoVtxMuonsOIHit = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3NoFiltersTkTracksFromL2OIHitNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -process.hltL3NoFiltersNoVtxTkFromL2OICombination = cms.EDProducer( "L3TrackCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit' ) -) -process.hltL3NoFiltersNoVtxTrajSeedIOHit = cms.EDProducer( "TSGFromL2Muon", - TkSeedGenerator = cms.PSet( - PSetNames = cms.vstring( 'skipTSG', - 'iterativeTSG' ), - L3TkCollectionA = cms.InputTag( "hltL3NoFiltersNoVtxTkFromL2OICombination" ), - iterativeTSG = cms.PSet( - firstTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - ComponentName = cms.string( "StandardHitTripletGenerator" ), - GeneratorPSet = cms.PSet( - useBending = cms.bool( True ), - useFixedPreFiltering = cms.bool( False ), - maxElement = cms.uint32( 0 ), - phiPreFiltering = cms.double( 0.3 ), - extraHitRPhitolerance = cms.double( 0.06 ), - useMultScattering = cms.bool( True ), - ComponentName = cms.string( "PixelTripletHLTGenerator" ), - extraHitRZtolerance = cms.double( 0.06 ), - SeedComparitorPSet = cms.PSet( ComponentName = cms.string( "none" ) ) - ), - SeedingLayers = cms.InputTag( "hltPixelLayerTriplets" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ), - PSetNames = cms.vstring( 'firstTSG', - 'secondTSG' ), - ComponentName = cms.string( "CombinedTSG" ), - thirdTSG = cms.PSet( - PSetNames = cms.vstring( 'endcapTSG', - 'barrelTSG' ), - barrelTSG = cms.PSet( ), - endcapTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - maxElement = cms.uint32( 0 ), - ComponentName = cms.string( "StandardHitPairGenerator" ), - useOnDemandTracker = cms.untracked.int32( 0 ), - SeedingLayers = cms.InputTag( "hltMixedLayerPairs" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ), - etaSeparation = cms.double( 2.0 ), - ComponentName = cms.string( "DualByEtaTSG" ) - ), - secondTSG = cms.PSet( - ComponentName = cms.string( "TSGFromOrderedHits" ), - OrderedHitsFactoryPSet = cms.PSet( - maxElement = cms.uint32( 0 ), - ComponentName = cms.string( "StandardHitPairGenerator" ), - useOnDemandTracker = cms.untracked.int32( 0 ), - SeedingLayers = cms.InputTag( "hltPixelLayerPairs" ) - ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ) - ) - ), - skipTSG = cms.PSet( ), - ComponentName = cms.string( "DualByL2TSG" ) - ), - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'PropagatorWithMaterial' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.1 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.1 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - PCut = cms.double( 2.5 ), - TrackerSeedCleaner = cms.PSet( - cleanerFromSharedHits = cms.bool( True ), - ptCleaner = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - directionCleaner = cms.bool( True ) - ), - PtCut = cms.double( 1.0 ) -) -process.hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx = cms.EDProducer( "CkfTrajectoryMaker", - src = cms.InputTag( "hltL3NoFiltersNoVtxTrajSeedIOHit" ), - reverseTrajectories = cms.bool( False ), - TransientInitialStateEstimatorParameters = cms.PSet( - propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ), - numberMeasurementsForFit = cms.int32( 4 ), - propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" ) - ), - TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - cleanTrajectoryAfterInOut = cms.bool( False ), - useHitsSplitting = cms.bool( False ), - RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ), - doSeedingRegionRebuilding = cms.bool( False ), - trackCandidateAlso = cms.bool( True ), - TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetMuonCkfTrajectoryBuilder" ) ), - NavigationSchool = cms.string( "SimpleNavigationSchool" ), - TrajectoryBuilder = cms.string( "hltESPMuonCkfTrajectoryBuilder" ), - maxNSeeds = cms.uint32( 100000 ) -) -process.hltL3NoFiltersTkTracksFromL2IOHitNoVtx = cms.EDProducer( "TrackProducer", - src = cms.InputTag( "hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx" ), - SimpleMagneticField = cms.string( "" ), - clusterRemovalInfo = cms.InputTag( "" ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ), - Fitter = cms.string( "hltESPKFFittingSmoother" ), - useHitsSplitting = cms.bool( False ), - MeasurementTracker = cms.string( "" ), - AlgorithmName = cms.string( "undefAlgorithm" ), - alias = cms.untracked.string( "" ), - NavigationSchool = cms.string( "" ), - TrajectoryInEvent = cms.bool( True ), - TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - GeometricInnerState = cms.bool( True ), - useSimpleMF = cms.bool( False ), - Propagator = cms.string( "PropagatorWithMaterial" ) -) -process.hltL3NoFiltersNoVtxMuonsIOHit = cms.EDProducer( "L3MuonProducer", - ServiceParameters = cms.PSet( - Propagators = cms.untracked.vstring( 'hltESPSmartPropagatorAny', - 'SteppingHelixPropagatorAny', - 'hltESPSmartPropagator', - 'hltESPSteppingHelixPropagatorOpposite' ), - RPCLayers = cms.bool( True ), - UseMuonNavigation = cms.untracked.bool( True ) - ), - L3TrajBuilderParameters = cms.PSet( - ScaleTECyFactor = cms.double( -1.0 ), - GlbRefitterParameters = cms.PSet( - TrackerSkipSection = cms.int32( -1 ), - DoPredictionsOnly = cms.bool( False ), - PropDirForCosmics = cms.bool( False ), - HitThreshold = cms.int32( 1 ), - MuonHitsOption = cms.int32( 1 ), - Chi2CutRPC = cms.double( 1.0 ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - Chi2CutCSC = cms.double( 150.0 ), - Chi2CutDT = cms.double( 10.0 ), - RefitRPCHits = cms.bool( True ), - SkipStation = cms.int32( -1 ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ), - TrackerSkipSystem = cms.int32( -1 ), - DYTthrs = cms.vint32( 30, 15 ) - ), - ScaleTECxFactor = cms.double( -1.0 ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - MuonTrackingRegionBuilder = cms.PSet( - EtaR_UpperLimit_Par1 = cms.double( 0.25 ), - EtaR_UpperLimit_Par2 = cms.double( 0.15 ), - OnDemand = cms.double( -1.0 ), - Rescale_Dz = cms.double( 3.0 ), - vertexCollection = cms.InputTag( "pixelVertices" ), - Rescale_phi = cms.double( 3.0 ), - Eta_fixed = cms.double( 0.2 ), - DeltaZ_Region = cms.double( 15.9 ), - MeasurementTrackerName = cms.string( "hltESPMeasurementTracker" ), - PhiR_UpperLimit_Par2 = cms.double( 0.2 ), - Eta_min = cms.double( 0.05 ), - Phi_fixed = cms.double( 0.2 ), - DeltaR = cms.double( 0.2 ), - EscapePt = cms.double( 1.5 ), - UseFixedRegion = cms.bool( False ), - PhiR_UpperLimit_Par1 = cms.double( 0.6 ), - Rescale_eta = cms.double( 3.0 ), - Phi_min = cms.double( 0.05 ), - UseVertex = cms.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ) - ), - RefitRPCHits = cms.bool( True ), - PCut = cms.double( 2.5 ), - TrackTransformer = cms.PSet( - DoPredictionsOnly = cms.bool( False ), - Fitter = cms.string( "hltESPL3MuKFTrajectoryFitter" ), - TrackerRecHitBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonRecHitBuilder = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" ), - RefitDirection = cms.string( "insideOut" ), - RefitRPCHits = cms.bool( True ), - Propagator = cms.string( "hltESPSmartPropagatorAny" ) - ), - GlobalMuonTrackMatcher = cms.PSet( - Pt_threshold1 = cms.double( 0.0 ), - DeltaDCut_3 = cms.double( 15.0 ), - MinP = cms.double( 2.5 ), - MinPt = cms.double( 1.0 ), - Chi2Cut_1 = cms.double( 50.0 ), - Pt_threshold2 = cms.double( 9.99999999E8 ), - LocChi2Cut = cms.double( 0.001 ), - Eta_threshold = cms.double( 1.2 ), - Quality_3 = cms.double( 7.0 ), - Quality_2 = cms.double( 15.0 ), - Chi2Cut_2 = cms.double( 50.0 ), - Chi2Cut_3 = cms.double( 200.0 ), - DeltaDCut_1 = cms.double( 40.0 ), - DeltaRCut_2 = cms.double( 0.2 ), - DeltaRCut_3 = cms.double( 1.0 ), - DeltaDCut_2 = cms.double( 10.0 ), - DeltaRCut_1 = cms.double( 0.1 ), - Propagator = cms.string( "hltESPSmartPropagator" ), - Quality_1 = cms.double( 20.0 ) - ), - PtCut = cms.double( 1.0 ), - TrackerPropagator = cms.string( "SteppingHelixPropagatorAny" ), - tkTrajLabel = cms.InputTag( "hltL3NoFiltersTkTracksFromL2IOHitNoVtx" ), - tkTrajBeamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - tkTrajMaxChi2 = cms.double( 9.0E99 ), - tkTrajMaxDXYBeamSpot = cms.double( 9.0E99 ), - tkTrajVertex = cms.InputTag( "pixelVertices" ), - tkTrajUseVertex = cms.bool( False ) - ), - TrackLoaderParameters = cms.PSet( - PutTkTrackIntoEvent = cms.untracked.bool( False ), - beamSpot = cms.InputTag( "hltOnlineBeamSpot" ), - SmoothTkTrack = cms.untracked.bool( False ), - MuonSeededTracksInstance = cms.untracked.string( "L2Seeded" ), - Smoother = cms.string( "hltESPKFTrajectorySmootherForMuonTrackLoader" ), - MuonUpdatorAtVertexParameters = cms.PSet( - MaxChi2 = cms.double( 1000000.0 ), - Propagator = cms.string( "hltESPSteppingHelixPropagatorOpposite" ), - BeamSpotPositionErrors = cms.vdouble( 0.1, 0.1, 5.3 ) - ), - VertexConstraint = cms.bool( False ), - DoSmoothing = cms.bool( True ) - ), - MuonCollectionLabel = cms.InputTag( "hltL2Muons" ) -) -process.hltL3NoFiltersNoVtxTrajectorySeed = cms.EDProducer( "L3MuonTrajectorySeedCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxTrajSeedIOHit','hltL3TrajSeedOIStateNoVtx','hltL3NoFiltersNoVtxTrajSeedOIHit' ) -) -process.hltL3NoFiltersTrackCandidateFromL2NoVtx = cms.EDProducer( "L3TrackCandCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx','hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx','hltL3TrackCandidateFromL2OIStateNoVtx' ) -) -process.hltL3NoFiltersNoVtxTkTracksMergeStep1 = cms.EDProducer( "SimpleTrackListMerger", - ShareFrac = cms.double( 0.19 ), - promoteTrackQuality = cms.bool( True ), - MinPT = cms.double( 0.05 ), - copyExtras = cms.untracked.bool( True ), - Epsilon = cms.double( -0.001 ), - allowFirstHitShare = cms.bool( True ), - newQuality = cms.string( "confirmed" ), - MaxNormalizedChisq = cms.double( 1000.0 ), - TrackProducer1 = cms.string( "hltL3TkTracksFromL2OIStateNoVtx" ), - MinFound = cms.int32( 3 ), - TrackProducer2 = cms.string( "hltL3NoFiltersTkTracksFromL2OIHitNoVtx" ), - LostHitPenalty = cms.double( 0.0 ), - FoundHitBonus = cms.double( 100.0 ) -) -process.hltL3NoFiltersTkTracksFromL2Novtx = cms.EDProducer( "SimpleTrackListMerger", - ShareFrac = cms.double( 0.19 ), - promoteTrackQuality = cms.bool( True ), - MinPT = cms.double( 0.05 ), - copyExtras = cms.untracked.bool( True ), - Epsilon = cms.double( -0.001 ), - allowFirstHitShare = cms.bool( True ), - newQuality = cms.string( "confirmed" ), - MaxNormalizedChisq = cms.double( 1000.0 ), - TrackProducer1 = cms.string( "hltL3NoFiltersNoVtxTkTracksMergeStep1" ), - MinFound = cms.int32( 3 ), - TrackProducer2 = cms.string( "hltL3NoFiltersTkTracksFromL2IOHitNoVtx" ), - LostHitPenalty = cms.double( 0.0 ), - FoundHitBonus = cms.double( 100.0 ) -) -process.hltL3NoFiltersNoVtxMuonsLinksCombination = cms.EDProducer( "L3TrackLinksCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit','hltL3NoFiltersNoVtxMuonsIOHit' ) -) -process.hltL3NoFiltersNoVtxMuons = cms.EDProducer( "L3TrackCombiner", - labels = cms.VInputTag( 'hltL3NoFiltersNoVtxMuonsOIState','hltL3NoFiltersNoVtxMuonsOIHit','hltL3NoFiltersNoVtxMuonsIOHit' ) -) -process.hltL3NoFiltersNoVtxMuonCandidates = cms.EDProducer( "L3MuonCandidateProducer", - InputLinksObjects = cms.InputTag( "hltL3NoFiltersNoVtxMuonsLinksCombination" ), - InputObjects = cms.InputTag( "hltL3NoFiltersNoVtxMuons" ), - MuonPtOption = cms.string( "Tracker" ) -) -process.hltDimuonL3NoFiltersNoVtxFiltered33 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL2NoVtxFiltered10" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 2 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 33.0 ) -) -process.hltPreDoubleMu38NoFiltersNoVtx = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltDimuonL2NoVtxFiltered16 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL1Filtered0" ), - MinPt = cms.double( 16.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltDimuonL3NoFiltersNoVtxFiltered38 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltDimuonL2NoVtxFiltered16" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 2 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 38.0 ) -) -process.hltL1sL1Mu3p5EG12 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_Mu3p5_EG12" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) -process.hltPreMu38NoFiltersNoVtxPhoton38CaloIdL = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL1Mu3p5EG12L1Filtered3p5 = cms.EDFilter( "HLTMuonL1Filter", - saveTags = cms.bool( False ), - CSCTFtag = cms.InputTag( "unused" ), - PreviousCandTag = cms.InputTag( "hltL1sL1Mu3p5EG12" ), - MinPt = cms.double( 3.5 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 2.5 ), - SelectQualities = cms.vint32( ), - CandTag = cms.InputTag( "hltL1extraParticles" ), - ExcludeSingleSegmentCSC = cms.bool( False ) -) -process.hltL1Mu3p5EG12L2NoVtxFiltered16 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( False ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L1Filtered3p5" ), - MinPt = cms.double( 16.0 ), - MinN = cms.int32( 1 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered38 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L2NoVtxFiltered16" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 1 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 38.0 ) -) -process.hltHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaHLTHybridClusterProducer", - xi = cms.double( 0.0 ), - regionEtaMargin = cms.double( 0.14 ), - regionPhiMargin = cms.double( 0.4 ), - severityRecHitThreshold = cms.double( 4.0 ), - RecHitFlagToBeExcluded = cms.vstring( ), - ecalhitcollection = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - eThreshA = cms.double( 0.003 ), - basicclusterCollection = cms.string( "" ), - eThreshB = cms.double( 0.1 ), - dynamicPhiRoad = cms.bool( False ), - useEtForXi = cms.bool( True ), - l1UpperThr = cms.double( 999.0 ), - excludeFlagged = cms.bool( True ), - posCalcParameters = cms.PSet( - T0_barl = cms.double( 7.4 ), - LogWeighted = cms.bool( True ), - T0_endc = cms.double( 3.1 ), - T0_endcPresh = cms.double( 1.2 ), - W0 = cms.double( 4.2 ), - X0 = cms.double( 0.89 ) - ), - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - eseed = cms.double( 0.35 ), - ethresh = cms.double( 0.1 ), - ewing = cms.double( 0.0 ), - RecHitSeverityToBeExcluded = cms.vstring( 'kWeird' ), - step = cms.int32( 17 ), - debugLevel = cms.string( "INFO" ), - dynamicEThresh = cms.bool( False ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), - superclusterCollection = cms.string( "" ), - HybridBarrelSeedThr = cms.double( 1.5 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ) -) -process.hltCorrectedHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", - corectedSuperClusterCollection = cms.string( "" ), - sigmaElectronicNoise = cms.double( 0.03 ), - superClusterAlgo = cms.string( "Hybrid" ), - etThresh = cms.double( 1.0 ), - rawSuperClusterProducer = cms.InputTag( "hltHybridSuperClustersL1Seeded" ), - applyEnergyCorrection = cms.bool( True ), - isl_fCorrPset = cms.PSet( ), - VerbosityLevel = cms.string( "ERROR" ), - recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - fix_fCorrPset = cms.PSet( ), - modeEE = cms.int32( 0 ), - modeEB = cms.int32( 0 ), - dyn_fCorrPset = cms.PSet( ), - energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), - applyLocalContCorrection = cms.bool( False ), - localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), - crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), - applyCrackCorrection = cms.bool( False ), - hyb_fCorrPset = cms.PSet( - brLinearLowThr = cms.double( 1.1 ), - fBremVec = cms.vdouble( -0.05208, 0.1331, 0.9196, -5.735E-4, 1.343 ), - brLinearHighThr = cms.double( 8.0 ), - fEtEtaVec = cms.vdouble( 1.0012, -0.5714, 0.0, 0.0, 0.0, 0.5549, 12.74, 1.0448, 0.0, 0.0, 0.0, 0.0, 8.0, 1.023, -0.00181, 0.0, 0.0 ) - ) -) -process.hltMulti5x5BasicClustersL1Seeded = cms.EDProducer( "EgammaHLTMulti5x5ClusterProducer", - l1LowerThr = cms.double( 5.0 ), - Multi5x5BarrelSeedThr = cms.double( 0.5 ), - Multi5x5EndcapSeedThr = cms.double( 0.18 ), - endcapHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - barrelClusterCollection = cms.string( "notused" ), - regionEtaMargin = cms.double( 0.3 ), - regionPhiMargin = cms.double( 0.4 ), - RecHitFlagToBeExcluded = cms.vstring( ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - posCalcParameters = cms.PSet( - T0_barl = cms.double( 7.4 ), - LogWeighted = cms.bool( True ), - T0_endc = cms.double( 3.1 ), - T0_endcPresh = cms.double( 1.2 ), - W0 = cms.double( 4.2 ), - X0 = cms.double( 0.89 ) - ), - VerbosityLevel = cms.string( "ERROR" ), - doIsolated = cms.bool( True ), - barrelHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), - doEndcaps = cms.bool( True ), - doBarrel = cms.bool( False ), - endcapClusterCollection = cms.string( "multi5x5EndcapBasicClusters" ), - l1UpperThr = cms.double( 999.0 ) -) -process.hltMulti5x5SuperClustersL1Seeded = cms.EDProducer( "Multi5x5SuperClusterProducer", - barrelSuperclusterCollection = cms.string( "multi5x5BarrelSuperClusters" ), - endcapEtaSearchRoad = cms.double( 0.14 ), - dynamicPhiRoad = cms.bool( False ), - endcapClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5EndcapBasicClusters' ), - barrelPhiSearchRoad = cms.double( 0.8 ), - endcapPhiSearchRoad = cms.double( 0.6 ), - seedTransverseEnergyThreshold = cms.double( 1.0 ), - endcapSuperclusterCollection = cms.string( "multi5x5EndcapSuperClusters" ), - barrelEtaSearchRoad = cms.double( 0.06 ), - barrelClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5BarrelBasicClusters' ), - doBarrel = cms.bool( False ), - doEndcaps = cms.bool( True ), - bremRecoveryPset = cms.PSet( - barrel = cms.PSet( ), - endcap = cms.PSet( - a = cms.double( 47.85 ), - c = cms.double( 0.1201 ), - b = cms.double( 108.8 ) - ), - doEndcaps = cms.bool( True ), - doBarrel = cms.bool( False ) - ), - endcapClusterProducer = cms.string( "hltMulti5x5BasicClustersL1Seeded" ) -) -process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "PreshowerClusterProducer", - assocSClusterCollection = cms.string( "" ), - preshStripEnergyCut = cms.double( 0.0 ), - preshClusterCollectionY = cms.string( "preshowerYClusters" ), - preshClusterCollectionX = cms.string( "preshowerXClusters" ), - etThresh = cms.double( 5.0 ), - preshRecHitProducer = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), - endcapSClusterProducer = cms.InputTag( 'hltMulti5x5SuperClustersL1Seeded','multi5x5EndcapSuperClusters' ), - preshNclust = cms.int32( 4 ), - debugLevel = cms.string( "" ), - preshClusterEnergyCut = cms.double( 0.0 ), - preshSeededNstrip = cms.int32( 15 ) -) -process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", - corectedSuperClusterCollection = cms.string( "" ), - sigmaElectronicNoise = cms.double( 0.15 ), - superClusterAlgo = cms.string( "Multi5x5" ), - etThresh = cms.double( 1.0 ), - rawSuperClusterProducer = cms.InputTag( "hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), - applyEnergyCorrection = cms.bool( True ), - isl_fCorrPset = cms.PSet( ), - VerbosityLevel = cms.string( "ERROR" ), - recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - fix_fCorrPset = cms.PSet( - brLinearLowThr = cms.double( 0.6 ), - fBremVec = cms.vdouble( -0.04163, 0.08552, 0.95048, -0.002308, 1.077 ), - brLinearHighThr = cms.double( 6.0 ), - fEtEtaVec = cms.vdouble( 0.9746, -6.512, 0.0, 0.0, 0.02771, 4.983, 0.0, 0.0, -0.007288, -0.9446, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0 ) - ), - modeEE = cms.int32( 0 ), - modeEB = cms.int32( 0 ), - dyn_fCorrPset = cms.PSet( ), - energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), - applyLocalContCorrection = cms.bool( False ), - localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), - crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), - applyCrackCorrection = cms.bool( False ), - hyb_fCorrPset = cms.PSet( ) -) -process.hltL1SeededRecoEcalCandidate = cms.EDProducer( "EgammaHLTRecoEcalCandidateProducers", - scIslandEndcapProducer = cms.InputTag( "hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), - scHybridBarrelProducer = cms.InputTag( "hltCorrectedHybridSuperClustersL1Seeded" ), - recoEcalCandidateCollection = cms.string( "" ) -) -process.hltEGRegionalL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", - doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.65 ), - saveTags = cms.bool( False ), - region_eta_size_ecap = cms.double( 1.0 ), - barrel_end = cms.double( 1.4791 ), - l1IsolatedTag = cms.InputTag( 'hltL1extraParticles','Isolated' ), - candIsolatedTag = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - region_phi_size = cms.double( 1.044 ), - region_eta_size = cms.double( 0.522 ), - L1SeedFilterTag = cms.InputTag( "hltL1sL1Mu3p5EG12" ), - candNonIsolatedTag = cms.InputTag( "" ), - l1NonIsolatedTag = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - ncandcut = cms.int32( 1 ) -) -process.hltEG38EtFilterL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaEtFilter", - saveTags = cms.bool( False ), - L1NonIsoCand = cms.InputTag( "" ), - relaxed = cms.untracked.bool( False ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - inputTag = cms.InputTag( "hltEGRegionalL1Mu3p5EG12" ), - etcutEB = cms.double( 38.0 ), - etcutEE = cms.double( 38.0 ), - ncandcut = cms.int32( 1 ) -) -process.hltL1SeededHLTClusterShape = cms.EDProducer( "EgammaHLTClusterShapeProducer", - recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - ecalRechitEB = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - ecalRechitEE = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), - isIeta = cms.bool( True ) -) -process.hltMuNoFilters38Photon38CaloIdLClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.035 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.014 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededHLTClusterShape" ), - candTag = cms.InputTag( "hltEG38EtFilterL1Mu3p5EG12" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltL1SeededPhotonHcalForHE = cms.EDProducer( "EgammaHLTHcalIsolationProducersRegional", - eMinHE = cms.double( 0.8 ), - hbheRecHitProducer = cms.InputTag( "hltHbhereco" ), - effectiveAreaBarrel = cms.double( 0.105 ), - outerCone = cms.double( 0.14 ), - eMinHB = cms.double( 0.7 ), - innerCone = cms.double( 0.0 ), - etMinHE = cms.double( -1.0 ), - etMinHB = cms.double( -1.0 ), - rhoProducer = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ), - depth = cms.int32( -1 ), - doRhoCorrection = cms.bool( False ), - effectiveAreaEndcap = cms.double( 0.17 ), - recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - rhoMax = cms.double( 9.9999999E7 ), - rhoScale = cms.double( 1.0 ), - doEtSum = cms.bool( False ) -) -process.hltMuNoFilters38Photon38CaloIdLHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( 0.15 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededPhotonHcalForHE" ), - candTag = cms.InputTag( "hltMuNoFilters38Photon38CaloIdLClusterShapeFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltPreMu42NoFiltersNoVtxPhoton42CaloIdL = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL1Mu3p5EG12L2NoVtxFiltered12 = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( False ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L1Filtered3p5" ), - MinPt = cms.double( 12.0 ), - MinN = cms.int32( 1 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.5 ), - MinNhits = cms.vint32( 0 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 0 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered42 = cms.EDFilter( "HLTMuonL3PreFilter", - MaxNormalizedChi2 = cms.double( 9999.0 ), - saveTags = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1Mu3p5EG12L2NoVtxFiltered12" ), - MinNmuonHits = cms.int32( 0 ), - MinN = cms.int32( 1 ), - MinTrackPt = cms.double( 0.0 ), - MaxEta = cms.double( 2.5 ), - MaxDXYBeamSpot = cms.double( 9999.0 ), - MinNhits = cms.int32( 0 ), - MinDxySig = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MaxDz = cms.double( 9999.0 ), - MaxPtDifference = cms.double( 9999.0 ), - MaxDr = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ), - MinDr = cms.double( -1.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinPt = cms.double( 42.0 ) -) -process.hltEG42EtFilterL1Mu3p5EG12 = cms.EDFilter( "HLTEgammaEtFilter", - saveTags = cms.bool( False ), - L1NonIsoCand = cms.InputTag( "" ), - relaxed = cms.untracked.bool( False ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - inputTag = cms.InputTag( "hltEGRegionalL1Mu3p5EG12" ), - etcutEB = cms.double( 42.0 ), - etcutEE = cms.double( 42.0 ), - ncandcut = cms.int32( 1 ) -) -process.hltMuNoFilters42Photon42CaloIdLClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.035 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.014 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededHLTClusterShape" ), - candTag = cms.InputTag( "hltEG42EtFilterL1Mu3p5EG12" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltMuNoFilters42Photon42CaloIdLHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), - thrOverEEB = cms.double( 0.15 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( False ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltL1SeededPhotonHcalForHE" ), - candTag = cms.InputTag( "hltMuNoFilters42Photon42CaloIdLClusterShapeFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltL1sL1SingleEG20ORL1SingleEG22 = cms.EDFilter( "HLTLevel1GTSeed", - L1SeedsLogicalExpression = cms.string( "L1_SingleEG20 OR L1_SingleEG22" ), - saveTags = cms.bool( True ), - L1MuonCollectionTag = cms.InputTag( "hltL1extraParticles" ), - L1UseL1TriggerObjectMaps = cms.bool( True ), - L1UseAliasesForSeeding = cms.bool( True ), - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - L1CollectionsTag = cms.InputTag( "hltL1extraParticles" ), - L1NrBxInEvent = cms.int32( 3 ), - L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), - L1TechTriggerSeeding = cms.bool( False ) -) -process.hltPreEle27WP85Gsf = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltRechitInRegionsECAL = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - useUncalib = cms.bool( False ), - regionEtaMargin = cms.double( 0.14 ), - ecalhitLabels = cms.VInputTag( 'hltEcalRecHit:EcalRecHitsEB','hltEcalRecHit:EcalRecHitsEE' ), - regionPhiMargin = cms.double( 0.4 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1UpperThr = cms.double( 999.0 ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - productLabels = cms.vstring( 'EcalRecHitsEB', - 'EcalRecHitsEE' ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) -) -process.hltRechitInRegionsES = cms.EDProducer( "EgammaHLTRechitInRegionsProducer", - l1LowerThr = cms.double( 5.0 ), - doIsolated = cms.bool( True ), - useUncalib = cms.bool( False ), - regionEtaMargin = cms.double( 0.14 ), - ecalhitLabels = cms.VInputTag( 'hltEcalPreshowerRecHit:EcalRecHitsES' ), - regionPhiMargin = cms.double( 0.4 ), - l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), - l1UpperThr = cms.double( 999.0 ), - l1LowerThrIgnoreIsolation = cms.double( 0.0 ), - productLabels = cms.vstring( 'EcalRecHitsES' ), - l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ) -) -process.hltParticleFlowRecHitECALL1Seeded = cms.EDProducer( "PFRecHitProducer", - producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEB' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 0.08 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ), - cms.PSet( timingCleaning = cms.bool( True ), - topologicalCleaning = cms.bool( True ), - cleaningThreshold = cms.double( 2.0 ), - skipTTRecoveredHits = cms.bool( True ), - name = cms.string( "PFRecHitQTestECAL" ) - ) - ), - name = cms.string( "PFEBRecHitCreator" ) - ), - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsECAL','EcalRecHitsEE' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 0.3 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ), - cms.PSet( timingCleaning = cms.bool( True ), - topologicalCleaning = cms.bool( True ), - cleaningThreshold = cms.double( 2.0 ), - skipTTRecoveredHits = cms.bool( True ), - name = cms.string( "PFRecHitQTestECAL" ) - ) - ), - name = cms.string( "PFEERecHitCreator" ) - ) - ), - navigator = cms.PSet( - barrel = cms.PSet( ), - endcap = cms.PSet( ), - name = cms.string( "PFRecHitECALNavigator" ) - ) -) -process.hltParticleFlowRecHitPSL1Seeded = cms.EDProducer( "PFRecHitProducer", - producers = cms.VPSet( - cms.PSet( src = cms.InputTag( 'hltRechitInRegionsES','EcalRecHitsES' ), - qualityTests = cms.VPSet( - cms.PSet( threshold = cms.double( 7.0E-6 ), - name = cms.string( "PFRecHitQTestThreshold" ) - ) - ), - name = cms.string( "PFPSRecHitCreator" ) - ) - ), - navigator = cms.PSet( name = cms.string( "PFRecHitPreshowerNavigator" ) ) + navigator = cms.PSet( name = cms.string( "PFRecHitPreshowerNavigator" ) ) ) process.hltParticleFlowClusterPSL1Seeded = cms.EDProducer( "PFClusterProducer", pfClusterBuilder = cms.PSet( @@ -12207,11 +10877,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -14962,11 +13632,11 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -process.hltPrePFJet260 = cms.EDFilter( "HLTPrescaler", +process.hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", +process.hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), voronoiRfact = cms.double( 0.9 ), @@ -14985,7 +13655,7 @@ useDeterministicSeed = cms.bool( True ), doPVCorrection = cms.bool( False ), maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), + rParam = cms.double( 0.8 ), maxProblematicHcalCells = cms.uint32( 9999999 ), doOutputJets = cms.bool( True ), src = cms.InputTag( "hltTowerMakerForAll" ), @@ -14993,7 +13663,7 @@ puPtMin = cms.double( 10.0 ), srcPVs = cms.InputTag( "NotUsed" ), jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.4 ), + radiusPU = cms.double( 0.8 ), maxProblematicEcalCells = cms.uint32( 9999999 ), doPUOffsetCorr = cms.bool( False ), inputEMin = cms.double( 0.0 ), @@ -15026,11 +13696,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) -process.hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", +process.hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", min_N90 = cms.int32( -2 ), min_N90hits = cms.int32( 2 ), min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK4CaloJets" ), + jetsInput = cms.InputTag( "hltAK8CaloJets" ), JetIDParams = cms.PSet( useRecHits = cms.bool( True ), hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), @@ -15046,21 +13716,21 @@ maxRapidity = cms.double( 5.0 ), pfCandidatesTag = cms.InputTag( "hltTowerMakerForAll" ) ) -process.hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJets" ), +process.hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJets" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -process.hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), +process.hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) ) -process.hltSingleCaloJet200 = cms.EDFilter( "HLT1CaloJet", +process.hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", saveTags = cms.bool( True ), - MinPt = cms.double( 200.0 ), + MinPt = cms.double( 260.0 ), MinN = cms.int32( 1 ), MaxEta = cms.double( 5.0 ), MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK4CaloJetsCorrectedIDPassed" ), + inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), MinE = cms.double( -1.0 ), triggerType = cms.int32( 85 ) ) @@ -15132,6 +13802,66 @@ HOGrid = cms.vdouble( ), EBGrid = cms.vdouble( ) ) +process.hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( False ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.8 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForPF" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.8 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) process.hltAK4CaloJetsPF = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), doAreaFastjet = cms.bool( False ), @@ -15192,6 +13922,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) +process.hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", + filter = cms.bool( False ), + src = cms.InputTag( "hltAK8CaloJetsPF" ), + etMin = cms.double( 5.0 ) +) process.hltAK4CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", filter = cms.bool( False ), src = cms.InputTag( "hltAK4CaloJetsPF" ), @@ -16588,279 +15323,32 @@ maxHcalEOverEcalE = cms.double( 0.1 ), maxEcalEOverP_1 = cms.double( 0.5 ), maxHcalEOverP = cms.double( 1.0 ), - maxEcalEOverPRes = cms.double( 0.2 ), - maxHcalE = cms.double( 10.0 ), - maxEeleOverPout = cms.double( 0.2 ), - maxNtracks = cms.double( 3.0 ), - maxEleHcalEOverEcalE = cms.double( 0.1 ), - maxDPhiIN = cms.double( 0.1 ), - maxEeleOverPoutRes = cms.double( 0.5 ) - ), - electron_iso_pt = cms.double( 10.0 ), - isolatedElectronID_mvaWeightFile = cms.string( "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml" ), - vertexCollection = cms.InputTag( "hltPixelVertices" ), - X0_Map = cms.string( "RecoParticleFlow/PFProducer/data/allX0histos.root" ), - calibPFSCEle_Fbrem_barrel = cms.vdouble( 0.6, 6.0, -0.0255975, 0.0576727, 0.975442, -5.46394E-4, 1.26147, 25.0, -0.02025, 0.04537, 0.9728, -8.962E-4, 1.172 ), - blocks = cms.InputTag( "hltParticleFlowBlock" ), - punchThroughMETFactor = cms.double( 4.0 ), - metSignificanceForRejection = cms.double( 4.0 ), - photon_protectionsForJetMET = cms.PSet( - sumPtTrackIsoSlope = cms.double( 0.001 ), - sumPtTrackIso = cms.double( 2.0 ) - ), - usePhotonReg = cms.bool( False ), - dzPV = cms.double( 0.2 ), - calibHF_a_EMHAD = cms.vdouble( 1.42215, 1.00496, 0.68961, 0.81656, 0.98504, 0.98504, 1.00802, 1.0593, 1.4576, 1.4576 ), - useRegressionFromDB = cms.bool( False ), - muon_ECAL = cms.vdouble( 0.5, 0.5 ), - usePFSCEleCalib = cms.bool( True ) -) -process.hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "PFJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.4 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltParticleFlow" ), - inputEtMin = cms.double( 0.0 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "hltPixelVertices" ), - jetPtMin = cms.double( 0.0 ), - radiusPU = cms.double( 0.4 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 0 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -process.hltFixedGridRhoFastjetAll = cms.EDProducer( "FixedGridRhoProducerFastjet", - gridSpacing = cms.double( 0.55 ), - maxRapidity = cms.double( 5.0 ), - pfCandidatesTag = cms.InputTag( "hltParticleFlow" ) -) -process.hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", - src = cms.InputTag( "hltAK4PFJets" ), - correctors = cms.vstring( 'hltESPAK4PFCorrection' ) -) -process.hltPFJetsCorrectedMatchedToCaloJets200 = cms.EDProducer( "PFJetsMatchedToFilteredCaloJetsProducer", - DeltaR = cms.double( 0.5 ), - CaloJetFilter = cms.InputTag( "hltSingleCaloJet200" ), - TriggerType = cms.int32( 85 ), - PFJetSrc = cms.InputTag( "hltAK4PFJetsCorrected" ) -) -process.hltSinglePFJet260 = cms.EDFilter( "HLT1PFJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltPFJetsCorrectedMatchedToCaloJets200" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -process.hltPreAK8PFJet360TrimModMass30 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltAK8CaloJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( 0.9 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( True ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), - minSeed = cms.uint32( 14327 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForAll" ), - inputEtMin = cms.double( 0.3 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -process.hltAK8CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", - min_N90 = cms.int32( -2 ), - min_N90hits = cms.int32( 2 ), - min_EMF = cms.double( 1.0E-6 ), - jetsInput = cms.InputTag( "hltAK8CaloJets" ), - JetIDParams = cms.PSet( - useRecHits = cms.bool( True ), - hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), - hoRecHitsColl = cms.InputTag( "hltHoreco" ), - hfRecHitsColl = cms.InputTag( "hltHfreco" ), - ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), - eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) + maxEcalEOverPRes = cms.double( 0.2 ), + maxHcalE = cms.double( 10.0 ), + maxEeleOverPout = cms.double( 0.2 ), + maxNtracks = cms.double( 3.0 ), + maxEleHcalEOverEcalE = cms.double( 0.1 ), + maxDPhiIN = cms.double( 0.1 ), + maxEeleOverPoutRes = cms.double( 0.5 ) ), - max_EMF = cms.double( 999.0 ) -) -process.hltAK8CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJets" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -process.hltAK8CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", - src = cms.InputTag( "hltAK8CaloJetsIDPassed" ), - correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) -) -process.hltAK8SingleCaloJet260 = cms.EDFilter( "HLT1CaloJet", - saveTags = cms.bool( True ), - MinPt = cms.double( 260.0 ), - MinN = cms.int32( 1 ), - MaxEta = cms.double( 5.0 ), - MinMass = cms.double( -1.0 ), - inputTag = cms.InputTag( "hltAK8CaloJetsCorrectedIDPassed" ), - MinE = cms.double( -1.0 ), - triggerType = cms.int32( 85 ) -) -process.hltAK8CaloJetsPF = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32( 5 ), - doAreaFastjet = cms.bool( False ), - voronoiRfact = cms.double( -9.0 ), - maxBadHcalCells = cms.uint32( 9999999 ), - doAreaDiskApprox = cms.bool( False ), - maxRecoveredEcalCells = cms.uint32( 9999999 ), - jetType = cms.string( "CaloJet" ), - minSeed = cms.uint32( 0 ), - Ghost_EtaMax = cms.double( 6.0 ), - doRhoFastjet = cms.bool( False ), - jetAlgorithm = cms.string( "AntiKt" ), - nSigmaPU = cms.double( 1.0 ), - GhostArea = cms.double( 0.01 ), - Rho_EtaMax = cms.double( 4.4 ), - maxBadEcalCells = cms.uint32( 9999999 ), - useDeterministicSeed = cms.bool( True ), - doPVCorrection = cms.bool( False ), - maxRecoveredHcalCells = cms.uint32( 9999999 ), - rParam = cms.double( 0.8 ), - maxProblematicHcalCells = cms.uint32( 9999999 ), - doOutputJets = cms.bool( True ), - src = cms.InputTag( "hltTowerMakerForPF" ), - inputEtMin = cms.double( 0.3 ), - puPtMin = cms.double( 10.0 ), - srcPVs = cms.InputTag( "NotUsed" ), - jetPtMin = cms.double( 1.0 ), - radiusPU = cms.double( 0.8 ), - maxProblematicEcalCells = cms.uint32( 9999999 ), - doPUOffsetCorr = cms.bool( False ), - inputEMin = cms.double( 0.0 ), - useMassDropTagger = cms.bool( False ), - muMin = cms.double( -1.0 ), - subtractorName = cms.string( "" ), - muCut = cms.double( -1.0 ), - subjetPtMin = cms.double( -1.0 ), - useTrimming = cms.bool( False ), - muMax = cms.double( -1.0 ), - yMin = cms.double( -1.0 ), - useFiltering = cms.bool( False ), - rFilt = cms.double( -1.0 ), - yMax = cms.double( -1.0 ), - zcut = cms.double( -1.0 ), - MinVtxNdof = cms.int32( 5 ), - MaxVtxZ = cms.double( 15.0 ), - UseOnlyVertexTracks = cms.bool( False ), - dRMin = cms.double( -1.0 ), - nFilt = cms.int32( -1 ), - usePruning = cms.bool( False ), - maxDepth = cms.int32( -1 ), - yCut = cms.double( -1.0 ), - DzTrVtxMax = cms.double( 0.0 ), - UseOnlyOnePV = cms.bool( False ), - rcut_factor = cms.double( -1.0 ), - sumRecHits = cms.bool( False ), - trimPtFracMin = cms.double( -1.0 ), - dRMax = cms.double( -1.0 ), - DxyTrVtxMax = cms.double( 0.0 ), - useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) -) -process.hltAK8CaloJetsPFEt5 = cms.EDFilter( "EtMinCaloJetSelector", - filter = cms.bool( False ), - src = cms.InputTag( "hltAK8CaloJetsPF" ), - etMin = cms.double( 5.0 ) + electron_iso_pt = cms.double( 10.0 ), + isolatedElectronID_mvaWeightFile = cms.string( "RecoEgamma/ElectronIdentification/data/TMVA_BDTSimpleCat_17Feb2011.weights.xml" ), + vertexCollection = cms.InputTag( "hltPixelVertices" ), + X0_Map = cms.string( "RecoParticleFlow/PFProducer/data/allX0histos.root" ), + calibPFSCEle_Fbrem_barrel = cms.vdouble( 0.6, 6.0, -0.0255975, 0.0576727, 0.975442, -5.46394E-4, 1.26147, 25.0, -0.02025, 0.04537, 0.9728, -8.962E-4, 1.172 ), + blocks = cms.InputTag( "hltParticleFlowBlock" ), + punchThroughMETFactor = cms.double( 4.0 ), + metSignificanceForRejection = cms.double( 4.0 ), + photon_protectionsForJetMET = cms.PSet( + sumPtTrackIsoSlope = cms.double( 0.001 ), + sumPtTrackIso = cms.double( 2.0 ) + ), + usePhotonReg = cms.bool( False ), + dzPV = cms.double( 0.2 ), + calibHF_a_EMHAD = cms.vdouble( 1.42215, 1.00496, 0.68961, 0.81656, 0.98504, 0.98504, 1.00802, 1.0593, 1.4576, 1.4576 ), + useRegressionFromDB = cms.bool( False ), + muon_ECAL = cms.vdouble( 0.5, 0.5 ), + usePFSCEleCalib = cms.bool( True ) ) process.hltAK8PFJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -16922,6 +15410,11 @@ DxyTrVtxMax = cms.double( 0.0 ), useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) ) +process.hltFixedGridRhoFastjetAll = cms.EDProducer( "FixedGridRhoProducerFastjet", + gridSpacing = cms.double( 0.55 ), + maxRapidity = cms.double( 5.0 ), + pfCandidatesTag = cms.InputTag( "hltParticleFlow" ) +) process.hltAK8PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", src = cms.InputTag( "hltAK8PFJets" ), correctors = cms.vstring( 'hltESPAK4PFCorrection' ) @@ -17029,6 +15522,9 @@ CandTag = cms.InputTag( "hltL1extraParticles" ), ExcludeSingleSegmentCSC = cms.bool( False ) ) +process.hltL2MuonCandidatesNoVtx = cms.EDProducer( "L2MuonCandidateProducer", + InputObjects = cms.InputTag( "hltL2Muons" ) +) process.hltL2fL1sMu6NotBptxORL1f0L2Filtered10 = cms.EDFilter( "HLTMuonL2PreFilter", saveTags = cms.bool( True ), MaxDr = cms.double( 9999.0 ), @@ -17905,9 +16401,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseRelativeIsolationDiscriminator = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTaus" ), @@ -17969,9 +16463,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRelIsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -18117,13 +16609,13 @@ L1GtObjectMapTag = cms.InputTag( "hltL1GtObjectMap" ), L1TechTriggerSeeding = cms.bool( False ) ) -process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", +process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), - endcap_end = cms.double( 2.17 ), + endcap_end = cms.double( 2.1 ), saveTags = cms.bool( False ), region_eta_size_ecap = cms.double( 1.0 ), barrel_end = cms.double( 1.4791 ), @@ -18146,17 +16638,17 @@ etcutEE = cms.double( 22.0 ), ncandcut = cms.int32( 1 ) ) -process.hltEle22WP85ClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoClusterShapeFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.033 ), + thrRegularEE = cms.double( 0.03 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.011 ), + thrRegularEB = cms.double( 0.01 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), @@ -18164,61 +16656,61 @@ candTag = cms.InputTag( "hltEG22L1sIso18erOrIso20erOr22EtFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HEFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.2 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.15 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( False ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHoverE" ), - candTag = cms.InputTag( "hltEle22WP85ClusterShapeFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoClusterShapeFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85EcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoEcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.12 ), + thrOverEEE = cms.double( 0.035 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.16 ), + thrOverEEB = cms.double( 0.07 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85HEFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHEFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85HcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoHcalIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.3 ), + thrOverEEE = cms.double( 0.05 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.2 ), + thrOverEEB = cms.double( 0.05 ), thrRegularEB = cms.double( -1.0 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaHcalPFClusterIso" ), - candTag = cms.InputTag( "hltEle22WP85EcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoEcalIsoFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85PixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", +process.hltEle22WP90RhoPixelMatchFilter = cms.EDFilter( "HLTElectronPixelMatchFilter", saveTags = cms.bool( True ), s2_threshold = cms.double( 0.4 ), npixelmatchcut = cms.double( 1.0 ), @@ -18228,7 +16720,7 @@ s_a_phi1F = cms.double( 0.0076 ), s_a_phi1I = cms.double( 0.0088 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - candTag = cms.InputTag( "hltEle22WP85HcalIsoFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoHcalIsoFilter" ), tanhSO10ForwardThres = cms.double( 1.0 ), L1IsoPixelSeedsTag = cms.InputTag( "hltEgammaElectronPixelSeeds" ), L1NonIsoCand = cms.InputTag( "" ), @@ -18243,79 +16735,61 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -process.hltEle22WP85GsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.009 ), + thrRegularEE = cms.double( 999.9 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.012 ), + thrRegularEB = cms.double( 999.9 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP' ), - candTag = cms.InputTag( "hltEle22WP85PixelMatchFilter" ), - nonIsoTag = cms.InputTag( "" ) -) -process.hltEle22WP85GsfMissingHitsFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( False ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits' ), - candTag = cms.InputTag( "hltEle22WP85GsfOneOESuperMinusOneOPFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoPixelMatchFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDetaFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.01 ), + thrRegularEE = cms.double( 0.006 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.005 ), + thrRegularEB = cms.double( 0.006 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltEle22WP85GsfMissingHitsFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfDphiFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( True ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.03 ), + thrRegularEE = cms.double( 0.05 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.03 ), + thrRegularEB = cms.double( 0.04 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltEle22WP85GsfDetaFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltEle22WP85GsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", +process.hltEle22WP90RhoGsfTrackIsoFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), L1NonIsoCand = cms.InputTag( "" ), @@ -18330,10 +16804,10 @@ useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltEle22WP85GsfDphiFilter" ), + candTag = cms.InputTag( "hltEle22WP90RhoGsfDphiFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", +process.hltOverlapFilterIsoEle22GsfCaloJet5 = cms.EDFilter( "HLT2PhotonTau", saveTags = cms.bool( False ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltAK4CaloJetsPFEt5' ), @@ -18346,14 +16820,14 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltTauJet5" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), MaxPt = cms.double( -1.0 ), MinDphi = cms.double( 0.0 ) ) -process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", +process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 = cms.EDFilter( "HLT2PhotonPFTau", saveTags = cms.bool( True ), MinMinv = cms.double( 0.0 ), originTag2 = cms.VInputTag( 'hltSelectedPFTausTrackFindingLooseIsolation' ), @@ -18366,7 +16840,7 @@ MaxMinv = cms.double( -1.0 ), MinDeta = cms.double( 0.0 ), MaxDelR = cms.double( 99999.0 ), - inputTag1 = cms.InputTag( "hltEle22WP85GsfTrackIsoFilter" ), + inputTag1 = cms.InputTag( "hltEle22WP90RhoGsfTrackIsoFilter" ), inputTag2 = cms.InputTag( "hltPFTau20TrackLooseIso" ), MaxDphi = cms.double( -1.0 ), MaxDeta = cms.double( -1.0 ), @@ -20654,9 +19128,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumRelativeIsolationDiscriminatorReg = cms.EDProducer( "PFRecoTauDiscriminationByIsolation", PFTauProducer = cms.InputTag( "hltPFTausReg" ), @@ -20718,9 +19190,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowReg" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauMediumAbsOrRelIsolationDiscriminatorReg = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -20975,6 +19445,89 @@ MinE = cms.double( -1.0 ), triggerType = cms.int32( 87 ) ) +process.hltAK4CaloJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( 0.9 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "CaloJet" ), + minSeed = cms.uint32( 14327 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltTowerMakerForAll" ), + inputEtMin = cms.double( 0.3 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "NotUsed" ), + jetPtMin = cms.double( 1.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 5 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +process.hltAK4CaloJetsIDPassed = cms.EDProducer( "HLTCaloJetIDProducer", + min_N90 = cms.int32( -2 ), + min_N90hits = cms.int32( 2 ), + min_EMF = cms.double( 1.0E-6 ), + jetsInput = cms.InputTag( "hltAK4CaloJets" ), + JetIDParams = cms.PSet( + useRecHits = cms.bool( True ), + hbheRecHitsColl = cms.InputTag( "hltHbhereco" ), + hoRecHitsColl = cms.InputTag( "hltHoreco" ), + hfRecHitsColl = cms.InputTag( "hltHfreco" ), + ebRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + eeRecHitsColl = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ) + ), + max_EMF = cms.double( 999.0 ) +) +process.hltAK4CaloJetsCorrected = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJets" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) +process.hltAK4CaloJetsCorrectedIDPassed = cms.EDProducer( "CaloJetCorrectionProducer", + src = cms.InputTag( "hltAK4CaloJetsIDPassed" ), + correctors = cms.vstring( 'hltESPAK4CaloCorrection' ) +) process.hltMetCleanUsingJetID = cms.EDProducer( "HLTMETCleanerUsingJetID", minPt = cms.double( 20.0 ), maxEta = cms.double( 5.0 ), @@ -21098,9 +19651,7 @@ customOuterCone = cms.double( -1.0 ), particleFlowSrc = cms.InputTag( "hltParticleFlowForTaus" ), storeRawPUsumPt = cms.bool( False ), - verbosity = cms.int32( 0 ), - UseAllPFCandsForWeights = cms.bool( False ), - ApplyDiscriminationByWeightedECALIsolation = cms.bool( False ) + verbosity = cms.int32( 0 ) ) process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator = cms.EDProducer( "PFTauDiscriminatorLogicalAndProducer", PassValue = cms.double( 1.0 ), @@ -21144,15 +19695,78 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) +process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) +) +process.hltAK4PFJets = cms.EDProducer( "FastjetJetProducer", + Active_Area_Repeats = cms.int32( 5 ), + doAreaFastjet = cms.bool( False ), + voronoiRfact = cms.double( -9.0 ), + maxBadHcalCells = cms.uint32( 9999999 ), + doAreaDiskApprox = cms.bool( True ), + maxRecoveredEcalCells = cms.uint32( 9999999 ), + jetType = cms.string( "PFJet" ), + minSeed = cms.uint32( 0 ), + Ghost_EtaMax = cms.double( 6.0 ), + doRhoFastjet = cms.bool( False ), + jetAlgorithm = cms.string( "AntiKt" ), + nSigmaPU = cms.double( 1.0 ), + GhostArea = cms.double( 0.01 ), + Rho_EtaMax = cms.double( 4.4 ), + maxBadEcalCells = cms.uint32( 9999999 ), + useDeterministicSeed = cms.bool( True ), + doPVCorrection = cms.bool( False ), + maxRecoveredHcalCells = cms.uint32( 9999999 ), + rParam = cms.double( 0.4 ), + maxProblematicHcalCells = cms.uint32( 9999999 ), + doOutputJets = cms.bool( True ), + src = cms.InputTag( "hltParticleFlow" ), + inputEtMin = cms.double( 0.0 ), + puPtMin = cms.double( 10.0 ), + srcPVs = cms.InputTag( "hltPixelVertices" ), + jetPtMin = cms.double( 0.0 ), + radiusPU = cms.double( 0.4 ), + maxProblematicEcalCells = cms.uint32( 9999999 ), + doPUOffsetCorr = cms.bool( False ), + inputEMin = cms.double( 0.0 ), + useMassDropTagger = cms.bool( False ), + muMin = cms.double( -1.0 ), + subtractorName = cms.string( "" ), + muCut = cms.double( -1.0 ), + subjetPtMin = cms.double( -1.0 ), + useTrimming = cms.bool( False ), + muMax = cms.double( -1.0 ), + yMin = cms.double( -1.0 ), + useFiltering = cms.bool( False ), + rFilt = cms.double( -1.0 ), + yMax = cms.double( -1.0 ), + zcut = cms.double( -1.0 ), + MinVtxNdof = cms.int32( 0 ), + MaxVtxZ = cms.double( 15.0 ), + UseOnlyVertexTracks = cms.bool( False ), + dRMin = cms.double( -1.0 ), + nFilt = cms.int32( -1 ), + usePruning = cms.bool( False ), + maxDepth = cms.int32( -1 ), + yCut = cms.double( -1.0 ), + DzTrVtxMax = cms.double( 0.0 ), + UseOnlyOnePV = cms.bool( False ), + rcut_factor = cms.double( -1.0 ), + sumRecHits = cms.bool( False ), + trimPtFracMin = cms.double( -1.0 ), + dRMax = cms.double( -1.0 ), + DxyTrVtxMax = cms.double( 0.0 ), + useCMSBoostedTauSeedingAlgorithm = cms.bool( False ) +) +process.hltAK4PFJetsCorrected = cms.EDProducer( "PFJetCorrectionProducer", + src = cms.InputTag( "hltAK4PFJets" ), + correctors = cms.vstring( 'hltESPAK4PFCorrection' ) ) -process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -21198,51 +19812,49 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27JetCollectionsForLeptonPlusPFJets = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltEle27TriCentralPFJet40EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet40 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 40.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 40.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreEle27WP85GsfTriCentralPFJet605035 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltEle27TriCentralPFJet35EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt3PFJet35 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 35.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 3 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 35.0 ), + MinN = cms.int32( 3 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27DiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt2PFJet50 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 50.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 2 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 50.0 ), + MinN = cms.int32( 2 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) -process.hltEle27CentralPFJet60EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hlt1PFJet60 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltEle27JetCollectionsForLeptonPlusPFJets" ), - MinJetPt = cms.double( 60.0 ), - triggerType = cms.int32( 85 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 60.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 85 ) ) process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), @@ -21301,11 +19913,10 @@ src = cms.InputTag( "hltGoodOnlinePVs" ), cut = cms.string( "!isFake" ) ) -process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), +process.hltJetsNoLeptonsSingleTopIsoMu24 = cms.EDProducer( "HLTPFJetCollectionsForLeptonPlusJets", + SourceJetTag = cms.InputTag( "hltAK4PFJetsCorrected" ), minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) + HltLeptonTag = cms.InputTag( "hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02" ) ) process.hltJetFilterSingleTopIsoMu24 = cms.EDFilter( "HLTPFJetCollectionsFilter", saveTags = cms.bool( True ), @@ -21505,20 +20116,15 @@ L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) -process.hltJetsNoLeptonsSingleTopEle27 = cms.EDProducer( "HLTPFJetsCleanedFromLeadingLeptons", - jets = cms.InputTag( "hltAK4PFJetsCorrected" ), - minDeltaR = cms.double( 0.3 ), - numLeptons = cms.uint32( 1 ), - leptons = cms.InputTag( "hltEle27WP85GsfTrackIsoFilter" ) -) -process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLTPFJetCollectionsFilter", +process.hltJetFilterSingleTopEle27 = cms.EDFilter( "HLT1PFJet", saveTags = cms.bool( True ), - originalTag = cms.InputTag( "hltAK4PFJetsCorrected" ), - inputTag = cms.InputTag( "hltJetsNoLeptonsSingleTopEle27" ), - MinJetPt = cms.double( 30.0 ), - triggerType = cms.int32( 86 ), - MinNJets = cms.uint32( 1 ), - MaxAbsJetEta = cms.double( 2.6 ) + MinPt = cms.double( 30.0 ), + MinN = cms.int32( 1 ), + MaxEta = cms.double( 2.6 ), + MinMass = cms.double( -1.0 ), + inputTag = cms.InputTag( "hltAK4PFJetsCorrected" ), + MinE = cms.double( -1.0 ), + triggerType = cms.int32( 86 ) ) process.hltCentralJets30SingleTopEle27 = cms.EDProducer( "HLTPFJetCollectionProducer", TriggerTypes = cms.vint32( 86 ), @@ -23007,63 +21613,223 @@ s_a_zB = cms.double( 0.012 ), s_a_phi2F = cms.double( 0.00906 ) ) -process.hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.02 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.015 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), - candTag = cms.InputTag( "hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +process.hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( 0.02 ), + thrOverEEE = cms.double( -1.0 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( -1.0 ), + thrRegularEB = cms.double( 0.015 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Deta' ), + candTag = cms.InputTag( "hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +process.hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( 0.04 ), + thrOverEEE = cms.double( -1.0 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( -1.0 ), + thrRegularEB = cms.double( 0.015 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), + candTag = cms.InputTag( "hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +process.hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", + doIsolated = cms.bool( True ), + thrOverE2EE = cms.double( -1.0 ), + L1NonIsoCand = cms.InputTag( "" ), + saveTags = cms.bool( True ), + thrOverE2EB = cms.double( -1.0 ), + thrRegularEE = cms.double( -1.0 ), + thrOverEEE = cms.double( 0.1 ), + L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), + thrOverEEB = cms.double( 0.1 ), + thrRegularEB = cms.double( -1.0 ), + lessThan = cms.bool( True ), + useEt = cms.bool( True ), + ncandcut = cms.int32( 1 ), + isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), + candTag = cms.InputTag( "hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), + nonIsoTag = cms.InputTag( "" ) +) +process.hltPrePhoton22R9Id90HE10Iso40EBOnlyPFMET40 = cms.EDFilter( "HLTPrescaler", + L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), + offset = cms.uint32( 0 ) +) +process.hltHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaHLTHybridClusterProducer", + xi = cms.double( 0.0 ), + regionEtaMargin = cms.double( 0.14 ), + regionPhiMargin = cms.double( 0.4 ), + severityRecHitThreshold = cms.double( 4.0 ), + RecHitFlagToBeExcluded = cms.vstring( ), + ecalhitcollection = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + eThreshA = cms.double( 0.003 ), + basicclusterCollection = cms.string( "" ), + eThreshB = cms.double( 0.1 ), + dynamicPhiRoad = cms.bool( False ), + useEtForXi = cms.bool( True ), + l1UpperThr = cms.double( 999.0 ), + excludeFlagged = cms.bool( True ), + posCalcParameters = cms.PSet( + T0_barl = cms.double( 7.4 ), + LogWeighted = cms.bool( True ), + T0_endc = cms.double( 3.1 ), + T0_endcPresh = cms.double( 1.2 ), + W0 = cms.double( 4.2 ), + X0 = cms.double( 0.89 ) + ), + l1LowerThr = cms.double( 5.0 ), + doIsolated = cms.bool( True ), + eseed = cms.double( 0.35 ), + ethresh = cms.double( 0.1 ), + ewing = cms.double( 0.0 ), + RecHitSeverityToBeExcluded = cms.vstring( 'kWeird' ), + step = cms.int32( 17 ), + debugLevel = cms.string( "INFO" ), + dynamicEThresh = cms.bool( False ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), + superclusterCollection = cms.string( "" ), + HybridBarrelSeedThr = cms.double( 1.5 ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ) +) +process.hltCorrectedHybridSuperClustersL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", + corectedSuperClusterCollection = cms.string( "" ), + sigmaElectronicNoise = cms.double( 0.03 ), + superClusterAlgo = cms.string( "Hybrid" ), + etThresh = cms.double( 1.0 ), + rawSuperClusterProducer = cms.InputTag( "hltHybridSuperClustersL1Seeded" ), + applyEnergyCorrection = cms.bool( True ), + isl_fCorrPset = cms.PSet( ), + VerbosityLevel = cms.string( "ERROR" ), + recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + fix_fCorrPset = cms.PSet( ), + modeEE = cms.int32( 0 ), + modeEB = cms.int32( 0 ), + dyn_fCorrPset = cms.PSet( ), + energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), + applyLocalContCorrection = cms.bool( False ), + localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), + crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), + applyCrackCorrection = cms.bool( False ), + hyb_fCorrPset = cms.PSet( + brLinearLowThr = cms.double( 1.1 ), + fBremVec = cms.vdouble( -0.05208, 0.1331, 0.9196, -5.735E-4, 1.343 ), + brLinearHighThr = cms.double( 8.0 ), + fEtEtaVec = cms.vdouble( 1.0012, -0.5714, 0.0, 0.0, 0.0, 0.5549, 12.74, 1.0448, 0.0, 0.0, 0.0, 0.0, 8.0, 1.023, -0.00181, 0.0, 0.0 ) + ) +) +process.hltMulti5x5BasicClustersL1Seeded = cms.EDProducer( "EgammaHLTMulti5x5ClusterProducer", + l1LowerThr = cms.double( 5.0 ), + Multi5x5BarrelSeedThr = cms.double( 0.5 ), + Multi5x5EndcapSeedThr = cms.double( 0.18 ), + endcapHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + barrelClusterCollection = cms.string( "notused" ), + regionEtaMargin = cms.double( 0.3 ), + regionPhiMargin = cms.double( 0.4 ), + RecHitFlagToBeExcluded = cms.vstring( ), + l1TagNonIsolated = cms.InputTag( 'hltL1extraParticles','NonIsolated' ), + posCalcParameters = cms.PSet( + T0_barl = cms.double( 7.4 ), + LogWeighted = cms.bool( True ), + T0_endc = cms.double( 3.1 ), + T0_endcPresh = cms.double( 1.2 ), + W0 = cms.double( 4.2 ), + X0 = cms.double( 0.89 ) + ), + VerbosityLevel = cms.string( "ERROR" ), + doIsolated = cms.bool( True ), + barrelHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ), + l1LowerThrIgnoreIsolation = cms.double( 0.0 ), + l1TagIsolated = cms.InputTag( 'hltL1extraParticles','Isolated' ), + doEndcaps = cms.bool( True ), + doBarrel = cms.bool( False ), + endcapClusterCollection = cms.string( "multi5x5EndcapBasicClusters" ), + l1UpperThr = cms.double( 999.0 ) +) +process.hltMulti5x5SuperClustersL1Seeded = cms.EDProducer( "Multi5x5SuperClusterProducer", + barrelSuperclusterCollection = cms.string( "multi5x5BarrelSuperClusters" ), + endcapEtaSearchRoad = cms.double( 0.14 ), + dynamicPhiRoad = cms.bool( False ), + endcapClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5EndcapBasicClusters' ), + barrelPhiSearchRoad = cms.double( 0.8 ), + endcapPhiSearchRoad = cms.double( 0.6 ), + seedTransverseEnergyThreshold = cms.double( 1.0 ), + endcapSuperclusterCollection = cms.string( "multi5x5EndcapSuperClusters" ), + barrelEtaSearchRoad = cms.double( 0.06 ), + barrelClusterTag = cms.InputTag( 'hltMulti5x5BasicClustersL1Seeded','multi5x5BarrelBasicClusters' ), + doBarrel = cms.bool( False ), + doEndcaps = cms.bool( True ), + bremRecoveryPset = cms.PSet( + barrel = cms.PSet( ), + endcap = cms.PSet( + a = cms.double( 47.85 ), + c = cms.double( 0.1201 ), + b = cms.double( 108.8 ) + ), + doEndcaps = cms.bool( True ), + doBarrel = cms.bool( False ) + ), + endcapClusterProducer = cms.string( "hltMulti5x5BasicClustersL1Seeded" ) ) -process.hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 0.04 ), - thrOverEEE = cms.double( -1.0 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 0.015 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi' ), - candTag = cms.InputTag( "hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "PreshowerClusterProducer", + assocSClusterCollection = cms.string( "" ), + preshStripEnergyCut = cms.double( 0.0 ), + preshClusterCollectionY = cms.string( "preshowerYClusters" ), + preshClusterCollectionX = cms.string( "preshowerXClusters" ), + etThresh = cms.double( 5.0 ), + preshRecHitProducer = cms.InputTag( 'hltEcalPreshowerRecHit','EcalRecHitsES' ), + endcapSClusterProducer = cms.InputTag( 'hltMulti5x5SuperClustersL1Seeded','multi5x5EndcapSuperClusters' ), + preshNclust = cms.int32( 4 ), + debugLevel = cms.string( "" ), + preshClusterEnergyCut = cms.double( 0.0 ), + preshSeededNstrip = cms.int32( 15 ) ) -process.hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter = cms.EDFilter( "HLTEgammaGenericFilter", - doIsolated = cms.bool( True ), - thrOverE2EE = cms.double( -1.0 ), - L1NonIsoCand = cms.InputTag( "" ), - saveTags = cms.bool( True ), - thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( -1.0 ), - thrOverEEE = cms.double( 0.1 ), - L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), - thrOverEEB = cms.double( 0.1 ), - thrRegularEB = cms.double( -1.0 ), - lessThan = cms.bool( True ), - useEt = cms.bool( True ), - ncandcut = cms.int32( 1 ), - isoTag = cms.InputTag( "hltEgammaEleGsfTrackIso" ), - candTag = cms.InputTag( "hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter" ), - nonIsoTag = cms.InputTag( "" ) +process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded = cms.EDProducer( "EgammaSCCorrectionMaker", + corectedSuperClusterCollection = cms.string( "" ), + sigmaElectronicNoise = cms.double( 0.15 ), + superClusterAlgo = cms.string( "Multi5x5" ), + etThresh = cms.double( 1.0 ), + rawSuperClusterProducer = cms.InputTag( "hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), + applyEnergyCorrection = cms.bool( True ), + isl_fCorrPset = cms.PSet( ), + VerbosityLevel = cms.string( "ERROR" ), + recHitProducer = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ), + fix_fCorrPset = cms.PSet( + brLinearLowThr = cms.double( 0.6 ), + fBremVec = cms.vdouble( -0.04163, 0.08552, 0.95048, -0.002308, 1.077 ), + brLinearHighThr = cms.double( 6.0 ), + fEtEtaVec = cms.vdouble( 0.9746, -6.512, 0.0, 0.0, 0.02771, 4.983, 0.0, 0.0, -0.007288, -0.9446, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0 ) + ), + modeEE = cms.int32( 0 ), + modeEB = cms.int32( 0 ), + dyn_fCorrPset = cms.PSet( ), + energyCorrectorName = cms.string( "EcalClusterEnergyCorrectionObjectSpecific" ), + applyLocalContCorrection = cms.bool( False ), + localContCorrectorName = cms.string( "EcalBasicClusterLocalContCorrection" ), + crackCorrectorName = cms.string( "EcalClusterCrackCorrection" ), + applyCrackCorrection = cms.bool( False ), + hyb_fCorrPset = cms.PSet( ) ) -process.hltPrePhoton22R9Id90HE10Iso40EBOnlyPFMET40 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) +process.hltL1SeededRecoEcalCandidate = cms.EDProducer( "EgammaHLTRecoEcalCandidateProducers", + scIslandEndcapProducer = cms.InputTag( "hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded" ), + scHybridBarrelProducer = cms.InputTag( "hltCorrectedHybridSuperClustersL1Seeded" ), + recoEcalCandidateCollection = cms.string( "" ) ) process.hltEGRegionalL1SingleEG22 = cms.EDFilter( "HLTEgammaL1MatchFilterRegional", doIsolated = cms.bool( False ), @@ -23090,6 +21856,24 @@ etcutEE = cms.double( 999999.0 ), ncandcut = cms.int32( 1 ) ) +process.hltL1SeededPhotonHcalForHE = cms.EDProducer( "EgammaHLTHcalIsolationProducersRegional", + eMinHE = cms.double( 0.8 ), + hbheRecHitProducer = cms.InputTag( "hltHbhereco" ), + effectiveAreaBarrel = cms.double( 0.105 ), + outerCone = cms.double( 0.14 ), + eMinHB = cms.double( 0.7 ), + innerCone = cms.double( 0.0 ), + etMinHE = cms.double( -1.0 ), + etMinHB = cms.double( -1.0 ), + rhoProducer = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ), + depth = cms.int32( -1 ), + doRhoCorrection = cms.bool( False ), + effectiveAreaEndcap = cms.double( 0.17 ), + recoEcalCandidateProducer = cms.InputTag( "hltL1SeededRecoEcalCandidate" ), + rhoMax = cms.double( 9.9999999E7 ), + rhoScale = cms.double( 1.0 ), + doEtSum = cms.bool( False ) +) process.hltPhoton22R9Id90HE10Iso40EBOnlyHEFilter = cms.EDFilter( "HLTEgammaGenericFilter", doIsolated = cms.bool( True ), thrOverE2EE = cms.double( -1.0 ), @@ -24165,7 +22949,7 @@ candTag = cms.InputTag( "hltEle95CaloIdVTGsfTrkIdTGsfDetaFilter" ), nonIsoTag = cms.InputTag( "" ) ) -process.hltPreDoublePhoton85 = cms.EDFilter( "HLTPrescaler", +process.hltPreDoublePho85 = cms.EDFilter( "HLTPrescaler", L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), offset = cms.uint32( 0 ) ) @@ -24696,132 +23480,6 @@ reqOppCharge = cms.untracked.bool( False ), nZcandcut = cms.int32( 1 ) ) -process.hltPreL2DoubleMu23NoVertex = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL2DoubleMu23NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 23.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL2DoubleMu28NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 28.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 28.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 28.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) -process.hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 = cms.EDFilter( "HLTPrescaler", - L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ), - offset = cms.uint32( 0 ) -) -process.hltL2DoubleMu38NoVertexL2PreFiltered = cms.EDFilter( "HLTMuonL2PreFilter", - saveTags = cms.bool( True ), - MaxDr = cms.double( 9999.0 ), - CutOnChambers = cms.bool( True ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinPt = cms.double( 38.0 ), - MinN = cms.int32( 2 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MaxEta = cms.double( 2.0 ), - MinNhits = cms.vint32( 1 ), - MinDxySig = cms.double( -1.0 ), - MinNchambers = cms.vint32( 2 ), - AbsEtaBins = cms.vdouble( 5.0 ), - MaxDz = cms.double( 9999.0 ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MinDr = cms.double( -1.0 ), - NSigmaPt = cms.double( 0.0 ), - MinNstations = cms.vint32( 0 ) -) -process.hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 = cms.EDFilter( "HLTMuonDimuonL2Filter", - saveTags = cms.bool( True ), - ChargeOpt = cms.int32( 0 ), - SeedMapTag = cms.InputTag( "hltL2Muons" ), - MinNchambers = cms.int32( 2 ), - FastAccept = cms.bool( False ), - CandTag = cms.InputTag( "hltL2MuonCandidatesNoVtx" ), - PreviousCandTag = cms.InputTag( "hltL1DoubleMu10MuOpenOR3p5L1Filtered0" ), - MinAngle = cms.double( -999.0 ), - MaxPtBalance = cms.double( 999999.0 ), - MaxAcop = cms.double( 3.15 ), - MinPtMin = cms.double( 38.0 ), - MaxInvMass = cms.double( 9999.0 ), - MinPtMax = cms.double( 38.0 ), - BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), - MaxAngle = cms.double( 2.5 ), - MaxDz = cms.double( 9999.0 ), - MinPtPair = cms.double( 0.0 ), - MaxDr = cms.double( 9999.0 ), - MinAcop = cms.double( -1.0 ), - MinNstations = cms.int32( 0 ), - MinNhits = cms.int32( 1 ), - NSigmaPt = cms.double( 0.0 ), - MinPtBalance = cms.double( -1.0 ), - MaxEta = cms.double( 2.0 ), - MinInvMass = cms.double( 10.0 ) -) process.hltL1sL1ETM36ORETM40 = cms.EDFilter( "HLTLevel1GTSeed", L1SeedsLogicalExpression = cms.string( "L1_ETM36 OR L1_ETM40" ), saveTags = cms.bool( True ), @@ -26046,17 +24704,15 @@ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1', 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1', 'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1', - 'HLT_DoubleMu33NoFiltersNoVtx_v1', - 'HLT_DoubleMu38NoFiltersNoVtx_v1', 'HLT_DoubleMu4_3_Bs_v1', 'HLT_DoubleMu4_3_Jpsi_Displaced_v1', 'HLT_DoubleMu4_JpsiTrk_Displaced_v1', 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1', 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1', - 'HLT_DoublePhoton85_v1', + 'HLT_DoublePho85_v1', 'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1', 'HLT_Ele20WP60_Ele8_Mass55_v1', - 'HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1', + 'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1', 'HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1', 'HLT_Ele25WP60_SC4_Mass55_v1', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1', @@ -26075,9 +24731,6 @@ 'HLT_JetE30_NoBPTX_v1', 'HLT_JetE50_NoBPTX3BX_NoHalo_v1', 'HLT_JetE70_NoBPTX3BX_NoHalo_v1', - 'HLT_L2DoubleMu23_NoVertex_v1', - 'HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1', - 'HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1', 'HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1', 'HLT_L2Mu10_NoVertex_NoBPTX_v1', 'HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1', @@ -26090,14 +24743,11 @@ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_Mu25_TkMu0_dEta18_Onia_v1', 'HLT_Mu30_TkMu11_v1', - 'HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1', 'HLT_Mu40_eta2p1_PFJet200_PFJet50_v1', 'HLT_Mu40_v1', - 'HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1', 'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1', 'HLT_PFHT350_PFMET120_NoiseCleaned_v1', 'HLT_PFHT900_v1', - 'HLT_PFJet260_v1', 'HLT_PFMET120_NoiseCleaned_BTagCSV07_v1', 'HLT_PFMET170_NoiseCleaned_v1', 'HLT_Photon135_PFMET40_v1', @@ -26187,16 +24837,6 @@ process.HLTIterativeTrackingDisplacedNRMuMuIteration1 = cms.Sequence( process.hltIter1DisplacedNRMuMuClustersRefRemoval + process.hltIter1DisplacedNRMuMuMaskedMeasurementTrackerEvent + process.hltIter1DisplacedNRMuMuPixelLayerTriplets + process.hltIter1DisplacedNRMuMuPixelSeeds + process.hltIter1DisplacedNRMuMuCkfTrackCandidates + process.hltIter1DisplacedNRMuMuCtfWithMaterialTracks + process.hltIter1DisplacedNRMuMuTrackSelectionHighPurityLoose + process.hltIter1DisplacedNRMuMuTrackSelectionHighPurityTight + process.hltIter1DisplacedNRMuMuTrackSelectionHighPurity ) process.HLTIterativeTrackingDisplacedNRMuMuIteration2 = cms.Sequence( process.hltIter2DisplacedNRMuMuClustersRefRemoval + process.hltIter2DisplacedNRMuMuMaskedMeasurementTrackerEvent + process.hltIter2DisplacedNRMuMuPixelLayerPairs + process.hltIter2DisplacedNRMuMuPixelSeeds + process.hltIter2DisplacedNRMuMuCkfTrackCandidates + process.hltIter2DisplacedNRMuMuCtfWithMaterialTracks + process.hltIter2DisplacedNRMuMuTrackSelectionHighPurity ) process.HLTIterativeTrackingDisplacedNRMuMuIter02 = cms.Sequence( process.HLTIterativeTrackingDisplacedNRMuMuIteration0 + process.HLTIterativeTrackingDisplacedNRMuMuIteration1 + process.hltIter1DisplacedNRMuMuMerged + process.HLTIterativeTrackingDisplacedNRMuMuIteration2 + process.hltIter2DisplacedNRMuMuMerged ) -process.HLTL2muonrecoSequenceNoVtx = cms.Sequence( process.HLTL2muonrecoNocandSequence + process.hltL2MuonCandidatesNoVtx ) -process.HLTL3NoFiltersNoVtxmuonTkCandidateSequence = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltL3TrajSeedOIStateNoVtx + process.hltL3TrackCandidateFromL2OIStateNoVtx + process.hltL3TkTracksFromL2OIStateNoVtx + process.hltL3NoFiltersNoVtxMuonsOIState + process.hltL3NoFiltersNoVtxTrajSeedOIHit + process.hltL3NoFiltersTrackCandidateFromL2OIHitNoVtx + process.hltL3NoFiltersTkTracksFromL2OIHitNoVtx + process.hltL3NoFiltersNoVtxMuonsOIHit + process.hltL3NoFiltersNoVtxTkFromL2OICombination + process.hltPixelLayerTriplets + process.hltPixelLayerPairs + process.hltMixedLayerPairs + process.hltL3NoFiltersNoVtxTrajSeedIOHit + process.hltL3NoFiltersTrackCandidateFromL2IOHitNoVtx + process.hltL3NoFiltersTkTracksFromL2IOHitNoVtx + process.hltL3NoFiltersNoVtxMuonsIOHit + process.hltL3NoFiltersNoVtxTrajectorySeed + process.hltL3NoFiltersTrackCandidateFromL2NoVtx ) -process.HLTL3NoFiltersNoVtxmuonrecoNocandSequence = cms.Sequence( process.HLTL3NoFiltersNoVtxmuonTkCandidateSequence + process.hltL3NoFiltersNoVtxTkTracksMergeStep1 + process.hltL3NoFiltersTkTracksFromL2Novtx + process.hltL3NoFiltersNoVtxMuonsLinksCombination + process.hltL3NoFiltersNoVtxMuons ) -process.HLTL3NoFiltersNoVtxmuonrecoSequence = cms.Sequence( process.HLTL3NoFiltersNoVtxmuonrecoNocandSequence + process.hltL3NoFiltersNoVtxMuonCandidates ) -process.HLTMulti5x5SuperClusterL1Seeded = cms.Sequence( process.hltMulti5x5BasicClustersL1Seeded + process.hltMulti5x5SuperClustersL1Seeded + process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded + process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded ) -process.HLTL1SeededEcalClustersSequence = cms.Sequence( process.hltHybridSuperClustersL1Seeded + process.hltCorrectedHybridSuperClustersL1Seeded + process.HLTMulti5x5SuperClusterL1Seeded ) -process.HLTDoEGammaStartupSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTL1SeededEcalClustersSequence + process.hltL1SeededRecoEcalCandidate ) -process.HLTDoEgammaClusterShapeSequence = cms.Sequence( process.hltL1SeededHLTClusterShape ) -process.HLTDoLocalHcalWithoutHOSequence = cms.Sequence( process.hltHcalDigis + process.hltHbhereco + process.hltHfreco ) -process.HLTDoEGammaHESequence = cms.Sequence( process.HLTDoLocalHcalWithoutHOSequence + process.hltL1SeededPhotonHcalForHE ) process.HLTPFClusteringForEgamma = cms.Sequence( process.hltRechitInRegionsECAL + process.hltRechitInRegionsES + process.hltParticleFlowRecHitECALL1Seeded + process.hltParticleFlowRecHitPSL1Seeded + process.hltParticleFlowClusterPSL1Seeded + process.hltParticleFlowClusterECALUncorrectedL1Seeded + process.hltParticleFlowClusterECALL1Seeded + process.hltParticleFlowSuperClusterECALL1Seeded ) process.HLTDoLocalHcalWithTowerSequence = cms.Sequence( process.hltHcalDigis + process.hltHbhereco + process.hltHfreco + process.hltHoreco + process.hltTowerMakerForAll ) process.HLTFastJetForEgamma = cms.Sequence( process.hltFixedGridRhoFastjetAllCaloForMuons ) @@ -26225,12 +24865,12 @@ process.HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1SingleEG35Filter + process.hltEG42EtL1Seed35EtFilter + process.hltEgammaR9ID + process.hltEG42R9Id65R9IdFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEG42HE10R9Id65HEFilter + cms.ignore(process.hltEG42R9Id85HE10R9Id65R9IdLastFilter) + process.hltEgammaClusterShape + cms.ignore(process.hltEG42CaloId24b40eHE10R9Id65ClusterShapeFilter) + process.hltEgammaEcalPFClusterIsoRhoCorr + cms.ignore(process.hltEG42Iso50T80LCaloId24b40eHE10R9Id65EcalIsoFilter) + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + cms.ignore(process.hltEG42Iso50T80LCaloId24b40eHE10R9Id65HcalIsoLastFilter) + process.hltEG42RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter + process.HLTPFClusteringForEgammaUnseeded + process.hltEgammaCandidatesUnseeded + process.hltEgammaCandidatesWrapperUnseeded + process.hltDiEG22EtUnseededFilter + process.hltEgammaR9IDUnseeded + process.hltDiEG22R9Id65R9IdUnseededFilter + process.hltEgammaHoverEUnseeded + process.hltDiEG22HE10R9Id65HEUnseededFilter + cms.ignore(process.hltEG22R9Id85HE10R9Id65R9IdUnseededLastFilter) + process.hltEgammaClusterShapeUnseeded + cms.ignore(process.hltEG22CaloId24b40eHE10R9Id65ClusterShapeUnseededFilter) + process.hltEgammaEcalPFClusterIsoUnseeded + cms.ignore(process.hltEG22Iso50T80LCaloId24b40eHE10R9Id65EcalIsoUnseededFilter) + process.HLTPFHcalClusteringForEgammaUnseeded + process.hltEgammaHcalPFClusterIsoUnseeded + cms.ignore(process.hltEG22Iso50T80LCaloId24b40eHE10R9Id65HcalIsoUnseededFilter) + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.HLTTrackReconstructionForIsoForPhotons + process.hltEgammaHollowTrackIsoUnseeded + cms.ignore(process.hltEG22Iso50T80LCaloId24b40eHE10R9Id65TrackIsoUnseededLastFilter) + process.hltDiEG22RId85ORCaloId24b40eIso50T80LANDHE10R9Id65LegCombLastFilter ) process.HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence = cms.Sequence( process.hltEcalDigis + process.hltEcalUncalibRecHit + process.hltEcalDetIdToBeRecovered + process.hltEcalRecHit ) process.HLTDoCaloSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + process.HLTDoLocalHcalSequence + process.hltTowerMakerForAll ) -process.HLTAK4CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK4CaloJets + process.hltAK4CaloJetsIDPassed ) -process.HLTAK4CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK4CaloJetsCorrected + process.hltAK4CaloJetsCorrectedIDPassed ) -process.HLTAK4CaloJetsSequence = cms.Sequence( process.HLTAK4CaloJetsReconstructionSequence + process.HLTAK4CaloJetsCorrectionSequence ) +process.HLTAK8CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK8CaloJets + process.hltAK8CaloJetsIDPassed ) +process.HLTAK8CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK8CaloJetsCorrected + process.hltAK8CaloJetsCorrectedIDPassed ) +process.HLTAK8CaloJetsSequence = cms.Sequence( process.HLTAK8CaloJetsReconstructionSequence + process.HLTAK8CaloJetsCorrectionSequence ) process.HLTDoCaloSequencePF = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalWithoutPreshowerSequence + process.HLTDoLocalHcalSequence + process.hltTowerMakerForPF ) -process.HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK4CaloJetsPF ) -process.HLTPreAK4PFJetsRecoSequence = cms.Sequence( process.HLTAK4CaloJetsPrePFRecoSequence + process.hltAK4CaloJetsPFEt5 ) +process.HLTAK8CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK8CaloJetsPF + process.hltAK4CaloJetsPF ) +process.HLTPreAK8PFJetsRecoSequence = cms.Sequence( process.HLTAK8CaloJetsPrePFRecoSequence + process.hltAK8CaloJetsPFEt5 + process.hltAK4CaloJetsPFEt5 ) process.HLTRecopixelvertexingSequence = cms.Sequence( process.hltPixelLayerTriplets + process.hltPixelTracks + process.hltPixelVertices + process.hltTrimmedPixelVertices ) process.HLTIterativeTrackingIteration0 = cms.Sequence( process.hltIter0PFLowPixelSeedsFromPixelTracks + process.hltIter0PFlowCkfTrackCandidates + process.hltIter0PFlowCtfWithMaterialTracks + process.hltIter0PFlowTrackSelectionHighPurity ) process.HLTIter0TrackAndTauJet4Iter1Sequence = cms.Sequence( process.hltTrackIter0RefsForJets4Iter1 + process.hltAK4Iter0TrackJets4Iter1 + process.hltIter0TrackAndTauJets4Iter1 ) @@ -26241,17 +24881,10 @@ process.HLTTrackReconstructionForPF = cms.Sequence( process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.hltPFMuonMerging + process.hltMuonLinks + process.hltMuons ) process.HLTPreshowerSequence = cms.Sequence( process.hltEcalPreshowerDigis + process.hltEcalPreshowerRecHit ) process.HLTParticleFlowSequence = cms.Sequence( process.HLTPreshowerSequence + process.hltParticleFlowRecHitECALUnseeded + process.hltParticleFlowRecHitHCAL + process.hltParticleFlowRecHitPSUnseeded + process.hltParticleFlowClusterECALUncorrectedUnseeded + process.hltParticleFlowClusterPSUnseeded + process.hltParticleFlowClusterECALUnseeded + process.hltParticleFlowClusterHCAL + process.hltParticleFlowClusterHFEM + process.hltParticleFlowClusterHFHAD + process.hltLightPFTracks + process.hltParticleFlowBlock + process.hltParticleFlow ) -process.HLTAK4PFJetsReconstructionSequence = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequence + process.hltAK4PFJets ) -process.HLTAK4PFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAll + process.hltAK4PFJetsCorrected ) -process.HLTAK4PFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PFJetsReconstructionSequence + process.HLTAK4PFJetsCorrectionSequence ) -process.HLTAK8CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK8CaloJets + process.hltAK8CaloJetsIDPassed ) -process.HLTAK8CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK8CaloJetsCorrected + process.hltAK8CaloJetsCorrectedIDPassed ) -process.HLTAK8CaloJetsSequence = cms.Sequence( process.HLTAK8CaloJetsReconstructionSequence + process.HLTAK8CaloJetsCorrectionSequence ) -process.HLTAK8CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK8CaloJetsPF + process.hltAK4CaloJetsPF ) -process.HLTPreAK8PFJetsRecoSequence = cms.Sequence( process.HLTAK8CaloJetsPrePFRecoSequence + process.hltAK8CaloJetsPFEt5 + process.hltAK4CaloJetsPFEt5 ) process.HLTAK8PFJetsReconstructionSequence = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequence + process.hltAK8PFJets ) process.HLTAK8PFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAll + process.hltAK8PFJetsCorrected ) process.HLTAK8PFJetsSequence = cms.Sequence( process.HLTPreAK8PFJetsRecoSequence + process.HLTAK8PFJetsReconstructionSequence + process.HLTAK8PFJetsCorrectionSequence ) +process.HLTL2muonrecoSequenceNoVtx = cms.Sequence( process.HLTL2muonrecoNocandSequence + process.hltL2MuonCandidatesNoVtx ) process.HLTBeginSequenceAntiBPTX = cms.Sequence( process.hltTriggerType + process.HLTL1UnpackerSequence + process.hltBPTXAntiCoincidence + process.HLTBeamSpot ) process.HLTStoppedHSCPLocalHcalReco = cms.Sequence( process.hltHcalDigis + process.hltHbhereco ) process.HLTStoppedHSCPJetSequence = cms.Sequence( process.hltStoppedHSCPTowerMakerForAll + process.hltStoppedHSCPIterativeCone4CaloJets ) @@ -26261,9 +24894,9 @@ process.HLTPFTriggerSequenceMuTau = cms.Sequence( process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) process.HLTLooseIsoPFTauSequence = cms.Sequence( process.hltTauPFJets08Region + process.hltTauPFJetsRecoTauChargedHadrons + process.hltPFTauPiZeros + process.hltPFTausSansRef + process.hltPFTaus + process.hltPFTauTrackFindingDiscriminator + process.hltPFTauLooseAbsoluteIsolationDiscriminator + process.hltPFTauLooseRelativeIsolationDiscriminator + process.hltPFTauLooseAbsOrRelIsolationDiscriminator ) process.HLTIsoMuLooseIsoPFTauSequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltPFTauAgainstMuonDiscriminator + process.hltSelectedPFTausTrackFindingLooseIsolationAgainstMuon + process.hltPFTau20TrackLooseIsoAgainstMuon + process.hltOverlapFilterIsoMu17LooseIsoPFTau20 ) -process.HLTEle22WP85GsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP85ClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP85HEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP85EcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP85HcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP85PixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP85GsfOneOESuperMinusOneOPFilter + process.hltEle22WP85GsfMissingHitsFilter + process.hltEle22WP85GsfDetaFilter + process.hltEle22WP85GsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP85GsfTrackIsoFilter ) +process.HLTEle22WP90RhoGsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGRegionalL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltEG22L1sIso18erOrIso20erOr22EtFilter + process.hltEgammaClusterShape + process.hltEle22WP90RhoClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle22WP90RhoHEFilter + process.hltEgammaEcalPFClusterIso + process.hltEle22WP90RhoEcalIsoFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle22WP90RhoHcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle22WP90RhoPixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle22WP90RhoGsfOneOESuperMinusOneOPFilter + process.hltEle22WP90RhoGsfDetaFilter + process.hltEle22WP90RhoGsfDphiFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle22WP90RhoGsfTrackIsoFilter ) process.HLTPFTriggerSequenceForTaus = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequenceForTaus + process.hltAK4PFJetsForTaus ) -process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP85GsfLooseIsoPFTau20 ) +process.HLTIsoEle22GsfLooseIsoPFTau20Sequence = cms.Sequence( process.HLTLooseIsoPFTauSequence + process.hltPFTau20 + process.hltSelectedPFTausTrackFinding + process.hltPFTau20Track + process.hltSelectedPFTausTrackFindingLooseIsolation + process.hltPFTau20TrackLooseIso + process.hltOverlapFilterIsoEle22WP90GsfLooseIsoPFTau20 ) process.HLTCaloTausCreatorRegionalSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltCaloTowersTau1Regional + process.hltIconeTau1Regional + process.hltCaloTowersTau2Regional + process.hltIconeTau2Regional + process.hltCaloTowersTau3Regional + process.hltIconeTau3Regional + process.hltCaloTowersTau4Regional + process.hltIconeTau4Regional + process.hltCaloTowersCentral1Regional + process.hltIconeCentral1Regional + process.hltCaloTowersCentral2Regional + process.hltIconeCentral2Regional + process.hltCaloTowersCentral3Regional + process.hltIconeCentral3Regional + process.hltCaloTowersCentral4Regional + process.hltIconeCentral4Regional ) process.HLTL2TauJetsSequence = cms.Sequence( process.HLTCaloTausCreatorRegionalSequence + process.hltL2TauJets ) process.HLTDoLocalPixelSequenceRegL2Tau = cms.Sequence( process.hltSiPixelDigisReg + process.hltSiPixelClustersReg + process.hltSiPixelClustersRegCache + process.hltSiPixelRecHitsReg ) @@ -26283,11 +24916,22 @@ process.HLTMediumIsoPFTauSequenceReg = cms.Sequence( process.hltTauPFJets08RegionReg + process.hltTauPFJetsRecoTauChargedHadronsReg + process.hltPFTauPiZerosReg + process.hltPFTausSansRefReg + process.hltPFTausReg + process.hltPFTauTrackFindingDiscriminatorReg + process.hltPFTauMediumAbsoluteIsolationDiscriminatorReg + process.hltPFTauMediumRelativeIsolationDiscriminatorReg + process.hltPFTauMediumAbsOrRelIsolationDiscriminatorReg ) process.HLTRecoMETSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltMet ) process.HLTHBHENoiseCleanerSequence = cms.Sequence( process.hltHcalNoiseInfoProducer + process.hltHcalTowerNoiseCleaner ) +process.HLTAK4CaloJetsReconstructionSequence = cms.Sequence( process.HLTDoCaloSequence + process.hltAK4CaloJets + process.hltAK4CaloJetsIDPassed ) +process.HLTAK4CaloJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAllCalo + process.hltAK4CaloJetsCorrected + process.hltAK4CaloJetsCorrectedIDPassed ) +process.HLTAK4CaloJetsSequence = cms.Sequence( process.HLTAK4CaloJetsReconstructionSequence + process.HLTAK4CaloJetsCorrectionSequence ) +process.HLTAK4CaloJetsPrePFRecoSequence = cms.Sequence( process.HLTDoCaloSequencePF + process.hltAK4CaloJetsPF ) +process.HLTPreAK4PFJetsRecoSequence = cms.Sequence( process.HLTAK4CaloJetsPrePFRecoSequence + process.hltAK4CaloJetsPFEt5 ) +process.HLTAK4PFJetsReconstructionSequence = cms.Sequence( process.HLTL2muonrecoSequence + process.HLTL3muonrecoSequence + process.HLTTrackReconstructionForPF + process.HLTParticleFlowSequence + process.hltAK4PFJets ) +process.HLTAK4PFJetsCorrectionSequence = cms.Sequence( process.hltFixedGridRhoFastjetAll + process.hltAK4PFJetsCorrected ) +process.HLTAK4PFJetsSequence = cms.Sequence( process.HLTPreAK4PFJetsRecoSequence + process.HLTAK4PFJetsReconstructionSequence + process.HLTAK4PFJetsCorrectionSequence ) process.HLTEle45CaloIdVTGsfTrkIdTGsfSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1SingleEG22Filter + process.hltEG45EtFilter + process.hltEgammaClusterShape + process.hltEG45CaloIdVTClusterShapeFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEG45CaloIdVTHEFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle45CaloIdVTPixelMatchFilter + process.HLTGsfElectronSequence + process.hltEle45CaloIdVTGsfTrkIdTGsfDetaFilter + process.hltEle45CaloIdVTGsfTrkIdTGsfDphiFilter ) process.HLTEle23Ele12CaloIdTrackIdIsoSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1DoubleEG137Filter + process.hltEle23Ele12CaloIdTrackIdIsoEtLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoEtLeg2Filter + process.hltEgammaClusterShape + process.hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoClusterShapeLeg2Filter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle23Ele12CaloIdTrackIdIsoHELeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoHELeg2Filter + process.hltEgammaEcalPFClusterIso + process.hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoEcalIsoLeg2Filter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoHcalIsoLeg2Filter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoPixelMatchLeg2Filter + process.HLTGsfElectronSequence + process.hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoOneOEMinusOneOPLeg2Filter + process.hltEle23Ele12CaloIdTrackIdIsoDetaLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoDetaLeg2Filter + process.hltEle23Ele12CaloIdTrackIdIsoDphiLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoDphiLeg2Filter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg1Filter + process.hltEle23Ele12CaloIdTrackIdIsoTrackIsoLeg2Filter ) process.HLTEle17Ele12Ele10CaloIdTrackIdSequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1EG12EG7EG5Filter + process.hltEle17Ele12Ele10CaloIdTrackIdEtLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdEtLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdEtLeg3Filter + process.hltEgammaClusterShape + process.hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdClusterShapeLeg3Filter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltEle17Ele12Ele10CaloIdTrackIdHELeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdHELeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdHELeg3Filter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdPixelMatchLeg3Filter + process.HLTGsfElectronSequence + process.hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdOneOEMinusOneOPLeg3Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDetaLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDetaLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDetaLeg3Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDphiLeg1Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDphiLeg2Filter + process.hltEle17Ele12Ele10CaloIdTrackIdDphiLeg3Filter ) process.HLTMu23Ele12_Gsf = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1Mu12EG7Filter + process.hltMu23Ele12EtLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaClusterShape + process.hltMu23Ele12ClusterShapeLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltMu23Ele12HELegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaEcalPFClusterIso + process.hltMu23Ele12EcalIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltMu23Ele12HcalIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltMu23Ele12PixelMatchLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTGsfElectronSequence + process.hltMu23Ele12GsfDetaLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.hltMu23Ele12GsfDphiLegEle12GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltMu23Ele12GsfTrackIsoLegEle12GsfCaloIdTrackIdIsoMediumWPFilter ) process.HLTMu8Ele23_Gsf = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTPFClusteringForEgamma + process.hltEgammaCandidates + process.hltEGL1Mu3p5EG12ORL1MuOpenEG12Filter + process.hltMu8Ele23EtLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaClusterShape + process.hltMu8Ele23ClusterShapeLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalHcalWithTowerSequence + process.HLTFastJetForEgamma + process.hltEgammaHoverE + process.hltMu8Ele23HELegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.hltEgammaEcalPFClusterIso + process.hltMu8Ele23EcalIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTPFHcalClusteringForEgamma + process.hltEgammaHcalPFClusterIso + process.hltMu8Ele23HcalIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.hltMixedLayerPairs + process.hltEgammaElectronPixelSeeds + process.hltMu8Ele23PixelMatchLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTGsfElectronSequence + process.hltMu8Ele23GsfDetaLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.hltMu8Ele23GsfDphiLegEle23GsfCaloIdTrackIdIsoMediumWPFilter + process.HLTTrackReconstructionForIsoElectronIter02 + process.hltEgammaEleGsfTrackIso + process.hltMu8Ele23GsfTrackIsoLegEle23GsfCaloIdTrackIdIsoMediumWPFilter ) +process.HLTMulti5x5SuperClusterL1Seeded = cms.Sequence( process.hltMulti5x5BasicClustersL1Seeded + process.hltMulti5x5SuperClustersL1Seeded + process.hltMulti5x5EndcapSuperClustersWithPreshowerL1Seeded + process.hltCorrectedMulti5x5EndcapSuperClustersWithPreshowerL1Seeded ) +process.HLTL1SeededEcalClustersSequence = cms.Sequence( process.hltHybridSuperClustersL1Seeded + process.hltCorrectedHybridSuperClustersL1Seeded + process.HLTMulti5x5SuperClusterL1Seeded ) +process.HLTDoLocalHcalWithoutHOSequence = cms.Sequence( process.hltHcalDigis + process.hltHbhereco + process.hltHfreco ) process.HLTL1SeededEgammaRegionalRecoTrackerSequence = cms.Sequence( process.hltPixelLayerPairs + process.hltL1SeededEgammaRegionalPixelSeedGenerator + process.hltL1SeededEgammaRegionalCkfTrackCandidates + process.hltL1SeededEgammaRegionalCTFFinalFitWithMaterial ) process.HLTL1SeededEgammaRegionalRecoTrackerSequenceWithId = cms.Sequence( process.HLTL1SeededEgammaRegionalRecoTrackerSequence + process.hltL1SeededEgammaRegionalAnalyticalTrackSelectorHighPurity ) process.HLTPhoton22R9Id90HE10Iso40EBOnlySequence = cms.Sequence( process.HLTDoFullUnpackingEgammaEcalSequence + process.HLTL1SeededEcalClustersSequence + process.hltL1SeededRecoEcalCandidate + process.hltEGRegionalL1SingleEG22 + process.hltPhoton22R9Id90HE10Iso40EBOnlyEtFilter + process.HLTDoLocalHcalWithoutHOSequence + process.hltL1SeededPhotonHcalForHE + process.hltPhoton22R9Id90HE10Iso40EBOnlyHEFilter + process.hltL1SeededR9ID + process.hltPhoton22R9Id90HE10Iso40EBOnlyR9Filter + process.hltL1SeededPhotonEcalIso + process.hltPhoton22R9Id90HE10Iso40EBOnlyEcalIsoFilter + process.hltL1SeededPhotonHcalIso + process.hltPhoton22R9Id90HE10Iso40EBOnlyHcalIsoFilter + process.HLTDoLocalPixelSequence + process.HLTDoLocalStripSequence + process.HLTL1SeededEgammaRegionalRecoTrackerSequenceWithId + process.hltL1SeededPhotonHollowTrackIsoWithId + process.hltPhoton22R9Id90HE10Iso40EBOnlyTrackIsoLastFilter ) @@ -26334,15 +24978,10 @@ process.HLT_DoubleMu4_JpsiTrk_Displaced_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu33HighQ + process.hltPreDoubleMu4JpsiTrkDisplaced + process.hltDimuon33L1Filtered0 + process.HLTL2muonrecoSequence + process.hltDimuon33L2PreFiltered0 + process.HLTL3muonrecoSequence + process.hltDoubleMu4JpsiDisplacedL3Filtered + process.hltDisplacedmumuVtxProducerDoubleMu4Jpsi + process.hltDisplacedmumuFilterDoubleMu4Jpsi + process.HLTIterativeTrackingDisplacedJpsiIter02 + process.hltJpsiTkAllConeTracksIter + process.hltJpsiTkVertexProducer + process.hltJpsiTkVertexFilter + process.HLTEndSequence ) process.HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu33HighQ + process.hltPreDoubleMu4PsiPrimeTrkDisplaced + process.hltDimuon33L1Filtered0 + process.HLTL2muonrecoSequence + process.hltDimuon33L2PreFiltered0 + process.HLTL3muonrecoSequence + process.hltDoubleMu4PsiPrimeDisplacedL3Filtered + process.hltDisplacedmumuVtxProducerDoubleMu4PsiPrime + process.hltDisplacedmumuFilterDoubleMu4PsiPrime + process.HLTIterativeTrackingDisplacedPsiPrimeIter02 + process.hltPsiPrimeTkAllConeTracksIter + process.hltPsiPrimeTkVertexProducer + process.hltPsiPrimeTkVertexFilter + process.HLTEndSequence ) process.HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu33HighQ + process.hltPreDoubleMu4LowMassNonResonantTrkDisplaced + process.hltDimuon33L1Filtered0 + process.HLTL2muonrecoSequence + process.hltDimuon33L2PreFiltered0 + process.HLTL3muonrecoSequence + process.hltDoubleMu4LowMassNonResonantDisplacedL3Filtered + process.hltDisplacedmumuVtxProducerDoubleMu4LowMassNonResonant + process.hltDisplacedmumuFilterDoubleMu4LowMassNonResonant + process.HLTIterativeTrackingDisplacedNRMuMuIter02 + process.hltLowMassNonResonantTkAllConeTracksIter + process.hltLowMassNonResonantTkVertexProducer + process.hltLowMassNonResonantTkVertexFilter + process.HLTEndSequence ) -process.HLT_DoubleMu33NoFiltersNoVtx_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreDoubleMu33NoFiltersNoVtx + process.hltDimuonL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltDimuonL2NoVtxFiltered10 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltDimuonL3NoFiltersNoVtxFiltered33 + process.HLTEndSequence ) -process.HLT_DoubleMu38NoFiltersNoVtx_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreDoubleMu38NoFiltersNoVtx + process.hltDimuonL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltDimuonL2NoVtxFiltered16 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltDimuonL3NoFiltersNoVtxFiltered38 + process.HLTEndSequence ) -process.HLT_Mu38NoFiltersNoVtx_Photon38_CaloIdL_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1Mu3p5EG12 + process.hltPreMu38NoFiltersNoVtxPhoton38CaloIdL + process.hltL1Mu3p5EG12L1Filtered3p5 + process.HLTL2muonrecoSequenceNoVtx + process.hltL1Mu3p5EG12L2NoVtxFiltered16 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered38 + process.HLTDoEGammaStartupSequence + process.hltEGRegionalL1Mu3p5EG12 + process.hltEG38EtFilterL1Mu3p5EG12 + process.HLTDoEgammaClusterShapeSequence + process.hltMuNoFilters38Photon38CaloIdLClusterShapeFilter + process.HLTDoEGammaHESequence + process.hltMuNoFilters38Photon38CaloIdLHEFilter + process.HLTEndSequence ) -process.HLT_Mu42NoFiltersNoVtx_Photon42_CaloIdL_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1Mu3p5EG12 + process.hltPreMu42NoFiltersNoVtxPhoton42CaloIdL + process.hltL1Mu3p5EG12L1Filtered3p5 + process.HLTL2muonrecoSequenceNoVtx + process.hltL1Mu3p5EG12L2NoVtxFiltered12 + process.HLTL3NoFiltersNoVtxmuonrecoSequence + process.hltL1Mu3p5EG12L3NoFiltersNoVtxFiltered42 + process.HLTDoEGammaStartupSequence + process.hltEGRegionalL1Mu3p5EG12 + process.hltEG42EtFilterL1Mu3p5EG12 + process.HLTDoEgammaClusterShapeSequence + process.hltMuNoFilters42Photon42CaloIdLClusterShapeFilter + process.HLTDoEGammaHESequence + process.hltMuNoFilters42Photon42CaloIdLHEFilter + process.HLTEndSequence ) process.HLT_Ele27_WP85_Gsf_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85Gsf + process.HLTEle27WP85GsfSequence + process.HLTEndSequence ) process.HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoubleEle33CaloIdLGsfTrkIdVL + process.HLTDoubleEle33CaloIdVLGsfTrkIdVLSequence + process.HLTEndSequence ) process.HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleEG2210 + process.hltPrePhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95 + process.HLTPhoton36R9Id85ORCaloId24b40eIso50T80LPhoton18ANDHE10R9Id65Mass95Sequence + process.HLTEndSequence ) process.HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG35 + process.hltPrePhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65 + process.HLTPhoton42R9Id85ORCaloId24b40eIso50T80LPhoton22ANDHE10R9Id65Sequence + process.HLTEndSequence ) -process.HLT_PFJet260_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleJet128 + process.hltPrePFJet260 + process.HLTAK4CaloJetsSequence + process.hltSingleCaloJet200 + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToCaloJets200 + process.hltSinglePFJet260 + process.HLTEndSequence ) process.HLT_AK8PFJet360TrimMod_Mass30_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleJet128 + process.hltPreAK8PFJet360TrimModMass30 + process.HLTAK8CaloJetsSequence + process.hltAK8SingleCaloJet260 + process.HLTAK8PFJetsSequence + process.hltAK8PFJetsCorrectedMatchedToCaloJets260 + process.hltAK8TrimModJets + process.hltAK8SinglePFJet360TrimModMass30 + process.HLTEndSequence ) process.HLT_L2Mu10_NoVertex_NoBPTX_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu6NotBptxOR + process.hltPreL2Mu10NoVertexNoBPTX + process.hltL1fL1sMu6NotBptxORL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2fL1sMu6NotBptxORL1f0L2Filtered10 + process.HLTEndSequence ) process.HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sMu6NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreL2Mu10NoVertexNoBPTX3BXNoHalo + process.hltL1fL1sMu6NotBptxORL1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2fL1sMu6NotBptxORL1f0L2Filtered10 + process.HLTEndSequence ) @@ -26353,17 +24992,17 @@ process.HLT_JetE50_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE50NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy50 + process.HLTEndSequence ) process.HLT_JetE70_NoBPTX3BX_NoHalo_v1 = cms.Path( process.HLTBeginSequenceAntiBPTX + process.hltL1sL1SingleJetC32NotBptxOR + process.hltL1BeamHaloAntiCoincidence3BX + process.hltPreJetE70NoBPTX3BXNoHalo + process.HLTStoppedHSCPLocalHcalReco + process.hltStoppedHSCPHpdFilter + process.HLTStoppedHSCPJetSequence + process.hltStoppedHSCP1CaloJetEnergy70 + process.HLTEndSequence ) process.HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu14erORMu16er + process.hltPreIsoMu17eta2p1LooseIsoPFTau20 + process.hltL1fL1sMu14erORMu16erL1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu14erORMu16erL1f0L2Filtered14Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu14erORMu16erL1f0L2f14QL3Filtered17Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu14erORMu16erL1f0L2f14QL3f17QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.HLTPFTriggerSequenceMuTau + process.HLTIsoMuLooseIsoPFTauSequence + process.HLTEndSequence ) -process.HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP85GsfLooseIsoPFTau20 + process.HLTEle22WP85GsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22WP85GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22WP85GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) +process.HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleIsoEG18erORIsoEG20erOREG22 + process.hltPreEle22eta2p1WP90RhoGsfLooseIsoPFTau20 + process.HLTEle22WP90RhoGsfSequence + process.HLTRecoJetSequenceAK4PrePF + process.hltTauJet5 + process.hltOverlapFilterIsoEle22GsfCaloJet5 + process.HLTPFTriggerSequenceForTaus + process.HLTIsoEle22GsfLooseIsoPFTau20Sequence + process.HLTEndSequence ) process.HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sDoubleTauJet44erorDoubleJetC64 + process.hltPreDoubleMediumIsoPFTau40Trk1eta2p1Reg + process.HLTL2TauJetsSequence + process.hltDoubleL2Tau35eta2p1 + process.HLTL2TauPixelIsolationSequence + process.hltL2DiTauIsoFilter + process.hltL2TauJetsIso + process.hltDoubleL2IsoTau35eta2p1 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFJetTriggerSequenceReg + process.HLTMediumIsoPFTauSequenceReg + process.hltDoublePFTau40Reg + process.hltPFTauTrackPt1DiscriminatorReg + process.hltSelectedPFTausTrackPt1Reg + process.hltDoublePFTau40TrackPt1Reg + process.hltSelectedPFTausTrackPt1MediumIsolationReg + process.hltDoublePFTau40TrackPt1MediumIsolationReg + process.hltL1JetsHLTDoublePFTauTrackPt1MediumIsolationMatchReg + process.hltDoublePFTau40TrackPt1MediumIsolationL1HLTMatchedReg + process.hltDoublePFTau40TrackPt1MediumIsolationDz02Reg + process.HLTEndSequence ) process.HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM70 + process.hltPreLooseIsoPFTau50Trk30eta2p1MET120 + process.HLTL2TauJetsSequence + process.hltSingleL2Tau35eta2p1 + process.HLTRecoMETSequence + process.hltMET120 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean120 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID120 + process.HLTRecoJetSequenceAK4PrePF + process.HLTPFTriggerSequenceForTaus + process.HLTLooseIsoPFTauSequence + process.hltPFTau50 + process.hltSelectedPFTausTrackFinding + process.hltPFTau50Track + process.hltPFTauTrackPt30Discriminator + process.hltSelectedPFTausTrackPt30 + process.hltPFTau50TrackPt30 + process.hltPFTauLooseRelativeIsolationDiscriminator0p06 + process.hltPFTauLooseAbsOrRel0p06IsolationDiscriminator + process.hltSelectedPFTausTrackPt30AbsOrRelIsolation + process.hltPFTau50TrackPt30LooseAbsOrRelIso + process.HLTEndSequence ) process.HLT_ReducedIterativeTracking_v1 = cms.Path( process.HLTBeginSequence + process.hltPreReducedIterativeTracking + process.HLTRecoJetSequenceAK4PrePF + process.HLTDoLocalPixelSequence + process.HLTRecopixelvertexingSequence + process.HLTDoLocalStripSequence + process.HLTIterativeTrackingIter02 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet605035 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet35MuCleaned + process.hltIsoMu24Trk02DiCentralPFJet50MuCleaned + process.hltIsoMu24Trk02CentralPFJet60MuCleaned + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02TriCentralPFJet40 + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltIsoMu24Trk02JetCollectionsForLeptonPlusPFJets + process.hltIsoMu24Trk02TriCentralPFJet40MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet40EleCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltEle27JetCollectionsForLeptonPlusPFJets + process.hltEle27TriCentralPFJet35EleCleaned + process.hltEle27DiCentralPFJet50EleCleaned + process.hltEle27CentralPFJet60EleCleaned + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet40 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet40 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfTriCentralPFJet605035 + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hlt3PFJet35 + process.hlt2PFJet50 + process.hlt1PFJet60 + process.HLTEndSequence ) process.HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreIsoMu24IterTrk02CentralPFJet30BTagCSV + process.hltL1fL1sMu16L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16L1f0L2f16QL3Filtered24Q + process.HLTL3muoncaloisorecoSequenceNoBools + process.HLTTrackReconstructionForIsoL3MuonIter02 + process.hltL3crIsoL1sMu16L1f0L2f16QL3f24QL3crIsoRhoFiltered0p15IterTrk02 + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopIsoMu24 + process.hltJetFilterSingleTopIsoMu24 + process.hltCentralJets30SingleTopIsoMu24 + process.hltLeadingCentralJets30SingleTopIsoMu24 + process.hltJetTrackAssociationSingleTopIsoMu24 + process.hltTrackIPTagInfosSingleTopIsoMu24 + process.hltSecondaryVertexSingleTopIsoMu24 + process.hltCSVJetTagSingleTopIsoMu24 + process.hltCSVFilterSingleTopIsoMu24 + process.HLTEndSequence ) process.HLT_Mu40_eta2p1_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sMu16 + process.hltPreMu40eta2p1PFJet200PFJet50 + process.hltL1fL1sMu16Eta2p1L1Filtered0 + process.HLTL2muonrecoSequence + process.hltL2fL1sMu16Eta2p1L1f0L2Filtered16Q + process.HLTL3muonrecoSequence + process.hltL3fL1sMu16Eta2p1L1f0L2f16QL3Filtered40Q + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltMu40eta2p1CleanAK4PFJet + process.hltMu40eta2p1DiCentralPFJet50MuCleaned + process.hltMu40eta2p1CentralPFJet200MuCleaned + process.HLTEndSequence ) -process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetsNoLeptonsSingleTopEle27 + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) +process.HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle27WP85GsfCentralPFJet30BTagCSV + process.HLTEle27WP85GsfSequence + process.HLTAK4PFJetsSequence + process.hltOnlinePrimaryVertices + process.hltGoodOnlinePVs + process.hltGoodOnlinePVSelector + process.hltJetFilterSingleTopEle27 + process.hltCentralJets30SingleTopEle27 + process.hltLeadingCentralJets30SingleTopEle27 + process.hltJetTrackAssociationSingleTopEle27 + process.hltTrackIPTagInfosSingleTopEle27 + process.hltSecondaryVertexSingleTopEle27 + process.hltCSVJetTagSingleTopEle27 + process.hltCSVFilterSingleTopEle27 + process.HLTEndSequence ) process.HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle45CaloIdVTGsfTrkIdTPFJet200PFJet50 + process.HLTEle45CaloIdVTGsfTrkIdTGsfSequence + process.HLTAK4PFJetsSequence + process.hltPFJetsCorrectedMatchedToL1 + process.hltDiPFJet50 + process.hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet + process.hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned + process.hltEle45CaloIdVTGsfTrkIdTCentralPFJet200EleCleaned + process.HLTEndSequence ) process.HLT_Ele23_Ele12_CaloId_TrackId_Iso_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleEG137 + process.hltPreEle23Ele12CaloIdTrackIdIso + process.HLTEle23Ele12CaloIdTrackIdIsoSequence + process.HLTEndSequence ) process.HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1EG12EG7EG5 + process.hltPreEle17Ele12Ele10CaloIdTrackId + process.HLTEle17Ele12Ele10CaloIdTrackIdSequence + process.HLTEndSequence ) @@ -26391,13 +25030,10 @@ process.HLT_Photon300_NoHE_VBF_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG30 + process.hltPrePhoton300NoHEVBF + process.HLTSinglePhoton300NoHESequence + process.HLTAK4CaloJetsSequence + process.hltDiCaloJet20MJJ400AllJetsDEta3Filter + process.HLTEndSequence ) process.HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoubleEle33CaloIdLGsfTrkIdVLMW + process.HLTDoubleEle33CaloIdLGsfTrkIdVLMWSequence + process.hltDiEle33CaloIdLNewPixelMatchUnseededFilter + process.HLTEndSequence ) process.HLT_Ele95_CaloIdVT_GsfTrkIdT_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreEle95CaloIdVTGsfTrkIdT + process.HLTEle95CaloIdVTGsfTrkIdTGsfSequence + process.HLTEndSequence ) -process.HLT_DoublePhoton85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePhoton85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) +process.HLT_DoublePho85_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPreDoublePho85 + process.HLTDoublePho85Sequence + process.HLTEndSequence ) process.HLT_Photon155_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG22 + process.hltPrePhoton155 + process.HLTPhoton155Sequence + process.HLTEndSequence ) process.HLT_Ele20WP60_Ele8_Mass55_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle20WP60Ele8Mass55 + process.HLTEle20WP60Ele8Mass55Sequence + process.HLTEndSequence ) process.HLT_Ele25WP60_SC4_Mass55_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1SingleEG20ORL1SingleEG22 + process.hltPreEle25WP60SC4Mass55 + process.HLTEle25WP60SC4Mass55Sequence + process.HLTEndSequence ) -process.HLT_L2DoubleMu23_NoVertex_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreL2DoubleMu23NoVertex + process.hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2DoubleMu23NoVertexL2PreFiltered + process.HLTEndSequence ) -process.HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreL2DoubleMu28NoVertex2ChaAngle2p5Mass10 + process.hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2DoubleMu28NoVertexL2PreFiltered + process.hltL2DoubleMu28NoVertexL2Filtered2ChaAngle2p5Mass10 + process.HLTEndSequence ) -process.HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1DoubleMu10MuOpenORDoubleMu103p5 + process.hltPreL2DoubleMu38NoVertex2ChaAngle2p5Mass10 + process.hltL1DoubleMu10MuOpenOR3p5L1Filtered0 + process.HLTL2muonrecoSequenceNoVtx + process.hltL2DoubleMu38NoVertexL2PreFiltered + process.hltL2DoubleMu38NoVertexL2Filtered2ChaAngle2p5Mass10 + process.HLTEndSequence ) process.HLT_PFMET170_NoiseCleaned_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM36ORETM40 + process.hltPrePFMET170NoiseCleaned + process.HLTRecoMETSequence + process.hltMET90 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean80 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID80 + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET170Filter + process.HLTEndSequence ) process.HLT_PFMET120_NoiseCleaned_BTagCSV07_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ETM36ORETM40 + process.hltPrePFMET120NoiseCleanedBTagCSV07 + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean70 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID70 + process.hltSusyPreBtagJetFilter + process.HLTFastPrimaryVertexSequence + process.hltFastPVPixelVertexSelector + process.HLTBtagCSVSequenceL3 + process.hltBLifetimeL3FilterCSVsusy + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.HLTEndSequence ) process.HLT_PFHT350_PFMET120_NoiseCleaned_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1HTT150OrHTT175 + process.hltPrePFHT350PFMET120NoiseCleaned + process.HLTRecoMETSequence + process.hltMET70 + process.HLTHBHENoiseCleanerSequence + process.hltMetClean + process.hltMETClean60 + process.HLTAK4CaloJetsSequence + process.hltMetCleanUsingJetID + process.hltMETCleanUsingJetID60 + process.hltHtMht + process.hltHt280 + process.HLTAK4PFJetsSequence + process.hltPFMETProducer + process.hltPFMET120Filter + process.hltPFHT + process.hltPFHT350 + process.HLTEndSequence ) @@ -26438,7 +25074,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index c3cd13c9335e7..d81645690b3df 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/HIon/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/HIon/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTHIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/HIon/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/HIon/V15') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -1108,11 +1108,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1134,7 +1134,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1649,22 +1649,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2443,6 +2435,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2457,14 +2450,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2474,24 +2467,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2501,7 +2491,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2514,11 +2504,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -4793,11 +4782,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -8335,7 +8324,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index f568528198e2a..b93886fed0c28 100644 --- a/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/branches/withNewDZ/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,11 +1,11 @@ -# /dev/CMSSW_7_2_0/PIon/V3 (CMSSW_7_2_0_pre6_HLT1) +# /dev/CMSSW_7_1_2/PIon/V15 (CMSSW_7_1_8) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_7_2_0/PIon/V3') + tableName = cms.string('/dev/CMSSW_7_1_2/PIon/V15') ) process.HLTIter4PSetTrajectoryFilterIT = cms.PSet( @@ -1108,11 +1108,11 @@ ) process.hcal_db_producer = cms.ESProducer( "HcalDbProducer" ) process.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer", - trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), + categoryVariableName = cms.string( "vertexCategory" ), useTrackWeights = cms.bool( True ), useCategories = cms.bool( True ), pseudoMultiplicityMin = cms.uint32( 2 ), - categoryVariableName = cms.string( "vertexCategory" ), + correctVertexMass = cms.bool( True ), trackSelection = cms.PSet( totalHitsMin = cms.uint32( 0 ), jetDeltaRMax = cms.double( 0.3 ), @@ -1134,7 +1134,7 @@ calibrationRecords = cms.vstring( 'CombinedSVRecoVertex', 'CombinedSVPseudoVertex', 'CombinedSVNoVertex' ), - correctVertexMass = cms.bool( True ), + trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ), charmCut = cms.double( 1.5 ), vertexFlip = cms.bool( False ), minimumTrackWeight = cms.double( 0.5 ), @@ -1649,22 +1649,14 @@ PropagationDirection = cms.string( "alongMomentum" ) ) process.hltESPStripCPEfromTrackAngle = cms.ESProducer( "StripCPEESProducer", - ComponentType = cms.string( "StripCPEfromTrackAngle" ), + TanDiffusionAngle = cms.double( 0.01 ), + UncertaintyScaling = cms.double( 1.42 ), + ThicknessRelativeUncertainty = cms.double( 0.02 ), + MaybeNoiseThreshold = cms.double( 3.5 ), ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ), - parameters = cms.PSet( - mLC_P2 = cms.double( 0.3 ), - mLC_P1 = cms.double( 0.618 ), - mLC_P0 = cms.double( -0.326 ), - useLegacyError = cms.bool( True ), - mTEC_P1 = cms.double( 0.471 ), - mTEC_P0 = cms.double( -1.885 ), - mTOB_P0 = cms.double( -1.026 ), - mTOB_P1 = cms.double( 0.253 ), - mTIB_P0 = cms.double( -0.742 ), - mTIB_P1 = cms.double( 0.202 ), - mTID_P0 = cms.double( -1.427 ), - mTID_P1 = cms.double( 0.433 ) - ) + MinimumUncertainty = cms.double( 0.01 ), + ComponentType = cms.string( "StripCPEfromTrackAngle" ), + NoiseThreshold = cms.double( 2.3 ) ) process.hltESPTTRHBWithTrackAngle = cms.ESProducer( "TkTransientTrackingRecHitBuilderESProducer", StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ), @@ -2443,6 +2435,7 @@ DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ), DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ), CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ), + DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ), CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ), OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ), @@ -2457,14 +2450,14 @@ SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ), DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ), OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ), - SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), + DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ), SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ), CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ), DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ), SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ), SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ), - SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), + CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ), SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ), SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ), @@ -2474,24 +2467,21 @@ DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ), DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ), SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ), - deltaPhiSearchWindow = cms.double( 0.25 ), SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ), SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ), - deltaEtaSearchWindow = cms.double( 0.2 ), CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ), DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ), CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ), OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ), - CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ), + SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ), CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ), - deltaEtaCrackSearchWindow = cms.double( 0.25 ), SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ), OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ), DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ), SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ), EnableDTMeasurement = cms.bool( True ), - DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ), + CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ), scaleDT = cms.bool( True ), DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ), @@ -2501,7 +2491,7 @@ CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ), CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ), CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ), - DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ), + SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ), SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ), SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ), crackWindow = cms.double( 0.04 ), @@ -2514,11 +2504,10 @@ DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ), beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ), SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ), - CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ), - CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), + EnableCSCMeasurement = cms.bool( True ), CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ), OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ), - EnableCSCMeasurement = cms.bool( True ), + CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ), CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 ) ) process.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGenerator", @@ -4793,11 +4782,11 @@ L1NonIsoCand = cms.InputTag( "" ), saveTags = cms.bool( False ), thrOverE2EB = cms.double( -1.0 ), - thrRegularEE = cms.double( 1.0 ), + thrRegularEE = cms.double( 0.009 ), thrOverEEE = cms.double( -1.0 ), L1IsoCand = cms.InputTag( "hltEgammaCandidates" ), thrOverEEB = cms.double( -1.0 ), - thrRegularEB = cms.double( 999.0 ), + thrRegularEB = cms.double( 0.012 ), lessThan = cms.bool( True ), useEt = cms.bool( True ), ncandcut = cms.int32( 1 ), @@ -8335,7 +8324,10 @@ import os cmsswVersion = os.environ['CMSSW_VERSION'] -# none for now +# from CMSSW_7_2_0_pre6: Use Legacy Errors in "StripCPEESProducer" for HLT (PRs 5286/5151) +if cmsswVersion >= "CMSSW_7_2": + if 'hltESPStripCPEfromTrackAngle' in process.__dict__: + process.hltESPStripCPEfromTrackAngle.useLegacyError = cms.bool(True) # adapt HLT modules to the correct process name if 'hltTrigReport' in process.__dict__: diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/getFrozenHLT.sh b/branches/withNewDZ/HLTrigger/Configuration/test/getFrozenHLT.sh index 4e4b9fd0354bf..7bd42b5df9621 100755 --- a/branches/withNewDZ/HLTrigger/Configuration/test/getFrozenHLT.sh +++ b/branches/withNewDZ/HLTrigger/Configuration/test/getFrozenHLT.sh @@ -4,7 +4,7 @@ TABLES="2014 2014" # HLT_8E33v2="/online/collisions/2012/8e33/v2.4/HLT" # HLT_2013="/online/collisions/2012/8e33/v3.2/HLT" -HLT_2014="/dev/CMSSW_7_2_0/2014" +HLT_2014="/dev/CMSSW_7_1_0/GRun" # print extra messages ? VERBOSE=false diff --git a/branches/withNewDZ/HLTrigger/Configuration/test/getHLT.sh b/branches/withNewDZ/HLTrigger/Configuration/test/getHLT.sh index 6f5203aee8b96..6028cda44d975 100755 --- a/branches/withNewDZ/HLTrigger/Configuration/test/getHLT.sh +++ b/branches/withNewDZ/HLTrigger/Configuration/test/getHLT.sh @@ -1,8 +1,8 @@ #! /bin/bash # ConfDB configurations to use -MASTER="/dev/CMSSW_7_2_0/HLT" # no explicit version, take te most recent -TARGET="/dev/CMSSW_7_2_0/\$TABLE" # no explicit version, take te most recent +MASTER="/dev/CMSSW_7_1_2/HLT" # no explicit version, take te most recent +TARGET="/dev/CMSSW_7_1_2/\$TABLE" # no explicit version, take te most recent TABLES="GRun HIon PIon" # $TABLE in the above variable will be expanded to these TABLES # print extra messages ? diff --git a/branches/withNewDZ/HLTrigger/Timer/plugins/FastTimerServiceClient.cc b/branches/withNewDZ/HLTrigger/Timer/plugins/FastTimerServiceClient.cc index bccab3cc27c1b..51f6c79ab56c1 100644 --- a/branches/withNewDZ/HLTrigger/Timer/plugins/FastTimerServiceClient.cc +++ b/branches/withNewDZ/HLTrigger/Timer/plugins/FastTimerServiceClient.cc @@ -33,9 +33,10 @@ class FastTimerServiceClient : public DQMEDHarvester { private: std::string m_dqm_path; - void dqmEndLuminosityBlock(DQMStore::IBooker & booker, DQMStore::IGetter & getter, edm::LuminosityBlock const &, edm::EventSetup const&) override; - void dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter & getter) override; + void dqmEndLuminosityBlock(DQMStore::IGetter & getter, edm::LuminosityBlock const & lumi, edm::EventSetup const & setup); + void dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter & getter); +private: void fillSummaryPlots( DQMStore::IBooker & booker, DQMStore::IGetter & getter); void fillProcessSummaryPlots( DQMStore::IBooker & booker, DQMStore::IGetter & getter, std::string const & path); void fillPathSummaryPlots( DQMStore::IBooker & booker, DQMStore::IGetter & getter, double events, std::string const & path); @@ -58,9 +59,9 @@ FastTimerServiceClient::dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter } void -FastTimerServiceClient::dqmEndLuminosityBlock(DQMStore::IBooker & booker, DQMStore::IGetter & getter, edm::LuminosityBlock const & lumi, edm::EventSetup const & setup) +FastTimerServiceClient::dqmEndLuminosityBlock(DQMStore::IGetter & getter, edm::LuminosityBlock const & lumi, edm::EventSetup const & setup) { - fillSummaryPlots(booker, getter); + // fillSummaryPlots(getter); } void @@ -153,67 +154,22 @@ FastTimerServiceClient::fillPathSummaryPlots(DQMStore::IBooker & booker, DQMStor uint32_t bins = counter->GetXaxis()->GetNbins(); double min = counter->GetXaxis()->GetXmin(); double max = counter->GetXaxis()->GetXmax(); - booker.setCurrentFolder(current_path + "/Paths"); - - TH1F * average; - TH1F * running; - TH1F * efficiency; - MonitorElement * me; - - me = getter.get( current_path + "/Paths/" + label + "_module_average" ); - if (me) { - average = me->getTH1F(); - assert( me->getTH1F()->GetXaxis()->GetNbins() == (int) bins ); - assert( me->getTH1F()->GetXaxis()->GetXmin() == min ); - assert( me->getTH1F()->GetXaxis()->GetXmax() == max ); - average->Reset(); - } else { - average = booker.book1D(label + "_module_average", label + " module average", bins, min, max)->getTH1F(); - average->SetYTitle("processing time [ms]"); - for (uint32_t i = 1; i <= bins; ++i) { - const char * module = counter->GetXaxis()->GetBinLabel(i); - average->GetXaxis()->SetBinLabel(i, module); - } - } - - me = getter.get( current_path + "/Paths/" + label + "_module_running" ); - if (me) { - running = me->getTH1F(); - assert( me->getTH1F()->GetXaxis()->GetNbins() == (int) bins ); - assert( me->getTH1F()->GetXaxis()->GetXmin() == min ); - assert( me->getTH1F()->GetXaxis()->GetXmax() == max ); - running->Reset(); - } else { - running = booker.book1D(label + "_module_running", label + " module running", bins, min, max)->getTH1F(); - running->SetYTitle("processing time [ms]"); - for (uint32_t i = 1; i <= bins; ++i) { - const char * module = counter->GetXaxis()->GetBinLabel(i); - running->GetXaxis()->SetBinLabel(i, module); - } - } - - me = getter.get( current_path + "/Paths/" + label + "_module_efficiency" ); - if (me) { - efficiency = me->getTH1F(); - assert( me->getTH1F()->GetXaxis()->GetNbins() == (int) bins ); - assert( me->getTH1F()->GetXaxis()->GetXmin() == min ); - assert( me->getTH1F()->GetXaxis()->GetXmax() == max ); - efficiency->Reset(); - } else { - efficiency = booker.book1D(label + "_module_efficiency", label + " module efficiency", bins, min, max)->getTH1F(); - efficiency->SetYTitle("filter efficiency"); - efficiency->SetMaximum(1.05); - for (uint32_t i = 1; i <= bins; ++i) { - const char * module = counter->GetXaxis()->GetBinLabel(i); - efficiency->GetXaxis()->SetBinLabel(i, module); - } - } - + TH1F * average = booker.book1D(label + "_module_average", label + " module average", bins, min, max)->getTH1F(); + average ->SetYTitle("processing time [ms]"); + TH1F * running = booker.book1D(label + "_module_running", label + " module running", bins, min, max)->getTH1F(); + running ->SetYTitle("processing time [ms]"); + TH1F * efficiency = booker.book1D(label + "_module_efficiency", label + " module efficiency", bins, min, max)->getTH1F(); + efficiency->SetYTitle("filter efficiency"); + efficiency->SetMaximum(1.05); for (uint32_t i = 1; i <= bins; ++i) { + const char * module = counter->GetXaxis()->GetBinLabel(i); + average ->GetXaxis()->SetBinLabel(i, module); + running ->GetXaxis()->SetBinLabel(i, module); + efficiency->GetXaxis()->SetBinLabel(i, module); double t = total ->GetBinContent(i); double n = counter->GetBinContent(i); double p = counter->GetBinContent(i+1); - average ->SetBinContent(i, t / events); + average ->SetBinContent(i, t / events); if (n) { running ->SetBinContent(i, t / n); efficiency->SetBinContent(i, p / n); diff --git a/branches/withNewDZ/HLTrigger/Timer/plugins/ThroughputServiceClient.cc b/branches/withNewDZ/HLTrigger/Timer/plugins/ThroughputServiceClient.cc index b8b7afa229a4f..40e4ee564b111 100644 --- a/branches/withNewDZ/HLTrigger/Timer/plugins/ThroughputServiceClient.cc +++ b/branches/withNewDZ/HLTrigger/Timer/plugins/ThroughputServiceClient.cc @@ -33,8 +33,8 @@ class ThroughputServiceClient : public DQMEDHarvester { private: std::string m_dqm_path; - void dqmEndLuminosityBlock(DQMStore::IBooker & booker, DQMStore::IGetter & getter, edm::LuminosityBlock const &, edm::EventSetup const&) override; - void dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter & getter) override; + void dqmEndLuminosityBlock(DQMStore::IGetter & getter, edm::LuminosityBlock const & lumi, edm::EventSetup const & setup); + void dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter & getter); private: void fillSummaryPlots( DQMStore::IBooker & booker, DQMStore::IGetter & getter); @@ -57,9 +57,9 @@ ThroughputServiceClient::dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter } void -ThroughputServiceClient::dqmEndLuminosityBlock(DQMStore::IBooker & booker, DQMStore::IGetter & getter, edm::LuminosityBlock const &, edm::EventSetup const&) +ThroughputServiceClient::dqmEndLuminosityBlock(DQMStore::IGetter & getter, edm::LuminosityBlock const & lumi, edm::EventSetup const & setup) { - fillSummaryPlots(booker, getter); + // fillSummaryPlots(getter); } void @@ -85,19 +85,10 @@ ThroughputServiceClient::fillSummaryPlots(DQMStore::IBooker & booker, DQMStore:: for (auto const & folder: folders) { TH1F * sourced = getter.get( folder + "/throughput_sourced" )->getTH1F(); TH1F * retired = getter.get( folder + "/throughput_retired" )->getTH1F(); - TH1F * concurrent = nullptr; booker.setCurrentFolder(folder); unsigned int nbins = sourced->GetXaxis()->GetNbins(); double range = sourced->GetXaxis()->GetXmax(); - MonitorElement * me = getter.get( folder + "/concurrent" ); - if (me) { - concurrent = me->getTH1F(); - assert( concurrent->GetXaxis()->GetNbins() == (int) nbins ); - assert( concurrent->GetXaxis()->GetXmax() == range ); - concurrent->Reset(); - } else { - concurrent = booker.book1D("concurrent", "Concurrent events being processed", nbins, 0., range)->getTH1F(); - } + TH1F * concurrent = booker.book1D("concurrent", "Concurrent events being processed", nbins, 0., range)->getTH1F(); double sum = 0; // from bin=0 (underflow) to bin=nbins+1 (overflow) for (unsigned int i = 0; i <= nbins+1; ++i) { diff --git a/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/native/x86_tsc_clock.h b/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/native/x86_tsc_clock.h index d8381fd24bdbb..aee9c9f3c94a5 100644 --- a/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/native/x86_tsc_clock.h +++ b/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/native/x86_tsc_clock.h @@ -106,29 +106,6 @@ namespace native { } }; - - // TSC-based clock, determining at run-time the best strategy to serialise the reads from the TSC - struct clock_serialising_rdtsc - { - // std::chrono-like native interface - typedef native_duration duration; - typedef duration::rep rep; - typedef duration::period period; - typedef native_time_point time_point; - - static const bool is_steady; - static const bool is_available; - - static time_point now() noexcept - { - rep ticks = serialising_rdtsc(); - duration d(ticks); - time_point t(d); - return t; - } - }; - - } // namespace native #endif // native_x86_tsc_clock_h diff --git a/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc.h b/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc.h index d58f831b946d5..70aa19ad11dc6 100644 --- a/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc.h +++ b/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc.h @@ -52,19 +52,12 @@ bool tsc_allowed(); double calibrate_tsc_hz(); -// IFUNC support requires GCC >= 4.6.0 and GLIBC >= 2.11.1 -#if ( defined __GNUC__ && (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ) \ - and ( defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) ) - +#if defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) +// IFUNC support requires GLIBC >= 2.11.1 // processor specific serialising access to the TSC extern uint64_t serialising_rdtsc(void); +#endif // defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) -#else - -// processor specific serialising access to the TSC -extern uint64_t (*serialising_rdtsc)(void); - -#endif // IFUNC support #endif // x86_tsc_h diff --git a/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc_clock.h b/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc_clock.h index 7ec8954ce0e06..a241dd7f140a8 100644 --- a/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc_clock.h +++ b/branches/withNewDZ/HLTrigger/Timer/test/chrono/interface/x86_tsc_clock.h @@ -104,6 +104,8 @@ struct clock_rdtscp }; +#if defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) +// IFUNC support requires GLIBC >= 2.11.1 // TSC-based clock, determining at run-time the best strategy to serialise the reads from the TSC struct clock_serialising_rdtsc { @@ -111,7 +113,7 @@ struct clock_serialising_rdtsc typedef std::chrono::nanoseconds duration; typedef duration::rep rep; typedef duration::period period; - typedef std::chrono::time_point time_point; + typedef std::chrono::time_point time_point; static const bool is_steady; static const bool is_available; @@ -124,6 +126,7 @@ struct clock_serialising_rdtsc return time; } }; +#endif // defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) #endif // x86_tsc_clock_h diff --git a/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/native/x86_tsc_clock.cc b/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/native/x86_tsc_clock.cc index eebc33d123369..e3aff5bac29e6 100644 --- a/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/native/x86_tsc_clock.cc +++ b/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/native/x86_tsc_clock.cc @@ -18,9 +18,6 @@ namespace native { const bool clock_rdtscp::is_available = has_rdtscp() and tsc_allowed(); const bool clock_rdtscp::is_steady = has_invariant_tsc(); - const bool clock_serialising_rdtsc::is_available = has_tsc() and tsc_allowed(); - const bool clock_serialising_rdtsc::is_steady = has_invariant_tsc(); - } // namespace native #endif // defined __x86_64__ or defined __i386__ diff --git a/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc.cc b/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc.cc index 0583cea18fa34..88cf929e751e7 100644 --- a/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc.cc +++ b/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc.cc @@ -122,6 +122,9 @@ double calibrate_tsc_hz() { } +#if defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) +// IFUNC support requires GLIBC >= 2.11.1 + // new processors can use rdtscp; uint64_t serialising_rdtscp(void) { @@ -154,7 +157,7 @@ namespace { static inline constexpr unsigned int _(const char b[4]) { - return * (unsigned int *)(b); + return * reinterpret_cast(b); } } // namespace @@ -163,14 +166,10 @@ extern "C" { static uint64_t (*serialising_rdtsc_resolver(void))(void) { - if (not tsc_allowed()) - return serialising_rdtsc_unimplemented; - if (has_rdtscp()) // if available, use the RDTSCP instruction return serialising_rdtscp; - - if (has_tsc()) { + else if (has_tsc()) { // if the TSC is available, chck the processor vendor unsigned int eax, ebx, ecx, edx; __get_cpuid(0x00, & eax, & ebx, & ecx, & edx); @@ -183,23 +182,13 @@ extern "C" { else // for other processors, assume that MFENCE can be used as a serialising instruction before RDTSC return serialising_rdtsc_mfence; - } - - return serialising_rdtsc_unimplemented; + } else + return serialising_rdtsc_unimplemented; } } -// IFUNC support requires GCC >= 4.6.0 and GLIBC >= 2.11.1 -#if ( defined __GNUC__ && (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ) \ - and ( defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) ) - -uint64_t serialising_rdtsc(void) __attribute__((ifunc("serialising_rdtsc_resolver"))) __attribute__((externally_visible)); - -#else - -uint64_t (*serialising_rdtsc)(void) = serialising_rdtsc_resolver(); - -#endif // IFUNC support +extern uint64_t serialising_rdtsc(void) __attribute__((ifunc("serialising_rdtsc_resolver"))) __attribute__((externally_visible)); +#endif // defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) #endif // defined __x86_64__ or defined __i386__ diff --git a/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc_clock.cc b/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc_clock.cc index 4b7e4d99e3d39..cdc3a4dbe7585 100644 --- a/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc_clock.cc +++ b/branches/withNewDZ/HLTrigger/Timer/test/chrono/src/x86_tsc_clock.cc @@ -16,7 +16,10 @@ const bool clock_rdtsc_mfence::is_steady = has_invariant_tsc(); const bool clock_rdtscp::is_available = has_rdtscp() and tsc_allowed(); const bool clock_rdtscp::is_steady = has_invariant_tsc(); +#if defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) +// IFUNC support requires GLIBC >= 2.11.1 const bool clock_serialising_rdtsc::is_available = has_tsc() and tsc_allowed(); const bool clock_serialising_rdtsc::is_steady = has_invariant_tsc(); +#endif // defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) #endif // defined __x86_64__ or defined __i386__ diff --git a/branches/withNewDZ/HLTrigger/Timer/test/chrono/test/chrono.cc b/branches/withNewDZ/HLTrigger/Timer/test/chrono/test/chrono.cc index f1c672dd47cde..0367a9994d78b 100644 --- a/branches/withNewDZ/HLTrigger/Timer/test/chrono/test/chrono.cc +++ b/branches/withNewDZ/HLTrigger/Timer/test/chrono/test/chrono.cc @@ -154,19 +154,19 @@ void init_timers(std::vector & timers) timers.push_back(new Benchmark("MFENCE; RDTSC (" + tsc_freq + ") (using nanoseconds)")); if (clock_rdtscp::is_available) timers.push_back(new Benchmark("RDTSCP (" + tsc_freq + ") (using nanoseconds)")); +#if defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) if (clock_serialising_rdtsc::is_available) timers.push_back(new Benchmark("run-time selected serialising RDTSC (" + tsc_freq + ") (using nanoseconds)")); +#endif // defined __GLIBC__ && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11) // x86 DST-based clock (native) - if (native::clock_rdtsc::is_available) + if (clock_rdtsc::is_available) timers.push_back(new Benchmark("RDTSC (" + tsc_freq + ") (native)")); - if (native::clock_rdtsc_lfence::is_available) + if (clock_rdtsc_lfence::is_available) timers.push_back(new Benchmark("LFENCE; RDTSC (" + tsc_freq + ") (native)")); - if (native::clock_rdtsc_mfence::is_available) + if (clock_rdtsc_mfence::is_available) timers.push_back(new Benchmark("MFENCE; RDTSC (" + tsc_freq + ") (native)")); - if (native::clock_rdtscp::is_available) + if (clock_rdtscp::is_available) timers.push_back(new Benchmark("RDTSCP (" + tsc_freq + ") (native)")); - if (native::clock_serialising_rdtsc::is_available) - timers.push_back(new Benchmark("run-time selected serialising RDTSC (" + tsc_freq + ") (native)")); #endif // defined __x86_64__ or defined __i386__ diff --git a/branches/withNewDZ/JetMETCorrections/Modules/plugins/QGLikelihoodDBWriter.cc b/branches/withNewDZ/JetMETCorrections/Modules/plugins/QGLikelihoodDBWriter.cc index b599bc0d73024..4c92b2548d7dd 100644 --- a/branches/withNewDZ/JetMETCorrections/Modules/plugins/QGLikelihoodDBWriter.cc +++ b/branches/withNewDZ/JetMETCorrections/Modules/plugins/QGLikelihoodDBWriter.cc @@ -2,7 +2,6 @@ // Email: benedikt.hegner@cern.ch, tom.cornelis@cern.ch #include "TFile.h" -#include "TVector.h" #include "TList.h" #include "TKey.h" #include "TH1.h" @@ -55,62 +54,61 @@ void QGLikelihoodDBWriter::beginJob(){ QGLikelihoodObject *payload = new QGLikelihoodObject(); payload->data.clear(); - // Get the ROOT file and the vectors with binning information + // Get the ROOT files and the keys to the histogram TFile *f = TFile::Open(edm::FileInPath(inputRootFile.c_str()).fullPath().c_str()); - TVectorT *etaBins; f->GetObject("etaBins", etaBins); - TVectorT *ptBinsC; f->GetObject("ptBinsC", ptBinsC); - TVectorT *ptBinsF; f->GetObject("ptBinsF", ptBinsF); - TVectorT *rhoBins; f->GetObject("rhoBins", rhoBins); - - // Get keys to the histograms TList *keys = f->GetListOfKeys(); if(!keys){ edm::LogError("NoKeys") << "There are no keys in the input file." << std::endl; return; } - + // Loop over directories/histograms TIter nextdir(keys); TKey *keydir; while((keydir = (TKey*)nextdir())){ - if(!keydir->IsFolder()) continue; TDirectory *dir = (TDirectory*)keydir->ReadObj() ; TIter nexthist(dir->GetListOfKeys()); TKey *keyhist; while((keyhist = (TKey*)nexthist())){ - std::string histname = keyhist->GetName(); + + float ptMin, ptMax, rhoMin, rhoMax, etaMin, etaMax; int varIndex, qgIndex; + std::string histname = keyhist->GetName(); + std::string histname_ = keyhist->GetName(); + // First check the variable name, and use index in same order as RecoJets/JetProducers/plugins/QGTagger.cc:73 - if(extractString("mult", histname)) varIndex = 0; - else if(extractString("ptD", histname)) varIndex = 1; - else if(extractString("axis2", histname)) varIndex = 2; + if(extractString("nPFCand_QC_ptCutJet0", histname)) varIndex = 0; + else if(extractString("ptD_QCJet0", histname)) varIndex = 1; + else if(extractString("axis2_QCJet0", histname)) varIndex = 2; else continue; + // Check pseudorapidity range + if(extractString("_F", histname)){ etaMin = 2.5; etaMax = 4.7;} + else { etaMin = 0.;etaMax = 2.5;} + // Check quark or gluon if(extractString("quark", histname)) qgIndex = 0; else if(extractString("gluon", histname)) qgIndex = 1; else continue; - // Get eta, pt and rho ranges - extractString("eta-", histname); - int etaBin = std::atoi(histname.substr(0, histname.find("_")).c_str()); - extractString("pt-", histname); - int ptBin = std::atoi(histname.substr(0, histname.find("_")).c_str()); - extractString("rho-", histname); - int rhoBin = std::atoi(histname.substr(0, histname.find("_")).c_str()); - - float etaMin = (*etaBins)[etaBin]; - float etaMax = (*etaBins)[etaBin+1]; - TVectorT *ptBins = (etaBin == 0? ptBinsC : ptBinsF); - float ptMin = (*ptBins)[ptBin]; - float ptMax = (*ptBins)[ptBin+1]; - float rhoMin = (*rhoBins)[rhoBin]; - float rhoMax = (*rhoBins)[rhoBin+1]; + // Access the pt information + extractString("pt", histname); + ptMin = std::atof(histname.substr(0, histname.find("_")).c_str()); + extractString("_", histname); + ptMax = std::atof(histname.substr(0, histname.find("rho")).c_str()); + + if(etaMin == 2.5 && ptMin > 128) continue; //In forward use one bin for 127->2000 + if(etaMin == 2.5 && ptMin == 127) ptMax = 4000; + + // Access the rho information + extractString("rho", histname); + rhoMin = std::atof(histname.c_str()); + rhoMax = rhoMin + 1.; // WARNING: Check if this is still valid when changed to fixedGrid rho (try to move it in the name...) // Print out for debugging char buff[1000]; - sprintf(buff, "%50s : var=%1d, qg=%1d, etaMin=%6.2f, etaMax=%6.2f, ptMin=%8.2f, ptMax=%8.2f, rhoMin=%6.2f, rhoMax=%6.2f", keyhist->GetName(), varIndex, qgIndex, etaMin, etaMax, ptMin, ptMax, rhoMin, rhoMax ); + sprintf(buff, "%50s : var=%1d, qg=%1d, etaMin=%6.2f, etaMax=%6.2f, ptMin=%8.2f, ptMax=%8.2f, rhoMin=%6.2f, rhoMax=%6.2f", histname_.c_str(), varIndex, qgIndex, etaMin, etaMax, ptMin, ptMax, rhoMin, rhoMax ); edm::LogVerbatim("HistName") << buff << std::endl; // Define category parameters @@ -127,6 +125,11 @@ void QGLikelihoodDBWriter::beginJob(){ // Get TH1 TH1* th1hist = (TH1*) keyhist->ReadObj(); + // In the future, this part will (preferably) move to the making of the root files + if(th1hist->GetEntries()<50 ) th1hist->Rebin(5); // try to make it more stable + else if(th1hist->GetEntries()<500 ) th1hist->Rebin(2); // try to make it more stable + th1hist->Scale(1./th1hist->Integral("width")); + // Transform ROOT TH1 to QGLikelihoodObject (same indexing) QGLikelihoodObject::Histogram histogram(th1hist->GetNbinsX(), th1hist->GetXaxis()->GetBinLowEdge(1), th1hist->GetXaxis()->GetBinUpEdge(th1hist->GetNbinsX())); for(int ibin = 0; ibin <= th1hist->GetNbinsX() + 1; ++ibin){ @@ -141,13 +144,14 @@ void QGLikelihoodDBWriter::beginJob(){ payload->data.push_back(entry); } } + // Define the valid range, if no category is found within these bounds a warning will be thrown - payload->qgValidRange.RhoMin = rhoBins->Min(); - payload->qgValidRange.RhoMax = rhoBins->Max(); - payload->qgValidRange.EtaMin = etaBins->Min(); - payload->qgValidRange.EtaMax = etaBins->Max(); - payload->qgValidRange.PtMin = ptBinsC->Min(); - payload->qgValidRange.PtMax = ptBinsC->Max(); + payload->qgValidRange.RhoMin = 0; + payload->qgValidRange.RhoMax = 46; + payload->qgValidRange.EtaMin = 0; + payload->qgValidRange.EtaMax = 4.7; + payload->qgValidRange.PtMin = 20; + payload->qgValidRange.PtMax = 4000; payload->qgValidRange.QGIndex = -1; payload->qgValidRange.VarIndex = -1; diff --git a/branches/withNewDZ/JetMETCorrections/Modules/test/QGLikelihoodDBWriter_cfg.py b/branches/withNewDZ/JetMETCorrections/Modules/test/QGLikelihoodDBWriter_cfg.py index c41139052d9be..517fc3ec422ea 100644 --- a/branches/withNewDZ/JetMETCorrections/Modules/test/QGLikelihoodDBWriter_cfg.py +++ b/branches/withNewDZ/JetMETCorrections/Modules/test/QGLikelihoodDBWriter_cfg.py @@ -10,7 +10,7 @@ ), ) -qgDatabaseVersion = 'v1.1' +qgDatabaseVersion = 'v0-test' process.load('CondCore.DBCommon.CondDBCommon_cfi') process.CondDBCommon.connect = 'sqlite_file:QGL_'+qgDatabaseVersion+'.db' @@ -30,56 +30,34 @@ label = cms.string('QGL_AK5PFchs') ), cms.PSet( - record = cms.string('QGL_AK4PF'), - tag = cms.string('QGLikelihoodObject_'+qgDatabaseVersion+'_AK4PF'), - label = cms.string('QGL_AK4PF') + record = cms.string('QGL_Syst_Pythia'), + tag = cms.string('QGLikelihoodSystematicsObject_'+qgDatabaseVersion+'_Pythia'), + label = cms.string('QGL_Syst_Pythia') ), cms.PSet( - record = cms.string('QGL_AK4PFchs'), - tag = cms.string('QGLikelihoodObject_'+qgDatabaseVersion+'_AK4PFchs'), - label = cms.string('QGL_AK4PFchs') + record = cms.string('QGL_Syst_Herwig++'), + tag = cms.string('QGLikelihoodSystematicsObject_'+qgDatabaseVersion+'_Herwig++'), + label = cms.string('QGL_Syst_Herwig++') ), -# ONLY AFTER FIRST DATA -# cms.PSet( -# record = cms.string('QGL_Syst_Pythia'), -# tag = cms.string('QGLikelihoodSystematicsObject_'+qgDatabaseVersion+'_Pythia'), -# label = cms.string('QGL_Syst_Pythia') -# ), -# cms.PSet( -# record = cms.string('QGL_Syst_Herwig++'), -# tag = cms.string('QGLikelihoodSystematicsObject_'+qgDatabaseVersion+'_Herwig++'), -# label = cms.string('QGL_Syst_Herwig++') -# ), ) ) srcDirectory = 'temp/' -process.dbWriterAK4PF = cms.EDAnalyzer('QGLikelihoodDBWriter', - src = cms.string(srcDirectory + 'pdfQG_AK4_13TeV.root'), - payload= cms.string('QGL_AK4PF') -) -process.dbWriterAK4PFchs = cms.EDAnalyzer('QGLikelihoodDBWriter', - src = cms.string(srcDirectory + 'pdfQG_AK4chs_13TeV.root'), - payload= cms.string('QGL_AK4PFchs') -) process.dbWriterAK5PF = cms.EDAnalyzer('QGLikelihoodDBWriter', - src = cms.string(srcDirectory + 'pdfQG_AK5_13TeV.root'), + src = cms.string(srcDirectory + 'ReducedHisto_2012.root'), payload= cms.string('QGL_AK5PF') ) process.dbWriterAK5PFchs = cms.EDAnalyzer('QGLikelihoodDBWriter', - src = cms.string(srcDirectory + 'pdfQG_AK5chs_13TeV.root'), + src = cms.string(srcDirectory + 'ReducedHisto_2012_CHS.root'), payload= cms.string('QGL_AK5PFchs') +) +process.dbWriterSystPythia = cms.EDAnalyzer('QGLikelihoodSystematicsDBWriter', + src = cms.string(srcDirectory + 'SystDatabase.txt'), + payload= cms.string('QGL_Syst_Pythia') +) +process.dbWriterSystHerwigpp = cms.EDAnalyzer('QGLikelihoodSystematicsDBWriter', + src = cms.string(srcDirectory + 'SystDatabase_Hpp.txt'), + payload= cms.string('QGL_Syst_Herwig++') ) -# ONLY AFTER FIRST DATA: -#process.dbWriterSystPythia = cms.EDAnalyzer('QGLikelihoodSystematicsDBWriter', -# src = cms.string(srcDirectory + 'SystDatabase.txt'), -# payload= cms.string('QGL_Syst_Pythia') -#) -#process.dbWriterSystHerwigpp = cms.EDAnalyzer('QGLikelihoodSystematicsDBWriter', -# src = cms.string(srcDirectory + 'SystDatabase_Hpp.txt'), -# payload= cms.string('QGL_Syst_Herwig++') -#) - - -process.p = cms.Path(process.dbWriterAK4PF*process.dbWriterAK5PF*process.dbWriterAK4PFchs*process.dbWriterAK5PFchs) +process.p = cms.Path(process.dbWriterAK5PF * process.dbWriterAK5PFchs * process.dbWriterSystPythia * process.dbWriterSystHerwigpp) diff --git a/branches/withNewDZ/JetMETCorrections/Type1MET/python/correctionTermsPfMetType0PFCandidate_cff.py b/branches/withNewDZ/JetMETCorrections/Type1MET/python/correctionTermsPfMetType0PFCandidate_cff.py index 502ce94fed060..4fdffc9707ab1 100644 --- a/branches/withNewDZ/JetMETCorrections/Type1MET/python/correctionTermsPfMetType0PFCandidate_cff.py +++ b/branches/withNewDZ/JetMETCorrections/Type1MET/python/correctionTermsPfMetType0PFCandidate_cff.py @@ -12,9 +12,4 @@ corrPfMetType0PfCand ) -correctionTermsPfMetType0PFCandidateForValidation = cms.Sequence( - type0PFMEtCorrectionPFCandToVertexAssociationForValidation + - corrPfMetType0PfCand - ) - ##____________________________________________________________________________|| diff --git a/branches/withNewDZ/JetMETCorrections/Type1MET/python/pfMETCorrectionType0_cfi.py b/branches/withNewDZ/JetMETCorrections/Type1MET/python/pfMETCorrectionType0_cfi.py index 53e4959335c27..6a023d5a240f2 100644 --- a/branches/withNewDZ/JetMETCorrections/Type1MET/python/pfMETCorrectionType0_cfi.py +++ b/branches/withNewDZ/JetMETCorrections/Type1MET/python/pfMETCorrectionType0_cfi.py @@ -54,13 +54,6 @@ * pfCandidateToVertexAssociation ) -type0PFMEtCorrectionPFCandToVertexAssociationForValidation = cms.Sequence( - cms.ignore(selectedVerticesForPFMEtCorrType0) - * cms.ignore(selectedPrimaryVertexHighestPtTrackSumForPFMEtCorrType0) - * particleFlowDisplacedVertex - * pfCandidateToVertexAssociation -) - type0PFMEtCorrection = cms.Sequence( type0PFMEtCorrectionPFCandToVertexAssociation * pfMETcorrType0 diff --git a/branches/withNewDZ/L1Trigger/CSCTrackFinder/interface/CSCTFSectorProcessor.h b/branches/withNewDZ/L1Trigger/CSCTrackFinder/interface/CSCTFSectorProcessor.h index b48b316348291..ef197fd9da4a5 100644 --- a/branches/withNewDZ/L1Trigger/CSCTrackFinder/interface/CSCTFSectorProcessor.h +++ b/branches/withNewDZ/L1Trigger/CSCTrackFinder/interface/CSCTFSectorProcessor.h @@ -89,6 +89,7 @@ class CSCTFSectorProcessor int run_core; int trigger_on_ME1a, trigger_on_ME1b, trigger_on_ME2, trigger_on_ME3, trigger_on_ME4; int trigger_on_MB1a, trigger_on_MB1d; + int singlesTrackPt; unsigned int singlesTrackOutput; int rescaleSinglesPhi; diff --git a/branches/withNewDZ/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverMiniLUT.cc b/branches/withNewDZ/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverMiniLUT.cc index 10386cf6ec475..a74dbb15348b4 100644 --- a/branches/withNewDZ/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverMiniLUT.cc +++ b/branches/withNewDZ/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverMiniLUT.cc @@ -28,10 +28,10 @@ lclphidat CSCSectorReceiverMiniLUT::calcLocalPhiMini(unsigned theadd, const boo unsigned short int pattern = ((theadd >> 8) & 0xf); unsigned short int strip = (theadd & 0xff); - if(strip < 2*CSCConstants::MAX_NUM_STRIPS && pattern < CSCConstants::NUM_CLCT_PATTERNS) { - data.phi_local = gangedME1a ? static_cast((lcl_phi_param0[pattern] + strip)*lcl_phi_param1) : static_cast((lcl_phi_param0[pattern] + strip)*0.625* lcl_phi_param1); + if(strip < 2*CSCConstants::MAX_NUM_STRIPS && pattern < CSCConstants::NUM_CLCT_PATTERNS) + gangedME1a ? data.phi_local = static_cast((lcl_phi_param0[pattern] + strip)*lcl_phi_param1) : data.phi_local = static_cast((lcl_phi_param0[pattern] + strip)*0.625* lcl_phi_param1); //DA and MDG, rescale range of local phi so ME1/1b fits in 0-511 - } else + else edm::LogWarning("CSCSectorReceiverMiniLUT") << "+++ Value of strip, " << strip << ", exceeds max allowed, " << 2*CSCConstants::MAX_NUM_STRIPS-1 diff --git a/branches/withNewDZ/L1Trigger/Configuration/python/L1Trigger_custom.py b/branches/withNewDZ/L1Trigger/Configuration/python/L1Trigger_custom.py index e2ffd94e8a761..a55a7bf745840 100644 --- a/branches/withNewDZ/L1Trigger/Configuration/python/L1Trigger_custom.py +++ b/branches/withNewDZ/L1Trigger/Configuration/python/L1Trigger_custom.py @@ -94,12 +94,12 @@ def customiseL1Menu(process): if l1MenuSource == 'sqlFile' : # the menu will be read from the SQL file instead of the global tag - useSqlFile = '/afs/cern.ch/user/g/ghete/public/L1Menu/L1Menu_Collisions2015_25ns_v1/sqlFile/L1Menu_Collisions2015_25ns_v1_mc.db' - menuDbTag = 'L1GtTriggerMenu_L1Menu_Collisions2015_25ns_v1_mc' + useSqlFile = '/afs/cern.ch/user/g/ghete/public/L1Menu/L1Menu_Collisions2015_25ns_v0/sqlFile/L1Menu_Collisions2015_25ns_v0_mc.db' + menuDbTag = 'L1GtTriggerMenu_L1Menu_Collisions2015_25ns_v0_mc' elif l1MenuSource == 'xmlFile' : # the menu will be read from an XML file instead of the global tag - must copy the file in luminosityDirectory luminosityDirectory = "startup" - useXmlFile = 'L1Menu_Collisions2015_25ns_v1_L1T_Scales_20101224_Imp0_0x102f.xml' + useXmlFile = 'L1Menu_Collisions2015_25ns_v0_L1T_Scales_20101224_Imp0_0x102f.xml' else : print ' Using default L1 trigger menu from Global Tag ' diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFBitCountAlgorithmImp.h b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFBitCountAlgorithmImp.h index 7c9bfd2249bcb..a576555bd5b80 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFBitCountAlgorithmImp.h +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFBitCountAlgorithmImp.h @@ -34,6 +34,7 @@ namespace l1t { std::vector * spares); private: + CaloParamsStage1* const params_; }; } diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFRingSumAlgorithmImp.h b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFRingSumAlgorithmImp.h index 46eca41bb4058..93fc29269573c 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFRingSumAlgorithmImp.h +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage1Layer2HFRingSumAlgorithmImp.h @@ -35,6 +35,7 @@ namespace l1t { std::vector * spares); private: + CaloParamsStage1* const params_; std::vector cosPhi; std::vector sinPhi; }; @@ -48,6 +49,7 @@ namespace l1t { const std::vector * taus, std::vector * spares); private: + CaloParamsStage1* const params_; }; } diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2MainProcessorFirmware.h b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2MainProcessorFirmware.h index 2c6848afb1ead..842f944bc174c 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2MainProcessorFirmware.h +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2MainProcessorFirmware.h @@ -48,6 +48,7 @@ namespace l1t { private: + unsigned const & m_fwv; CaloParams* m_params; Stage2TowerDecompressAlgorithm* m_towerAlgo; diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2PreProcessorFirmware.h b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2PreProcessorFirmware.h index 2d239e048709e..800454f6f778d 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2PreProcessorFirmware.h +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/interface/Stage2PreProcessorFirmware.h @@ -36,6 +36,7 @@ namespace l1t { private: //FirmwareVersion const & m_fwv; + int const & m_fwv; CaloParams* m_params; Stage2TowerCompressAlgorithm* m_towerAlgo; diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2CentralityAlgorithm.cc b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2CentralityAlgorithm.cc index f63e34bcc8768..af99dd9848d6e 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2CentralityAlgorithm.cc +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2CentralityAlgorithm.cc @@ -11,7 +11,7 @@ #include "L1Trigger/L1TCalorimeter/interface/PUSubtractionMethods.h" #include "L1Trigger/L1TCalorimeter/interface/legacyGtHelper.h" -l1t::Stage1Layer2CentralityAlgorithm::Stage1Layer2CentralityAlgorithm(CaloParamsStage1* ) +l1t::Stage1Layer2CentralityAlgorithm::Stage1Layer2CentralityAlgorithm(CaloParamsStage1* params) : params_(params) { } diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2DiTauAlgorithm.cc b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2DiTauAlgorithm.cc index cdc3a4b32f275..7a17b6a1c3fac 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2DiTauAlgorithm.cc +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2DiTauAlgorithm.cc @@ -11,7 +11,7 @@ //#include "L1Trigger/L1TCalorimeter/interface/PUSubtractionMethods.h" //#include "L1Trigger/L1TCalorimeter/interface/legacyGtHelper.h" -l1t::Stage1Layer2DiTauAlgorithm::Stage1Layer2DiTauAlgorithm(CaloParamsStage1* ) +l1t::Stage1Layer2DiTauAlgorithm::Stage1Layer2DiTauAlgorithm(CaloParamsStage1* params) : params_(params) { } diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2FlowAlgorithm.cc b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2FlowAlgorithm.cc index 97e6b4d87f3d9..147bf890df80f 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2FlowAlgorithm.cc +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2FlowAlgorithm.cc @@ -11,7 +11,7 @@ #include "L1Trigger/L1TCalorimeter/interface/PUSubtractionMethods.h" #include "L1Trigger/L1TCalorimeter/interface/legacyGtHelper.h" -l1t::Stage1Layer2FlowAlgorithm::Stage1Layer2FlowAlgorithm(CaloParamsStage1* ) +l1t::Stage1Layer2FlowAlgorithm::Stage1Layer2FlowAlgorithm(CaloParamsStage1* params) : params_(params) { //now do what ever initialization is needed //Converting phi to be as it is define at GCT (-pi to pi instead of 0 to 2*pi) diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EtSumAlgorithmFirmwareImp1.cc b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EtSumAlgorithmFirmwareImp1.cc index b7fd33bf4f30a..475aee87c83b9 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EtSumAlgorithmFirmwareImp1.cc +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EtSumAlgorithmFirmwareImp1.cc @@ -32,7 +32,7 @@ l1t::Stage2Layer2EtSumAlgorithmFirmwareImp1::~Stage2Layer2EtSumAlgorithmFirmware void l1t::Stage2Layer2EtSumAlgorithmFirmwareImp1::processEvent(const std::vector & towers, std::vector & etsums) { - double pi = std::atan(1.0) * 4.0; + double pi = std::atan(1.d) * 4.0d; int ietaMax=28, ietaMin=-28, iphiMax=72, iphiMin=1; diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2MainProcessorImp1.cc b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2MainProcessorImp1.cc index d3257af67a624..b42063aff1fdc 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2MainProcessorImp1.cc +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2MainProcessorImp1.cc @@ -20,6 +20,7 @@ using namespace std; l1t::Stage2MainProcessorFirmwareImp1::Stage2MainProcessorFirmwareImp1(unsigned fwv, CaloParams* params) : + m_fwv(fwv), m_params(params) { diff --git a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2PreProcessFirmwareImp1.cc b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2PreProcessFirmwareImp1.cc index 2436e08a04fe1..b7c53f0077709 100644 --- a/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2PreProcessFirmwareImp1.cc +++ b/branches/withNewDZ/L1Trigger/L1TCalorimeter/src/firmware/Stage2PreProcessFirmwareImp1.cc @@ -14,6 +14,7 @@ using namespace std; l1t::Stage2PreProcessorFirmwareImp1::Stage2PreProcessorFirmwareImp1(unsigned fwv, CaloParams* params) : + m_fwv(fwv), m_params(params) { diff --git a/branches/withNewDZ/L1TriggerConfig/L1GtConfigProducers/data/Luminosity/startup/L1Menu_Collisions2015_25ns_v1_L1T_Scales_20101224_Imp0_0x102f.xml b/branches/withNewDZ/L1TriggerConfig/L1GtConfigProducers/data/Luminosity/startup/L1Menu_Collisions2015_25ns_v1_L1T_Scales_20101224_Imp0_0x102f.xml deleted file mode 100644 index 85d83207a8dcf..0000000000000 --- a/branches/withNewDZ/L1TriggerConfig/L1GtConfigProducers/data/Luminosity/startup/L1Menu_Collisions2015_25ns_v1_L1T_Scales_20101224_Imp0_0x102f.xml +++ /dev/null @@ -1,5603 +0,0 @@ - - -
- L1Menu_Collisions2015_25ns_v1 - 2014-07-10 - Vasile Mihai Ghete, Takashi Matsushita - L1 menu for pp data taking 2015, Stage 1 version - 2014-09-15 - Vasile Mihai Ghete, Takashi Matsushita - L1 menu for pp data taking 2015 - Imp0 - L1T_Scales_20101224 -
- - - - DoubleIsoEG_0x0F_0x0A OR DoubleNoIsoEG_0x0F_0x0A OR ( SingleIsoEG_0x0F AND SingleNoIsoEG_0x0A ) OR ( SingleIsoEG_0x0A AND SingleNoIsoEG_0x0F ) - - - - DoubleIsoEG_0x14_0x0A OR ( SingleIsoEG_0x14 AND SingleNoIsoEG_0x0A ) OR ( SingleIsoEG_0x0A AND SingleNoIsoEG_0x14 ) - - - - DoubleIsoEG_0x16_0x0A OR DoubleNoIsoEG_0x16_0x0A OR ( SingleIsoEG_0x16 AND SingleNoIsoEG_0x0A ) OR ( SingleIsoEG_0x0A AND SingleNoIsoEG_0x16 ) - - - - DoubleMu_wsc_0x01_Eta1p6_HighQ_WdEta18 - - - - DoubleMu_wsc_0x01_Eta1p6_HighQ_WdEta18_OS - - - - DoubleMu_wsc_0x0D_0x01_HighQ_WdEta18 - - - - DoubleMu_0x0E_0x09 - - - - Corr_CenJet_ForJet_0x09_NWdPhi6 - - - - Corr_CenJet_ForJet_0x09_NWdPhi7 - - - - DoubleCenJet_0x19 - - - - DoubleCenJet_wsc_0x08_WdPhi7 AND HTT_0x0FA - - - - DoubleCenJet_0x0E AND ETM_0x078 - - - - DoubleCenJet_0x0F AND ETM_0x078 - - - - ETM_0x078 - - - - ETM_0x078 AND ( NOT Corr_ETM_CenJet_0x78_0x0D_WdPhi2 ) AND ( NOT Corr_ETM_ForJet_0x78_0x0D_WdPhi2 ) - - - - ETM_0x08C AND ( NOT Corr_ETM_CenJet_0x8C_0x0D_WdPhi2 ) AND ( NOT Corr_ETM_ForJet_0x8C_0x0D_WdPhi2 ) - - - - SingleMu_0x01_Eta2p1 AND ETM_0x06E - - - - SingleMu_0x01_Eta2p1 AND ETM_0x06E AND HTT_0x0C8 - - - - SingleMu_0x01_Eta2p1 AND ETM_0x06E AND ( SingleCenJet_0x1E OR SingleTauJet_0x1E ) - - - - QuadMu_0x01_HighQ - - - - QuadCenJet_0x0F - - - - SingleMu_0x11_Eta2p1 - - - - SingleMu_0x01_BeamHalo - - - - SingleCenJet_0x05 AND ( NOT ( BPTX_plus.v0 OR BPTX_minus.v0 ) ) - - - - TripleIsoEG_0x0E_0x0A_0x08 OR TripleNoIsoEG_0x0E_0x0A_0x08 OR ( DoubleIsoEG_0x0E_0x0A AND SingleNoIsoEG_0x08 ) OR ( DoubleNoIsoEG_0x0E_0x0A AND SingleIsoEG_0x08 ) OR ( DoubleIsoEG_0x0E_0x08 AND SingleNoIsoEG_0x0A ) OR ( DoubleNoIsoEG_0x0E_0x08 AND SingleIsoEG_0x0A ) OR ( DoubleIsoEG_0x0A_0x08 AND SingleNoIsoEG_0x0E ) OR ( DoubleNoIsoEG_0x0A_0x08 AND SingleIsoEG_0x0E ) - - - - TripleMu_0x01_HighQ - - - - TripleMu_0x09_0x09_0x05_HighQ - - - - TripleCenJet_0x17_0x13_0x10 OR ( DoubleCenJet_0x13_0x10 AND SingleForJet_0x17 ) OR ( DoubleCenJet_0x17_0x10 AND SingleForJet_0x13 ) - - - - - - - - - 1 - - - 09 - - - - - 1F1F - - - - - 3ffff - - - - - - - 1 - - - 09 - - - - - 0F0F - - - - - 3ffff - - - - - - 3FFFE - - - - 380 - - - - - - - 1 - - - 09 - - - - - 1F1F - - - - - 3ffff - - - - - - - 1 - - - 09 - - - - - 0F0F - - - - - 3ffff - - - - - - 3FFFE - - - - 300 - - - - - - - 1 - - - 0 - - - 078 - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0d - - - - - 7F7F - - - - - 3ffff - - - - - - 0 - - - - 007 - - - - - - - 1 - - - 0 - - - 08c - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0d - - - - - 7F7F - - - - - 3ffff - - - - - - 0 - - - - 007 - - - - - - - 1 - - - 0 - - - 078 - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0d - - - - - 0F0F - - - - - 3ffff - - - - - - 0 - - - - 007 - - - - - - - 1 - - - 0 - - - 08c - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0d - - - - - 0F0F - - - - - 3ffff - - - - - - 0 - - - - 007 - - - - - - 1 - - - 0e - - - 0e - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0f - - - 0f - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 13 - - - 10 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 17 - - - 10 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 19 - - - 19 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 08 - - - 08 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - 3fff - - - - - 0ff - - - - - - - 1 - - - 0a - - - 08 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0e - - - 08 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0e - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0f - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 14 - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 16 - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0e - - - 09 - - - - 0e0 - - 0 - - - 0 - - - 090 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e8 - - - e8 - - - - - - - 1 - - - 01 - - - 01 - - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - - - - FFFF0000FFFF - - - FFFF0000FFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e0 - - - e0 - - - - - 000000000007ffff - - - - - 1ffffffffffffffffff - - - - - - - 1 - - - 01 - - - 01 - - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - - - - FFFF0000FFFF - - - FFFF0000FFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 2 - - - - e0 - - - e0 - - - - - 000000000007ffff - - - - - 1ffffffffffffffffff - - - - - - - 1 - - - 0d - - - 01 - - - - 0d0 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e0 - - - e0 - - - - - 000000000007ffff - - - - - 1ffffffffffffffffff - - - - - - - 1 - - - 0a - - - 08 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0e - - - 08 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0e - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0f - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 16 - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0 - - - 06e - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 078 - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 08c - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 0c8 - - - - - 00 - - - - - - - 1 - - - 0 - - - 0fa - - - - - 00 - - - - - - - 1 - - - 0f - - - 0f - - - 0f - - - 0f - - - - - 7F7F - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 01 - - - 01 - - - 01 - - - 01 - - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - 8f - - - 8f - - - - - 00 - - - 00 - - - 00 - - - 00 - - - - 1 - - - - e0 - - - e0 - - - e0 - - - e0 - - - - - - - 1 - - - 05 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 1e - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 13 - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 17 - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 08 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0a - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0e - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0f - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 14 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 16 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 01 - - - - 010 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - 02 - - - - - - - 1 - - - 01 - - - - 010 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 11 - - - - 110 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 08 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0a - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0e - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0f - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 14 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 16 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 1e - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 17 - - - 13 - - - 10 - - - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0e - - - 0a - - - 08 - - - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 01 - - - 01 - - - 01 - - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - 8f - - - - - 00 - - - 00 - - - 00 - - - - 1 - - - - e0 - - - e0 - - - e0 - - - - - - - 1 - - - 09 - - - 09 - - - 05 - - - - 090 - - 0 - - - 0 - - - 090 - - 0 - - - 0 - - - 050 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - 8f - - - - - 00 - - - 00 - - - 00 - - - - 1 - - - - e0 - - - e0 - - - e0 - - - - - - - 1 - - - 0e - - - 0a - - - 08 - - - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - - - - - BPTX_plus_AND_minus.v0 OR ( NOT BPTX_plus_AND_minus.v0 ) - - - - DoubleMu_0x01_HighQ - - - - DoubleMu_0x0A AND ( SingleNoIsoEG_0x06 OR SingleIsoEG_0x06 ) - - - - DoubleMu_0x0B AND ( SingleNoIsoEG_0x07 OR SingleIsoEG_0x07 ) - - - - DoubleMu_0x0D_0x06 - - - - DoubleMu_0x0D_0x01 - - - - DoubleCenJet_0x1C - - - - DoubleCenJet_0x1E - - - - DoubleCenJet_0x0D - - - - DoubleCenJet_0x15 - - - - DoubleTauJet_0x09_Eta2p17 - - - - DoubleTauJet_0x0D_Eta2p17 - - - - DoubleTauJet_0x11_Eta2p17 - - - - ETM_0x0C8 - - - - ETM_0x03C - - - - ETM_0x050 - - - - ETM_0x064 - - - - ETM_0x08C - - - - HTT_0x0FA - - - - HTT_0x12C - - - - HTT_0x15E - - - - HTT_0x190 - - - - HTT_0x1F4 - - - - SingleIsoEG_0x14_Eta2p17 AND SingleTauJet_0x05_Eta2p17 - - - - SingleMu_0x0D_Eta2p1 AND ETM_0x064 - - - - SingleMu_0x0F_Eta2p1 AND ETM_0x03C - - - - SingleMu_0x10_Eta2p1 AND SingleTauJet_0x05_Eta2p17 - - - - SingleMu_0x12 AND ( SingleNoIsoEG_0x0A OR SingleIsoEG_0x0A ) - - - - SingleMu_0x12 AND ( SingleNoIsoEG_0x08 OR SingleIsoEG_0x08 ) - - - - Corr_Mu_CenJet_0x05_0x04_WdEtaPhi2 - - - - Corr_Mu_CenJet_0x05_0x0D_WdEtaPhi2 - - - - Corr_Mu_CenJet_0x05_0x17_WdEtaPhi2 - - - - SingleMu_0x07 AND ( SingleNoIsoEG_0x12 OR SingleIsoEG_0x12 ) - - - - SingleMu_0x09 AND ( DoubleIsoEG_0x05 OR DoubleNoIsoEG_0x05 OR ( SingleIsoEG_0x05 AND SingleNoIsoEG_0x05 ) ) - - - - SingleMu_0x09 AND ( SingleNoIsoEG_0x14 OR SingleIsoEG_0x14 ) - - - - SingleMu_0x09 AND SingleIsoEG_0x12 - - - - SingleMu_0x0A AND ( DoubleIsoEG_0x0A OR DoubleNoIsoEG_0x0A OR ( SingleIsoEG_0x0A AND SingleNoIsoEG_0x0A ) ) - - - - SingleMu_0x0A AND HTT_0x12C - - - - QuadCenJet_0x09 AND SingleTauJet_0x0D - - - - QuadCenJet_0x0A - - - - QuadCenJet_0x15 - - - - SingleNoIsoEG_0x0A OR SingleIsoEG_0x0A - - - - SingleNoIsoEG_0x14 OR SingleIsoEG_0x14 - - - - SingleNoIsoEG_0x19 OR SingleIsoEG_0x19 - - - - SingleNoIsoEG_0x1E OR SingleIsoEG_0x1E - - - - SingleNoIsoEG_0x23 OR SingleIsoEG_0x23 - - - - SingleNoIsoEG_0x23_Eta2p17 OR SingleIsoEG_0x23_Eta2p17 - - - - SingleNoIsoEG_0x05 OR SingleIsoEG_0x05 - - - - SingleIsoEG_0x12 - - - - SingleIsoEG_0x19_Eta2p17 - - - - SingleIsoEG_0x1C_Eta2p17 - - - - SingleIsoEG_0x1E_Eta2p17 - - - - SingleMu_0x0E - - - - SingleMu_0x0F_Eta2p1 - - - - SingleMu_0x10 - - - - SingleMu_0x10_Eta2p1 - - - - SingleMu_0x12 - - - - SingleMu_0x12_Eta2p1 - - - - SingleMu_0x13 - - - - SingleMu_0x13_Eta2p1 - - - - SingleMu_0x14 - - - - SingleMu_0x14_Eta2p1 - - - - SingleMu_0x09 - - - - SingleMu_0x0A AND ( NOT ( BPTX_plus.v0 OR BPTX_minus.v0 ) ) - - - - SingleMu_0x01_Open - - - - SingleCenJet_0x20 OR SingleForJet_0x20 - - - - SingleCenJet_0x2C OR SingleForJet_0x2C - - - - SingleCenJet_0x32 OR SingleForJet_0x32 - - - - SingleCenJet_0x3C OR SingleForJet_0x3C - - - - SingleCenJet_0x0D OR SingleForJet_0x0D - - - - SingleCenJet_0x11 OR SingleForJet_0x11 - - - - SingleCenJet_0x17 OR SingleForJet_0x17 - - - - SingleCenJet_0x08 AND ( NOT ( BPTX_plus.v0 OR BPTX_minus.v0 ) ) - - - - TripleIsoEG_0x0A OR TripleNoIsoEG_0x0A OR ( DoubleIsoEG_0x0A AND SingleNoIsoEG_0x0A ) OR ( DoubleNoIsoEG_0x0A AND SingleIsoEG_0x0A ) - - - - BPTX_plus_AND_minus.v0 - - - - - - - - - 1 - - - 05 - - - - 050 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 04 - - - - - 7F7F - - - - - 3ffff - - - - - - 0007 - - - - 007 - - - - - - - 1 - - - 05 - - - - 050 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 0d - - - - - 7F7F - - - - - 3ffff - - - - - - 0007 - - - - 007 - - - - - - - 1 - - - 05 - - - - 050 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 17 - - - - - 7F7F - - - - - 3ffff - - - - - - 0007 - - - - 007 - - - - - - 1 - - - 0d - - - 0d - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 15 - - - 15 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 1c - - - 1c - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 1e - - - 1e - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 05 - - - 05 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0a - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 01 - - - 01 - - - - 010 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e0 - - - e0 - - - - - - - 1 - - - 0a - - - 0a - - - - 0a0 - - 0 - - - 0 - - - 0a0 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e8 - - - e8 - - - - - - - 1 - - - 0b - - - 0b - - - - 0b0 - - 0 - - - 0 - - - 0b0 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e8 - - - e8 - - - - - - - 1 - - - 0d - - - 01 - - - - 0d0 - - 0 - - - 0 - - - 010 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e8 - - - fc - - - - - - - 1 - - - 0d - - - 06 - - - - 0d0 - - 0 - - - 0 - - - 060 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - 8f - - - - - 00 - - - 00 - - - - 1 - - - - e8 - - - e8 - - - - - - - 1 - - - 05 - - - 05 - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0a - - - 0a - - - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 09 - - - 09 - - - - - 3F3F - - - 3F3F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0d - - - 0d - - - - - 3F3F - - - 3F3F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 11 - - - 11 - - - - - 3F3F - - - 3F3F - - - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0 - - - 03c - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 050 - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 064 - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 08c - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 0c8 - - - - - ffffffffffffffffff - - - - - - - 1 - - - 0 - - - 0fa - - - - - 00 - - - - - - - 1 - - - 0 - - - 12c - - - - - 00 - - - - - - - 1 - - - 0 - - - 15e - - - - - 00 - - - - - - - 1 - - - 0 - - - 190 - - - - - 00 - - - - - - - 1 - - - 0 - - - 1f4 - - - - - 00 - - - - - - - 1 - - - 09 - - - 09 - - - 09 - - - 09 - - - - - 7F7F - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0a - - - 0a - - - 0a - - - 0a - - - - - 7F7F - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 15 - - - 15 - - - 15 - - - 15 - - - - - 7F7F - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 08 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0d - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 11 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 17 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 20 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 2c - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 32 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 3c - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0d - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 11 - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 17 - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 20 - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 2c - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 32 - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 3c - - - - - 0F0F - - - - - 3ffff - - - - - - - 1 - - - 05 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 06 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 07 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 08 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0a - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 12 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 14 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 14 - - - - - 3F3F - - - - - 3ffff - - - - - - - 1 - - - 19 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 19 - - - - - 3F3F - - - - - 3ffff - - - - - - - 1 - - - 1c - - - - - 3F3F - - - - - 3ffff - - - - - - - 1 - - - 1e - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 1e - - - - - 3F3F - - - - - 3ffff - - - - - - - 1 - - - 23 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 23 - - - - - 3F3F - - - - - 3ffff - - - - - - - 1 - - - 01 - - - - 010 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - fc - - - - - - - 1 - - - 07 - - - - 070 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 09 - - - - 090 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 0a - - - - 0a0 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 0d - - - - 0d0 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 0e - - - - 0e0 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 0f - - - - 0f0 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 10 - - - - 100 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 10 - - - - 100 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 12 - - - - 120 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 12 - - - - 120 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 13 - - - - 130 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 13 - - - - 130 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 14 - - - - 140 - - 0 - - - 0 - - - - - - FFFFFFFFFFFFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 14 - - - - 140 - - 0 - - - 0 - - - - - - 1FFFFFF01FFFFFF - - - - - 8f - - - - - 00 - - - - 1 - - - - f0 - - - - - - - 1 - - - 05 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 06 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 07 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 08 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0a - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 12 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 14 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 19 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 1e - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 23 - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 23 - - - - - 3F3F - - - - - 3ffff - - - - - - - 1 - - - 05 - - - - - 3F3F - - - - - 3ffff - - - - - - - 1 - - - 0d - - - - - 7F7F - - - - - 3ffff - - - - - - - 1 - - - 0a - - - 0a - - - 0a - - - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - 1 - - - 0a - - - 0a - - - 0a - - - - - 7F7F - - - 7F7F - - - 7F7F - - - - - 3ffff - - - 3ffff - - - 3ffff - - - - - - - - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - TechTrig - - - - - - - - - - - diff --git a/branches/withNewDZ/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py b/branches/withNewDZ/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py index 3de96c398de17..d6804e49a9942 100644 --- a/branches/withNewDZ/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py +++ b/branches/withNewDZ/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py @@ -33,7 +33,7 @@ process.load("L1TriggerConfig.L1GtConfigProducers.l1GtTriggerMenuTester_cfi") process.l1GtTriggerMenuTester.OverwriteHtmlFile = True -process.l1GtTriggerMenuTester.HtmlFile = "L1Menu_Collisions2015_25ns_v1_L1T_Scales_20101224_Imp0_0x102f.html" +process.l1GtTriggerMenuTester.HtmlFile = "L1Menu_Collisions2015_25ns_v0_L1T_Scales_20101224_Imp0_0x102f.html" process.l1GtTriggerMenuTester.UseHltMenu = useHltMenuOption process.l1GtTriggerMenuTester.HltProcessName = processName #process.l1GtTriggerMenuTester.NoThrowIncompatibleMenu = False diff --git a/branches/withNewDZ/PhysicsTools/MVATrainer/src/ProcNormalize.cc b/branches/withNewDZ/PhysicsTools/MVATrainer/src/ProcNormalize.cc index 83b0d953841e2..c9925ccedcb10 100644 --- a/branches/withNewDZ/PhysicsTools/MVATrainer/src/ProcNormalize.cc +++ b/branches/withNewDZ/PhysicsTools/MVATrainer/src/ProcNormalize.cc @@ -46,7 +46,7 @@ class ProcNormalize : public TrainProcessor { virtual bool load() override; virtual void save() override; - + private: enum Iteration { ITER_EMPTY, @@ -174,10 +174,9 @@ void ProcNormalize::configure(DOMElement *elem) if (pdfs.size() != nInputs * nCategories) throw cms::Exception("ProcNormalize") - << "Got " << pdfs.size() - << " pdf configs in total for " << nCategories - << " categories and " << nInputs - << " input varibles (" << (nInputs * nCategories) << " in total)." << std::endl; + << "Got " << (pdfs.size() / nCategories) + << " pdf configs for " << nInputs + << " input varibles." << std::endl; } Calibration::VarProcessor *ProcNormalize::getCalibration() const @@ -523,7 +522,7 @@ void ProcNormalize::save() iter->distr.begin(); iter2 != iter->distr.end(); iter2++) { DOMElement *value = doc->createElement(XMLUniStr("value")); - elem->appendChild(value); + elem->appendChild(value); XMLDocument::writeContent(value, doc, *iter2); } diff --git a/branches/withNewDZ/PhysicsTools/MVATrainer/test/BuildFile.xml b/branches/withNewDZ/PhysicsTools/MVATrainer/test/BuildFile.xml index ae7fced276e68..65c2d1c631c13 100644 --- a/branches/withNewDZ/PhysicsTools/MVATrainer/test/BuildFile.xml +++ b/branches/withNewDZ/PhysicsTools/MVATrainer/test/BuildFile.xml @@ -1,6 +1,5 @@ - - + diff --git a/branches/withNewDZ/PhysicsTools/MVATrainer/test/testMVATrainer.cpp b/branches/withNewDZ/PhysicsTools/MVATrainer/test/testMVATrainer.cpp index 0ff30d26a0403..30d3d2cee496c 100644 --- a/branches/withNewDZ/PhysicsTools/MVATrainer/test/testMVATrainer.cpp +++ b/branches/withNewDZ/PhysicsTools/MVATrainer/test/testMVATrainer.cpp @@ -14,8 +14,6 @@ #include "PhysicsTools/MVATrainer/interface/MVATrainer.h" -#include "FWCore/ParameterSet/interface/FileInPath.h" - using namespace PhysicsTools; static double gauss() @@ -59,8 +57,7 @@ static void train(MVAComputer *computer) void test() { - edm::FileInPath file("PhysicsTools/MVATrainer/test/testMVATrainer.xml"); - MVATrainer trainer(file.fullPath()); + MVATrainer trainer("testMVATrainer.xml"); for(;;) { std::auto_ptr calib( diff --git a/branches/withNewDZ/PhysicsTools/PatAlgos/python/patInputFiles_cff.py b/branches/withNewDZ/PhysicsTools/PatAlgos/python/patInputFiles_cff.py index 960f5630a5b9b..e36e38bc841c5 100644 --- a/branches/withNewDZ/PhysicsTools/PatAlgos/python/patInputFiles_cff.py +++ b/branches/withNewDZ/PhysicsTools/PatAlgos/python/patInputFiles_cff.py @@ -1,67 +1,67 @@ import FWCore.ParameterSet.Config as cms from PhysicsTools.PatAlgos.tools.cmsswVersionTools import pickRelValInputFiles -# /RelValProdTTbar/CMSSW_7_2_0_pre5-START72_V1-v1/AODSIM +# /RelValProdTTbar/CMSSW_7_2_0_pre1-START72_V1-v1/AODSIM filesRelValProdTTbarAODSIM = cms.untracked.vstring( - #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre5' + #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre1' #, relVal = 'RelValProdTTbar' #, globalTag = 'START72_V1' #, dataTier = 'AODSIM' - #, maxVersions = 1 + #, maxVersions = 2 #, numberOfFiles = 1 #, useDAS = True #) - '/store/relval/CMSSW_7_2_0_pre5/RelValProdTTbar/AODSIM/START72_V1-v1/00000/84686BF3-AC30-E411-B9A8-00261894391C.root' + '/store/relval/CMSSW_7_2_0_pre1/RelValProdTTbar/AODSIM/START72_V1-v1/00000/7469A167-12FE-E311-BE14-003048FFD728.root' ) -# /RelValProdTTbar/CMSSW_7_2_0_pre5-START72_V1-v1/GEN-SIM-RECO +# /RelValProdTTbar/CMSSW_7_2_0_pre1-START72_V1-v1/GEN-SIM-RECO filesRelValProdTTbarGENSIMRECO = cms.untracked.vstring( - #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre5' + #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre1' #, relVal = 'RelValProdTTbar' #, globalTag = 'START72_V1' #, dataTier = 'GEN-SIM-RECO' - #, maxVersions = 1 + #, maxVersions = 2 #, numberOfFiles = 1 #, useDAS = True #) - '/store/relval/CMSSW_7_2_0_pre5/RelValProdTTbar/GEN-SIM-RECO/START72_V1-v1/00000/022350A9-AC30-E411-B225-0025905A6076.root' + '/store/relval/CMSSW_7_2_0_pre1/RelValProdTTbar/GEN-SIM-RECO/START72_V1-v1/00000/02F99F3C-03FE-E311-B8D5-0025905AA9CC.root' ) -# /RelValTTbar/CMSSW_7_2_0_pre5-PU_START72_V1_FastSim-v1/GEN-SIM-DIGI-RECO +# /RelValTTbar/CMSSW_7_2_0_pre1-PU_START72_V1_FastSim-v1/GEN-SIM-DIGI-RECO filesRelValTTbarPileUpFastSimGENSIMDIGIRECO = cms.untracked.vstring( - #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre5' + #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre1' #, relVal = 'RelValTTbar' - #, globalTag = 'PU_START71_V5_FastSim' + #, globalTag = 'PU_START72_V1_FastSim' #, dataTier = 'GEN-SIM-DIGI-RECO' - #, maxVersions = 1 + #, maxVersions = 2 #, numberOfFiles = 1 #, useDAS = True #) - '/store/relval/CMSSW_7_2_0_pre5/RelValTTbar/GEN-SIM-DIGI-RECO/PU_START72_V1_FastSim-v1/00000/0082D343-4B30-E411-93C1-0026189438F6.root' + '/store/relval/CMSSW_7_2_0_pre1/RelValTTbar/GEN-SIM-DIGI-RECO/PU_START72_V1_FastSim-v1/00000/002EC191-6EFD-E311-8707-0025905B85D0.root' ) -# /RelValTTbar_13/CMSSW_7_2_0_pre5-PU50ns_POSTLS172_V4-v1/GEN-SIM-RECO +# /RelValTTbar_13/CMSSW_7_2_0_pre1-PU50ns_POSTLS172_V2-v1/GEN-SIM-RECO filesRelValTTbarPileUpGENSIMRECO = cms.untracked.vstring( - #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre5' + #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre1' #, relVal = 'RelValTTbar_13' - #, globalTag = 'PU50ns_POSTLS172_V4' + #, globalTag = 'PU50ns_POSTLS172_V2' #, dataTier = 'GEN-SIM-RECO' - #, maxVersions = 1 + #, maxVersions = 2 #, numberOfFiles = 1 #, useDAS = True #) - '/store/relval/CMSSW_7_2_0_pre5/RelValTTbar_13/GEN-SIM-RECO/PU50ns_POSTLS172_V4-v1/00000/303570F4-6030-E411-B7A6-0025905A60A0.root' + '/store/relval/CMSSW_7_2_0_pre1/RelValTTbar_13/GEN-SIM-RECO/PU50ns_POSTLS172_V2-v1/00000/0AA51FF6-8EFD-E311-B591-0025905A6068.root' ) -# /SingleMu/CMSSW_7_2_0_pre5-GR_R_72_V2_RelVal_mu2012D-v1/RECO +# /SingleMu/CMSSW_7_2_0_pre1-GR_R_72_V1_RelVal_mu2012D-v1/RECO filesSingleMuRECO = cms.untracked.vstring( - #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre5' # not at CERN + #pickRelValInputFiles( cmsswVersion = 'CMSSW_7_2_0_pre1' #, relVal = 'SingleMu' #, dataTier = 'RECO' - #, globalTag = 'GR_R_72_V2_RelVal_mu2012D' - #, maxVersions = 1 + #, globalTag = 'GR_R_72_V1_RelVal_mu2012D' + #, maxVersions = 2 #, numberOfFiles = 1 #, useDAS = True #) - '/store/relval/CMSSW_7_2_0_pre5/SingleMu/RECO/GR_R_72_V2_RelVal_mu2012D-v1/00000/002CC908-9130-E411-B785-003048FFD732.root' + '/store/relval/CMSSW_7_2_0_pre1/SingleMu/RECO/GR_R_72_V1_RelVal_mu2012D-v1/00000/002D1019-ADFD-E311-9230-00259059642A.root' ) diff --git a/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index 324a3602560ec..1fceb445db834 100644 --- a/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -75,25 +75,9 @@ def miniAOD_customizeCommon(process): btagDiscriminators = ['jetBProbabilityBJetTags', 'jetProbabilityBJetTags', 'trackCountingHighPurBJetTags', 'trackCountingHighEffBJetTags', 'simpleSecondaryVertexHighEffBJetTags', 'simpleSecondaryVertexHighPurBJetTags', 'combinedSecondaryVertexBJetTags' , 'combinedInclusiveSecondaryVertexBJetTags' ], ) - - # add CMS top tagger - from RecoJets.JetProducers.caTopTaggers_cff import caTopTagInfos as toptag - process.cmsttRaw = toptag.clone() - process.caTopTagInfos = cms.EDProducer("RecoJetDeltaRTagInfoValueMapProducer", - src = cms.InputTag("ak8PFJetsCHS"), - matched = cms.InputTag("cmsTopTagPFJetsCHS"), - matchedTagInfos = cms.InputTag("cmsttRaw"), - distMax = cms.double(0.8) - ) - - #add AK8 + #add CA8 from PhysicsTools.PatAlgos.tools.jetTools import addJetCollection - addJetCollection(process, labelName = 'AK8', - jetSource = cms.InputTag('ak8PFJetsCHS'), - algo= 'AK', rParam = 0.8, - jetCorrections = ('AK8PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'), - btagInfos = ['caTopTagInfos'] - ) + addJetCollection(process, labelName = 'AK8', jetSource = cms.InputTag('ak8PFJetsCHS'),algo= 'AK', rParam = 0.8, jetCorrections = ('AK7PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None') ) process.patJetsAK8.userData.userFloats.src = [] # start with empty list of user floats process.selectedPatJetsAK8.cut = cms.string("pt > 100") process.patJetGenJetMatchAK8.matched = 'slimmedGenJets' @@ -104,22 +88,21 @@ def miniAOD_customizeCommon(process): process.ak8PFJetsCHSFiltered = ak8PFJetsCHSFiltered.clone() process.load("RecoJets.JetProducers.ak8PFJetsCHS_groomingValueMaps_cfi") process.patJetsAK8.userData.userFloats.src += ['ak8PFJetsCHSPrunedLinks','ak8PFJetsCHSTrimmedLinks','ak8PFJetsCHSFilteredLinks'] + ### CA8 groomed masses (for the matched jet): doesn't seem to work, it produces tons of warnings "Matched jets separated by dR greater than distMax=0.8" + # from RecoJets.Configuration.RecoPFJets_cff import ca8PFJetsCHSFiltered, ca8PFJetsCHSTrimmed # ca8PFJetsCHSPruned is already in AOD + # process.ca8PFJetsCHSTrimmed = ca8PFJetsCHSTrimmed.clone() + # process.ca8PFJetsCHSFiltered = ca8PFJetsCHSFiltered.clone() + # process.load("RecoJets.JetProducers.ca8PFJetsCHS_groomingValueMaps_cfi") + # process.ca8PFJetsCHSPrunedLinks.src = cms.InputTag("ak8PFJetsCHS") + # process.ca8PFJetsCHSTrimmedLinks.src = cms.InputTag("ak8PFJetsCHS") + # process.ca8PFJetsCHSFilteredLinks.src = cms.InputTag("ak8PFJetsCHS") + # process.patJetsAK8.userData.userFloats.src += ['ca8PFJetsCHSPrunedLinks','ca8PFJetsCHSTrimmedLinks','ca8PFJetsCHSFilteredLinks'] + ## cmsTopTagger (note: it is already run in RECO, we just add the value) + process.cmsTopTagPFJetsCHSLinksAK8 = process.ak8PFJetsCHSPrunedLinks.clone() + process.cmsTopTagPFJetsCHSLinksAK8.src = cms.InputTag("ak8PFJetsCHS") + process.cmsTopTagPFJetsCHSLinksAK8.matched = cms.InputTag("cmsTopTagPFJetsCHS") + process.patJetsAK8.userData.userFloats.src += ['cmsTopTagPFJetsCHSLinksAK8'] - # Add AK8 top tagging variables - process.patJetsAK8.tagInfoSources = cms.VInputTag(cms.InputTag("caTopTagInfos")) - process.patJetsAK8.addTagInfos = cms.bool(True) - - - - # add Njetiness - process.load('RecoJets.JetProducers.nJettinessAdder_cfi') - process.NjettinessAK8 = process.Njettiness.clone() - process.NjettinessAK8.src = cms.InputTag("ak8PFJetsCHS") - process.NjettinessAK8.cone = cms.double(0.8) - process.patJetsAK8.userData.userFloats.src += ['NjettinessAK8:tau1','NjettinessAK8:tau2','NjettinessAK8:tau3'] - - - # from PhysicsTools.PatAlgos.tools.trigTools import switchOnTriggerStandAlone switchOnTriggerStandAlone( process, outputModule = '' ) diff --git a/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimmedJets_cfi.py b/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimmedJets_cfi.py index 0cb604c10f77d..256252634ca81 100644 --- a/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimmedJets_cfi.py +++ b/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimmedJets_cfi.py @@ -16,6 +16,6 @@ dropDaughters = cms.string("0"), dropTrackRefs = cms.string("1"), dropSpecific = cms.string("0"), - dropTagInfos = cms.string("0"), + dropTagInfos = cms.string("1"), ) diff --git a/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py b/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py index 583f0e02144c3..b658dd927f7e3 100644 --- a/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py +++ b/branches/withNewDZ/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py @@ -52,9 +52,8 @@ 'keep L1GlobalTriggerReadoutRecord_gtDigis_*_HLT', 'keep *_TriggerResults_*_HLT', 'keep *_TriggerResults_*_PAT', # for MET filters - 'keep patPackedCandidates_lostTracks_*_PAT', - 'keep HcalNoiseSummary_hcalnoise__*', - 'keep *_caTopTagInfos_*_*' + 'keep patPackedCandidates_lostTracks_*_PAT', + 'keep HcalNoiseSummary_hcalnoise__*' ) ) MicroEventContentMC = cms.PSet( diff --git a/branches/withNewDZ/PhysicsTools/PatAlgos/python/tools/jetTools.py b/branches/withNewDZ/PhysicsTools/PatAlgos/python/tools/jetTools.py index ce58140156796..2977f9472c3ea 100644 --- a/branches/withNewDZ/PhysicsTools/PatAlgos/python/tools/jetTools.py +++ b/branches/withNewDZ/PhysicsTools/PatAlgos/python/tools/jetTools.py @@ -327,8 +327,7 @@ def toolCode(self, process): ## load sequences and setups needed fro btagging ## This loads all available btagger, but the ones we need are added to the process by hand later. Only needed to get the ESProducer. Needs improvement #loadWithPostFix(process,"RecoBTag.Configuration.RecoBTag_cff",postfix) - if hasattr( process, 'secondaryVertexNegativeTagInfos' ) == False : - process.load("RecoBTag.Configuration.RecoBTag_cff") + process.load("RecoBTag.Configuration.RecoBTag_cff") #addESProducers(process,'RecoBTag.Configuration.RecoBTag_cff') import RecoBTag.Configuration.RecoBTag_cff as btag import RecoJets.JetProducers.caTopTaggers_cff as toptag @@ -395,8 +394,8 @@ def toolCode(self, process): process.load( 'RecoBTag.SecondaryVertex.bToCharmDecayVertexMerger_cfi' ) if 'caTopTagInfos' in acceptedTagInfos : _newPatJets.addTagInfos = True - if not hasattr( process, 'caTopTagInfos' ) and not hasattr( process, 'caTopTagInfosAK8' ): - process.load( 'RecoJets.JetProducers.caTopTaggers_cff' ) + if not hasattr( process, 'caTopTagInfos' ): + process.load( 'RecoJets.JetProducers.CATopTagInfos_cff' ) else: _newPatJets.addBTagInfo = False _newPatJets.addTagInfos = False diff --git a/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h b/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h index 992a268cae715..a28af668ad85b 100644 --- a/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h +++ b/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h @@ -20,15 +20,15 @@ template< class PhysicsObjectPtr , class SelectorType=VersionedSelector > class VersionedIdProducer : public edm::stream::EDProducer<> { public: - using PhysicsObjectType = typename PhysicsObjectPtr::value_type; + typedef typename PhysicsObjectPtr::value_type PhysicsObjectType; - using Collection = edm::View; - using TokenType = edm::EDGetTokenT; + typedef edm::View Collection; + typedef edm::EDGetTokenT TokenType; explicit VersionedIdProducer(const edm::ParameterSet&); ~VersionedIdProducer() {} - virtual void produce(edm::Event&, const edm::EventSetup&) override; + virtual void produce(edm::Event&, const edm::EventSetup&); private: // ----------member data --------------------------- diff --git a/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedSelector.h b/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedSelector.h index 6bf979d9249a2..0bc6a15447f32 100644 --- a/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedSelector.h +++ b/branches/withNewDZ/PhysicsTools/SelectorUtils/interface/VersionedSelector.h @@ -100,7 +100,7 @@ class VersionedSelector : public Selector { return this->operator()(ref, ret); } - using Selector::operator(); + using typename Selector::operator(); const unsigned char* md55Raw() const { return id_md5_; } bool operator==(const VersionedSelector& other) const { diff --git a/branches/withNewDZ/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py b/branches/withNewDZ/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py index afe8ea8c6cf51..78084ae50a876 100644 --- a/branches/withNewDZ/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py +++ b/branches/withNewDZ/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py @@ -2,8 +2,7 @@ from PhysicsTools.SelectorUtils.centralIDRegistry import central_id_registry -#keep python2.6 compatibility for computing -#import importlib +import importlib #general simple tools for various object types def setupVIDSelection(vidproducer,cutflow): @@ -29,8 +28,7 @@ def addVIDSelectionToPATProducer(patProducer,idProducer,idName): print '\t--- %s:%s added to %s'%(idProducer,idName,patProducer.label()) def setupAllVIDIdsInModule(process,id_module_name,setupFunction,patProducer=None): -# idmod = importlib.import_module(id_module_name) - idmod= __import__(id_module_name) + idmod = importlib.import_module(id_module_name) for name in dir(idmod): item = getattr(idmod,name) if hasattr(item,'idName') and hasattr(item,'cutFlow'): diff --git a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/cmsswWithPythonConfig_cfg.py b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/cmsswWithPythonConfig_cfg.py index 8237d23ea6856..56510ac2ffbe4 100644 --- a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/cmsswWithPythonConfig_cfg.py +++ b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/cmsswWithPythonConfig_cfg.py @@ -2,9 +2,10 @@ process = cms.Process("Test") -from PhysicsTools.PatAlgos.patInputFiles_cff import filesRelValProdTTbarGENSIMRECO process.source = cms.Source("PoolSource", - fileNames = filesRelValProdTTbarGENSIMRECO + fileNames = cms.untracked.vstring( + '/store/relval/CMSSW_7_1_0_pre1/RelValProdTTbar/GEN-SIM-RECO/START70_V5-v1/00000/14842A6B-2086-E311-B5CB-02163E00E8DA.root' + ) ) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) ) diff --git a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/fwliteWithPythonConfig_cfg.py b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/fwliteWithPythonConfig_cfg.py index e13e5a31ecd78..7755559dca3cd 100644 --- a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/fwliteWithPythonConfig_cfg.py +++ b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/fwliteWithPythonConfig_cfg.py @@ -3,7 +3,7 @@ process = cms.PSet() process.fwliteInput = cms.PSet( - fileNames = cms.vstring('root://eoscms//eos/cms/store/relval/CMSSW_7_2_0_pre5/RelValProdTTbar/GEN-SIM-RECO/START72_V1-v1/00000/022350A9-AC30-E411-B225-0025905A6076.root'), ## mandatory + fileNames = cms.vstring('root://eoscms//eos/cms/store/relval/CMSSW_7_1_0_pre1/RelValProdTTbar/GEN-SIM-RECO/START70_V5-v1/00000/14842A6B-2086-E311-B5CB-02163E00E8DA.root'), ## mandatory maxEvents = cms.int32(100), ## optional outputEvery = cms.uint32(10), ## optional ) diff --git a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/select_error_events_cfg.py b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/select_error_events_cfg.py index f23568c94c9ce..090d2720dab93 100644 --- a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/select_error_events_cfg.py +++ b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/select_error_events_cfg.py @@ -8,11 +8,10 @@ ## Options and Output Report process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) -from PhysicsTools.PatAlgos.patInputFiles_cff import filesRelValProdTTbarGENSIMRECO process.source = cms.Source("PoolSource", - fileNames = filesRelValProdTTbarGENSIMRECO, - inputCommands = cms.untracked.vstring("keep *", "drop *_MEtoEDMConverter_*_*") # drop the DQM histograms -) + fileNames = cms.untracked.vstring('/store/relval/CMSSW_7_1_0_pre1/RelValProdTTbar/GEN-SIM-RECO/START70_V5-v1/00000/14842A6B-2086-E311-B5CB-02163E00E8DA.root'), + inputCommands = cms.untracked.vstring("keep *", "drop *_MEtoEDMConverter_*_*") # drop the DQM histograms + ) ## Maximal Number of Events process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) ) diff --git a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexFilter_cfg.py b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexFilter_cfg.py index 48511eea4f296..cc9a9384fd6e0 100644 --- a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexFilter_cfg.py +++ b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexFilter_cfg.py @@ -2,9 +2,10 @@ process = cms.Process("Test") -from PhysicsTools.PatAlgos.patInputFiles_cff import filesRelValProdTTbarGENSIMRECO process.source = cms.Source("PoolSource", - fileNames = filesRelValProdTTbarGENSIMRECO + fileNames = cms.untracked.vstring( + '/store/relval/CMSSW_7_1_0_pre1/RelValProdTTbar/GEN-SIM-RECO/START70_V5-v1/00000/14842A6B-2086-E311-B5CB-02163E00E8DA.root' + ) ) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) ) diff --git a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexObjectFilter_cfg.py b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexObjectFilter_cfg.py index 608897aa2f4ae..7bdd9121ca256 100644 --- a/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexObjectFilter_cfg.py +++ b/branches/withNewDZ/PhysicsTools/UtilAlgos/test/testPrimaryVertexObjectFilter_cfg.py @@ -2,9 +2,10 @@ process = cms.Process("Test") -from PhysicsTools.PatAlgos.patInputFiles_cff import filesRelValProdTTbarGENSIMRECO process.source = cms.Source("PoolSource", - fileNames = filesRelValProdTTbarGENSIMRECO + fileNames = cms.untracked.vstring( + '/store/relval/CMSSW_7_1_0_pre1/RelValProdTTbar/GEN-SIM-RECO/START70_V5-v1/00000/14842A6B-2086-E311-B5CB-02163E00E8DA.root' + ) ) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) ) diff --git a/branches/withNewDZ/RecoBTag/PerformanceDB/plugins/PhysicsPerformanceDBWriterFromFile_WPandPayload_IOV.cc b/branches/withNewDZ/RecoBTag/PerformanceDB/plugins/PhysicsPerformanceDBWriterFromFile_WPandPayload_IOV.cc index b51cb50499448..6fb5911edca53 100644 --- a/branches/withNewDZ/RecoBTag/PerformanceDB/plugins/PhysicsPerformanceDBWriterFromFile_WPandPayload_IOV.cc +++ b/branches/withNewDZ/RecoBTag/PerformanceDB/plugins/PhysicsPerformanceDBWriterFromFile_WPandPayload_IOV.cc @@ -114,7 +114,7 @@ void PhysicsPerformanceDBWriterFromFile_WPandPayload_IOV::beginJob() while (!in.eof()){ float temp; in >> temp; - std::cout <<" Inserting "< - - diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitMultiFitAlgo.h b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitMultiFitAlgo.h index ad9c4f687b1cf..e7af495a2b351 100644 --- a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitMultiFitAlgo.h +++ b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitMultiFitAlgo.h @@ -25,7 +25,7 @@ class EcalUncalibRecHitMultiFitAlgo EcalUncalibRecHitMultiFitAlgo(); ~EcalUncalibRecHitMultiFitAlgo() { }; - EcalUncalibratedRecHit makeRecHit(const EcalDataFrame& dataFrame, const EcalPedestals::Item * aped, const EcalMGPAGainRatio * aGain, const SampleMatrix &noisecor, const FullSampleVector &fullpulse, const FullSampleMatrix &fullpulsecov, const BXVector &activeBX); + EcalUncalibratedRecHit makeRecHit(const EcalDataFrame& dataFrame, const EcalPedestals::Item * aped, const EcalMGPAGainRatio * aGain, const TMatrixDSym &noisecor, const TVectorD &fullpulse, const TMatrixDSym &fullpulsecov, const std::set &activeBX); void disableErrorCalculation() { _computeErrors = false; } private: diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitTimeWeightsAlgo.h b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitTimeWeightsAlgo.h index ff5c58f528c13..cb5a6168b6fc0 100644 --- a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitTimeWeightsAlgo.h +++ b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EcalUncalibRecHitTimeWeightsAlgo.h @@ -17,9 +17,6 @@ #include "CondFormats/EcalObjects/interface/EcalGainRatios.h" #include "CondFormats/EcalObjects/interface/EcalWeightSet.h" -#include "RecoLocalCalo/EcalRecAlgos/interface/EigenMatrixTypes.h" - - #include "TVectorD.h" #include @@ -31,7 +28,7 @@ template class EcalUncalibRecHitTimeWeightsAlgo virtual ~EcalUncalibRecHitTimeWeightsAlgo() { }; /// Compute time - double time(const C& dataFrame, const std::vector &litudes, const EcalPedestals::Item * aped, const EcalMGPAGainRatio * aGain, const FullSampleVector &fullpulse, const EcalWeightSet::EcalWeightMatrix** weights) { + double time(const C& dataFrame, const std::vector &litudes, const EcalPedestals::Item * aped, const EcalMGPAGainRatio * aGain, const TVectorD &fullpulse, const EcalWeightSet::EcalWeightMatrix** weights) { const unsigned int nsample = EcalDataFrame::MAXSAMPLES; @@ -87,7 +84,7 @@ template class EcalUncalibRecHitTimeWeightsAlgo int ipulse = std::distance(amplitudes.begin(),amplit); int bx = ipulse - 5; int firstsamplet = std::max(0,bx + 3); - int offset = 7-3-bx; + int offset = -3-bx; TVectorD pulse; pulse.ResizeTo(nsample); diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EigenMatrixTypes.h b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EigenMatrixTypes.h deleted file mode 100644 index 97adb60648a34..0000000000000 --- a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/EigenMatrixTypes.h +++ /dev/null @@ -1,11 +0,0 @@ -#include - -typedef Eigen::Matrix SampleVector; -typedef Eigen::Matrix FullSampleVector; -typedef Eigen::Matrix PulseVector; -typedef Eigen::Matrix BXVector; -typedef Eigen::Matrix SampleMatrix; -typedef Eigen::Matrix FullSampleMatrix; -typedef Eigen::Matrix PulseMatrix; -typedef Eigen::Matrix SamplePulseMatrix; -typedef Eigen::LLT SampleDecompLLT; diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/PulseChiSqSNNLS.h b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/PulseChiSqSNNLS.h index acedca00a9a3a..21d89f0ffd663 100644 --- a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/PulseChiSqSNNLS.h +++ b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/PulseChiSqSNNLS.h @@ -1,53 +1,69 @@ #ifndef PulseChiSqSNNLS_h #define PulseChiSqSNNLS_h -#include "RecoLocalCalo/EcalRecAlgos/interface/EigenMatrixTypes.h" +#include "TMatrixD.h" +#include "TVectorD.h" +#include "TMatrixDSym.h" +#include "Math/Minimizer.h" +#include "Math/IFunction.h" +#include "RecoLocalCalo/EcalRecAlgos/interface/TDecompCholFast.h" #include #include class PulseChiSqSNNLS { public: - - typedef BXVector::Index Index; - PulseChiSqSNNLS(); ~PulseChiSqSNNLS(); - bool DoFit(const SampleVector &samples, const SampleMatrix &samplecor, double pederr, const BXVector &bxs, const FullSampleVector &fullpulse, const FullSampleMatrix &fullpulsecov); + bool DoFit(const std::vector &samples, const TMatrixDSym &samplecor, double pederr, const std::set &bxs, const TVectorD &fullpulse, const TMatrixDSym &fullpulsecov); - const SamplePulseMatrix &pulsemat() const { return _pulsemat; } - const SampleMatrix &invcov() const { return _invcov; } + const TMatrixD &pulsemat() const { return _pulsemat; } + const TMatrixDSym &invcov() const { return _invcov; } - const PulseVector &X() const { return _ampvecmin; } - const PulseVector &Errors() const { return _errvec; } - const BXVector &BXs() const { return _bxsmin; } + const TVectorD &X() const { return _ampvecmin; } + const TVectorD &Errors() const { return _errvec; } double ChiSq() const { return _chisq; } void disableErrorCalculation() { _computeErrors = false; } protected: - bool Minimize(const SampleMatrix &samplecor, double pederr, const FullSampleMatrix &fullpulsecov); + bool Minimize(const TMatrixDSym &samplecor, double pederr, const std::set &bxs, const TMatrixDSym &fullpulsecov); bool NNLS(); - bool updateCov(const SampleMatrix &samplecor, double pederr, const FullSampleMatrix &fullpulsecov); + bool updateCov(const TMatrixDSym &samplecor, double pederr, const std::set &bxs, const TMatrixDSym &fullpulsecov); double ComputeChiSq(); - double ComputeApproxUncertainty(unsigned int ipulse); - - SampleVector _sampvec; - SampleMatrix _invcov; - SamplePulseMatrix _pulsemat; - PulseVector _ampvec; - PulseVector _errvec; - PulseVector _ampvecmin; - - SampleDecompLLT _covdecomp; - - BXVector _bxs; - BXVector _bxsmin; - unsigned int _nP; + TVectorD _sampvec; + TMatrixDSym _invcov; + TVectorD _workvec; + TMatrixD _pulsemat; + TVectorD _ampvec; + TVectorD _ampvecmin; + TVectorD _errvec; + TMatrixD _workmat; + TMatrixD _aTamat; + TVectorD _wvec; + TVectorD _aTbvec; + TVectorD _aTbcorvec; + TMatrixDSym _aPmat; + TVectorD _sPvec; + TDecompCholFast _decompP; + std::array _pulsematstorage; + std::array _ampvecstorage; + std::array _ampvecminstorage; + std::array _errvecstorage; + std::array _workmatstorage; + std::array _aTamatstorage; + std::array _wvecstorage; + std::array _aTbvecstorage; + std::array _aTbcorvecstorage; + std::array _aPstorage; + std::array _sPstorage; + std::array _decompPstorage; + std::set _idxsP; + std::set _idxsFixed; double _chisq; bool _computeErrors; diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/TDecompCholFast.h b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/TDecompCholFast.h new file mode 100644 index 0000000000000..de505e77d9da9 --- /dev/null +++ b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/interface/TDecompCholFast.h @@ -0,0 +1,13 @@ +#ifndef TDecompCholFast_h +#define TDecompCholFast_h + +#include "TDecompChol.h" + +class TDecompCholFast : public TDecompChol { + public: + TDecompCholFast() {} + + void SetMatrixFast(const TMatrixDSym& a, double *data); +}; + +#endif diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/EcalUncalibRecHitMultiFitAlgo.cc b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/EcalUncalibRecHitMultiFitAlgo.cc index 050317c411e06..7b60af435701d 100644 --- a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/EcalUncalibRecHitMultiFitAlgo.cc +++ b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/EcalUncalibRecHitMultiFitAlgo.cc @@ -10,7 +10,7 @@ EcalUncalibRecHitMultiFitAlgo::EcalUncalibRecHitMultiFitAlgo() : } /// compute rechits -EcalUncalibratedRecHit EcalUncalibRecHitMultiFitAlgo::makeRecHit(const EcalDataFrame& dataFrame, const EcalPedestals::Item * aped, const EcalMGPAGainRatio * aGain, const SampleMatrix &noisecor, const FullSampleVector &fullpulse, const FullSampleMatrix &fullpulsecov, const BXVector &activeBX) { +EcalUncalibratedRecHit EcalUncalibRecHitMultiFitAlgo::makeRecHit(const EcalDataFrame& dataFrame, const EcalPedestals::Item * aped, const EcalMGPAGainRatio * aGain, const TMatrixDSym &noisecor, const TVectorD &fullpulse, const TMatrixDSym &fullpulsecov, const std::set &activeBX) { uint32_t flags = 0; @@ -21,7 +21,7 @@ EcalUncalibratedRecHit EcalUncalibRecHitMultiFitAlgo::makeRecHit(const EcalDataF double pedval = 0.; double pedrms = 0.; - SampleVector amplitudes; + std::vector amplitudes(nsample); for(unsigned int iSample = 0; iSample < nsample; iSample++) { const EcalMGPASample &sample = dataFrame.sample(iSample); @@ -66,6 +66,10 @@ EcalUncalibratedRecHit EcalUncalibRecHitMultiFitAlgo::makeRecHit(const EcalDataF } } + + + std::vector fitvals; + std::vector fiterrs; if(!_computeErrors) _pulsefunc.disableErrorCalculation(); bool status = _pulsefunc.DoFit(amplitudes,noisecor,pedrms,activeBX,fullpulse,fullpulsecov); @@ -75,32 +79,25 @@ EcalUncalibratedRecHit EcalUncalibRecHitMultiFitAlgo::makeRecHit(const EcalDataF edm::LogWarning("EcalUncalibRecHitMultiFitAlgo::makeRecHit") << "Failed Fit" << std::endl; } - unsigned int ipulseintime = 0; - for (unsigned int ipulse=0; ipulse<_pulsefunc.BXs().rows(); ++ipulse) { - if (_pulsefunc.BXs().coeff(ipulse)==0) { - ipulseintime = ipulse; - break; - } - } - + unsigned int ipulseintime = std::distance(activeBX.begin(),activeBX.find(0)); double amplitude = status ? _pulsefunc.X()[ipulseintime] : 0.; double amperr = status ? _pulsefunc.Errors()[ipulseintime] : 0.; double jitter = 0.; - //printf("status = %i\n",int(status)); //printf("amplitude = %5f +- %5f, chisq = %5f\n",amplitude,amperr,chisq); EcalUncalibratedRecHit rh( dataFrame.id(), amplitude , pedval, jitter, chisq, flags ); rh.setAmplitudeError(amperr); - - for (unsigned int ipulse=0; ipulse<_pulsefunc.BXs().rows(); ++ipulse) { - int bx = _pulsefunc.BXs().coeff(ipulse); - if (bx!=0) { - rh.setOutOfTimeAmplitude(bx+5, status ? _pulsefunc.X().coeff(ipulse) : 0.); + for (std::set::const_iterator bxit = activeBX.begin(); bxit!=activeBX.end(); ++bxit) { + int ipulse = std::distance(activeBX.begin(),bxit); + if(*bxit==0) { + rh.setOutOfTimeAmplitude(*bxit+5,0.); + } else { + rh.setOutOfTimeAmplitude(*bxit+5, status ? _pulsefunc.X()[ipulse] : 0.); } } - + return rh; } diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/PulseChiSqSNNLS.cc b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/PulseChiSqSNNLS.cc index 043870e7f826c..a1ad6e53b4581 100644 --- a/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/PulseChiSqSNNLS.cc +++ b/branches/withNewDZ/RecoLocalCalo/EcalRecAlgos/src/PulseChiSqSNNLS.cc @@ -1,14 +1,14 @@ #include "RecoLocalCalo/EcalRecAlgos/interface/PulseChiSqSNNLS.h" #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include PulseChiSqSNNLS::PulseChiSqSNNLS() : + _sampvec(10), + _invcov(10), + _workvec(10), _chisq(0.), _computeErrors(true) { - - Eigen::initParallel(); } @@ -16,110 +16,94 @@ PulseChiSqSNNLS::~PulseChiSqSNNLS() { } -bool PulseChiSqSNNLS::DoFit(const SampleVector &samples, const SampleMatrix &samplecor, double pederr, const BXVector &bxs, const FullSampleVector &fullpulse, const FullSampleMatrix &fullpulsecov) { +bool PulseChiSqSNNLS::DoFit(const std::vector &samples, const TMatrixDSym &samplecor, double pederr, const std::set &bxs, const TVectorD &fullpulse, const TMatrixDSym &fullpulsecov) { - const unsigned int nsample = SampleVector::RowsAtCompileTime; - const unsigned int npulse = bxs.rows(); - - _sampvec = samples; - _bxs = bxs; - - _pulsemat = SamplePulseMatrix::Zero(nsample,npulse); - _ampvec = PulseVector::Zero(npulse); - _errvec = PulseVector::Zero(npulse); - _nP = 0; + const unsigned int nsample = samples.size(); + const unsigned int npulse = bxs.size(); + + //resize matrices using reserved memory on the stack + _pulsemat.Use(nsample,npulse,_pulsematstorage.data()); + _ampvec.Use(npulse,_ampvecstorage.data()); + _ampvecmin.Use(npulse,_ampvecminstorage.data()); + _errvec.Use(npulse,_errvecstorage.data()); + _workmat.Use(npulse,nsample,_workmatstorage.data()); + _aTamat.Use(npulse,npulse,_aTamatstorage.data()); + _wvec.Use(npulse,_wvecstorage.data()); + _aTbvec.Use(npulse,_aTbvecstorage.data()); + _aTbcorvec.Use(npulse,_aTbcorvecstorage.data()); + + //initialize parameters and index index set + _sampvec.SetElements(samples.data()); + _ampvec.Zero(); + _idxsP.clear(); + _idxsFixed.clear(); _chisq = 0.; - + //initialize pulse template matrix - for (unsigned int ipulse=0; ipulse::const_iterator bxit = bxs.begin(); bxit!=bxs.end(); ++bxit) { + int ipulse = std::distance(bxs.begin(),bxit); + int bx = *bxit; int firstsamplet = std::max(0,bx + 3); - int offset = 7-3-bx; - - const unsigned int nsamplepulse = nsample-firstsamplet; - _pulsemat.col(ipulse).segment(firstsamplet,nsamplepulse) = fullpulse.segment(firstsamplet+offset,nsamplepulse); + int offset = -3-bx; + + for (unsigned int isample = firstsamplet; isample::const_iterator itintime = _idxsP.find(ipulseintime); + if (itintime != _idxsP.end()) { + _idxsP.erase(itintime); } - } - if (!foundintime) return status; - - const unsigned int ipulseintimemin = ipulseintime; - - double approxerr = ComputeApproxUncertainty(ipulseintime); - double chisq0 = _chisq; - double x0 = _ampvecmin[ipulseintime]; - - //move in time pulse first to active set if necessary - if (ipulseintime<_nP) { - _pulsemat.col(_nP-1).swap(_pulsemat.col(ipulseintime)); - std::swap(_ampvec.coeffRef(_nP-1),_ampvec.coeffRef(ipulseintime)); - std::swap(_bxs.coeffRef(_nP-1),_bxs.coeffRef(ipulseintime)); - ipulseintime = _nP - 1; - --_nP; - } - - - SampleVector pulseintime = _pulsemat.col(ipulseintime); - _pulsemat.col(ipulseintime).setZero(); - - //two point interpolation for upper uncertainty when amplitude is away from boundary - double xplus100 = x0 + approxerr; - _ampvec.coeffRef(ipulseintime) = xplus100; - _sampvec = samples - _ampvec.coeff(ipulseintime)*pulseintime; - status &= Minimize(samplecor,pederr,fullpulsecov); - if (!status) return status; - double chisqplus100 = ComputeChiSq(); - - double sigmaplus = std::abs(xplus100-x0)/sqrt(chisqplus100-chisq0); - - //if amplitude is sufficiently far from the boundary, compute also the lower uncertainty and average them - if ( (x0/sigmaplus) > 0.5 ) { - for (unsigned int ipulse=0; ipulse 0.5 ) { + double xminus100 = std::max(0.,x0-_errvec[ipulseintime]); + _ampvec[ipulseintime] = xminus100; + status &= Minimize(samplecor,pederr,bxs,fullpulsecov); + if (!status) return status; + double chisqminus100 = ComputeChiSq(); + + double sigmaminus = std::abs(xminus100-x0)/sqrt(chisqminus100-chisq0); + _errvec[ipulseintime] = 0.5*(sigmaplus + sigmaminus); + + } + else { + _errvec[ipulseintime] = sigmaplus; + } + + _chisq = chisq0; } - else { - _errvec[ipulseintimemin] = sigmaplus; - } - - _chisq = chisq0; - + return status; } -bool PulseChiSqSNNLS::Minimize(const SampleMatrix &samplecor, double pederr, const FullSampleMatrix &fullpulsecov) { +bool PulseChiSqSNNLS::Minimize(const TMatrixDSym &samplecor, double pederr, const std::set &bxs, const TMatrixDSym &fullpulsecov) { const int maxiter = 50; @@ -132,7 +116,7 @@ bool PulseChiSqSNNLS::Minimize(const SampleMatrix &samplecor, double pederr, con break; } - status = updateCov(samplecor,pederr,fullpulsecov); + status = updateCov(samplecor,pederr,bxs,fullpulsecov); if (!status) break; status = NNLS(); if (!status) break; @@ -151,47 +135,42 @@ bool PulseChiSqSNNLS::Minimize(const SampleMatrix &samplecor, double pederr, con } -bool PulseChiSqSNNLS::updateCov(const SampleMatrix &samplecor, double pederr, const FullSampleMatrix &fullpulsecov) { +bool PulseChiSqSNNLS::updateCov(const TMatrixDSym &samplecor, double pederr, const std::set &bxs, const TMatrixDSym &fullpulsecov) { - const unsigned int nsample = SampleVector::RowsAtCompileTime; - const unsigned int npulse = _bxs.rows(); + const unsigned int nsample = _sampvec.GetNrows(); - _invcov.triangularView() = (pederr*pederr)*samplecor; + _invcov = samplecor; + _invcov *= pederr*pederr; - for (unsigned int ipulse=0; ipulse::const_iterator bxit = bxs.begin(); bxit!=bxs.end(); ++bxit) { + int ipulse = std::distance(bxs.begin(),bxit); + if (_ampvec[ipulse]==0.) continue; + int bx = *bxit; int firstsamplet = std::max(0,bx + 3); - int offset = 7-3-bx; + int offset = -3-bx; - double ampsq = _ampvec.coeff(ipulse)*_ampvec.coeff(ipulse); - - const unsigned int nsamplepulse = nsample-firstsamplet; - _invcov.block(firstsamplet,firstsamplet,nsamplepulse,nsamplepulse).triangularView() += ampsq*fullpulsecov.block(firstsamplet+offset,firstsamplet+offset,nsamplepulse,nsamplepulse); + double ampsq = _ampvec[ipulse]*_ampvec[ipulse]; + for (unsigned int isample = firstsamplet; isample() = invcovp.transpose()*invcovp; - aTamat = aTamat.selfadjointView(); - PulseVector aTbvec = invcovp.transpose()*_covdecomp.matrixL().solve(_sampvec); - + unsigned int nsample = _sampvec.GetNrows(); - PulseVector wvec(npulse); + _workmat.TMult(_pulsemat,_invcov); + _aTamat.Mult(_workmat,_pulsemat); + _aTbvec = _workmat*_sampvec; + //correct for possible effect of non-zero fixed amplitudes + _workvec = _sampvec; + for (std::set::const_iterator itidx=_idxsFixed.begin(); itidx!=_idxsFixed.end(); ++itidx) { + for (unsigned int isample=0; isample0 || _nP==0) { - if ( _nP==npulse ) break; + if (iter>0 || !_idxsP.size()) { + if ( (_idxsP.size()+_idxsFixed.size())==npulse ) break; - const unsigned int nActive = npulse - _nP; - - wvec.tail(nActive) = aTbvec.tail(nActive) - (aTamat.selfadjointView()*_ampvec).tail(nActive); + //compute derivatives + _wvec = _ampvec; + _wvec *= _aTamat; + _wvec -= _aTbvec; + _wvec *= -1.0; - Index idxwmax; - double wmax = wvec.tail(nActive).maxCoeff(&idxwmax); + //find wmax in active set + double wmax = -std::numeric_limits::max(); + unsigned int idxwmax = 0; + for (unsigned int idx=0; idxwmax) { + wmax = _wvec[idx]; + idxwmax = idx; + } + } //convergence if (wmax<1e-11) break; //unconstrain parameter - Index idxp = _nP + idxwmax; - //printf("adding index %i, orig index %i\n",int(idxp),int(_bxs.coeff(idxp))); - aTamat.col(_nP).swap(aTamat.col(idxp)); - aTamat.row(_nP).swap(aTamat.row(idxp)); - _pulsemat.col(_nP).swap(_pulsemat.col(idxp)); - std::swap(aTbvec.coeffRef(_nP),aTbvec.coeffRef(idxp)); - std::swap(_ampvec.coeffRef(_nP),_ampvec.coeffRef(idxp)); - std::swap(_bxs.coeffRef(_nP),_bxs.coeffRef(idxp)); - ++_nP; + _idxsP.insert(idxwmax); } while (true) { //printf("iter in, idxsP = %i\n",int(_idxsP.size())); - if (_nP==0) break; + if (_idxsP.size()==0) break; - PulseVector ampvecpermtest = _ampvec; + //trick: resize matrices without reallocating memory + const unsigned int npulseP = _idxsP.size(); + _aPmat.Use(npulseP,_aPstorage.data()); + _sPvec.Use(npulseP,_sPstorage.data()); - //solve for unconstrained parameters - ampvecpermtest.head(_nP) = aTamat.topLeftCorner(_nP,_nP).ldlt().solve(aTbvec.head(_nP)); + //fill reduced matrix AP + for (std::set::const_iterator itidx=_idxsP.begin(); itidx!=_idxsP.end(); ++itidx) { + unsigned int iidx = std::distance(_idxsP.begin(),itidx); + _sPvec(iidx) = _aTbcorvec(*itidx); + for (std::set::const_iterator jtidx=_idxsP.begin(); jtidx!=_idxsP.end(); ++jtidx) { + unsigned int jidx = std::distance(_idxsP.begin(),jtidx); + _aPmat(iidx,jidx) = _aTamat(*itidx,*jtidx); + } + } + + //solve for unconstrained parameters + _decompP.SetMatrixFast(_aPmat,_decompPstorage.data()); + bool status = _decompP.Solve(_sPvec); + if (!status) return false; //check solution - if (ampvecpermtest.head(_nP).minCoeff()>0.) { - _ampvec.head(_nP) = ampvecpermtest.head(_nP); + if (_sPvec.Min()>0.) { + //_ampvec.Zero(); + for (std::set::const_iterator itidx=_idxsP.begin(); itidx!=_idxsP.end(); ++itidx) { + unsigned int iidx = std::distance(_idxsP.begin(),itidx); + _ampvec[*itidx] = _sPvec[iidx]; + } + break; } - - //update parameter vector - Index minratioidx=0; + //update parameter vector double minratio = std::numeric_limits::max(); - for (unsigned int ipulse=0; ipulse<_nP; ++ipulse) { - if (ampvecpermtest.coeff(ipulse)<=0.) { - double ratio = _ampvec.coeff(ipulse)/(_ampvec.coeff(ipulse)-ampvecpermtest.coeff(ipulse)); - if (ratio::const_iterator itidx=_idxsP.begin(); itidx!=_idxsP.end(); ++itidx) { + unsigned int iidx = std::distance(_idxsP.begin(),itidx); + double ratio = _ampvec[*itidx]/(_ampvec[*itidx]-_sPvec[iidx]); + if (_sPvec[iidx]<=0. && ratio::const_iterator itidx=_idxsP.begin(); itidx!=_idxsP.end(); ++itidx) { + unsigned int iidx = std::distance(_idxsP.begin(),itidx); + _ampvec[*itidx] += minratio*(_sPvec[iidx] - _ampvec[*itidx]); + } + + + //printf("fixing indexes\n"); + for (unsigned int ipulse = 0; ipulse::const_iterator itpulse = _idxsP.find(ipulse); + if (itpulse!=_idxsP.end()) { + _ampvec[ipulse] = 0.; + _idxsP.erase(itpulse); + } + } + } } ++iter; } + //compute approximate uncertainties + //(using 1/second derivative since full Hessian is not meaningful in + //presence of positive amplitude boundaries.) + for (unsigned int ipulse=0; ipulse { +class EcalUncalibRecHitProducer : public edm::EDProducer { public: explicit EcalUncalibRecHitProducer(const edm::ParameterSet& ps); diff --git a/branches/withNewDZ/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc b/branches/withNewDZ/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc index a8bbfeedba2c2..7e3b9ca534e87 100644 --- a/branches/withNewDZ/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc +++ b/branches/withNewDZ/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc @@ -17,11 +17,10 @@ EcalUncalibRecHitWorkerMultiFit::EcalUncalibRecHitWorkerMultiFit(const edm::ParameterSet&ps,edm::ConsumesCollector& c) : EcalUncalibRecHitWorkerBaseClass(ps,c), - noisecorEBg12(SampleMatrix::Zero()), noisecorEEg12(SampleMatrix::Zero()), - noisecorEBg6(SampleMatrix::Zero()), noisecorEEg6(SampleMatrix::Zero()), - noisecorEBg1(SampleMatrix::Zero()), noisecorEEg1(SampleMatrix::Zero()), - fullpulseEB(FullSampleVector::Zero()),fullpulseEE(FullSampleVector::Zero()), - fullpulsecovEB(FullSampleMatrix::Zero()),fullpulsecovEE(FullSampleMatrix::Zero()) { + noisecorEBg12(10), noisecorEEg12(10), + noisecorEBg6(10), noisecorEEg6(10), + noisecorEBg1(10), noisecorEEg1(10), + fullpulseEB(12),fullpulseEE(12),fullpulsecovEB(12),fullpulsecovEE(12) { // get the pulse shape, amplitude covariances and noise correlations EcalPulseShapeParameters_ = ps.getParameter("EcalPulseShapeParameters"); @@ -29,10 +28,7 @@ EcalUncalibRecHitWorkerMultiFit::EcalUncalibRecHitWorkerMultiFit(const edm::Para // get the BX for the pulses to be activated std::vector activeBXs = ps.getParameter< std::vector >("activeBXs"); - activeBX.resize(activeBXs.size()); - for (unsigned int ibx=0; ibx("ampErrorCalculation"); @@ -284,9 +280,9 @@ EcalUncalibRecHitWorkerMultiFit::run( const edm::Event & evt, if (((EcalDataFrame)(*itdg)).hasSwitchToGain1()) { gain = 1; } - const SampleMatrix &noisecormat = noisecor(barrel,gain); - const FullSampleVector &fullpulse = barrel ? fullpulseEB : fullpulseEE; - const FullSampleMatrix &fullpulsecov = barrel ? fullpulsecovEB : fullpulsecovEE; + const TMatrixDSym &noisecormat = noisecor(barrel,gain); + const TVectorD &fullpulse = barrel ? fullpulseEB : fullpulseEE; + const TMatrixDSym &fullpulsecov = barrel ? fullpulsecovEB : fullpulsecovEE; uncalibRecHit = multiFitMethod_.makeRecHit(*itdg, aped, aGain, noisecormat,fullpulse,fullpulsecov,activeBX); @@ -406,7 +402,7 @@ EcalUncalibRecHitWorkerMultiFit::run( const edm::Event & evt, } -const SampleMatrix &EcalUncalibRecHitWorkerMultiFit::noisecor(bool barrel, int gain) const { +const TMatrixDSym &EcalUncalibRecHitWorkerMultiFit::noisecor(bool barrel, int gain) const { if (barrel) { if (gain==6) { return noisecorEBg6; @@ -463,8 +459,8 @@ void EcalUncalibRecHitWorkerMultiFit::fillInputs(const edm::ParameterSet& params const std::vector eePulse = params.getParameter< std::vector >("EEPulseShapeTemplate"); int nShapeSamples = ebPulse.size(); for (int i=0; i ebPulseCov = params.getParameter< std::vector >("EBPulseShapeCovariance"); @@ -472,8 +468,8 @@ void EcalUncalibRecHitWorkerMultiFit::fillInputs(const edm::ParameterSet& params for(int k=0; k& amplitudeBins, const std::vector& shiftBins); - const SampleMatrix &noisecor(bool barrel, int gain) const; + const TMatrixDSym &noisecor(bool barrel, int gain) const; // multifit method - SampleMatrix noisecorEBg12; - SampleMatrix noisecorEEg12; - SampleMatrix noisecorEBg6; - SampleMatrix noisecorEEg6; - SampleMatrix noisecorEBg1; - SampleMatrix noisecorEEg1; - FullSampleVector fullpulseEB; - FullSampleVector fullpulseEE; - FullSampleMatrix fullpulsecovEB; - FullSampleMatrix fullpulsecovEE; - BXVector activeBX; + TMatrixDSym noisecorEBg12; + TMatrixDSym noisecorEEg12; + TMatrixDSym noisecorEBg6; + TMatrixDSym noisecorEEg6; + TMatrixDSym noisecorEBg1; + TMatrixDSym noisecorEEg1; + TVectorD fullpulseEB; + TVectorD fullpulseEE; + TMatrixDSym fullpulsecovEB; + TMatrixDSym fullpulsecovEE; + std::set activeBX; bool ampErrorCalculation_; EcalUncalibRecHitMultiFitAlgo multiFitMethod_; diff --git a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.cc b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.cc index 1c0a2e5aef706..c540ab50783c7 100644 --- a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.cc +++ b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.cc @@ -28,7 +28,7 @@ StripCPEESProducer::StripCPEESProducer(const edm::ParameterSet & p) throw cms::Exception("Unknown StripCPE type") << type; cpeNum = enumMap[type]; - parametersPSet = (p.exists("parameters") ? p.getParameter("parameters") : p); + pset = p; setWhatProduced(this,name); } @@ -49,19 +49,19 @@ produce(const TkStripCPERecord & iRecord) switch(cpeNum) { case SIMPLE: - cpe = boost::shared_ptr(new StripCPE( parametersPSet, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); + cpe = boost::shared_ptr(new StripCPE( pset, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); break; case TRACKANGLE: - cpe = boost::shared_ptr(new StripCPEfromTrackAngle( parametersPSet, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); + cpe = boost::shared_ptr(new StripCPEfromTrackAngle( pset, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); break; case GEOMETRIC: - cpe = boost::shared_ptr(new StripCPEgeometric(parametersPSet, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); + cpe = boost::shared_ptr(new StripCPEgeometric(pset, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); break; case TEMPLATE: - cpe = boost::shared_ptr(new StripCPEfromTemplate( parametersPSet, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); + cpe = boost::shared_ptr(new StripCPEfromTemplate( pset, *magfield, *pDD, *lorentzAngle, *backPlaneCorrection, *confObj, *latency )); break; diff --git a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.h b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.h index 62c49ece53620..22e27a494faa0 100644 --- a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.h +++ b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.h @@ -24,7 +24,7 @@ class StripCPEESProducer: public edm::ESProducer { std::map enumMap; CPE_t cpeNum; - edm::ParameterSet parametersPSet; + edm::ParameterSet pset; boost::shared_ptr cpe; }; diff --git a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEESProducer_cfi.py b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEESProducer_cfi.py deleted file mode 100644 index c3dc44c778d9d..0000000000000 --- a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEESProducer_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -stripCPEESProducer = cms.ESProducer("StripCPEESProducer", - ComponentName = cms.string('stripCPE'), - ComponentType = cms.string('SimpleStripCPE'), - parameters = cms.PSet() -) diff --git a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPE_cfi.py b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPE_cfi.py index 6d9ba23c2520a..c979e486eb209 100644 --- a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPE_cfi.py +++ b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPE_cfi.py @@ -1,9 +1,8 @@ import FWCore.ParameterSet.Config as cms -from RecoLocalTracker.SiStripRecHitConverter.StripCPEESProducer_cfi import * -StripCPEESProducer = stripCPEESProducer.clone() -StripCPEESProducer.ComponentName = cms.string('SimpleStripCPE') -StripCPEESProducer.ComponentType = cms.string('SimpleStripCPE') -StripCPEESProducer.parameters = cms.PSet() +StripCPEESProducer = cms.ESProducer("StripCPEESProducer", + ComponentName = cms.string('SimpleStripCPE'), + ComponentType = cms.string('SimpleStripCPE') +) diff --git a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTemplate_cfi.py b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTemplate_cfi.py index c53a9f3e5f83a..566216dc9e238 100644 --- a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTemplate_cfi.py +++ b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTemplate_cfi.py @@ -1,13 +1,11 @@ import FWCore.ParameterSet.Config as cms -from RecoLocalTracker.SiStripRecHitConverter.StripCPEESProducer_cfi import * -StripCPEfromTemplateESProducer = stripCPEESProducer.clone() -StripCPEfromTemplateESProducerComponentName = cms.string('StripCPEfromTemplate') -StripCPEfromTemplateESProducer.ComponentType = cms.string('StripCPEfromTemplate') -StripCPEfromTemplateESProducer.parameters = cms.PSet( - UseTemplateReco = cms.bool(False), - TemplateRecoSpeed = cms.int32(0), - UseStripSplitClusterErrors = cms.bool(False) -) +StripCPEfromTemplateESProducer = cms.ESProducer("StripCPEESProducer", + ComponentName = cms.string('StripCPEfromTemplate'), + ComponentType = cms.string('StripCPEfromTemplate'), + UseTemplateReco = cms.bool(False), + TemplateRecoSpeed = cms.int32(0), + UseStripSplitClusterErrors = cms.bool(False) + ) diff --git a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTrackAngle_cfi.py b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTrackAngle_cfi.py index af2cfcac04d35..9b932610eb76d 100644 --- a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTrackAngle_cfi.py +++ b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTrackAngle_cfi.py @@ -1,22 +1,20 @@ import FWCore.ParameterSet.Config as cms -from RecoLocalTracker.SiStripRecHitConverter.StripCPEESProducer_cfi import * -StripCPEfromTrackAngleESProducer = stripCPEESProducer.clone() -StripCPEfromTrackAngleESProducer.ComponentName = cms.string('StripCPEfromTrackAngle') -StripCPEfromTrackAngleESProducer.ComponentType = cms.string('StripCPEfromTrackAngle') -StripCPEfromTrackAngleESProducer.parameters = cms.PSet( - mLC_P0 = cms.double(-.326), - mLC_P1 = cms.double( .618), - mLC_P2 = cms.double( .300), - mTIB_P0 = cms.double(-.742), - mTIB_P1 = cms.double( .202), - mTOB_P0 = cms.double(-1.026), - mTOB_P1 = cms.double( .253), - mTID_P0 = cms.double(-1.427), - mTID_P1 = cms.double( .433), - mTEC_P0 = cms.double(-1.885), - mTEC_P1 = cms.double( .471), - useLegacyError = cms.bool(False), -) +StripCPEfromTrackAngleESProducer = cms.ESProducer("StripCPEESProducer", + ComponentName = cms.string('StripCPEfromTrackAngle'), + ComponentType = cms.string('StripCPEfromTrackAngle'), + mLC_P0 = cms.double(-.326), + mLC_P1 = cms.double( .618), + mLC_P2 = cms.double( .300), + mTIB_P0 = cms.double(-.742), + mTIB_P1 = cms.double( .202), + mTOB_P0 = cms.double(-1.026), + mTOB_P1 = cms.double( .253), + mTID_P0 = cms.double(-1.427), + mTID_P1 = cms.double( .433), + mTEC_P0 = cms.double(-1.885), + mTEC_P1 = cms.double( .471), + useLegacyError = cms.bool(False), + ) diff --git a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEgeometric_cfi.py b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEgeometric_cfi.py index ac6f234600fad..36b9b36cad747 100644 --- a/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEgeometric_cfi.py +++ b/branches/withNewDZ/RecoLocalTracker/SiStripRecHitConverter/python/StripCPEgeometric_cfi.py @@ -1,14 +1,12 @@ import FWCore.ParameterSet.Config as cms -from RecoLocalTracker.SiStripRecHitConverter.StripCPEESProducer_cfi import * -StripCPEgeometricESProducer = stripCPEESProducer.clone() -StripCPEgeometricESProducer.ComponentName = cms.string('StripCPEgeometric') -StripCPEgeometricESProducer.ComponentType = cms.string('StripCPEgeometric') -StripCPEgeometricESProducer.parameters = cms.PSet( - TanDiffusionAngle = cms.double(0.01), - ThicknessRelativeUncertainty = cms.double(0.02), - NoiseThreshold = cms.double(2.3), - MaybeNoiseThreshold = cms.double(3.5), - UncertaintyScaling = cms.double(1.42), - MinimumUncertainty = cms.double(0.01) +StripCPEgeometricESProducer =cms.ESProducer("StripCPEESProducer", + ComponentName = cms.string('StripCPEgeometric'), + ComponentType = cms.string('StripCPEgeometric'), + TanDiffusionAngle = cms.double(0.01), + ThicknessRelativeUncertainty = cms.double(0.02), + NoiseThreshold = cms.double(2.3), + MaybeNoiseThreshold = cms.double(3.5), + UncertaintyScaling = cms.double(1.42), + MinimumUncertainty = cms.double(0.01), ) diff --git a/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc b/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc index 633896bbb7393..709419dd9b32a 100644 --- a/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc +++ b/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc @@ -386,11 +386,9 @@ SeedClusterRemover::produce(Event& iEvent, const EventSetup& iSetup) LogDebug("SeedClusterRemover")<<"to merge in, "<size()<<" strp and "<size()<<" pxl"; oldStrMask->copyMaskTo(collectedStrips_); oldPxlMask->copyMaskTo(collectedPixels_); - assert(stripClusters->dataSize()>=collectedStrips_.size()); - collectedStrips_.resize(stripClusters->dataSize(),false); // for ondemand }else { - collectedStrips_.resize(stripClusters->dataSize(), false); - collectedPixels_.resize(pixelClusters->dataSize(), false); + collectedStrips_.resize(stripClusters->dataSize()); fill(collectedStrips_.begin(), collectedStrips_.end(), false); + collectedPixels_.resize(pixelClusters->dataSize()); fill(collectedPixels_.begin(), collectedPixels_.end(), false); } @@ -449,8 +447,7 @@ SeedClusterRemover::produce(Event& iEvent, const EventSetup& iSetup) iEvent.put( removedPixelClusterMask ); } - collectedStrips_.clear(); - collectedPixels_.clear(); + } diff --git a/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc b/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc index 38e1b9a223d8a..01e215f7f67d9 100644 --- a/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc +++ b/branches/withNewDZ/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc @@ -292,14 +292,11 @@ void TrackClusterRemover::process(OmniClusterRef const & ocluster, SiStripDetId } if (pblocks_[subdet-1].cutOnStripCharge_ && (clusCharge > (pblocks_[subdet-1].minGoodStripCharge_*sensorThickness(detid)))) return; } - - if (collectedStrips_.size()<=cluster.key()) - edm::LogError("BadCollectionSize")<geographicalId()].insert(cluster); assert(collectedStrips_.size() > cluster.key()); - strips[cluster.key()] = false; + //assert(hit->geographicalId() == cluster->geographicalId()); //This condition fails if (!clusterWasteSolution_) collectedStrips_[cluster.key()]=true; - } @@ -438,11 +435,9 @@ TrackClusterRemover::produce(Event& iEvent, const EventSetup& iSetup) LogDebug("TrackClusterRemover")<<"to merge in, "<size()<<" strp and "<size()<<" pxl"; oldStrMask->copyMaskTo(collectedStrips_); oldPxlMask->copyMaskTo(collectedPixels_); - assert(stripClusters->dataSize()>=collectedStrips_.size()); - collectedStrips_.resize(stripClusters->dataSize(), false); }else { - collectedStrips_.resize(stripClusters->dataSize(), false); - collectedPixels_.resize(pixelClusters->dataSize(), false); + collectedStrips_.resize(stripClusters->dataSize()); fill(collectedStrips_.begin(), collectedStrips_.end(), false); + collectedPixels_.resize(pixelClusters->dataSize()); fill(collectedPixels_.begin(), collectedPixels_.end(), false); } if (doTracks_) { @@ -550,8 +545,7 @@ TrackClusterRemover::produce(Event& iEvent, const EventSetup& iSetup) iEvent.put( removedPixelClusterMask ); } - collectedStrips_.clear(); - collectedPixels_.clear(); + } diff --git a/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignCaloSpecificAlgo.h b/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignCaloSpecificAlgo.h index 8f63aa5de7e87..11e97329736b8 100644 --- a/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignCaloSpecificAlgo.h +++ b/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignCaloSpecificAlgo.h @@ -19,12 +19,12 @@ #define METProducers_SignCaloMETAlgo_h //____________________________________________________________________________|| -#include "DataFormats/METReco/interface/MET.h" #include "DataFormats/METReco/interface/CommonMETData.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Common/interface/View.h" #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/METReco/interface/SigInputObj.h" +#include "TMatrixD.h" namespace metsig { class SignAlgoResolutions; @@ -39,9 +39,9 @@ class SignCaloSpecificAlgo { ~SignCaloSpecificAlgo(); void usePreviousSignif(const std::vector &values); - void usePreviousSignif(const reco::METCovMatrix &matrix) { matrix_ = matrix; } + void usePreviousSignif(const TMatrixD &matrix) { matrix_ = matrix; } double getSignificance(){return significance_;} - reco::METCovMatrix getSignificanceMatrix()const {return matrix_;} + TMatrixD getSignificanceMatrix()const {return matrix_;} void calculateBaseCaloMET(edm::Handle > towers, const CommonMETData& met, const metsig::SignAlgoResolutions & resolutions, bool noHF, double globalthreshold); @@ -50,7 +50,7 @@ class SignCaloSpecificAlgo { std::vector makeVectorOutOfCaloTowers(edm::Handle > towers, const metsig::SignAlgoResolutions& resolutions, bool noHF, double globalthreshold); double significance_; - reco::METCovMatrix matrix_; + TMatrixD matrix_; }; diff --git a/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignPFSpecificAlgo.h b/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignPFSpecificAlgo.h index 8f693cd4dd972..02c8b35df0e64 100644 --- a/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignPFSpecificAlgo.h +++ b/branches/withNewDZ/RecoMET/METAlgorithms/interface/SignPFSpecificAlgo.h @@ -21,8 +21,8 @@ #include "RecoMET/METAlgorithms/interface/significanceAlgo.h" #include "RecoMET/METAlgorithms/interface/SignAlgoResolutions.h" #include "DataFormats/JetReco/interface/PFJet.h" -#include "DataFormats/METReco/interface/MET.h" #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h" +#include "TMatrixD.h" //____________________________________________________________________________|| namespace metsig @@ -39,8 +39,8 @@ namespace metsig void addPFJets(const edm::View* PFJets); void addPFCandidate(reco::PFCandidatePtr pf); void useOriginalPtrs(const edm::ProductID& productID); - reco::METCovMatrix getSignifMatrix() const {return algo_.getSignifMatrix();} - reco::METCovMatrix mkSignifMatrix(edm::Handle > &PFCandidates); + TMatrixD getSignifMatrix() const {return algo_.getSignifMatrix();} + TMatrixD mkSignifMatrix(edm::Handle > &PFCandidates); private: metsig::SignAlgoResolutions *resolutions_; diff --git a/branches/withNewDZ/RecoMET/METAlgorithms/interface/significanceAlgo.h b/branches/withNewDZ/RecoMET/METAlgorithms/interface/significanceAlgo.h index 1c2cf0d2cf544..d5fec606ff720 100644 --- a/branches/withNewDZ/RecoMET/METAlgorithms/interface/significanceAlgo.h +++ b/branches/withNewDZ/RecoMET/METAlgorithms/interface/significanceAlgo.h @@ -77,7 +77,6 @@ #include #include "DataFormats/METReco/interface/SigInputObj.h" -#include "DataFormats/METReco/interface/MET.h" #include "TMatrixTBase.h" #include "TMatrixD.h" #include "TVectorD.h" @@ -88,18 +87,18 @@ namespace metsig{ significanceAlgo(); ~significanceAlgo(); - const void addSignifMatrix(const reco::METCovMatrix &input); - const void setSignifMatrix(const reco::METCovMatrix &input,const double &met_r, const double &met_phi, const double &met_set); + const void addSignifMatrix(const TMatrixD &input); + const void setSignifMatrix(const TMatrixD &input,const double &met_r, const double &met_phi, const double &met_set); const double significance(double& met_r, double& met_phi, double& met_set); const void addObjects(const std::vector& EventVec); const void subtractObjects(const std::vector& EventVec); - reco::METCovMatrix getSignifMatrix() const {return signifmatrix_;} + TMatrixD getSignifMatrix() const {return signifmatrix_;} // const std::vector eventVec(){return eventVec_;} private: - void rotateMatrix( Double_t theta, reco::METCovMatrix &v); + void rotateMatrix( Double_t theta, TMatrixD &v); // std::vector eventVec_; - reco::METCovMatrix signifmatrix_; + TMatrixD signifmatrix_; // workers: double set_worker_; double xmet_; diff --git a/branches/withNewDZ/RecoMET/METAlgorithms/src/SignCaloSpecificAlgo.cc b/branches/withNewDZ/RecoMET/METAlgorithms/src/SignCaloSpecificAlgo.cc index ff18eaa37a33c..622c9f8ba3be8 100644 --- a/branches/withNewDZ/RecoMET/METAlgorithms/src/SignCaloSpecificAlgo.cc +++ b/branches/withNewDZ/RecoMET/METAlgorithms/src/SignCaloSpecificAlgo.cc @@ -23,7 +23,8 @@ using namespace std; //____________________________________________________________________________|| SignCaloSpecificAlgo::SignCaloSpecificAlgo(): - significance_(0.) + significance_(0.), + matrix_(2,2) { matrix_(0,0)=matrix_(1,0)=matrix_(0,1)=matrix_(1,1)=0.; } diff --git a/branches/withNewDZ/RecoMET/METAlgorithms/src/SignPFSpecificAlgo.cc b/branches/withNewDZ/RecoMET/METAlgorithms/src/SignPFSpecificAlgo.cc index e2b252df38a9d..15214a95e122f 100644 --- a/branches/withNewDZ/RecoMET/METAlgorithms/src/SignPFSpecificAlgo.cc +++ b/branches/withNewDZ/RecoMET/METAlgorithms/src/SignPFSpecificAlgo.cc @@ -78,7 +78,7 @@ void metsig::SignPFSpecificAlgo::addPFCandidate(reco::PFCandidatePtr pf) } //____________________________________________________________________________|| -reco::METCovMatrix metsig::SignPFSpecificAlgo::mkSignifMatrix(edm::Handle > &PFCandidates) +TMatrixD metsig::SignPFSpecificAlgo::mkSignifMatrix(edm::Handle > &PFCandidates) { useOriginalPtrs(PFCandidates.id()); for(edm::View::const_iterator iParticle = (PFCandidates.product())->begin(); iParticle != (PFCandidates.product())->end(); ++iParticle ) diff --git a/branches/withNewDZ/RecoMET/METAlgorithms/src/significanceAlgo.cc b/branches/withNewDZ/RecoMET/METAlgorithms/src/significanceAlgo.cc index 616b991cb247c..a4da5dec29cc3 100644 --- a/branches/withNewDZ/RecoMET/METAlgorithms/src/significanceAlgo.cc +++ b/branches/withNewDZ/RecoMET/METAlgorithms/src/significanceAlgo.cc @@ -26,6 +26,7 @@ metsig::significanceAlgo::significanceAlgo(): // eventVec_(0), + signifmatrix_(2,2), set_worker_(0), xmet_(0), ymet_(0) @@ -38,20 +39,25 @@ metsig::significanceAlgo::significanceAlgo(): //******* Add an existing significance matrix to the algo, so that the vector sum can be continued. Only makes sense if matrix is empty or you want to purposefully increase uncertainties (for example in systematic studies)! const void -metsig::significanceAlgo::addSignifMatrix(const reco::METCovMatrix& input){ - signifmatrix_+=input; +metsig::significanceAlgo::addSignifMatrix(const TMatrixD &input){ + // check that the matrix is size 2: + if(input.GetNrows()==2 && input.GetNcols()==2) { + signifmatrix_+=input; + } return; } //////////////////////// /// reset the signficance matrix (this is the most likely case), so that the vector sum can be continued const void -metsig::significanceAlgo::setSignifMatrix(const reco::METCovMatrix &input,const double &met_r, const double &met_phi, const double &met_set){ - signifmatrix_=input; - set_worker_=met_set; - xmet_=met_r*cos(met_phi); - ymet_=met_r*sin(met_phi); - +metsig::significanceAlgo::setSignifMatrix(const TMatrixD &input,const double &met_r, const double &met_phi, const double &met_set){ + // check that the matrix is size 2: + if(input.GetNrows()==2 && input.GetNcols()==2) { + signifmatrix_=input; + set_worker_=met_set; + xmet_=met_r*cos(met_phi); + ymet_=met_r*sin(met_phi); + } return; } @@ -63,11 +69,11 @@ metsig::significanceAlgo::~significanceAlgo(){ // //*** rotate a 2D matrix by angle theta **********************// void -metsig::significanceAlgo::rotateMatrix( Double_t theta, reco::METCovMatrix &v) +metsig::significanceAlgo::rotateMatrix( Double_t theta, TMatrixD &v) { // I suggest not using this to rotate trivial matrices. - reco::METCovMatrix r; - reco::METCovMatrix rInv; + TMatrixD r(2,2); + TMatrixD rInv(2,2); r(0,0) = cos(theta); r(0,1) = sin(theta); r(1,0) = -sin(theta); r(1,1) = cos(theta); rInv = r; @@ -81,7 +87,7 @@ metsig::significanceAlgo::rotateMatrix( Double_t theta, reco::METCovMatrix &v) const void metsig::significanceAlgo::subtractObjects(const std::vector& eventVec) { - reco::METCovMatrix v_tot = signifmatrix_; + TMatrixD v_tot = signifmatrix_; //--- Loop over physics objects in the event ---// // for(unsigned int objnum=1; objnum < EventVec.size(); objnum++ ) { for(std::vector::const_iterator obj = eventVec.begin(); obj!= eventVec.end(); ++obj){ @@ -115,7 +121,7 @@ metsig::significanceAlgo::subtractObjects(const std::vector const void metsig::significanceAlgo::addObjects(const std::vector& eventVec) { - reco::METCovMatrix v_tot = signifmatrix_; + TMatrixD v_tot = signifmatrix_; //--- Loop over physics objects in the event ---// // for(unsigned int objnum=1; objnum < EventVec.size(); objnum++ ) { for(std::vector::const_iterator obj = eventVec.begin(); obj!= eventVec.end(); ++obj){ @@ -156,8 +162,8 @@ metsig::significanceAlgo::significance(double &met_r, double &met_phi, double &m //--- Temporary variables ---// - reco::METCovMatrix v_tot; - ROOT::Math::SVector metvec; + TMatrixD v_tot(2,2); + TVectorD metvec(2); //--- Initialize sum of rotated covariance matrices ---// v_tot=signifmatrix_; @@ -172,9 +178,7 @@ metsig::significanceAlgo::significance(double &met_r, double &met_phi, double &m // one other option: if particles cancel there could be small numbers. // this check fixes this, added by F.Blekman - double det=0; - v_tot.Det(det); - if(fabs(det)<0.000001) + if(fabs(v_tot.Determinant())<0.000001) return -1; @@ -186,7 +190,7 @@ metsig::significanceAlgo::significance(double &met_r, double &met_phi, double &m metvec(0) = xmet_; metvec(1) = ymet_; - double lnSignificance = ROOT::Math::Dot(metvec, (v_tot * metvec) ); + double lnSignificance = metvec * (v_tot * metvec); // v_tot.Invert(); // std::cout << "INVERTED AGAIN:\n"<< v_tot(0,0) << "," << v_tot(0,1) << "\n" << v_tot(1,0) << "," << v_tot(1,1) << std::endl; diff --git a/branches/withNewDZ/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackCleanerBySharedHits.cc b/branches/withNewDZ/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackCleanerBySharedHits.cc index 02c8c4f86f5f5..dcde4b9012a36 100644 --- a/branches/withNewDZ/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackCleanerBySharedHits.cc +++ b/branches/withNewDZ/RecoPixelVertexing/PixelTrackFitting/src/PixelTrackCleanerBySharedHits.cc @@ -30,29 +30,28 @@ TracksWithRecHits PixelTrackCleanerBySharedHits::cleanTracks(const TracksWithRec const TrackerTopology *tTopo) { typedef std::vector RecHits; - vector cleanedTracks; + LogDebug("PixelTrackCleanerBySharedHits") << "Cleanering tracks" << "\n"; - unsigned int size = trackHitPairs.size(); - if (size == 0) return cleanedTracks; + int size = trackHitPairs.size(); bool trackOk[size]; - for (auto i = 0U; i < size; i++) trackOk[i] = true; + for (int i = 0; i < size; i++) trackOk[i] = true; - for (auto iTrack1 = 0U; iTrack1 < size; iTrack1++) { + for (auto iTrack1 = 0; iTrack1 < size; iTrack1++) { auto track1 = trackHitPairs[iTrack1].first; const RecHits& recHits1 = trackHitPairs[iTrack1].second; if (!trackOk[iTrack1]) continue; - for (auto iTrack2 = iTrack1 + 1U; iTrack2 < size; iTrack2++) + for (auto iTrack2 = iTrack1 + 1; iTrack2 < size; iTrack2++) { if ( !trackOk[iTrack2]) continue; auto track2 = trackHitPairs[iTrack2].first; const RecHits& recHits2 = trackHitPairs[iTrack2].second; - auto commonRecHits = 0U; + int commonRecHits = 0; for (auto iRecHit1 = 0U; iRecHit1 < recHits1.size(); iRecHit1++) { for (auto iRecHit2 = 0U; iRecHit2 < recHits2.size(); iRecHit2++) { if (recHitsAreEqual(recHits1[iRecHit1], recHits2[iRecHit2])) { commonRecHits++; break;} // if a hit is common, no other can be the same! @@ -68,10 +67,14 @@ TracksWithRecHits PixelTrackCleanerBySharedHits::cleanTracks(const TracksWithRec } } - for (auto i = 0U; i < size; i++) + vector cleanedTracks; + + for (int i = 0; i < size; i++) { if (trackOk[i]) cleanedTracks.push_back(trackHitPairs[i]); else delete trackHitPairs[i].first; } return cleanedTracks; } + + diff --git a/branches/withNewDZ/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationByIsolation_cfi.py b/branches/withNewDZ/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationByIsolation_cfi.py index e7a9d5ddf6154..d395f033c7609 100644 --- a/branches/withNewDZ/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationByIsolation_cfi.py +++ b/branches/withNewDZ/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationByIsolation_cfi.py @@ -14,6 +14,7 @@ # Select which collections to use for isolation. You can select one or both ApplyDiscriminationByECALIsolation = cms.bool(True), # use PFGammas when isolating ApplyDiscriminationByTrackerIsolation = cms.bool(True), # use PFChargedHadr when isolating + ApplyDiscriminationByWeightedECALIsolation = cms.bool(False), #do not use pileup weighting of neutral deposits by default applyOccupancyCut = cms.bool(True), # apply a cut on number of isolation objects maximumOccupancy = cms.uint32(0), # no tracks > 1 GeV or gammas > 1.5 GeV allowed @@ -50,5 +51,8 @@ applyRhoCorrection = cms.bool(False), rhoProducer = cms.InputTag("fixedGridRhoFastjetAll"), rhoConeSize = cms.double(0.5), - rhoUEOffsetCorrection = cms.double(1.0) + rhoUEOffsetCorrection = cms.double(1.0), + UseAllPFCandsForWeights = cms.bool(False), + verbosity = cms.int32(0) + ) diff --git a/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/DuplicateListMerger.cc b/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/DuplicateListMerger.cc index 2b35f21e6d0cd..62cd4fa43f0ee 100644 --- a/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/DuplicateListMerger.cc +++ b/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/DuplicateListMerger.cc @@ -192,6 +192,9 @@ void DuplicateListMerger::produce(edm::Event& iEvent, const edm::EventSetup& iSe std::auto_ptr outputSeeds; edm::RefProd< TrajectorySeedCollection > refTrajSeeds; + const int rSize = (int)originalHandle->size(); + edm::RefToBase seedsRefs[rSize]; + edm::Handle > originalMVAStore; edm::Handle > mergedMVAStore; @@ -334,6 +337,7 @@ void DuplicateListMerger::produce(edm::Event& iEvent, const edm::EventSetup& iSe track.outerStateCovariance(), track.outerDetId(), track.innerStateCovariance(), track.innerDetId(), track.seedDirection(), origSeedRef ) ); + seedsRefs[(*matchIter0).first]=origSeedRef; out_generalTracks->back().setExtra( reco::TrackExtraRef( refTrkExtras, outputTrkExtras->size() - 1) ); reco::TrackExtra & tx = outputTrkExtras->back(); tx.setResiduals(track.residuals()); @@ -431,6 +435,7 @@ void DuplicateListMerger::produce(edm::Event& iEvent, const edm::EventSetup& iSe track.outerStateCovariance(), track.outerDetId(), track.innerStateCovariance(), track.innerDetId(), track.seedDirection(), origSeedRef ) ); + seedsRefs[i]=origSeedRef; out_generalTracks->back().setExtra( reco::TrackExtraRef( refTrkExtras, outputTrkExtras->size() - 1) ); reco::TrackExtra & tx = outputTrkExtras->back(); tx.setResiduals(track.residuals()); diff --git a/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.cc b/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.cc index b8a959e699045..62ae945f5abb4 100644 --- a/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.cc +++ b/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.cc @@ -187,7 +187,7 @@ MultiTrackSelector::~MultiTrackSelector() { } -void MultiTrackSelector::beginStream(edm::StreamID) { +void MultiTrackSelector::beginJob() { if(!useForestFromDB_){ TFile gbrfile(dbFileName_.c_str()); forest_ = (GBRForest*)gbrfile.Get(forestLabel_.c_str()); diff --git a/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.h b/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.h index 760dbdbf61e68..872a12c010cc9 100644 --- a/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.h +++ b/branches/withNewDZ/RecoTracker/FinalTrackSelectors/plugins/MultiTrackSelector.h @@ -15,7 +15,7 @@ #include #include #include -#include "FWCore/Framework/interface/stream/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" @@ -32,7 +32,7 @@ #include "CommonTools/Utils/interface/StringCutObjectSelector.h" #include "CondFormats/EgammaObjects/interface/GBRForest.h" - class dso_hidden MultiTrackSelector : public edm::stream::EDProducer<> { + class dso_hidden MultiTrackSelector : public edm::global::EDProducer<> { private: public: /// constructor @@ -42,7 +42,7 @@ virtual ~MultiTrackSelector() ; protected: - void beginStream(edm::StreamID) override final; + void beginJob() final; // void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const final { // init(); @@ -52,7 +52,7 @@ typedef math::XYZPoint Point; /// process one event - void produce(edm::Event& evt, const edm::EventSetup& es ) override final { + void produce(edm::StreamID, edm::Event& evt, const edm::EventSetup& es ) const final { run(evt,es); } virtual void run( edm::Event& evt, const edm::EventSetup& es ) const; @@ -87,7 +87,6 @@ /// vertex cuts std::vector vtxNumber_; - //StringCutObjectSelector is not const thread safe std::vector > vertexCut_; // parameters for adapted optimal cuts on chi2 and primary vertex compatibility diff --git a/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/HSCPHLTFilter.cc b/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/HSCPHLTFilter.cc index a856ff5e1bb1f..9e61709c1cfc1 100644 --- a/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/HSCPHLTFilter.cc +++ b/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/HSCPHLTFilter.cc @@ -105,7 +105,7 @@ bool HSCPHLTFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) //}fflush(stdout); edm::Handle< trigger::TriggerEvent > trEvHandle; - iEvent.getByToken(trEvToken, trEvHandle); + iEvent.getByLabel("hltTriggerSummaryAOD", trEvHandle); trigger::TriggerEvent trEv = *trEvHandle; CountEvent++; diff --git a/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/MuonSegmentProducer.cc b/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/MuonSegmentProducer.cc index 35ee5f9c59fd6..273e8a06533a0 100644 --- a/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/MuonSegmentProducer.cc +++ b/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/MuonSegmentProducer.cc @@ -55,8 +55,8 @@ class MuonSegmentProducer : public edm::EDProducer { virtual void produce(edm::Event&, const edm::EventSetup&); virtual void endJob() ; - edm::EDGetTokenT< CSCSegmentCollection > m_cscSegmentToken; - edm::EDGetTokenT< DTRecSegment4DCollection > m_dtSegmentToken; + edm::InputTag m_cscSegmentTag; + edm::InputTag m_dtSegmentTag; }; using namespace susybsm; @@ -65,9 +65,8 @@ MuonSegmentProducer::MuonSegmentProducer(const edm::ParameterSet& iConfig) { using namespace edm; using namespace std; - - m_cscSegmentToken = consumes< CSCSegmentCollection >( iConfig.getParameter("CSCSegments" ) ); - m_dtSegmentToken = consumes< DTRecSegment4DCollection >(iConfig.getParameter("DTSegments" ) ); + m_cscSegmentTag = iConfig.getParameter("CSCSegments"); + m_dtSegmentTag = iConfig.getParameter("DTSegments"); produces(); } @@ -99,7 +98,7 @@ MuonSegmentProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) iSetup.get().get(cscGeom); edm::Handle dtSegments; - iEvent.getByToken(m_dtSegmentToken, dtSegments); + iEvent.getByLabel(m_dtSegmentTag, dtSegments); for (unsigned int d=0; dsize(); d++) { DTRecSegment4DRef SegRef = DTRecSegment4DRef( dtSegments, d ); @@ -113,7 +112,7 @@ MuonSegmentProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) } edm::Handle cscSegments; - iEvent.getByToken(m_cscSegmentToken, cscSegments); + iEvent.getByLabel(m_cscSegmentTag, cscSegments); for (unsigned int c=0; csize(); c++) { CSCSegmentRef SegRef = CSCSegmentRef( cscSegments, c ); diff --git a/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/SimHitShifter.cc b/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/SimHitShifter.cc index 16f120250146b..c8e772fe3569f 100644 --- a/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/SimHitShifter.cc +++ b/branches/withNewDZ/SUSYBSMAnalysis/HSCP/plugins/SimHitShifter.cc @@ -1,3 +1,7 @@ + +//FIXME THIS FILE NEED A BIG CLEANING... (Loic) + + // -*- C++ -*- // // Package: SimHitShifter @@ -5,14 +9,15 @@ // /**\class SimHitShifter SimHitShifter.cc simhitshifter/SimHitShifter/src/SimHitShifter.cc - Description: [one line class summary] + Description: [one line class summary] - Implementation: - [Notes on implementation] + Implementation: + [Notes on implementation] */ // // Original Author: Camilo Andres Carrillo Montoya,40 2-B15,+41227671625, // Created: Mon Aug 30 18:35:05 CEST 2010 +// $Id: SimHitShifter.cc,v 1.3 2012/08/15 14:41:07 querten Exp $ // // @@ -91,6 +96,8 @@ #include "TROOT.h" #include "TMath.h" #include "TCanvas.h" +#include "TRandom3.h" +#include "TStopwatch.h" //Track #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" @@ -101,55 +108,178 @@ #include +using std::cout; +using std::endl; // // class declaration // class SimHitShifter : public edm::EDProducer { - public: - explicit SimHitShifter(const edm::ParameterSet&); - ~SimHitShifter(); +public: + explicit SimHitShifter(const edm::ParameterSet&); + ~SimHitShifter(); //edm::ESHandle rpcGeo; - virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; - std::map shiftinfo; + virtual void beginRun(const edm::Run&, const edm::EventSetup&); + std::map shiftinfo; + +private: + bool Debug; + bool KillMuonHits; + bool ShiftAmpMuon; + bool ShiftAmpTrack; + bool RemoveNonSignalTrkHits; + double VaryMuonThresh; + double AmpMuonShiftSize; + double AmpTrackShiftSize; + bool ShiftTiming; + TRandom3 randGlobal; + + int nCSCHits; + int nRPCHits; + int nDTHits; + TH1F* _hProbDT; // probability for a DT hit to be recorded + + bool keepDTMuonHit(double amplitude); + double getProbRecordHit(double dE, bool print=false); + void fillProbKeepDTMuonHit(); + + std::vector particleIds_; + std::string ShiftFileName; + virtual void beginJob(const edm::Run&, const edm::EventSetup&) ; + virtual void produce(edm::Event&, const edm::EventSetup&); + virtual void endJob() ; +}; +double SimHitShifter::getProbRecordHit(double dE, bool print) { + // Calculate probability that a muon DT hit with energy loss dE (in keV) is recorded. + // Do calculation based on email from Anna Meneguzzo, 2012-06-03: + // https://hypernews.cern.ch/HyperNews/CMS/get/dt-performance/118/1/1/1/1/1/1/1.html + // First get expected number of primary ionization electrons. This is done based on a Poisson distribution. + + double _probHitRecord = 0.50; // probability to produce a primary election in a region such that it reaches the wire + // Value from Anna Meneguzzo email, 2012-06-03: + // If you look at fig 3 for example of http://cmsdoc.cern.ch/documents/02/note02_002.pdf the electric + // field lines which arrive on the wire do not cover the entire cell drift region, as can be seen in fig. 3. Approximately + // only one half of the charge reaches the wire and it is there multiplied. In the note Enrico assumes 60% " From fig. 3 we evaluate that the average + // collection factor C is C = 60 %" . I reported 50% indeed it is something between 50% and 60%. + // The 50% is the probability that a primary electron is produced in the region such that it reach the wire. + + int _ntrials = 100000; // number of trials to use to get the probability + double _primElePerKev = 10; // from Anna + double meanPrimEleExp = dE * _primElePerKev; + + TF1 *fPoisson = new TF1("fPoisson", "TMath::Poisson(x,[0])", 0, 20); + fPoisson->SetParameter(0, meanPrimEleExp); + + int nPass = 0; + for (int itrial=0; itrial<_ntrials; itrial++) { + bool passTrial = false; + double numPrimEle = fPoisson->GetRandom(); + int numPrimEleInt = floor(numPrimEle + 0.5); + for (int iEle=0; iEleGetNbinsX(); ibin++) { + double ampGeV = _hProbDT->GetBinCenter(ibin); + double ampKeV = ampGeV * 1.e6; + double prob = getProbRecordHit(ampKeV); + _hProbDT->SetBinContent(ibin, prob); + } +} + +bool SimHitShifter::keepDTMuonHit(double amplitude){ + int ibin = _hProbDT->FindBin(amplitude); + double probKeep = _hProbDT->GetBinContent(ibin); + if (ibin<1) probKeep = 0; + if (ibin>_hProbDT->GetNbinsX()) probKeep = 1.0; + + double randNum = randGlobal.Rndm(); + bool keep = randNum("ShiftFileName","/afs/cern.ch/user/c/carrillo/simhits/CMSSW_3_5_8_patch2/src/simhitshifter/SimHitShifter/Merged_Muon_RawId_Shift.txt"); - - //iSetup.get().get(rpcGeo); - std::ifstream ifin(ShiftFileName.c_str()); int rawId; float offset; - std::cout<<"In the constructor, The name of the file is "<>rawId >>offset; shiftinfo[rawId]=offset; - std::cout<<"rawId ="<("MuonDTHits"); - produces("MuonRPCHits"); + + ShiftTiming = iConfig.getUntrackedParameter("ShiftTiming"); + ShiftAmpMuon = iConfig.getUntrackedParameter("ShiftAmpMuon"); + Debug = iConfig.getUntrackedParameter("Debug"); + KillMuonHits = iConfig.getUntrackedParameter("KillMuonHits"); + RemoveNonSignalTrkHits = iConfig.getUntrackedParameter("RemoveNonSignalTrkHits"); + ShiftAmpTrack = iConfig.getUntrackedParameter("ShiftAmpTrack"); + VaryMuonThresh = iConfig.getUntrackedParameter("VaryMuonThresh"); + // VaryMuonThresh = 0.99; + AmpMuonShiftSize = iConfig.getUntrackedParameter("AmpMuonShiftSize"); + AmpTrackShiftSize = iConfig.getUntrackedParameter("AmpTrackShiftSize"); + particleIds_ = iConfig.getParameter< std::vector >("particleIds"); + + cout << "Running with parameters: " << endl + << " Debug = " << Debug << endl + << " ShiftTiming = " << ShiftTiming << endl + << " ShiftAmpMuon = " << ShiftAmpMuon << endl + << " ShiftAmpTrack = " << ShiftAmpTrack << endl + << " KillMuonHits = " << KillMuonHits << endl + << " RemoveNonSignalTrkHits = " << RemoveNonSignalTrkHits << endl + << " VaryMuonThresh = " << VaryMuonThresh << endl + << " AmpMuonShiftSize = " << AmpMuonShiftSize << endl + << " AmpTrackShiftSize = " << AmpTrackShiftSize << endl + << endl; + + + + if (ShiftTiming || + ShiftAmpMuon || + KillMuonHits) { + produces("MuonCSCHits"); + produces("MuonDTHits"); + produces("MuonRPCHits"); + } + + if (ShiftAmpTrack) { + produces("TrackerHitsPixelBarrelHighTof"); + produces("TrackerHitsPixelBarrelLowTof"); + produces("TrackerHitsPixelEndcapHighTof"); + produces("TrackerHitsPixelEndcapLowTof"); + produces("TrackerHitsTECHighTof"); + produces("TrackerHitsTECLowTof"); + produces("TrackerHitsTIBHighTof"); + produces("TrackerHitsTIBLowTof"); + produces("TrackerHitsTIDHighTof"); + produces("TrackerHitsTIDLowTof"); + produces("TrackerHitsTOBHighTof"); + produces("TrackerHitsTOBLowTof"); + } + + // make plot of probability to keep DT muon hits + fillProbKeepDTMuonHit(); } @@ -158,117 +288,535 @@ SimHitShifter::~SimHitShifter() } void SimHitShifter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){ - using namespace edm; - - //std::cout << " Getting the SimHits " < > theSimHitContainers; - iEvent.getManyByType(theSimHitContainers); - //std::cout << " The Number of sim Hits is " << theSimHitContainers.size() < > theSimHitContainers; + iEvent.getManyByType(theSimHitContainers); + //std::cout << " The Number of sim Hits is " << theSimHitContainers.size() < pcsc(new edm::PSimHitContainer); + std::auto_ptr pdt (new edm::PSimHitContainer); + std::auto_ptr prpc(new edm::PSimHitContainer); + std::auto_ptr ptrk(new edm::PSimHitContainer); + std::auto_ptr ptrkPXBH(new edm::PSimHitContainer); + std::auto_ptr ptrkPXBL(new edm::PSimHitContainer); + std::auto_ptr ptrkPXEH(new edm::PSimHitContainer); + std::auto_ptr ptrkPXEL(new edm::PSimHitContainer); + std::auto_ptr ptrkTECH(new edm::PSimHitContainer); + std::auto_ptr ptrkTECL(new edm::PSimHitContainer); + std::auto_ptr ptrkTIBH(new edm::PSimHitContainer); + std::auto_ptr ptrkTIBL(new edm::PSimHitContainer); + std::auto_ptr ptrkTIDH(new edm::PSimHitContainer); + std::auto_ptr ptrkTIDL(new edm::PSimHitContainer); + std::auto_ptr ptrkTOBH(new edm::PSimHitContainer); + std::auto_ptr ptrkTOBL(new edm::PSimHitContainer); + std::vector theSimHits; + + using std::oct; + using std::dec; + + std::vector simTrackIds; + + Handle simTracksHandle; + iEvent.getByLabel("g4SimHits",simTracksHandle); + const SimTrackContainer simTracks = *(simTracksHandle.product()); + + SimTrackContainer::const_iterator simTrack; + + for (int i = 0; i < int(theSimHitContainers.size()); i++){ + theSimHits.insert(theSimHits.end(),theSimHitContainers.at(i)->begin(),theSimHitContainers.at(i)->end()); + } + + + for (simTrack = simTracks.begin(); simTrack != simTracks.end(); ++simTrack) { + // Check if the particleId is in our list + std::vector::const_iterator partIdItr = find(particleIds_.begin(),particleIds_.end(),simTrack->type()); + if(partIdItr==particleIds_.end()) continue; + if (Debug) cout << "MC Signal: pt = " << (*simTrack).momentum().pt() << endl; + simTrackIds.push_back(simTrack->trackId()); + } + + TRandom3 rand; + + nCSCHits = 0; + nRPCHits = 0; + nDTHits = 0; + + // threshold values from running: + // ~/workdirNewer]$ root -l -b -q 'studyHitAmplitudes.C+' | & tee studyHitAmplitudes.log + // old values, obtained with q=1, m=100 GeV signal MC + // double thresholdCSC = 2.69356e-07; + // double thresholdRPC = 8.32867e-08; + double thresholdDT = 2.70418e-08; + + // new values, for simulated muons: + double thresholdCSC = 3.58981e-07; + double thresholdRPC = 7.58294e-08; + // double thresholdDT = 3.25665e-08; + + thresholdCSC *= 1. + VaryMuonThresh; + thresholdRPC *= 1. + VaryMuonThresh; + thresholdDT *= 1. + VaryMuonThresh; - std::auto_ptr pcsc(new edm::PSimHitContainer); - std::auto_ptr pdt(new edm::PSimHitContainer); - std::auto_ptr prpc(new edm::PSimHitContainer); - std::vector theSimHits; - using std::oct; - using std::dec; - - for (int i = 0; i < int(theSimHitContainers.size()); i++){ - theSimHits.insert(theSimHits.end(),theSimHitContainers.at(i)->begin(),theSimHitContainers.at(i)->end()); - } + if (ShiftTiming || + ShiftAmpMuon || + KillMuonHits) { - for (std::vector::const_iterator iHit = theSimHits.begin(); iHit != theSimHits.end(); iHit++){ - DetId theDetUnitId((*iHit).detUnitId()); - DetId simdetid= DetId((*iHit).detUnitId()); + for (std::vector::const_iterator iHit = theSimHits.begin(); iHit != theSimHits.end(); iHit++){ + DetId theDetUnitId((*iHit).detUnitId()); + DetId simdetid= DetId((*iHit).detUnitId()); - if(simdetid.det()!=DetId::Muon) continue; + if(simdetid.det()!=DetId::Muon) continue; - float newtof = 0; + float newtof = 0; + float newamplitude = 0; - if(simdetid.det()==DetId::Muon && simdetid.subdetId()== MuonSubdetId::RPC){//Only RPCs - //std::cout<<"\t\t We have an RPC Sim Hit! in t="<<(*iHit).timeOfFlight()<<" DetId="<<(*iHit).detUnitId()<KillMuonRate)) prpc->push_back(hit); + + if (!KillMuonHits || (newamplitude>thresholdRPC)) prpc->push_back(hit); // original + // if (!KillMuonHits || (newamplitude>0)) prpc->push_back(hit); // testing + } else if(simdetid.det()==DetId::Muon && simdetid.subdetId()== MuonSubdetId::DT) { //Only DTs + int RawId = simdetid.rawId(); + // std::cout<<"We found a DT simhit the RawId in Dec is"; + // std::cout<push_back(hit); - } - } + // std::cout<<"CSC check newtof"<KillMuonRate)) pcsc->push_back(hit); + + if (!KillMuonHits || (newamplitude>thresholdCSC)) pcsc->push_back(hit); // original + // if (!KillMuonHits || (newamplitude>0)) pcsc->push_back(hit); // testing + } else { // end CSC's + if (Debug) cout << "Warning: Found hit with simdetid.det()==DetId::Muon but not matched to CSC, RPC, or DT." << endl; + } + + } // for (std::vector::const_iterator iHit = theSimHits.begin(); iHit != theSimHits.end(); iHit++){ - std::cout<<"Putting collections in the event"< PxlBrlHighContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsPixelBarrelHighTof",PxlBrlHighContainer); + if (!PxlBrlHighContainer.isValid()) { + edm::LogError("TrackerHitAnalyzer::analyze") + << "Unable to find TrackerHitsPixelBarrelHighTof in event!"; + return; + } + + + ///////////////////////////////// + // get Pixel Forward information + //////////////////////////////// + // extract low container + edm::Handle PxlFwdLowContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsPixelEndcapLowTof",PxlFwdLowContainer); + if (!PxlFwdLowContainer.isValid()) { + edm::LogError("TrackerHitAnalyzer::analyze") + << "Unable to find TrackerHitsPixelEndcapLowTof in event!"; + return; + } + + // extract high container + edm::Handle PxlFwdHighContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsPixelEndcapHighTof",PxlFwdHighContainer); + if (!PxlFwdHighContainer.isValid()) { + edm::LogError("TrackerHitAnalyzer::analyze") + << "Unable to find TrackerHitsPixelEndcapHighTof in event!"; + return; + } + + /////////////////////////////////// + // get Silicon TIB information + ////////////////////////////////// + // extract TIB low container + edm::Handle SiTIBLowContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTIBLowTof",SiTIBLowContainer); + if (!SiTIBLowContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTIBLowTof in event!"; + return; + } + ////////////////////////////////// + // extract TIB low container + edm::Handle SiTIBHighContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTIBHighTof",SiTIBHighContainer); + if (!SiTIBHighContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTIBHighTof in event!"; + return; + } + /////////////////////////////////// + // get Silicon TOB information + ////////////////////////////////// + // extract TOB low container + edm::Handle SiTOBLowContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTOBLowTof",SiTOBLowContainer); + if (!SiTOBLowContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTOBLowTof in event!"; + return; + } + ////////////////////////////////// + // extract TOB low container + edm::Handle SiTOBHighContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTOBHighTof",SiTOBHighContainer); + if (!SiTOBHighContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTOBHighTof in event!"; + return; + } + + /////////////////////////////////// + // get Silicon TID information + ////////////////////////////////// + // extract TID low container + edm::Handle SiTIDLowContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTIDLowTof",SiTIDLowContainer); + if (!SiTIDLowContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTIDLowTof in event!"; + return; + } + ////////////////////////////////// + // extract TID low container + edm::Handle SiTIDHighContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTIDHighTof",SiTIDHighContainer); + if (!SiTIDHighContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTIDHighTof in event!"; + return; + } + /////////////////////////////////// + // get Silicon TEC information + ////////////////////////////////// + // extract TEC low container + edm::Handle SiTECLowContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTECLowTof",SiTECLowContainer); + if (!SiTECLowContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTECLowTof in event!"; + return; + } + ////////////////////////////////// + // extract TEC low container + edm ::Handle SiTECHighContainer; + iEvent.getByLabel("g4SimHits","TrackerHitsTECHighTof",SiTECHighContainer); + if (!SiTECHighContainer.isValid()) { + edm::LogError("TrackerHitProducer::analyze") + << "Unable to find TrackerHitsTECHighTof in event!"; + return; + } + + // For each hit collection, do the amplitude variation only for hits from signal tracks. + // Hits from all non-signal tracks also need to filled, but should not be varied in amplitude. + double newEnergyLoss; + for (std::vector::const_iterator itHit = PxlBrlHighContainer->begin(); itHit != PxlBrlHighContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk PXBH: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkPXBH->push_back(hit); + } + + for (std::vector::const_iterator itHit = PxlBrlLowContainer->begin(); itHit != PxlBrlLowContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk PXBL: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkPXBL->push_back(hit); + } + + for (std::vector::const_iterator itHit = PxlFwdHighContainer->begin(); itHit != PxlFwdHighContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk PXEH: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkPXEH->push_back(hit); + } + + for (std::vector::const_iterator itHit = PxlFwdLowContainer->begin(); itHit != PxlFwdLowContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk PXEL: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkPXEL->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTECHighContainer->begin(); itHit != SiTECHighContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TECH: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTECH->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTECLowContainer->begin(); itHit != SiTECLowContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TECL: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTECL->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTIBHighContainer->begin(); itHit != SiTIBHighContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TIBH: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTIBH->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTIBLowContainer->begin(); itHit != SiTIBLowContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TIBL: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTIBL->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTIDHighContainer->begin(); itHit != SiTIDHighContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TIDH: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTIDH->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTIDLowContainer->begin(); itHit != SiTIDLowContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TIDL: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTIDL->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTOBHighContainer->begin(); itHit != SiTOBHighContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TOBH: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTOBH->push_back(hit); + } + + for (std::vector::const_iterator itHit = SiTOBLowContainer->begin(); itHit != SiTOBLowContainer->end(); itHit++){ + newEnergyLoss = (*itHit).energyLoss(); + if (std::find(simTrackIds.begin(), simTrackIds.end(), itHit->trackId()) != simTrackIds.end()) { newEnergyLoss = scaleEnergyLoss * (*itHit).energyLoss(); } + else { if (RemoveNonSignalTrkHits) continue; } + if (Debug) cout << "Trk TOBL: old amplitude = " << (*itHit).energyLoss() << "; newamplitude = " << scaleEnergyLoss * (*itHit).energyLoss() << "; process type = " << (*itHit).processType() << "; particle type = " << itHit->particleType() << endl; + PSimHit hit((*itHit).entryPoint(), (*itHit).exitPoint(), (*itHit).pabs(), (*itHit).timeOfFlight(), + newEnergyLoss, + (*itHit).particleType(), DetId((*itHit).detUnitId()), (*itHit).trackId(), (*itHit).thetaAtEntry(), (*itHit).phiAtEntry(), (*itHit).processType()); + ptrkTOBL->push_back(hit); + } + + } // end if (ShiftAmpTrack) { + + if (Debug) cout << "Number of hits added of each type: " << endl + << "ptrkPXBH: " << ptrkPXBH->size() << endl + << "ptrkPXBL: " << ptrkPXBL->size() << endl + << "ptrkPXEH: " << ptrkPXEH->size() << endl + << "ptrkPXEL: " << ptrkPXEL->size() << endl + << "ptrkTECH: " << ptrkTECH->size() << endl + << "ptrkTECL: " << ptrkTECL->size() << endl + << "ptrkTIBH: " << ptrkTIBH->size() << endl + << "ptrkTIBL: " << ptrkTIBL->size() << endl + << "ptrkTIDH: " << ptrkTIDH->size() << endl + << "ptrkTIDL: " << ptrkTIDL->size() << endl + << "ptrkTOBH: " << ptrkTOBH->size() << endl + << "ptrkTOBL: " << ptrkTOBL->size() << endl + << "pmuonCSC: " << pcsc ->size() << endl + << "pmuonRPC: " << prpc ->size() << endl + << "pmuonDT: " << pdt ->size() << endl + << endl; + + if (ShiftTiming || + ShiftAmpMuon || + KillMuonHits) { + iEvent.put(pcsc,"MuonCSCHits"); + iEvent.put(pdt, "MuonDTHits"); + iEvent.put(prpc,"MuonRPCHits"); + } + + if (ShiftAmpTrack) { + iEvent.put(ptrkPXBH,"TrackerHitsPixelBarrelHighTof"); + iEvent.put(ptrkPXBL,"TrackerHitsPixelBarrelLowTof"); + iEvent.put(ptrkPXEH,"TrackerHitsPixelEndcapHighTof"); + iEvent.put(ptrkPXEL,"TrackerHitsPixelEndcapLowTof"); + iEvent.put(ptrkTECH,"TrackerHitsTECHighTof"); + iEvent.put(ptrkTECL,"TrackerHitsTECLowTof"); + iEvent.put(ptrkTIBH,"TrackerHitsTIBHighTof"); + iEvent.put(ptrkTIBL,"TrackerHitsTIBLowTof"); + iEvent.put(ptrkTIDH,"TrackerHitsTIDHighTof"); + iEvent.put(ptrkTIDL,"TrackerHitsTIDLowTof"); + iEvent.put(ptrkTOBH,"TrackerHitsTOBHighTof"); + iEvent.put(ptrkTOBL,"TrackerHitsTOBLowTof"); + } + +} // end void SimHitShifter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){ + void SimHitShifter::beginRun(const edm::Run& run, const edm::EventSetup& iSetup) @@ -285,8 +833,7 @@ SimHitShifter::beginJob(const edm::Run& run, const edm::EventSetup& iSetup) // ------------ method called once each job just after ending the event loop ------------ void -SimHitShifter::endJob() { -} +SimHitShifter::endJob(){} //define this as a plug-in DEFINE_FWK_MODULE(SimHitShifter); diff --git a/branches/withNewDZ/TrackingTools/KalmanUpdators/python/Chi2ChargeMeasurementEstimatorESProducer_cfi.py b/branches/withNewDZ/TrackingTools/KalmanUpdators/python/Chi2ChargeMeasurementEstimatorESProducer_cfi.py index ac40d44bbc8e3..bfcf7f34b40e1 100644 --- a/branches/withNewDZ/TrackingTools/KalmanUpdators/python/Chi2ChargeMeasurementEstimatorESProducer_cfi.py +++ b/branches/withNewDZ/TrackingTools/KalmanUpdators/python/Chi2ChargeMeasurementEstimatorESProducer_cfi.py @@ -1,11 +1,10 @@ import FWCore.ParameterSet.Config as cms Chi2ChargeMeasurementEstimator = cms.ESProducer("Chi2ChargeMeasurementEstimatorESProducer", - ComponentName = cms.string('Chi2Charge'), - nSigma = cms.double(3.0), - MaxChi2 = cms.double(30.0), - minGoodStripCharge = cms.double(2069), - pTChargeCutThreshold = cms.double(-1.) + ComponentName = cms.string('Chi2Charge'), + nSigma = cms.double(3.0), + MaxChi2 = cms.double(30.0), + minGoodStripCharge = cms.double(2069) ) diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/bloom.bin b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/bloom.bin deleted file mode 100644 index eb8bc6ccbaac3..0000000000000 Binary files a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/bloom.bin and /dev/null differ diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/classname-blmflt.py b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/classname-blmflt.py deleted file mode 100755 index 05e48253ea5ab..0000000000000 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/classname-blmflt.py +++ /dev/null @@ -1,23 +0,0 @@ -#! /usr/bin/env python -import pydablooms -CAPACITY=5000 -ERROR_RATE=float(1)/CAPACITY -bloom = pydablooms.Dablooms(capacity=CAPACITY, error_rate=ERROR_RATE,filepath='bloom.bin') - -f = open('classes.txt','r') -g = open('classnames.txt','w') -for line in f : - fields = line.split("'") - if fields[0] == 'class ' : - g.write(fields[1]+'\n') - -f.close() -g.close() -h = open('classnames.txt','rb') -i = 0 -for line in h: - bloom.add(line.rstrip(), i) - i += 1 - -bloom.flush() - diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_checker.sh b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_checker.sh index a49e3d5c79df8..1afcb4f14c684 100755 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_checker.sh +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_checker.sh @@ -3,18 +3,24 @@ export LC_ALL=C if [ $# -eq 0 ] ;then J=$(getconf _NPROCESSORS_ONLN); else J=$1; fi eval `scram runtime -sh` -ulimit -m 4000000 +ulimit -m 2000000 +ulimit -v 2000000 ulimit -t 1200 ulimit -f 40000000 +if [ ! -f ${LOCALRT}/tmp/classes.txt ] + then + echo "run ${CMSSW_BASE}/src/Utilities/StaticAnalyzers/scripts/run_class_dumper.sh first" + exit 1 +fi cd ${LOCALRT}/tmp/ touch check-start -#touch function-checker.txt.unsorted class-checker.txt.unsorted +touch function-checker.txt.unsorted class-checker.txt.unsorted cd ${LOCALRT}/src/Utilities/StaticAnalyzers scram b -j $J cd ${LOCALRT}/ export USER_CXXFLAGS="-DEDM_ML_DEBUG -w" -export USER_LLVM_CHECKERS="-enable-checker threadsafety -enable-checker optional.ClassChecker -enable-checker cms -disable-checker cms.FunctionDumper" -scram b -k -j $J checker SCRAM_IGNORE_PACKAGES=Fireworks/% SCRAM_IGNORE_SUBDIRS=test > ${LOCALRT}/tmp/class+function-checker.log 2>&1 +export USER_LLVM_CHECKERS="-enable-checker threadsafety -enable-checker optional.ClassChecker -enable-checker cms.FunctionChecker" +scram b -k -j $J checker SCRAM_IGNORE_PACKAGES=Fireworks/% SCRAM_IGNORE_SUBDIRS=test 2>&1 > ${LOCALRT}/tmp/class+function-checker.log cd ${LOCALRT}/tmp/ touch check-end sort -u < class-checker.txt.unsorted | grep -e"^data class">class-checker.txt diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_dumper.sh b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_dumper.sh index 3163ea6bd9747..760693741e67a 100755 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_dumper.sh +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/run_class_dumper.sh @@ -3,8 +3,8 @@ export LC_ALL=C if [ $# -eq 0 ] ;then J=$(getconf _NPROCESSORS_ONLN); else J=$1; fi eval `scram runtime -sh` -ulimit -n 4096000 -ulimit -m 4000000 +ulimit -m 2000000 +ulimit -v 2000000 ulimit -t 1200 ulimit -f 40000000 for file in `cmsglimpse -l -F src/classes.*.h$ include`;do @@ -13,13 +13,13 @@ for file in `cmsglimpse -l -F src/classes.*.h$ include`;do done cd ${LOCALRT}/tmp/ touch dump-start -#touch function-dumper.txt.unsorted plugins.txt.unsorted classes.txt.dumperct.unsorted classes.txt.dumperft.unsorted classes.txt.dumperall.unsorted +touch function-dumper.txt.unsorted plugins.txt.unsorted classes.txt.dumperct.unsorted classes.txt.dumperft.unsorted classes.txt.dumperall.unsorted cd ${LOCALRT}/src/Utilities/StaticAnalyzers scram b -j $J cd ${LOCALRT}/ export USER_CXXFLAGS="-DEDM_ML_DEBUG -w" export USER_LLVM_CHECKERS="-disable-checker cplusplus -disable-checker unix -disable-checker threadsafety -disable-checker core -disable-checker security -disable-checker deadcode -disable-checker cms -enable-checker cms.FunctionDumper -enable-checker optional.ClassDumper -enable-checker optional.ClassDumperCT -enable-checker optional.ClassDumperFT -enable-checker optional.EDMPluginDumper" -scram b -k -j $J checker SCRAM_IGNORE_PACKAGES=Fireworks/% SCRAM_IGNORE_SUBDIRS=test > $CMSSW_BASE/tmp/class+function-dumper.log 2>&1 +scram b -k -j $J checker SCRAM_IGNORE_PACKAGES=Fireworks/% SCRAM_IGNORE_SUBDIRS=test 2>&1 > $CMSSW_BASE/tmp/class+function-dumper.log find ${LOCALRT}/src/ -name classes\*.h.cc | xargs rm -fv cd ${LOCALRT}/tmp touch dump-end diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/statics.py b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/statics.py index cd56809382db5..6cbc391b15a56 100755 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/statics.py +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/scripts/statics.py @@ -31,9 +31,6 @@ if fields[2] == ' static variable ' : G.add_edge(fields[1],fields[3],kind=' static variable ') statics.add(fields[3]) - if fields[2] == ' known thread unsafe function ' : - G.add_edge(fields[1],fields[3],kind=' known thread unsafe function ') - statics.add(fields[3]) f.close() for tfunc in sorted(toplevelfuncs): for static in sorted(statics): diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp index 8150896611e0f..91bc580edeac8 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp @@ -98,7 +98,7 @@ void ArgSizeChecker::checkPreStmt(const CXXConstructExpr *E, CheckerContext &ctx const clang::ento::PathDiagnosticLocation DLoc = clang::ento::PathDiagnosticLocation::createBegin(PVD, ctx.getSourceManager()); - BugType * BT = new BugType(this,"Function parameter copied by value with size > max","ArgSize"); + BugType * BT = new BugType("Function parameter copied by value with size > max","ArgSize"); BugReport *report = new BugReport(*BT, os.str() , DLoc); report->addRange(PVD->getSourceRange()); ctx.emitReport(report); @@ -163,7 +163,7 @@ void ArgSizeChecker::checkASTDecl(const CXXMethodDecl *MD, AnalysisManager& mgr, std::string oname = "operator"; // if ( fname.substr(0,oname.length()) == oname ) continue; - BugType * BT = new BugType(this,"Function parameter with size > max", "ArgSize"); + BugType * BT = new BugType("Function parameter with size > max", "ArgSize"); BugReport *report = new BugReport(*BT, os.str() , DLoc); BR.emitReport(report); } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.h index 74932453e423a..8e1430888afb6 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ArgSizeChecker.h @@ -10,6 +10,7 @@ namespace clangcms { class ArgSizeChecker : public clang::ento::Checker, clang::ento::check::ASTDecl > { + mutable llvm::OwningPtr BT; public: void checkPreStmt(const clang::CXXConstructExpr *ref, clang::ento::CheckerContext &C) const; void checkASTDecl(const clang::CXXMethodDecl *CMD, clang::ento::AnalysisManager& mgr, diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.cpp index 9de68235922e5..a6ba38964abf4 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.cpp @@ -9,7 +9,7 @@ #include "CmsSupport.h" using namespace clangcms; -void CatchAll::checkASTCodeBody(const clang::Decl* D, clang::ento::AnalysisManager& AM, clang::ento::BugReporter& BR) const +void CatchAll::checkASTCodeBody(const clang::Decl*& D, clang::ento::AnalysisManager& AM, clang::ento::BugReporter& BR) const { const char *sfile=BR.getSourceManager().getPresumedLoc(D->getLocation()).getFilename(); if ((!sfile) || (!support::isCmsLocalFile(sfile))) return; @@ -19,7 +19,7 @@ void CatchAll::checkASTCodeBody(const clang::Decl* D, clang::ento::AnalysisManag if (!s) return; clang::ento::LocationOrAnalysisDeclContext x(AM.getAnalysisDeclContext(D)); clang::ento::PathDiagnosticLocation DLoc = clang::ento::PathDiagnosticLocation::createBegin(s, BR.getSourceManager(),x); - BR.EmitBasicReport(D, this, "'catch(...)' in sources","CMS code rules","using 'catch(...)' is forbidden", DLoc,s->getSourceRange ()); + BR.EmitBasicReport(D, "'catch(...)' in sources","CMS code rules","using 'catch(...)' is forbidden", DLoc,s->getSourceRange ()); } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.h index cac40f8b5b17c..1a670b9c0a2f6 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/CatchAll.h @@ -14,7 +14,7 @@ namespace clangcms { class CatchAll : public clang::ento::Checker< clang::ento::check::ASTCodeBody > { public: - void checkASTCodeBody(const clang::Decl* D, clang::ento::AnalysisManager&, clang::ento::BugReporter& BR) const; + void checkASTCodeBody(const clang::Decl*& D, clang::ento::AnalysisManager&, clang::ento::BugReporter& BR) const; private: const clang::Stmt* process(const clang::Stmt* S) const; inline bool checkCatchAll(const clang::CXXCatchStmt* S) const {return S->getCaughtType().isNull();} diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClangCmsCheckerPluginRegister.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClangCmsCheckerPluginRegister.cpp index 0e593075f5013..7acd7affc86f1 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClangCmsCheckerPluginRegister.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClangCmsCheckerPluginRegister.cpp @@ -22,7 +22,6 @@ #include "FunctionChecker.h" #include "FunctionDumper.h" #include "EDMPluginDumper.h" -#include "ThrUnsafeFCallChecker.h" #include @@ -45,13 +44,12 @@ void clang_registerCheckers ( clang::ento::CheckerRegistry ®istry) registry.addChecker< clangcms::FiniteMathChecker>( "cms.NonFiniteMath", "Reports usage of isnan and isinf." ); registry.addChecker< clangcms::UsingNamespace>( "cms.CodeRules.UsingNamespace", "Checks for 'using namespace' or 'using std::' in header files" ); registry.addChecker< clangcms::CatchAll>( "cms.CodeRules.CatchAll", "Checks for 'catch(...)' in source files" ); - registry.addChecker< clangcms::edmChecker>( "cms.edmChecker", "Flags classes inheriting from edm::EDProducer,edm::EDFilter,edm::Analyzer or edm::OutputModule" ); + registry.addChecker< clangcms::edmChecker>( "optional.edmChecker", "Checks classes inheriting from edm::Producer and edm::Filter" ); registry.addChecker< clangcms::getByChecker>( "optional.getByChecker", "Checks for calls to edm::getByLabel or edm::getManyByType and reports edm::Handle type passed" ); registry.addChecker< clangcms::ArgSizeChecker>( "optional.ArgSize", "Reports args passed by value with size>4k." ); registry.addChecker< clangcms::FunctionChecker>( "cms.FunctionChecker", "Reports functions which access non-const statics" ); registry.addChecker< clangcms::FunctionDumper>( "cms.FunctionDumper", "Reports function calls and overrides" ); registry.addChecker< clangcms::EDMPluginDumper>( "optional.EDMPluginDumper", "Dumps macro DEFINE_EDM_PLUGIN types" ); - registry.addChecker< clangcms::ThrUnsafeFCallChecker>( "cms.ThrUnsafeFCallChecker", "Reports calls of known thread unsafe functions" ); } extern "C" diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.cpp index 822a36823d496..ff9ec82860156 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.cpp @@ -44,17 +44,24 @@ namespace clangcms { void writeLog(std::string ostring) { - std::string tname ="class-checker.txt.unsorted"; - support::writeLog(ostring,tname); + const char * pPath = std::getenv("LOCALRT"); + std::string tname = ""; + if ( pPath != NULL ) tname += std::string(pPath); + tname+="/tmp/class-checker.txt.unsorted"; + std::fstream file; + file.open(tname.c_str(),std::ios::in|std::ios::out|std::ios::app); + file< { - const CheckerBase *Checker; clang::ento::BugReporter &BR; clang::AnalysisDeclContext *AC; + typedef const clang::CXXMemberCallExpr * WorkListUnit; typedef clang::SmallVector DFSWorkList; @@ -83,9 +90,8 @@ class WalkAST : public clang::StmtVisitor { const clang::CXXMemberCallExpr *visitingCallExpr; public: - WalkAST(const CheckerBase *checker, clang::ento::BugReporter &br, clang::AnalysisDeclContext *ac) - : Checker(checker), - BR(br), + WalkAST(clang::ento::BugReporter &br, clang::AnalysisDeclContext *ac) + : BR(br), AC(ac), visitingCallExpr(0) {} @@ -260,7 +266,7 @@ void WalkAST::CheckReturnStmt(const clang::ReturnStmt * RS, const clang::MemberE else MD = llvm::dyn_cast(AC->getDecl()); if ( llvm::isa(RE) ) return; - clang::QualType RQT = MD->getCallResultType(); + clang::QualType RQT = MD->getResultType(); clang::QualType RTy = Ctx.getCanonicalType(RQT); if ( (RTy->isPointerType() || RTy->isReferenceType() ) ) { if( !support::isConst(RTy) ) { @@ -304,7 +310,7 @@ void WalkAST::VisitCXXConstCastExpr(clang::CXXConstCastExpr *CCE) { os <<"const_cast used\n"; std::string tolog = "data class '"+MD->getParent()->getNameAsString()+"' const function '" + support::getQualifiedName(*MD)+ "' Warning: "+os.str()+"."; writeLog(tolog); - BugType * BT = new BugType(Checker,"const_cast used in const function ","Data Class Const Correctness"); + BugType * BT = new BugType("ClassChecker : const_cast used in const function ","ThreadSafety"); BugReport * R = new BugReport(*BT,tolog,CELoc); BR.emitReport(R); return; @@ -345,7 +351,7 @@ void WalkAST::ReportDeclRef( const clang::DeclRefExpr * DRE) { const clang::CXXMethodDecl * MD = llvm::cast(AC->getDecl()); std::string tolog = "data class '"+MD->getParent()->getNameAsString()+"' const function '" + support::getQualifiedName(*MD) + "' Warning: "+os.str(); writeLog(tolog); - BugType * BT = new BugType(Checker,"ClassChecker : non-const static local variable accessed","Data Class Const Correctness"); + BugType * BT = new BugType("ClassChecker : non-const static local variable accessed","ThreadSafety"); BugReport * R = new BugReport(*BT,os.str(),CELoc); BR.emitReport(R); return; @@ -361,7 +367,7 @@ void WalkAST::ReportDeclRef( const clang::DeclRefExpr * DRE) { const clang::CXXMethodDecl * MD = llvm::cast(AC->getDecl()); std::string tolog = "data class '"+MD->getParent()->getNameAsString()+"' const function '" + support::getQualifiedName(*MD) + "' Warning: "+os.str(); writeLog(tolog); - BugType * BT = new BugType(Checker,"Non-const static member variable accessed","Data Class Const Correctness"); + BugType * BT = new BugType("ClassChecker : non-const static member variable accessed","ThreadSafety"); BugReport * R = new BugReport(*BT,os.str(),CELoc); BR.emitReport(R); return; @@ -382,7 +388,7 @@ void WalkAST::ReportDeclRef( const clang::DeclRefExpr * DRE) { const clang::CXXMethodDecl * MD = llvm::cast(AC->getDecl()); std::string tolog = "data class '"+MD->getParent()->getNameAsString()+"' const function '" + support::getQualifiedName(*MD) + "' Warning: "+os.str(); writeLog(tolog); - BugType * BT = new BugType(Checker,"Non-const global static variable accessed","Data Class Const Correctness"); + BugType * BT = new BugType("ClassChecker : non-const global static variable accessed","ThreadSafety"); BugReport * R = new BugReport(*BT,os.str(),CELoc); BR.emitReport(R); return; @@ -480,7 +486,7 @@ void WalkAST::ReportMember(const clang::MemberExpr *ME) { std::string tolog = "data class '"+MD->getParent()->getNameAsString()+"' const function '" + support::getQualifiedName(*MD) + "' Warning: " + os.str(); if (!m_exception.reportClass( CELoc, BR ) ) return; writeLog(tolog); - BR.EmitBasicReport(AC->getDecl(),Checker,"Member data modified in const function","Data Class Const Correctness",os.str(),CELoc); + BR.EmitBasicReport(AC->getDecl(),"Class Checker : Member data modified in const function","ThreadSafety",os.str(),CELoc); } void WalkAST::ReportCall(const clang::CXXMemberCallExpr *CE) { @@ -510,7 +516,7 @@ void WalkAST::ReportCall(const clang::CXXMemberCallExpr *CE) { if ( support::isSafeClassName(MD->getQualifiedNameAsString()) ) return; if (!m_exception.reportClass( CELoc, BR ) ) return; writeLog(tolog); - BugType * BT = new BugType(Checker,"Non-const member function could modify member data object","Data Class Const Correctness"); + BugType * BT = new BugType("Class Checker : Non-const member function could modify member data object","ThreadSafety"); BugReport * R = new BugReport(*BT,os.str(),CELoc); BR.emitReport(R); @@ -538,7 +544,7 @@ void WalkAST::ReportCast(const clang::ExplicitCastExpr *CE) { if (!m_exception.reportClass( CELoc, BR ) ) return; writeLog(tolog); - BugType * BT = new BugType(Checker,"Const cast away from member data in const function","Data Class Const Correctness"); + BugType * BT = new BugType("Class Checker : Const cast away from member data in const function","ThreadSafety"); BugReport * R = new BugReport(*BT,os.str(),CELoc); BR.emitReport(R); @@ -569,7 +575,7 @@ void WalkAST::ReportCallArg(const clang::CXXMemberCallExpr *CE,const int i) { if (!m_exception.reportClass( ELoc, BR ) ) return; writeLog(tolog); - BR.EmitBasicReport(CE->getCalleeDecl(),Checker,"Member data passed to non-const reference","Data Class Const Correctness",os.str(),ELoc); + BR.EmitBasicReport(CE->getCalleeDecl(),"Class Checker : Member data passed to non-const reference","ThreadSafety",os.str(),ELoc); } @@ -594,11 +600,11 @@ void WalkAST::ReportCallReturn(const clang::ReturnStmt * RS) { std::string tolog = "data class '"+MD->getParent()->getNameAsString()+"' const function '" + support::getQualifiedName(*MD) + "' Warning: "+os.str(); writeLog(tolog); clang::ASTContext &Ctx = AC->getASTContext(); - clang::QualType RQT = MD->getCallResultType(); + clang::QualType RQT = MD->getResultType(); clang::QualType RTy = Ctx.getCanonicalType(RQT); if ( (RTy->isPointerType() || RTy->isReferenceType() ) ) { if( !support::isConst(RTy) ) { - BugType * BT = new BugType(Checker,"Const function returns pointer or reference to non-const member data object","Data Class Const Correctness"); + BugType * BT = new BugType("Class Checker : Const function returns pointer or reference to non-const member data object","ThreadSafety"); BugReport * R = new BugReport(*BT,os.str(),CELoc); BR.emitReport(R); } @@ -606,7 +612,7 @@ void WalkAST::ReportCallReturn(const clang::ReturnStmt * RS) { std::string svname = "const class std::vector<"; std::string rtname = RTy.getAsString(); if ( (RTy->isReferenceType() || RTy ->isRecordType() ) && support::isConst(RTy) && rtname.substr(0,svname.length()) == svname ) { - BugType * BT = new BugType(Checker,"Const function returns member data object of type const std::vector<*> or const std::vector<*>&","Data Class Const Correctness"); + BugType * BT = new BugType("Class Checker : Const function returns member data object of type const std::vector<*> or const std::vector<*>&","ThreadSafety"); BugReport * R = new BugReport(*BT,os.str(),CELoc); BR.emitReport(R); } @@ -640,9 +646,9 @@ void ClassChecker::checkASTDecl(const clang::CXXRecordDecl *RD, clang::ento::Ana if ( MD->hasAttr() || MD->hasAttr()) continue; if ( MD->hasBody() ) { clang::Stmt *Body = MD->getBody(); - WalkAST walker(this,BR, mgr.getAnalysisDeclContext(MD)); + clangcms::WalkAST walker(BR, mgr.getAnalysisDeclContext(MD)); walker.Visit(Body); - clang::QualType RQT = MD->getCallResultType(); + clang::QualType RQT = MD->getResultType(); clang::ASTContext &Ctx = BR.getContext(); clang::QualType RTy = Ctx.getCanonicalType(RQT); clang::ento::PathDiagnosticLocation ELoc =clang::ento::PathDiagnosticLocation::createBegin( MD , SM ); @@ -653,7 +659,7 @@ void ClassChecker::checkASTDecl(const clang::CXXRecordDecl *RD, clang::ento::Ana os << MD->getQualifiedNameAsString() << " is a const member function that returns a pointer or reference to a non-const object \n"; std::string tolog = "data class '"+MD->getParent()->getNameAsString()+"' const function '" + MD->getNameAsString() + "' Warning: "+os.str(); writeLog(tolog); - BR.EmitBasicReport(MD,this, "Const function returns pointer or reference to non-const object.","Data Class Const Correctness",os.str(),ELoc); + BR.EmitBasicReport(MD, "Class Checker : Const function returns pointer or reference to non-const object.","ThreadSafety",os.str(),ELoc); } std::string svname = "const class std::vector<"; std::string rtname = RTy.getAsString(); @@ -671,7 +677,7 @@ void ClassChecker::checkASTDecl(const clang::CXXRecordDecl *RD, clang::ento::Ana os << MD->getQualifiedNameAsString() << " is a const member function that returns an object of type const std::vector<*> or const std::vector<*>& "<getParent()->getNameAsString()+"' const function '" + MD->getNameAsString() + "' Warning: "+os.str(); writeLog(tolog); - BR.EmitBasicReport(MD,this, "Const function returns const std::vector<*> or const std::vector<*>&","Data Class Const Correctness",os.str(),ELoc); + BR.EmitBasicReport(MD, "Class Checker : Const function returns const std::vector<*> or const std::vector<*>&","ThreadSafety",os.str(),ELoc); } } } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.h index 60abcb922cca1..4620f23e901ab 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassChecker.h @@ -10,6 +10,7 @@ namespace clangcms { class ClassChecker : public clang::ento::Checker > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.cpp index 987815f9e8d84..269a7e4e3b168 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.cpp @@ -1,5 +1,4 @@ #include "ClassDumper.h" -#include "CmsSupport.h" #include #include #include @@ -11,6 +10,18 @@ using namespace llvm; namespace clangcms { +void writeLog(std::string ostring,std::string tfstring) { + const char * pPath = std::getenv("LOCALRT"); + std::string tname = ""; + if ( pPath != NULL ) tname += std::string(pPath); + tname+=tfstring; + std::fstream file; + file.open(tname.c_str(),std::ios::in|std::ios::out|std::ios::app); + file<getNameForDiagnostic(os,Policy,1); crname = crname+os.str()+"'"; - support::writeLog(crname, tname); + writeLog(crname, tname); for (unsigned J = 0, F = SD->getTemplateArgs().size(); J!=F; ++J) { if (SD->getTemplateArgs().get(J).getKind() == clang::TemplateArgument::Type) { std::string taname; @@ -47,7 +58,7 @@ void ClassDumper::checkASTDecl(const clang::CXXRecordDecl *RD,clang::ento::Analy if ( ! ( taname == "") ) { std::string sdname = SD->getQualifiedNameAsString(); std::string cfname = "templated data class '"+sdname+"' template type class '"+taname+"'"; - support::writeLog(crname+" "+cfname,tname); + writeLog(crname+" "+cfname,tname); } } } @@ -55,7 +66,7 @@ void ClassDumper::checkASTDecl(const clang::CXXRecordDecl *RD,clang::ento::Analy } else { // Dump the class name crname = crname+rname+"'"; - support::writeLog(crname,tname); + writeLog(crname,tname); } @@ -75,7 +86,7 @@ void ClassDumper::checkASTDecl(const clang::CXXRecordDecl *RD,clang::ento::Analy llvm::raw_string_ostream os(buf); SD->getNameForDiagnostic(os,Policy,1); std::string cfname ="member data class '"+os.str()+"'"; - support::writeLog(crname+" "+cfname,tname); + writeLog(crname+" "+cfname,tname); // Recurse the template args for (unsigned J = 0, F = SD->getTemplateArgs().size(); J!=F; ++J) { if (SD->getTemplateArgs().get(J).getKind() == clang::TemplateArgument::Type) { @@ -92,13 +103,13 @@ void ClassDumper::checkASTDecl(const clang::CXXRecordDecl *RD,clang::ento::Analy if (!(taname == "")) { std::string sdname = SD->getQualifiedNameAsString(); std::string cfname = "templated member data class '"+sdname+"' template type class '"+taname+"'"; - support::writeLog(crname+" "+cfname,tname); + writeLog(crname+" "+cfname,tname); } } } } else { std::string cfname ="member data class '"+fname+"' "; - support::writeLog(crname+" "+cfname,tname); + writeLog(crname+" "+cfname,tname); } } } @@ -114,7 +125,7 @@ void ClassDumper::checkASTDecl(const clang::CXXRecordDecl *RD,clang::ento::Analy if (!BRD) continue; std::string bname = BRD->getQualifiedNameAsString(); std::string cbname = "base class '"+bname+"'"; - support::writeLog(crname+" "+cbname,tname); + writeLog(crname+" "+cbname,tname); } @@ -126,7 +137,7 @@ void ClassDumperCT::checkASTDecl(const clang::ClassTemplateDecl *TD,clang::ento: const char *sfile=BR.getSourceManager().getPresumedLoc(TD->getLocation()).getFilename(); if (!support::isCmsLocalFile(sfile)) return; - std::string pname = "classes.txt.dumperct.unsorted"; + std::string pname = "/tmp/classes.txt.dumperct.unsorted"; std::string tname = TD->getTemplatedDecl()->getQualifiedNameAsString(); if ( tname == "edm::Wrapper" || tname == "edm::RunCache" || tname == "edm::LuminosityBlockCache" || tname == "edm::GlobalCache" ) { for ( auto I = TD->spec_begin(), @@ -150,7 +161,7 @@ void ClassDumperFT::checkASTDecl(const clang::FunctionTemplateDecl *TD,clang::en const char *sfile=BR.getSourceManager().getPresumedLoc(TD->getLocation()).getFilename(); if (!support::isCmsLocalFile(sfile)) return; - std::string pname = "classes.txt.dumperft.unsorted"; + std::string pname = "/tmp/classes.txt.dumperft.unsorted"; if (TD->getTemplatedDecl()->getQualifiedNameAsString().find("typelookup") != std::string::npos ) { for ( auto I = TD->spec_begin(), E = TD->spec_end(); I != E; ++I) { diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.h index 50ce9e8972e67..4df61947f4c88 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ClassDumper.h @@ -19,6 +19,7 @@ namespace clangcms { class ClassDumper : public clang::ento::Checker > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: void checkASTDecl(const clang::CXXRecordDecl *CRD, clang::ento::AnalysisManager& mgr, @@ -26,7 +27,7 @@ class ClassDumper : public clang::ento::Checker > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: @@ -48,6 +50,7 @@ class ClassDumperCT : public clang::ento::Checker > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: @@ -60,6 +63,7 @@ class ClassDumperFT : public clang::ento::Checker > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: void checkASTDecl(const clang::CXXRecordDecl *CRD, clang::ento::AnalysisManager& mgr, diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/CmsSupport.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/CmsSupport.cpp index e2db304ff34a9..83c20a1466639 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/CmsSupport.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/CmsSupport.cpp @@ -16,10 +16,6 @@ #include #include #include -// PGartung needed for bloom filter loading -#include "dablooms.h" -#define CAPACITY 5000 -#define ERROR_RATE .0002 using namespace clangcms; @@ -38,8 +34,6 @@ bool support::isCmsLocalFile(const char* file) if ((DirLen==0) || (strncmp(file,LocalDir,DirLen)!=0) || (strncmp(&file[DirLen],"/src/",5)!=0)) return false; return true; } - - // This is a wrapper around NamedDecl::getQualifiedNameAsString. // It produces more qualified output to distinguish several cases // which would otherwise be ambiguous. @@ -92,104 +86,69 @@ std::string support::getQualifiedName(const clang::NamedDecl &d) { return ret; } - -bool support::isSafeClassName(const std::string &cname) { - - static const std::vector names = { - "std::atomic", - "struct std::atomic", - "std::__atomic_", - "std::mutex", - "std::recursive_mutex", - "boost::thread_specific_ptr", - "class std::atomic", - "class std::__atomic_", - "class std::mutex", - "class std::recursive_mutex", - "class boost::thread_specific_ptr", - "tbb::", - "class tbb::", - "edm::AtomicPtrCache", - "class edm::AtomicPtrCache" - "std::once_flag", - "struct std::once_flag", - "boost::::extents" - }; +bool support::isSafeClassName(const std::string &name) { + static const std::string atomic = "std::atomic"; + static const std::string satomic = "struct std::atomic"; + static const std::string uatomic = "std::__atomic_"; + static const std::string mutex = "std::mutex"; + static const std::string rmutex = "std::recursive_mutex"; + static const std::string btsp = "boost::thread_specific_ptr"; + static const std::string catomic = "class std::atomic"; + static const std::string cuatomic = "class std::__atomic_"; + static const std::string cmutex = "class std::mutex"; + static const std::string crmutex = "class std::recursive_mutex"; + static const std::string cbtsp = "class boost::thread_specific_ptr"; + static const std::string tbb = "tbb::"; + static const std::string ctbb = "class tbb::"; + static const std::string eap = "edm::AtomicPtrCache"; + static const std::string ceap = "class edm::AtomicPtrCache"; + static const std::string once = "std::once_flag"; + static const std::string conce = "struct std::once_flag"; + static const std::string boostext = "boost::::extents"; - for (auto& name: names) - if ( cname.substr(0,name.length()) == name ) return true; + if ( name.substr(0,atomic.length()) == atomic || name.substr(0,catomic.length()) == catomic || name.substr(0,satomic.length()) == satomic + || name.substr(0,uatomic.length()) == uatomic || name.substr(0,cuatomic.length()) == cuatomic + || name.substr(0,mutex.length()) == mutex || name.substr(0,cmutex.length()) == cmutex + || name.substr(0,rmutex.length()) == rmutex || name.substr(0,crmutex.length()) == rmutex + || name.substr(0,btsp.length()) == btsp || name.substr(0,cbtsp.length()) == cbtsp + || name.substr(0,ctbb.length()) == ctbb || name.substr(0,tbb.length()) == tbb + || name.substr(0,eap.length()) == eap || name.substr(0,ceap.length()) == ceap + || name.substr(0,once.length()) == once || name.substr(0,conce.length()) == conce + || name.substr(0,boostext.length()) == boostext + ) + return true; return false; } bool support::isDataClass(const std::string & name) { - static std::string iname(""); - if ( iname == "") { - clang::FileSystemOptions FSO; - clang::FileManager FM(FSO); - const char * lPath = std::getenv("LOCALRT"); - const char * rPath = std::getenv("CMSSW_RELEASE_BASE"); - if ( lPath == NULL || rPath == NULL ) { - llvm::errs()<<"\n\nThe scram runtime envorinment is not set.\nRun 'cmsenv' or 'eval `scram runtime -csh`'.\n\n\n"; - exit(1); - } - const std::string lname = std::string(lPath); - const std::string rname = std::string(rPath); - const std::string tname("/src/Utilities/StaticAnalyzers/scripts/bloom.bin"); - const std::string fname1 = lname + tname; - const std::string fname2 = rname + tname; - if (!(FM.getFile(fname1) || FM.getFile(fname2))) { - llvm::errs()<<"\n\nChecker cannot find bloom filter file" < names = { - "TGraph::Fit(const char *,", - "TGraph2D::Fit(const char *,", - "TH1::Fit(const char *,", - "TMultiGraph::Fit(const char *,", - "TTable::Fit(const char *,", - "TTree::Fit(const char *,", - "TTreePlayer::Fit(const char *," - }; - for (auto& name: names) - if ( fname.substr(0,name.length()) == name ) return true; - return false; -} - -void support::writeLog(const std::string &ostring,const std::string &tfstring) { - const char * pPath = std::getenv("LOCALRT"); - if ( pPath == NULL ) { - llvm::errs()<<"\n\nThe scram runtime envorinment is not set.\nRun 'cmsenv' or 'eval `scram runtime -csh`'.\n\n\n"; + + std::string tname("/tmp/classes.txt"); + std::string fname1 = lname + tname; + if (!FM.getFile(fname1)) { + llvm::errs()<<"\n\nChecker cannot find classes.txt. Run \"USER_LLVM_CHECKERS='-enable-checker optional.ClassDumperCT -enable-checker optional.ClassDumperFT scram b checker to create $LOCALRT/tmp/classes.txt.\n\n\n"; exit(1); + } + if ( FM.getFile(fname1) ) + iname = fname1; + os <<"class '"<< name <<"'"; + std::ifstream ifile; + ifile.open(iname.c_str(),std::ifstream::in); + std::string line; + while (std::getline(ifile,line)) { + if ( line == os.str() ) return true; } - - std::string pname = std::string(pPath) +"/tmp/"; - const std::string tname = pname + tfstring; - - std::fstream file; - file.open(tname.c_str(),std::ios::out|std::ios::app); - file<addRange(CE->getSourceRange()); diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastAwayChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastAwayChecker.h index 71a88a507b7ea..cd6bbc49f6c21 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastAwayChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastAwayChecker.h @@ -17,7 +17,7 @@ namespace clangcms { class ConstCastAwayChecker: public clang::ento::Checker< clang::ento::check::PreStmt< clang::ExplicitCastExpr> > { public: - mutable std::unique_ptr BT; + mutable clang::OwningPtr BT; void checkPreStmt(const clang::ExplicitCastExpr *CE, clang::ento::CheckerContext &C) const; private: diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.cpp index 8655869d557b7..debd1289ea98a 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.cpp @@ -6,7 +6,6 @@ #include -#include #include "ConstCastChecker.h" #include "CmsSupport.h" @@ -28,9 +27,11 @@ void ConstCastChecker::checkPreStmt(const clang::CXXConstCastExpr *CE, if (! support::isDataClass(cname) ) return; } if (clang::ento::ExplodedNode *errorNode = C.generateSink()) { - if (!BT) BT.reset(new clang::ento::BugType(this,"const_cast used on a pointer to a data class ", "ThreadSafety")); - clang::ento::BugReport *R = new clang::ento::BugReport(*BT, - "const_cast was used on a pointer to a data class ", errorNode); + if (!BT) + BT.reset( + new clang::ento::BugType("const_cast used", + "ThreadSafety")); + clang::ento::BugReport *R = new clang::ento::BugReport(*BT, "const_cast was used, this may result in thread-unsafe code.", errorNode); R->addRange(CE->getSourceRange()); if ( ! m_exception.reportConstCast( *R, C ) ) return; diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.h index 12fc69272d8d9..eee47cb41f2f7 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ConstCastChecker.h @@ -16,7 +16,7 @@ namespace clangcms { class ConstCastChecker: public clang::ento::Checker< clang::ento::check::PreStmt< clang::CXXConstCastExpr> > { public: - mutable std::unique_ptr BT; + mutable clang::OwningPtr BT; void checkPreStmt(const clang::CXXConstCastExpr *CE, clang::ento::CheckerContext &C) const; private: diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/EDMPluginDumper.cc b/branches/withNewDZ/Utilities/StaticAnalyzers/src/EDMPluginDumper.cc index f7eb4b03849b1..b7c3cc4ee2ce3 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/EDMPluginDumper.cc +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/EDMPluginDumper.cc @@ -22,9 +22,14 @@ void EDMPluginDumper::checkASTDecl(const clang::ClassTemplateDecl *TD,clang::ent llvm::raw_svector_ostream os(buf); I->getTemplateArgs().get(J).print(mgr.getASTContext().getPrintingPolicy(),os); std::string rname = os.str(); - std::string fname("plugins.txt.unsorted"); + const char * pPath = std::getenv("LOCALRT"); + std::string dname(""); + if ( pPath != NULL ) dname = std::string(pPath); + std::string fname("/tmp/plugins.txt.unsorted"); + std::string tname = dname + fname; std::string ostring = rname +"\n"; - support::writeLog(ostring,fname); + std::ofstream file(tname.c_str(),std::ios::app); + file< > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.cc b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.cc index 7663fdc8c1f37..c51bc4d40244d 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.cc +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.cc @@ -34,7 +34,7 @@ void FiniteMathChecker::checkPreStmt(const clang::CallExpr *CE, clang::ento::Che return; if (!BT) - BT.reset(new clang::ento::BugType(this,"std::isnan / std::isinf does not work when fast-math is used. Please use edm::isNotFinite from 'FWCore/Utilities/interface/isNotFinite.h'", "fastmath plugin")); + BT.reset(new clang::ento::BugType("std::isnan / std::isinf does not work when fast-math is used. Please use edm::isNotFinite from 'FWCore/Utilities/interface/isNotFinite.h'", "fastmath plugin")); clang::ento::BugReport *report = new clang::ento::BugReport(*BT, BT->getName(), N); report->addRange(Callee->getSourceRange()); diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.h index e2403cc4295b6..2d876ecc8ca20 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FiniteMathChecker.h @@ -9,7 +9,7 @@ namespace clangcms { class FiniteMathChecker : public clang::ento::Checker > { - mutable std::unique_ptr BT; + mutable llvm::OwningPtr BT; public: void checkPreStmt(const clang::CallExpr *ref, clang::ento::CheckerContext &C) const; }; diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.cpp index 280c86b15611f..16f19f5cf252e 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.cpp @@ -28,14 +28,12 @@ using namespace llvm; namespace clangcms { class FWalker : public clang::StmtVisitor { - const CheckerBase *Checker; clang::ento::BugReporter &BR; clang::AnalysisDeclContext *AC; public: - FWalker(const CheckerBase * checker, clang::ento::BugReporter &br, clang::AnalysisDeclContext *ac ) - : Checker(checker), - BR(br), + FWalker(clang::ento::BugReporter &br, clang::AnalysisDeclContext *ac ) + : BR(br), AC(ac) {} const clang::Stmt * ParentStmt(const Stmt *S) { @@ -75,7 +73,10 @@ void FWalker::ReportDeclRef ( const clang::DeclRefExpr * DRE) { const char *sfile=BR.getSourceManager().getPresumedLoc(D->getLocation()).getFilename(); std::string fname(sfile); - if (!support::isInterestingLocation(fname)) return; + if ( fname.find("stdio.h") != std::string::npos + || fname.find("iostream") != std::string::npos + || fname.find("placeholders.hpp") != std::string::npos) return; + clang::QualType t = D->getType(); if ( support::isSafeClassName( t.getCanonicalType().getAsString() ) ) return; const Decl * PD = AC->getDecl(); @@ -94,7 +95,10 @@ void FWalker::ReportDeclRef ( const clang::DeclRefExpr * DRE) { } else DLoc = clang::ento::PathDiagnosticLocation::createBegin(DRE, BR.getSourceManager(), AC); - std::string tname ="function-checker.txt.unsorted"; + const char * pPath = std::getenv("LOCALRT"); + std::string tname = ""; + if ( pPath != NULL ) tname += std::string(pPath); + tname+="/tmp/function-checker.txt.unsorted"; std::string vname = support::getQualifiedName(*D); std::string svname = D->getNameAsString(); @@ -104,9 +108,10 @@ void FWalker::ReportDeclRef ( const clang::DeclRefExpr * DRE) { std::string buf; llvm::raw_string_ostream os(buf); os << "function '"<getLocation()).getFilename(); if (!support::isCmsLocalFile(sfile)) return; std::string fname(sfile); - if ( !support::isInterestingLocation(fname) ) return; + if ( fname.find("/test/") != std::string::npos) return; if (!MD->doesThisDeclarationHaveABody()) return; - FWalker walker(this, BR, mgr.getAnalysisDeclContext(MD)); + FWalker walker(BR, mgr.getAnalysisDeclContext(MD)); walker.Visit(MD->getBody()); return; } @@ -164,18 +171,22 @@ void FunctionChecker::checkASTDecl(const FunctionDecl *FD, AnalysisManager& mgr, llvm::raw_string_ostream os(buf); os << "function '"<< dname << "' is in an extern \"C\" context and most likely accesses or modifies fortran variables in a 'COMMONBLOCK'.\n"; clang::ento::PathDiagnosticLocation::createBegin(FD, BR.getSourceManager()); -// BR.EmitBasicReport(FD, "COMMONBLOCK variable accessed or modified","ThreadSafety",os.str(), FDLoc); +// BR.EmitBasicReport(FD, "FunctionChecker : COMMONBLOCK variable accessed or modified","ThreadSafety",os.str(), FDLoc); std::string ostring = "function '" + dname + "' static variable 'COMMONBLOCK'.\n"; - std::string tname = "function-checker.txt.unsorted"; - support::writeLog(ostring,tname); + const char * pPath = std::getenv("LOCALRT"); + std::string tname = ""; + if ( pPath != NULL ) tname += std::string(pPath); + tname+="/tmp/function-checker.txt.unsorted"; + std::ofstream file(tname.c_str(),std::ios::app); + file<getLocation ()).getFilename(); if (!support::isCmsLocalFile(sfile)) return; std::string fname(sfile); - if ( !support::isInterestingLocation(fname) ) return; + if ( fname.find("/test/") != std::string::npos) return; if (FD->doesThisDeclarationHaveABody()) { - FWalker walker(this, BR, mgr.getAnalysisDeclContext(FD)); + FWalker walker(BR, mgr.getAnalysisDeclContext(FD)); walker.Visit(FD->getBody()); } } @@ -187,12 +198,12 @@ void FunctionChecker::checkASTDecl(const FunctionTemplateDecl *TD, AnalysisManag const char *sfile=BR.getSourceManager().getPresumedLoc(TD->getLocation ()).getFilename(); if (!support::isCmsLocalFile(sfile)) return; std::string fname(sfile); - if ( !support::isInterestingLocation(fname) ) return; + if ( fname.find("/test/") != std::string::npos) return; for (FunctionTemplateDecl::spec_iterator I = const_cast(TD)->spec_begin(), E = const_cast(TD)->spec_end(); I != E; ++I) { if (I->doesThisDeclarationHaveABody()) { - FWalker walker(this,BR, mgr.getAnalysisDeclContext(*I)); + FWalker walker(BR, mgr.getAnalysisDeclContext(*I)); walker.Visit(I->getBody()); } } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.h index a06565d759ac0..47d835d1e6ac9 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionChecker.h @@ -13,13 +13,14 @@ class FunctionChecker : public clang::ento::Checker< clang::ento::check::ASTDecl clang::ento::check::ASTDecl, clang::ento::check::ASTDecl > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: void checkASTDecl(const clang::CXXMethodDecl *CMD, clang::ento::AnalysisManager& mgr, clang::ento::BugReporter &BR) const ; - void checkASTDecl(const clang::FunctionDecl *FD, clang::ento::AnalysisManager& mgr, + void checkASTDecl(const clang::FunctionDecl *FD, clang::ento::AnalysisManager& mgr, clang::ento::BugReporter &BR) const ; void checkASTDecl(const clang::FunctionTemplateDecl *TD, clang::ento::AnalysisManager& mgr, clang::ento::BugReporter &BR) const ; diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.cpp index fc723cf6952aa..fafc18dc0b4c4 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.cpp @@ -74,11 +74,15 @@ void FDumper::VisitCXXConstructExpr( CXXConstructExpr *CCE ) { if (!CCD) return; const char *sfile=BR.getSourceManager().getPresumedLoc(CCE->getExprLoc()).getFilename(); std::string sname(sfile); - if ( ! support::isInterestingLocation(sname) ) return; + if ( sname.find("/test/") != std::string::npos) return; std::string mname = support::getQualifiedName(*CCD); - std::string tname = "function-dumper.txt.unsorted"; - std::string ostring = "function '"+ mdname + "' " + "calls function '" + mname + "'\n"; - support::writeLog(ostring,tname); + const char * pPath = std::getenv("LOCALRT"); + std::string tname = ""; + if ( pPath != NULL ) tname += std::string(pPath); + tname+="/tmp/function-dumper.txt.unsorted"; + std::string ostring = "function '"+ mdname + "' " + "calls function '" + mname + "'\n"; + std::ofstream file(tname.c_str(),std::ios::app); + file<getExprLoc()).getFilename(); std::string sname(sfile); - if ( ! support::isInterestingLocation(sname) ) return; + if ( sname.find("/test/") != std::string::npos) return; std::string mname = support::getQualifiedName(*FD); - std::string tname = "function-dumper.txt.unsorted"; + const char * pPath = std::getenv("LOCALRT"); + std::string tname = ""; + if ( pPath != NULL ) tname += std::string(pPath); + tname+="/tmp/function-dumper.txt.unsorted"; std::string ostring; CXXMemberCallExpr * CXE = llvm::dyn_cast(CE); if (CXE) { @@ -106,57 +113,44 @@ void FDumper::VisitCallExpr( CallExpr *CE ) { if ( AMD && CD && RD && CD->isVirtual() && RD == AMD->getParent() ) ostring = "function '"+ mdname + "' " + "calls function '" + mname + " virtual'\n"; else ostring = "function '"+ mdname + "' " + "calls function '" + mname + "'\n"; } else { - if (FD->isVirtualAsWritten() || FD->isPure()) - ostring = "function '"+ mdname + "' " + "calls function '" + mname + " virtual'\n"; + if (FD->isVirtualAsWritten() || FD->isPure()) ostring = "function '"+ mdname + "' " + "calls function '" + mname + " virtual'\n"; else ostring = "function '"+ mdname + "' " + "calls function '" + mname + "'\n"; } - support::writeLog(ostring,tname); + std::ofstream file(tname.c_str(),std::ios::app); + file<getLocation().isInvalid()) return; + const char *sfile=BR.getSourceManager().getPresumedLoc(MD->getLocation()).getFilename(); std::string sname(sfile); - if ( ! support::isInterestingLocation(sname) ) return; - if ( ! support::isCmsLocalFile(sfile) ) return; + if ( sname.find("/test/") != std::string::npos) return; if (!MD->doesThisDeclarationHaveABody()) return; FDumper walker(BR, mgr.getAnalysisDeclContext(MD)); walker.Visit(MD->getBody()); std::string mname = support::getQualifiedName(*MD); const char * pPath = std::getenv("LOCALRT"); - std::string tname = "function-dumper.txt.unsorted"; + std::string tname=""; + if ( pPath != NULL ) tname += std::string(pPath); + tname += "/tmp/function-dumper.txt.unsorted"; for (auto I = MD->begin_overridden_methods(), E = MD->end_overridden_methods(); I!=E; ++I) { std::string oname = support::getQualifiedName(*(*I)); std::string ostring = "function '" + mname + "' " + "overrides function '" + oname + " virtual'\n"; - support::writeLog(ostring,tname); + std::ofstream file(tname.c_str(),std::ios::app); + file<getLocation().isInvalid()) return; - const char *sfile=BR.getSourceManager().getPresumedLoc(MD->getLocation()).getFilename(); - std::string sname(sfile); - if ( ! support::isInterestingLocation(sname) ) return; - if ( ! support::isCmsLocalFile(sfile) ) return; - if (!MD->doesThisDeclarationHaveABody()) return; - FDumper walker(BR, mgr.getAnalysisDeclContext(MD)); - walker.Visit(MD->getBody()); - return; -} - - - void FunctionDumper::checkASTDecl(const FunctionTemplateDecl *TD, AnalysisManager& mgr, BugReporter &BR) const { - if (TD->getLocation().isInvalid()) return; - const char *sfile=BR.getSourceManager().getPresumedLoc(TD->getLocation ()).getFilename(); + + const char *sfile=BR.getSourceManager().getPresumedLoc(TD->getLocation ()).getFilename(); std::string sname(sfile); - if ( ! support::isInterestingLocation(sname) ) return; - if ( ! support::isCmsLocalFile(sfile) ) return; + if ( sname.find("/test/") != std::string::npos) return; + for (FunctionTemplateDecl::spec_iterator I = const_cast(TD)->spec_begin(), E = const_cast(TD)->spec_end(); I != E; ++I) { diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.h index 82da5a81f4135..a7f243b78faae 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/FunctionDumper.h @@ -22,9 +22,9 @@ namespace clangcms { class FunctionDumper : public clang::ento::Checker< clang::ento::check::ASTDecl, - clang::ento::check::ASTDecl , clang::ento::check::ASTDecl > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: @@ -32,9 +32,6 @@ class FunctionDumper : public clang::ento::Checker< clang::ento::check::ASTDecl< void checkASTDecl(const clang::CXXMethodDecl *CMD, clang::ento::AnalysisManager& mgr, clang::ento::BugReporter &BR) const ; - void checkASTDecl(const clang::FunctionDecl *MD, clang::ento::AnalysisManager& mgr, - clang::ento::BugReporter &BR) const ; - void checkASTDecl(const clang::FunctionTemplateDecl *TD, clang::ento::AnalysisManager& mgr, clang::ento::BugReporter &BR) const ; diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.cpp index 7e3c6950ffbc9..c8ace91c93776 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.cpp @@ -37,8 +37,9 @@ void GlobalStaticChecker::checkASTDecl(const clang::VarDecl *D, llvm::raw_string_ostream os(buf); os << "Non-const variable '" << t.getAsString()<<" "<<*D << "' is static and might be thread-unsafe"; - BR.EmitBasicReport(D, this, "non-const global static variable", - "ThreadSafety", os.str(), DLoc); + BR.EmitBasicReport(D, "Possibly Thread-Unsafe: non-const static variable", + "ThreadSafety", + os.str(), DLoc); return; } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.h index 198b6f26fca75..65d512aed0ff7 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/GlobalStaticChecker.h @@ -15,7 +15,7 @@ namespace clangcms { class GlobalStaticChecker : public clang::ento::Checker< clang::ento::check::ASTDecl< clang::VarDecl> > { - mutable std::unique_ptr< clang::ento::BuiltinBug> BT; + mutable clang::OwningPtr< clang::ento::BuiltinBug> BT; public: void checkASTDecl(const clang::VarDecl *D, diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.cpp index 3e3f3c44dad94..a1159952484b9 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.cpp @@ -30,8 +30,9 @@ void MutableMemberChecker::checkASTDecl(const clang::FieldDecl *D, std::string buf; llvm::raw_string_ostream os(buf); os << "Mutable member'" <getParent()->getQualifiedNameAsString()<<"', might be thread-unsafe when accessing via a const handle."; - BR.EmitBasicReport(D, this, "mutable member", - "ThreadSafety", os.str(), DLoc); + BR.EmitBasicReport(D, "Possibly Thread-Unsafe: Mutable member", + "ThreadSafety", + os.str(), DLoc); return; } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.h index 657fb9e0a65a9..b7fac97cecc13 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/MutableMemberChecker.h @@ -16,7 +16,7 @@ namespace clangcms { class MutableMemberChecker : public clang::ento::Checker< clang::ento::check::ASTDecl< clang::FieldDecl> > { - mutable std::unique_ptr< clang::ento::BuiltinBug> BT; + mutable clang::OwningPtr< clang::ento::BuiltinBug> BT; public: void checkASTDecl(const clang::FieldDecl *D, diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/StaticLocalChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/StaticLocalChecker.cpp index 0c6152b2b6ba6..3df7342803f02 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/StaticLocalChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/StaticLocalChecker.cpp @@ -34,7 +34,8 @@ void StaticLocalChecker::checkASTDecl(const clang::VarDecl *D, llvm::raw_string_ostream os(buf); os << "Non-const variable '" < > { - mutable std::unique_ptr BT; + mutable clang::OwningPtr BT; public: void checkASTDecl(const clang::VarDecl *D, diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ThrUnsafeFCallChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ThrUnsafeFCallChecker.cpp deleted file mode 100644 index 86634846a97e2..0000000000000 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ThrUnsafeFCallChecker.cpp +++ /dev/null @@ -1,95 +0,0 @@ -#include "ThrUnsafeFCallChecker.h" -#include -#include -#include -#include - - -using namespace clang; -using namespace ento; -using namespace llvm; - -namespace clangcms { - -class TUFWalker : public clang::StmtVisitor { - const CheckerBase *Checker; - clang::ento::BugReporter &BR; - clang::AnalysisDeclContext *AC; - -public: - TUFWalker(const CheckerBase *checker, clang::ento::BugReporter &br, clang::AnalysisDeclContext *ac ) - : Checker(checker), - BR(br), - AC(ac) {} - - void VisitChildren(clang::Stmt *S ); - void VisitStmt( clang::Stmt *S) { VisitChildren(S); } - void VisitCXXMemberCallExpr( clang::CXXMemberCallExpr *CE ); - -}; - -void TUFWalker::VisitChildren( clang::Stmt *S) { - for (clang::Stmt::child_iterator I = S->child_begin(), E = S->child_end(); I!=E; ++I) - if (clang::Stmt *child = *I) { - Visit(child); - } -} - - - -void TUFWalker::VisitCXXMemberCallExpr( CXXMemberCallExpr *CE ) { - CXXMethodDecl * MD = CE->getMethodDecl(); - if (!MD) return; - const CXXMethodDecl * PD = llvm::dyn_cast(AC->getDecl()); - if (!PD) return; - std::string mname = support::getQualifiedName(*MD); - std::string pname = support::getQualifiedName(*PD); - llvm::SmallString<100> buf; - llvm::raw_svector_ostream os(buf); - if ( support::isKnownThrUnsafeFunc(mname) ) { - os << "Known thread unsafe function " << mname << " is called in function " << pname; - PathDiagnosticLocation CELoc = PathDiagnosticLocation::createBegin(CE, BR.getSourceManager(),AC); - BugType * BT = new BugType(Checker, "known thread unsafe function called","ThreadSafety"); - BugReport * R = new BugReport(*BT,os.str(),CELoc); - R->addRange(CE->getSourceRange()); - BR.emitReport(R); - - std::string tname = "function-checker.txt.unsorted"; - std::string ostring = "function '"+ pname + "' known thread unsafe function '" + mname + "'.\n"; - support::writeLog(ostring,tname); - } - - -} - -void ThrUnsafeFCallChecker::checkASTDecl(const CXXMethodDecl *MD, AnalysisManager& mgr, - BugReporter &BR) const { - const SourceManager &SM = BR.getSourceManager(); - PathDiagnosticLocation DLoc =PathDiagnosticLocation::createBegin( MD, SM ); - if ( SM.isInSystemHeader(DLoc.asLocation()) || SM.isInExternCSystemHeader(DLoc.asLocation()) ) return; - if (!MD->doesThisDeclarationHaveABody()) return; - clangcms::TUFWalker walker(this,BR, mgr.getAnalysisDeclContext(MD)); - walker.Visit(MD->getBody()); - return; -} - -void ThrUnsafeFCallChecker::checkASTDecl(const FunctionTemplateDecl *TD, AnalysisManager& mgr, - BugReporter &BR) const { - const clang::SourceManager &SM = BR.getSourceManager(); - clang::ento::PathDiagnosticLocation DLoc =clang::ento::PathDiagnosticLocation::createBegin( TD, SM ); - if ( SM.isInSystemHeader(DLoc.asLocation()) || SM.isInExternCSystemHeader(DLoc.asLocation()) ) return; - - for (FunctionTemplateDecl::spec_iterator I = const_cast(TD)->spec_begin(), - E = const_cast(TD)->spec_end(); I != E; ++I) - { - if (I->doesThisDeclarationHaveABody()) { - clangcms::TUFWalker walker(this,BR, mgr.getAnalysisDeclContext(*I)); - walker.Visit(I->getBody()); - } - } - return; -} - - - -} diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ThrUnsafeFCallChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/ThrUnsafeFCallChecker.h deleted file mode 100644 index 8fbeb5df5e8cf..0000000000000 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/ThrUnsafeFCallChecker.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef Utilities_StaticAnalyzers_ThrUnsafeFCallChecker_h -#define Utilities_StaticAnalyzers_ThrUnsafeFCallChecker_h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "CmsException.h" -#include "CmsSupport.h" - -namespace clangcms { - -class ThrUnsafeFCallChecker : public clang::ento::Checker< clang::ento::check::ASTDecl, - clang::ento::check::ASTDecl > -{ - - -public: - - void checkASTDecl(const clang::CXXMethodDecl *CMD, clang::ento::AnalysisManager& mgr, - clang::ento::BugReporter &BR) const ; - - void checkASTDecl(const clang::FunctionTemplateDecl *TD, clang::ento::AnalysisManager& mgr, - clang::ento::BugReporter &BR) const ; - - -private: - CmsException m_exception; -}; - -} -#endif diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/UsingNamespace.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/UsingNamespace.cpp index f0339c12de5ec..e39d2ed5bf952 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/UsingNamespace.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/UsingNamespace.cpp @@ -39,6 +39,6 @@ void UsingNamespace::reportBug (const char* bug, const clang::Decl *D, clang::en std::string buf; llvm::raw_string_ostream os(buf); os << bug << " in headers files."; - BR.EmitBasicReport(D, this, "using namespace in header files","CMS code rules",os.str(), DLoc); + BR.EmitBasicReport(D, "using namespace in header files","CMS code rules",os.str(), DLoc); } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/dablooms.c b/branches/withNewDZ/Utilities/StaticAnalyzers/src/dablooms.c deleted file mode 100644 index 447a000117063..0000000000000 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/dablooms.c +++ /dev/null @@ -1,578 +0,0 @@ -/* Copyright @2012 by Justin Hines at Bitly under a very liberal license. See LICENSE in the source distribution. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "murmur.h" -#include "dablooms.h" - -#define DABLOOMS_VERSION "0.9.1" - -#define ERROR_TIGHTENING_RATIO 0.5 -#define SALT_CONSTANT 0x97c29b3a - -const char *dablooms_version(void) -{ - return DABLOOMS_VERSION; -} - -void free_bitmap(bitmap_t *bitmap) -{ - if ((munmap(bitmap->array, bitmap->bytes)) < 0) { - perror("Error, unmapping memory"); - } - close(bitmap->fd); - free(bitmap); -} - -bitmap_t *bitmap_resize(bitmap_t *bitmap, size_t old_size, size_t new_size) -{ - int fd = bitmap->fd; - struct stat fileStat; - - fstat(fd, &fileStat); - size_t size = fileStat.st_size; - - /* grow file if necessary */ - if (size < new_size) { - if (ftruncate(fd, new_size) < 0) { - perror("Error increasing file size with ftruncate"); - free_bitmap(bitmap); - close(fd); - return NULL; - } - } - lseek(fd, 0, SEEK_SET); - - /* resize if mmap exists and possible on this os, else new mmap */ - if (bitmap->array != NULL) { -#if __linux - bitmap->array = mremap(bitmap->array, old_size, new_size, MREMAP_MAYMOVE); - if (bitmap->array == MAP_FAILED) { - perror("Error resizing mmap"); - free_bitmap(bitmap); - close(fd); - return NULL; - } -#else - if (munmap(bitmap->array, bitmap->bytes) < 0) { - perror("Error unmapping memory"); - free_bitmap(bitmap); - close(fd); - return NULL; - } - bitmap->array = NULL; -#endif - } - if (bitmap->array == NULL) { - bitmap->array = mmap(0, new_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (bitmap->array == MAP_FAILED) { - perror("Error init mmap"); - free_bitmap(bitmap); - close(fd); - return NULL; - } - } - - bitmap->bytes = new_size; - return bitmap; -} - -/* Create a new bitmap, not full featured, simple to give - * us a means of interacting with the 4 bit counters */ -bitmap_t *new_bitmap(int fd, size_t bytes) -{ - bitmap_t *bitmap; - - if ((bitmap = (bitmap_t *)malloc(sizeof(bitmap_t))) == NULL) { - return NULL; - } - - bitmap->bytes = bytes; - bitmap->fd = fd; - bitmap->array = NULL; - - if ((bitmap = bitmap_resize(bitmap, 0, bytes)) == NULL) { - return NULL; - } - - return bitmap; -} - -int bitmap_increment(bitmap_t *bitmap, unsigned int index, long offset) -{ - long access = index / 2 + offset; - uint8_t temp; - uint8_t n = bitmap->array[access]; - if (index % 2 != 0) { - temp = (n & 0x0f); - n = (n & 0xf0) + ((n & 0x0f) + 0x01); - } else { - temp = (n & 0xf0) >> 4; - n = (n & 0x0f) + ((n & 0xf0) + 0x10); - } - - if (temp == 0x0f) { - fprintf(stderr, "Error, 4 bit int Overflow\n"); - return -1; - } - - bitmap->array[access] = n; - return 0; -} - -/* increments the four bit counter */ -int bitmap_decrement(bitmap_t *bitmap, unsigned int index, long offset) -{ - long access = index / 2 + offset; - uint8_t temp; - uint8_t n = bitmap->array[access]; - - if (index % 2 != 0) { - temp = (n & 0x0f); - n = (n & 0xf0) + ((n & 0x0f) - 0x01); - } else { - temp = (n & 0xf0) >> 4; - n = (n & 0x0f) + ((n & 0xf0) - 0x10); - } - - if (temp == 0x00) { - fprintf(stderr, "Error, Decrementing zero\n"); - return -1; - } - - bitmap->array[access] = n; - return 0; -} - -/* decrements the four bit counter */ -int bitmap_check(bitmap_t *bitmap, unsigned int index, long offset) -{ - long access = index / 2 + offset; - if (index % 2 != 0 ) { - return bitmap->array[access] & 0x0f; - } else { - return bitmap->array[access] & 0xf0; - } -} - -int bitmap_flush(bitmap_t *bitmap) -{ - if ((msync(bitmap->array, bitmap->bytes, MS_SYNC) < 0)) { - perror("Error, flushing bitmap to disk"); - return -1; - } else { - return 0; - } -} - -/* - * Perform the actual hashing for `key` - * - * Only call the hash once to get a pair of initial values (h1 and - * h2). Use these values to generate all hashes in a quick loop. - * - * See paper by Kirsch, Mitzenmacher [2006] - * http://www.eecs.harvard.edu/~michaelm/postscripts/rsa2008.pdf - */ -void hash_func(counting_bloom_t *bloom, const char *key, size_t key_len, uint32_t *hashes) -{ - int i; - uint32_t checksum[4]; - - MurmurHash3_x64_128(key, key_len, SALT_CONSTANT, checksum); - uint32_t h1 = checksum[0]; - uint32_t h2 = checksum[1]; - - for (i = 0; i < bloom->nfuncs; i++) { - hashes[i] = (h1 + i * h2) % bloom->counts_per_func; - } -} - -int free_counting_bloom(counting_bloom_t *bloom) -{ - if (bloom != NULL) { - free(bloom->hashes); - bloom->hashes = NULL; - free(bloom->bitmap); - free(bloom); - bloom = NULL; - } - return 0; -} - -counting_bloom_t *counting_bloom_init(unsigned int capacity, double error_rate, long offset) -{ - counting_bloom_t *bloom; - - if ((bloom = malloc(sizeof(counting_bloom_t))) == NULL) { - fprintf(stderr, "Error, could not realloc a new bloom filter\n"); - return NULL; - } - bloom->bitmap = NULL; - bloom->capacity = capacity; - bloom->error_rate = error_rate; - bloom->offset = offset + sizeof(counting_bloom_header_t); - bloom->nfuncs = (int) ceil(log(1 / error_rate) / log(2)); - bloom->counts_per_func = (int) ceil(capacity * fabs(log(error_rate)) / (bloom->nfuncs * pow(log(2), 2))); - bloom->size = bloom->nfuncs * bloom->counts_per_func; - /* rounding-up integer divide by 2 of bloom->size */ - bloom->num_bytes = ((bloom->size + 1) / 2) + sizeof(counting_bloom_header_t); - bloom->hashes = calloc(bloom->nfuncs, sizeof(uint32_t)); - - return bloom; -} - -counting_bloom_t *new_counting_bloom(unsigned int capacity, double error_rate, const char *filename) -{ - counting_bloom_t *cur_bloom; - int fd; - - if ((fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0600)) < 0) { - perror("Error, Opening File Failed"); - fprintf(stderr, " %s \n", filename); - return NULL; - } - - cur_bloom = counting_bloom_init(capacity, error_rate, 0); - cur_bloom->bitmap = new_bitmap(fd, cur_bloom->num_bytes); - cur_bloom->header = (counting_bloom_header_t *)(cur_bloom->bitmap->array); - return cur_bloom; -} - -int counting_bloom_add(counting_bloom_t *bloom, const char *s, size_t len) -{ - unsigned int index, i, offset; - unsigned int *hashes = bloom->hashes; - - hash_func(bloom, s, len, hashes); - - for (i = 0; i < bloom->nfuncs; i++) { - offset = i * bloom->counts_per_func; - index = hashes[i] + offset; - bitmap_increment(bloom->bitmap, index, bloom->offset); - } - bloom->header->count++; - - return 0; -} - -int counting_bloom_remove(counting_bloom_t *bloom, const char *s, size_t len) -{ - unsigned int index, i, offset; - unsigned int *hashes = bloom->hashes; - - hash_func(bloom, s, len, hashes); - - for (i = 0; i < bloom->nfuncs; i++) { - offset = i * bloom->counts_per_func; - index = hashes[i] + offset; - bitmap_decrement(bloom->bitmap, index, bloom->offset); - } - bloom->header->count--; - - return 0; -} - -int counting_bloom_check(counting_bloom_t *bloom, const char *s, size_t len) -{ - unsigned int index, i, offset; - unsigned int *hashes = bloom->hashes; - - hash_func(bloom, s, len, hashes); - - for (i = 0; i < bloom->nfuncs; i++) { - offset = i * bloom->counts_per_func; - index = hashes[i] + offset; - if (!(bitmap_check(bloom->bitmap, index, bloom->offset))) { - return 0; - } - } - return 1; -} - -int free_scaling_bloom(scaling_bloom_t *bloom) -{ - int i; - for (i = bloom->num_blooms - 1; i >= 0; i--) { - free(bloom->blooms[i]->hashes); - bloom->blooms[i]->hashes = NULL; - free(bloom->blooms[i]); - bloom->blooms[i] = NULL; - } - free(bloom->blooms); - free_bitmap(bloom->bitmap); - free(bloom); - return 0; -} - -/* creates a new counting bloom filter from a given scaling bloom filter, with count and id */ -counting_bloom_t *new_counting_bloom_from_scale(scaling_bloom_t *bloom) -{ - int i; - long offset; - double error_rate; - counting_bloom_t *cur_bloom; - - error_rate = bloom->error_rate * (pow(ERROR_TIGHTENING_RATIO, bloom->num_blooms + 1)); - - if ((bloom->blooms = realloc(bloom->blooms, (bloom->num_blooms + 1) * sizeof(counting_bloom_t *))) == NULL) { - fprintf(stderr, "Error, could not realloc a new bloom filter\n"); - return NULL; - } - - cur_bloom = counting_bloom_init(bloom->capacity, error_rate, bloom->num_bytes); - bloom->blooms[bloom->num_blooms] = cur_bloom; - - bloom->bitmap = bitmap_resize(bloom->bitmap, bloom->num_bytes, bloom->num_bytes + cur_bloom->num_bytes); - - /* reset header pointer, as mmap may have moved */ - bloom->header = (scaling_bloom_header_t *) bloom->bitmap->array; - - /* Set the pointers for these header structs to the right location since mmap may have moved */ - bloom->num_blooms++; - for (i = 0; i < bloom->num_blooms; i++) { - offset = bloom->blooms[i]->offset - sizeof(counting_bloom_header_t); - bloom->blooms[i]->header = (counting_bloom_header_t *) (bloom->bitmap->array + offset); - } - - bloom->num_bytes += cur_bloom->num_bytes; - cur_bloom->bitmap = bloom->bitmap; - - return cur_bloom; -} - -counting_bloom_t *new_counting_bloom_from_file(unsigned int capacity, double error_rate, const char *filename) -{ - int fd; - off_t size; - - counting_bloom_t *bloom; - - if ((fd = open(filename, O_RDWR, (mode_t)0600)) < 0) { - fprintf(stderr, "Error, Could not open file %s: %s\n", filename, strerror(errno)); - return NULL; - } - if ((size = lseek(fd, 0, SEEK_END)) < 0) { - perror("Error, calling lseek() to tell file size"); - close(fd); - return NULL; - } - if (size == 0) { - fprintf(stderr, "Error, File size zero\n"); - } - - bloom = counting_bloom_init(capacity, error_rate, 0); - - if (size != bloom->num_bytes) { - free_counting_bloom(bloom); - fprintf(stderr, "Error, Actual filesize and expected filesize are not equal\n"); - return NULL; - } - if ((bloom->bitmap = new_bitmap(fd, size)) == NULL) { - fprintf(stderr, "Error, Could not create bitmap with file\n"); - free_counting_bloom(bloom); - return NULL; - } - - bloom->header = (counting_bloom_header_t *)(bloom->bitmap->array); - - return bloom; -} - -uint64_t scaling_bloom_clear_seqnums(scaling_bloom_t *bloom) -{ - uint64_t seqnum; - - if (bloom->header->disk_seqnum != 0) { - // disk_seqnum cleared on disk before any other changes - bloom->header->disk_seqnum = 0; - bitmap_flush(bloom->bitmap); - } - seqnum = bloom->header->mem_seqnum; - bloom->header->mem_seqnum = 0; - return seqnum; -} - -int scaling_bloom_add(scaling_bloom_t *bloom, const char *s, size_t len, uint64_t id) -{ - int i; - uint64_t seqnum; - - counting_bloom_t *cur_bloom = NULL; - for (i = bloom->num_blooms - 1; i >= 0; i--) { - cur_bloom = bloom->blooms[i]; - if (id >= cur_bloom->header->id) { - break; - } - } - - seqnum = scaling_bloom_clear_seqnums(bloom); - - if ((id > bloom->header->max_id) && (cur_bloom->header->count >= cur_bloom->capacity - 1)) { - cur_bloom = new_counting_bloom_from_scale(bloom); - cur_bloom->header->count = 0; - cur_bloom->header->id = bloom->header->max_id + 1; - } - if (bloom->header->max_id < id) { - bloom->header->max_id = id; - } - counting_bloom_add(cur_bloom, s, len); - - bloom->header->mem_seqnum = seqnum + 1; - - return 1; -} - -int scaling_bloom_remove(scaling_bloom_t *bloom, const char *s, size_t len, uint64_t id) -{ - counting_bloom_t *cur_bloom; - int i; - uint64_t seqnum; - - for (i = bloom->num_blooms - 1; i >= 0; i--) { - cur_bloom = bloom->blooms[i]; - if (id >= cur_bloom->header->id) { - seqnum = scaling_bloom_clear_seqnums(bloom); - - counting_bloom_remove(cur_bloom, s, len); - - bloom->header->mem_seqnum = seqnum + 1; - return 1; - } - } - return 0; -} - -int scaling_bloom_check(scaling_bloom_t *bloom, const char *s, size_t len) -{ - int i; - counting_bloom_t *cur_bloom; - for (i = bloom->num_blooms - 1; i >= 0; i--) { - cur_bloom = bloom->blooms[i]; - if (counting_bloom_check(cur_bloom, s, len)) { - return 1; - } - } - return 0; -} - -int scaling_bloom_flush(scaling_bloom_t *bloom) -{ - if (bitmap_flush(bloom->bitmap) != 0) { - return -1; - } - // all changes written to disk before disk_seqnum set - if (bloom->header->disk_seqnum == 0) { - bloom->header->disk_seqnum = bloom->header->mem_seqnum; - return bitmap_flush(bloom->bitmap); - } - return 0; -} - -uint64_t scaling_bloom_mem_seqnum(scaling_bloom_t *bloom) -{ - return bloom->header->mem_seqnum; -} - -uint64_t scaling_bloom_disk_seqnum(scaling_bloom_t *bloom) -{ - return bloom->header->disk_seqnum; -} - -scaling_bloom_t *scaling_bloom_init(unsigned int capacity, double error_rate, const char *filename, int fd) -{ - scaling_bloom_t *bloom; - - if ((bloom = malloc(sizeof(scaling_bloom_t))) == NULL) { - return NULL; - } - if ((bloom->bitmap = new_bitmap(fd, sizeof(scaling_bloom_header_t))) == NULL) { - fprintf(stderr, "Error, Could not create bitmap with file\n"); - free_scaling_bloom(bloom); - return NULL; - } - - bloom->header = (scaling_bloom_header_t *) bloom->bitmap->array; - bloom->capacity = capacity; - bloom->error_rate = error_rate; - bloom->num_blooms = 0; - bloom->num_bytes = sizeof(scaling_bloom_header_t); - bloom->fd = fd; - bloom->blooms = NULL; - - return bloom; -} - -scaling_bloom_t *new_scaling_bloom(unsigned int capacity, double error_rate, const char *filename) -{ - - scaling_bloom_t *bloom; - counting_bloom_t *cur_bloom; - int fd; - - if ((fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0600)) < 0) { - perror("Error, Opening File Failed"); - fprintf(stderr, " %s \n", filename); - return NULL; - } - - bloom = scaling_bloom_init(capacity, error_rate, filename, fd); - - if (!(cur_bloom = new_counting_bloom_from_scale(bloom))) { - fprintf(stderr, "Error, Could not create counting bloom\n"); - free_scaling_bloom(bloom); - return NULL; - } - cur_bloom->header->count = 0; - cur_bloom->header->id = 0; - - bloom->header->mem_seqnum = 1; - return bloom; -} - -scaling_bloom_t *new_scaling_bloom_from_file(unsigned int capacity, double error_rate, const char *filename) -{ - int fd; - off_t size; - - scaling_bloom_t *bloom; - counting_bloom_t *cur_bloom; - - if ((fd = open(filename, O_RDWR, (mode_t)0600)) < 0) { - fprintf(stderr, "Error, Could not open file %s: %s\n", filename, strerror(errno)); - return NULL; - } - if ((size = lseek(fd, 0, SEEK_END)) < 0) { - perror("Error, calling lseek() to tell file size"); - close(fd); - return NULL; - } - if (size == 0) { - fprintf(stderr, "Error, File size zero\n"); - } - - bloom = scaling_bloom_init(capacity, error_rate, filename, fd); - - size -= sizeof(scaling_bloom_header_t); - while (size) { - cur_bloom = new_counting_bloom_from_scale(bloom); - // leave count and id as they were set in the file - size -= cur_bloom->num_bytes; - if (size < 0) { - free_scaling_bloom(bloom); - fprintf(stderr, "Error, Actual filesize and expected filesize are not equal\n"); - return NULL; - } - } - return bloom; -} diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/dablooms.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/dablooms.h deleted file mode 100644 index f9887556df6a5..0000000000000 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/dablooms.h +++ /dev/null @@ -1,100 +0,0 @@ -/* Copyright @2012 by Justin Hines at Bitly under a very liberal license. See LICENSE in the source distribution. */ - -#ifndef __BLOOM_H__ -#define __BLOOM_H__ -#include -#include - -const char *dablooms_version(void); - -typedef struct { - size_t bytes; - int fd; - char *array; -} bitmap_t; - -#ifdef __cplusplus -extern "C" -{ -#endif -bitmap_t *bitmap_resize(bitmap_t *bitmap, size_t old_size, size_t new_size); -bitmap_t *new_bitmap(int fd, size_t bytes); - -int bitmap_increment(bitmap_t *bitmap, unsigned int index, long offset); -int bitmap_decrement(bitmap_t *bitmap, unsigned int index, long offset); -int bitmap_check(bitmap_t *bitmap, unsigned int index, long offset); -int bitmap_flush(bitmap_t *bitmap); - -void free_bitmap(bitmap_t *bitmap); - -#ifdef __cplusplus -} -#endif -typedef struct { - uint64_t id; - uint32_t count; - uint32_t _pad; -} counting_bloom_header_t; - - -typedef struct { - counting_bloom_header_t *header; - unsigned int capacity; - long offset; - unsigned int counts_per_func; - uint32_t *hashes; - size_t nfuncs; - size_t size; - size_t num_bytes; - double error_rate; - bitmap_t *bitmap; -} counting_bloom_t; - -#ifdef __cplusplus -extern "C" -{ -#endif -int free_counting_bloom(counting_bloom_t *bloom); -counting_bloom_t *new_counting_bloom(unsigned int capacity, double error_rate, const char *filename); -counting_bloom_t *new_counting_bloom_from_file(unsigned int capacity, double error_rate, const char *filename); -int counting_bloom_add(counting_bloom_t *bloom, const char *s, size_t len); -int counting_bloom_remove(counting_bloom_t *bloom, const char *s, size_t len); -int counting_bloom_check(counting_bloom_t *bloom, const char *s, size_t len); - -#ifdef __cplusplus -} -#endif -typedef struct { - uint64_t max_id; - uint64_t mem_seqnum; - uint64_t disk_seqnum; -} scaling_bloom_header_t; - -typedef struct { - scaling_bloom_header_t *header; - unsigned int capacity; - unsigned int num_blooms; - size_t num_bytes; - double error_rate; - int fd; - counting_bloom_t **blooms; - bitmap_t *bitmap; -} scaling_bloom_t; - -#ifdef __cplusplus -extern "C" -{ -#endif -scaling_bloom_t *new_scaling_bloom(unsigned int capacity, double error_rate, const char *filename); -scaling_bloom_t *new_scaling_bloom_from_file(unsigned int capacity, double error_rate, const char *filename); -int free_scaling_bloom(scaling_bloom_t *bloom); -int scaling_bloom_add(scaling_bloom_t *bloom, const char *s, size_t len, uint64_t id); -int scaling_bloom_remove(scaling_bloom_t *bloom, const char *s, size_t len, uint64_t id); -int scaling_bloom_check(scaling_bloom_t *bloom, const char *s, size_t len); -int scaling_bloom_flush(scaling_bloom_t *bloom); -uint64_t scaling_bloom_mem_seqnum(scaling_bloom_t *bloom); -uint64_t scaling_bloom_disk_seqnum(scaling_bloom_t *bloom); -#ifdef __cplusplus -} -#endif -#endif diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.cpp index afd74165eab6a..5dcb8e20e4874 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.cpp @@ -7,21 +7,49 @@ namespace clangcms { void edmChecker::checkASTDecl(const clang::CXXRecordDecl *RD, clang::ento::AnalysisManager& mgr, clang::ento::BugReporter &BR) const { - if (!RD->hasDefinition()) return; + const clang::SourceManager &SM = BR.getSourceManager(); - for ( auto J=RD->bases_begin(), F=RD->bases_end();J != F; ++J) { - auto BRD = J->getType()->getAsCXXRecordDecl(); - if (!BRD) continue; - std::string bname = BRD->getQualifiedNameAsString(); - if (bname=="edm::EDProducer" || bname=="edm::EDFilter" || bname=="edm::EDAnalyzer" || bname=="edm::OutputModule" ) { - llvm::SmallString<100> buf; - llvm::raw_svector_ostream os(buf); - os << RD->getQualifiedNameAsString() << " inherits from edm::EDProducer,edm::EDFilter,edm::EDAnalyzer, or edm::OutputModule"; - os << "\n"; - clang::ento::PathDiagnosticLocation ELoc =clang::ento::PathDiagnosticLocation::createBegin( RD, SM ); - BR.EmitBasicReport(RD, this, "inherits from edm::EDProducer,edm::EDFilter,edm::EDAnalyzer, or edm::OutputModule","ThreadSafety",os.str(),ELoc); - } + clang::ento::PathDiagnosticLocation DLoc =clang::ento::PathDiagnosticLocation::createBegin( RD, SM ); + if ( !m_exception.reportClass( DLoc, BR ) ) return; +// Check the class methods (member methods). + for (clang::CXXRecordDecl::method_iterator + I = RD->method_begin(), E = RD->method_end(); I != E; ++I) + { + if ( !llvm::isa((*I)) ) continue; + clang::CXXMethodDecl * MD = llvm::cast((*I)); + if ( MD->getNameAsString() == "beginRun" + || MD->getNameAsString() == "endRun" + || MD->getNameAsString() == "beginLuminosityBlock" + || MD->getNameAsString() == "endLuminosityBlock" ) + { +// llvm::errs()<getQualifiedNameAsString()<<"\n"; + for (auto J=RD->bases_begin(), F=RD->bases_end();J != F; ++J) + { + std::string name = J->getType()->castAs()->getDecl()->getQualifiedNameAsString(); +// llvm::errs()<getQualifiedNameAsString()<<"\n"; +// llvm::errs() << "inherits from " < buf; + llvm::raw_svector_ostream os(buf); + os << RD->getQualifiedNameAsString() << " inherits from edm::EDProducer or edm::EDFilter"; + os << "\n"; + llvm::errs()<param_begin(); + ParmVarDecl * PVD = *(I); + QualType PQT = PVD->getType(); + if ( PQT->isReferenceType() ) { + QualType RQT = PQT->getPointeeType(); + if (RQT.isConstQualified()) continue; + } + clang::ento::PathDiagnosticLocation ELoc =clang::ento::PathDiagnosticLocation::createBegin( MD, SM ); + BR.EmitBasicReport(MD, "Class Checker : inherits from edm::EDProducer or edm::EDFilter","optional",os.str(),ELoc); + } + } + } } } //end of class + } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.h index b0650b8e2e122..fcc6b53a83394 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/edmChecker.h @@ -19,6 +19,7 @@ namespace clangcms { class edmChecker : public clang::ento::Checker > { + mutable clang::OwningPtr< clang::ento::BugType> BT; public: diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.cpp b/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.cpp index 02c37b71b5a23..4d3424ad94063 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.cpp +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.cpp @@ -6,14 +6,12 @@ using namespace llvm; namespace clangcms { class Walker : public clang::StmtVisitor { - const CheckerBase *Checker; clang::ento::BugReporter &BR; clang::AnalysisDeclContext *AC; public: - Walker( const CheckerBase *checker, clang::ento::BugReporter &br, clang::AnalysisDeclContext *ac ) - : Checker(checker), - BR(br), + Walker(clang::ento::BugReporter &br, clang::AnalysisDeclContext *ac ) + : BR(br), AC(ac) {} void VisitChildren(clang::Stmt *S ); @@ -107,7 +105,7 @@ void Walker::VisitCXXMemberCallExpr( CXXMemberCallExpr *CE ) { // llvm::errs()<addRange(CE->getSourceRange()); BR.emitReport(R); @@ -132,7 +130,7 @@ void Walker::VisitCXXMemberCallExpr( CXXMemberCallExpr *CE ) { // llvm::errs()<<" "<addRange(CE->getSourceRange()); BR.emitReport(R); @@ -149,7 +147,7 @@ void getByChecker::checkASTDecl(const CXXMethodDecl *MD, AnalysisManager& mgr, PathDiagnosticLocation DLoc =PathDiagnosticLocation::createBegin( MD, SM ); if ( SM.isInSystemHeader(DLoc.asLocation()) || SM.isInExternCSystemHeader(DLoc.asLocation()) ) return; if (!MD->doesThisDeclarationHaveABody()) return; - clangcms::Walker walker(this,BR, mgr.getAnalysisDeclContext(MD)); + clangcms::Walker walker(BR, mgr.getAnalysisDeclContext(MD)); walker.Visit(MD->getBody()); return; } @@ -164,7 +162,7 @@ void getByChecker::checkASTDecl(const FunctionTemplateDecl *TD, AnalysisManager& E = const_cast(TD)->spec_end(); I != E; ++I) { if (I->doesThisDeclarationHaveABody()) { - clangcms::Walker walker(this,BR, mgr.getAnalysisDeclContext(*I)); + clangcms::Walker walker(BR, mgr.getAnalysisDeclContext(*I)); walker.Visit(I->getBody()); } } diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.h index b8655f4d9056c..e05e9561bc8e3 100644 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.h +++ b/branches/withNewDZ/Utilities/StaticAnalyzers/src/getByChecker.h @@ -23,6 +23,8 @@ namespace clangcms { class getByChecker : public clang::ento::Checker< clang::ento::check::ASTDecl, clang::ento::check::ASTDecl > { + mutable clang::OwningPtr< clang::ento::BugType> BT; + public: diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/murmur.c b/branches/withNewDZ/Utilities/StaticAnalyzers/src/murmur.c deleted file mode 100644 index fcf1dc1bcc632..0000000000000 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/murmur.c +++ /dev/null @@ -1,120 +0,0 @@ -//----------------------------------------------------------------------------- -// MurmurHash3 was written by Austin Appleby, and is placed in the public -// domain. The author hereby disclaims copyright to this source code. - -// Note - The x86 and x64 versions do _not_ produce the same results, as the -// algorithms are optimized for their respective platforms. You can still -// compile and run any of them on any platform, but your performance with the -// non-native version will be less than optimal. - -#include "murmur.h" - -#define FORCE_INLINE inline static - -FORCE_INLINE uint64_t rotl64 ( uint64_t x, int8_t r ) -{ - return (x << r) | (x >> (64 - r)); -} - -#define ROTL64(x,y) rotl64(x,y) - -#define BIG_CONSTANT(x) (x##LLU) - -#define getblock(x, i) (x[i]) - -//----------------------------------------------------------------------------- -// Finalization mix - force all bits of a hash block to avalanche - -FORCE_INLINE uint64_t fmix64(uint64_t k) -{ - k ^= k >> 33; - k *= BIG_CONSTANT(0xff51afd7ed558ccd); - k ^= k >> 33; - k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53); - k ^= k >> 33; - - return k; -} - -//----------------------------------------------------------------------------- - -void MurmurHash3_x64_128 ( const void * key, const int len, - const uint32_t seed, void * out ) -{ - const uint8_t * data = (const uint8_t*)key; - const int nblocks = len / 16; - - uint64_t h1 = seed; - uint64_t h2 = seed; - - uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5); - uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f); - - int i; - - //---------- - // body - - const uint64_t * blocks = (const uint64_t *)(data); - - for(i = 0; i < nblocks; i++) { - uint64_t k1 = getblock(blocks,i*2+0); - uint64_t k2 = getblock(blocks,i*2+1); - - k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1; - - h1 = ROTL64(h1,27); h1 += h2; h1 = h1*5+0x52dce729; - - k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2; - - h2 = ROTL64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5; - } - - //---------- - // tail - - const uint8_t * tail = (const uint8_t*)(data + nblocks*16); - - uint64_t k1 = 0; - uint64_t k2 = 0; - - switch(len & 15) { - case 15: k2 ^= ((uint64_t)tail[14]) << 48; - case 14: k2 ^= ((uint64_t)tail[13]) << 40; - case 13: k2 ^= ((uint64_t)tail[12]) << 32; - case 12: k2 ^= ((uint64_t)tail[11]) << 24; - case 11: k2 ^= ((uint64_t)tail[10]) << 16; - case 10: k2 ^= ((uint64_t)tail[ 9]) << 8; - case 9: k2 ^= ((uint64_t)tail[ 8]) << 0; - k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2; - - case 8: k1 ^= ((uint64_t)tail[ 7]) << 56; - case 7: k1 ^= ((uint64_t)tail[ 6]) << 48; - case 6: k1 ^= ((uint64_t)tail[ 5]) << 40; - case 5: k1 ^= ((uint64_t)tail[ 4]) << 32; - case 4: k1 ^= ((uint64_t)tail[ 3]) << 24; - case 3: k1 ^= ((uint64_t)tail[ 2]) << 16; - case 2: k1 ^= ((uint64_t)tail[ 1]) << 8; - case 1: k1 ^= ((uint64_t)tail[ 0]) << 0; - k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1; - } - - //---------- - // finalization - - h1 ^= len; h2 ^= len; - - h1 += h2; - h2 += h1; - - h1 = fmix64(h1); - h2 = fmix64(h2); - - h1 += h2; - h2 += h1; - - ((uint64_t*)out)[0] = h1; - ((uint64_t*)out)[1] = h2; -} - -//----------------------------------------------------------------------------- diff --git a/branches/withNewDZ/Utilities/StaticAnalyzers/src/murmur.h b/branches/withNewDZ/Utilities/StaticAnalyzers/src/murmur.h deleted file mode 100644 index 808ee1110d848..0000000000000 --- a/branches/withNewDZ/Utilities/StaticAnalyzers/src/murmur.h +++ /dev/null @@ -1,19 +0,0 @@ -//----------------------------------------------------------------------------- -// MurmurHash3 was written by Austin Appleby, and is placed in the public -// domain. The author hereby disclaims copyright to this source code. - -#ifndef _MURMURHASH3_H_ -#define _MURMURHASH3_H_ - -#include - -#ifdef __cplusplus -extern "C" -{ -#endif -void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out ); -#ifdef __cplusplus -} -#endif - -#endif // _MURMURHASH3_H_ diff --git a/branches/withNewDZ/Validation/EventGenerator/src/HepMCValidationHelper.cc b/branches/withNewDZ/Validation/EventGenerator/src/HepMCValidationHelper.cc index acaff48216bc0..4a0ed26d0e632 100644 --- a/branches/withNewDZ/Validation/EventGenerator/src/HepMCValidationHelper.cc +++ b/branches/withNewDZ/Validation/EventGenerator/src/HepMCValidationHelper.cc @@ -185,7 +185,7 @@ namespace HepMCValidationHelper { for (unsigned int i = 0; i < taus.size(); ++i){ std::vector taudaughters; findDescendents(taus[i], taudaughters); - assert(taudaughters.size()>0); + //assert(taudaughters.size()>0); if ( taudaughters.size()==0 ) { edm::LogError("HepMCValidationHelper") << "Tau with no daughters. This is a bug. Fix it"; continue; diff --git a/branches/withNewDZ/Validation/Geometry/interface/MaterialBudgetAction.h b/branches/withNewDZ/Validation/Geometry/interface/MaterialBudgetAction.h index d633aff772046..6540c8e8c7c0e 100644 --- a/branches/withNewDZ/Validation/Geometry/interface/MaterialBudgetAction.h +++ b/branches/withNewDZ/Validation/Geometry/interface/MaterialBudgetAction.h @@ -1,9 +1,10 @@ -#ifndef Validation_Geometry_MaterialBudgetAction_h -#define Validation_Geometry_MaterialBudgetAction_h - +#ifndef _MaterialBudgetAction_h +#define _MaterialBudgetAction_h #include #include - +#include + +// user include files #include "Validation/Geometry/interface/MaterialBudgetTree.h" #include "Validation/Geometry/interface/MaterialBudgetFormat.h" #include "Validation/Geometry/interface/MaterialBudgetHistos.h" @@ -12,7 +13,7 @@ #include "Validation/Geometry/interface/MaterialBudgetTxt.h" #include "Validation/Geometry/interface/TestHistoMgr.h" -#include "SimG4Core/Watcher/interface/SimWatcher.h" +#include "SimG4Core/Watcher/interface/SimProducer.h" #include "SimG4Core/Notification/interface/Observer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -20,22 +21,26 @@ class BeginOfTrack; class BeginOfRun; -class BeginOfEvent; class G4Step; class EndOfTrack; +class EndOfEvent; class G4StepPoint; class G4VTouchable; -class MaterialBudgetAction : public SimWatcher, - public Observer, +class MaterialBudgetAction : public SimProducer, + public Observer, public Observer, public Observer, - public Observer + public Observer, + public Observer { public: MaterialBudgetAction(const edm::ParameterSet&); virtual ~MaterialBudgetAction(); + void produce(edm::Event&, const edm::EventSetup&); + + private: MaterialBudgetAction(const MaterialBudgetAction&); // stop default @@ -45,10 +50,16 @@ class MaterialBudgetAction : public SimWatcher, void update(const BeginOfTrack*); void update(const G4Step*); void update(const EndOfTrack*); + void update(const EndOfEvent*); + + void initRun(); + void processEvent( unsigned int nEv ); + void endRun(); bool CheckTouchableInSelectedVolumes( const G4VTouchable* touch ); bool StopAfterProcess( const G4Step* aStep ); + private: void save( const G4Step* aStep ); std::string getSubDetectorName( G4StepPoint* aStepPoint ); std::string getPartName( G4StepPoint* aStepPoint ); @@ -65,6 +76,7 @@ class MaterialBudgetAction : public SimWatcher, std::vector theVolumeList; G4String theProcessToStop; std::string theHistoList; + }; #endif diff --git a/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetAction.cc b/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetAction.cc index 98a15a985a12b..3e8bdfcc1ccbe 100644 --- a/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetAction.cc +++ b/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetAction.cc @@ -26,9 +26,10 @@ #include + //------------------------------------------------------------------------- -MaterialBudgetAction::MaterialBudgetAction(const edm::ParameterSet& iPSet) - : theHistoMgr(0) +MaterialBudgetAction::MaterialBudgetAction(const edm::ParameterSet& iPSet) : + theHistoMgr(0) { theData = new MaterialBudgetData; @@ -130,8 +131,15 @@ MaterialBudgetAction::~MaterialBudgetAction() delete theData; } + +//------------------------------------------------------------------------- +void MaterialBudgetAction::produce(edm::Event& e, const edm::EventSetup&) +{ +} + + //------------------------------------------------------------------------- -void MaterialBudgetAction::update(const BeginOfRun* ) +void MaterialBudgetAction::update(const BeginOfRun* trk) { //----- Check that selected volumes are indeed part of the geometry const G4LogicalVolumeStore* lvs = G4LogicalVolumeStore::GetInstance(); @@ -139,6 +147,7 @@ void MaterialBudgetAction::update(const BeginOfRun* ) std::vector::const_iterator volcite; for( volcite = theVolumeList.begin(); volcite != theVolumeList.end(); volcite++ ){ + //- std::cout << " MaterialBudgetAction checking volume " << *volcite << std::endl; bool volFound = false; for( lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++ ) { if( (*lvcite)->GetName() == *volcite ) { @@ -241,6 +250,7 @@ void MaterialBudgetAction::update(const BeginOfTrack* trk) //------------------------------------------------------------------------- void MaterialBudgetAction::update(const G4Step* aStep) { + //----- Check it is inside one of the volumes selected if( theVolumeList.size() != 0 ) { if( !CheckTouchableInSelectedVolumes( aStep->GetTrack()->GetTouchable() ) ) return; @@ -295,22 +305,34 @@ std::string MaterialBudgetAction::getPartName( G4StepPoint* aStepPoint ) } } + + //------------------------------------------------------------------------- void MaterialBudgetAction::update(const EndOfTrack* trk) { + // std::cout << " EndOfTrack " << saveToHistos << std::endl; const G4Track * aTrack = (*trk)(); // recover G4 pointer if wanted // if( aTrack->GetParentID() != 0 ) return; //---------- end of track (OutOfWorld) //- std::cout << " Data End Track " << std::endl; theData->dataEndTrack( aTrack ); +} +void MaterialBudgetAction::update(const EndOfEvent* evt) +{ //- std::cout << " Data End Event " << std::endl; if (saveToTree) theTree->fillEndTrack(); if (saveToHistos) theHistos->fillEndTrack(); if (saveToTxt) theTxt->fillEndTrack(); } +//------------------------------------------------------------------------- +void MaterialBudgetAction::endRun() +{ +} + + //------------------------------------------------------------------------- bool MaterialBudgetAction::CheckTouchableInSelectedVolumes( const G4VTouchable* touch ) { @@ -325,8 +347,10 @@ bool MaterialBudgetAction::CheckTouchableInSelectedVolumes( const G4VTouchable* } return false; + } + //------------------------------------------------------------------------- bool MaterialBudgetAction::StopAfterProcess( const G4Step* aStep ) { diff --git a/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetCategorizer.cc b/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetCategorizer.cc index 7a6d98e2a2643..bf96eb3b40078 100644 --- a/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetCategorizer.cc +++ b/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetCategorizer.cc @@ -1,4 +1,5 @@ #include "Validation/Geometry/interface/MaterialBudgetCategorizer.h" +//#include "Utilities/UI/interface/SimpleConfigurable.h" #include "G4LogicalVolumeStore.hh" #include "G4Material.hh" diff --git a/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetData.cc b/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetData.cc index b8b6a9ee9d0f5..79b50eb6fc9b2 100644 --- a/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetData.cc +++ b/branches/withNewDZ/Validation/Geometry/src/MaterialBudgetData.cc @@ -99,6 +99,10 @@ void MaterialBudgetData::SetAllStepsToTree() void MaterialBudgetData::dataStartTrack( const G4Track* aTrack ) { + // rr + std::cout << "MaterialBudget Analysis of Event #" << G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetEventID() << std::endl; + // rr + const G4ThreeVector& dir = aTrack->GetMomentum() ; if( myMaterialBudgetCategorizer == 0) myMaterialBudgetCategorizer = new MaterialBudgetCategorizer; @@ -165,68 +169,70 @@ void MaterialBudgetData::dataEndTrack( const G4Track* aTrack ) //- std::cout << "[OVAL] MaterialBudget " << G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetEventID() << " " << theEta << " " << thePhi << " " << theTotalMB << std::endl; // rr std::cout << "Recorded steps " << theStepN << std::endl; - std::cout << " Material Budget: Radiation Length " << "G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetEventID()" << " eta " << theEta << " phi " << thePhi << " total X " << theTotalMB << " SUP " << theSupportMB << " SEN " << theSensitiveMB << " CAB " << theCablesMB << " COL " << theCoolingMB << " ELE " << theElectronicsMB << " other " << theOtherMB << " Air " << theAirMB << std::endl; - std::cout << " Material Budget: Interaction Length " << "G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetEventID()" << " eta " << theEta << " phi " << thePhi << " total L " << theTotalIL << " SUP " << theSupportIL << " SEN " << theSensitiveIL << " CAB " << theCablesIL << " COL " << theCoolingIL << " ELE " << theElectronicsIL << " other " << theOtherIL << " Air " << theAirIL << std::endl; + std::cout << " Material Budget: Radiation Length " << G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetEventID() << " eta " << theEta << " phi " << thePhi << " total X " << theTotalMB << " SUP " << theSupportMB << " SEN " << theSensitiveMB << " CAB " << theCablesMB << " COL " << theCoolingMB << " ELE " << theElectronicsMB << " other " << theOtherMB << " Air " << theAirMB << std::endl; + std::cout << " Material Budget: Interaction Length " << G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetEventID() << " eta " << theEta << " phi " << thePhi << " total L " << theTotalIL << " SUP " << theSupportIL << " SEN " << theSensitiveIL << " CAB " << theCablesIL << " COL " << theCoolingIL << " ELE " << theElectronicsIL << " other " << theOtherIL << " Air " << theAirIL << std::endl; // rr } + void MaterialBudgetData::dataPerStep( const G4Step* aStep ) { - assert(aStep); + G4Material * theMaterialPre = aStep->GetPreStepPoint()->GetMaterial(); + // G4Material * theMaterialPost = aStep->GetPostStepPoint()->GetMaterial(); + G4StepPoint* prePoint = aStep->GetPreStepPoint(); G4StepPoint* postPoint = aStep->GetPostStepPoint(); - assert(prePoint); - assert(postPoint); - G4Material * theMaterialPre = prePoint->GetMaterial(); - assert(theMaterialPre); CLHEP::Hep3Vector prePos = prePoint->GetPosition(); CLHEP::Hep3Vector postPos = postPoint->GetPosition(); G4double steplen = aStep->GetStepLength(); - G4double radlen = theMaterialPre->GetRadlen(); - G4double intlen = theMaterialPre->GetNuclearInterLength(); - G4double density = theMaterialPre->GetDensity() / densityConvertionFactor; // always g/cm3 - - G4String materialName = theMaterialPre->GetName(); - std::cout << " steplen " << steplen << " radlen " << radlen << " mb " << steplen/radlen << " mate " << theMaterialPre->GetName() << std::endl; + G4double radlen; + G4double intlen; + G4double density; - G4String volumeName = aStep->GetPreStepPoint()->GetTouchable()->GetVolume(0)->GetLogicalVolume()->GetName(); - std::cout << " Volume " << volumeName << "\n"; - std::cout << " Material " << materialName << "\n"; + radlen = theMaterialPre->GetRadlen(); + intlen = theMaterialPre->GetNuclearInterLength(); + density = theMaterialPre->GetDensity() / densityConvertionFactor; // always g/cm3 + + G4String name = theMaterialPre->GetName(); + // std::cout << " steplen " << steplen << " radlen " << radlen << " mb " << steplen/radlen << " mate " << theMaterialPre->GetName() << std::endl; + + G4LogicalVolume* lv = aStep->GetTrack()->GetVolume()->GetLogicalVolume(); // instantiate the categorizer - assert(myMaterialBudgetCategorizer); - int volumeID = myMaterialBudgetCategorizer->volume( volumeName ); - int materialID = myMaterialBudgetCategorizer->material( materialName ); - std::cout << "Volume ID " << volumeID << " and material ID " << materialID << "\n"; - - // FIXME: Both volume ID and material ID are zeros, so this part is not executed leaving all - // values as zeros. - if( volumeID != 0 ) - { - theSupportFractionMB = myMaterialBudgetCategorizer->x0fraction(materialName).at(0); - theSensitiveFractionMB = myMaterialBudgetCategorizer->x0fraction(materialName).at(1); - theCablesFractionMB = myMaterialBudgetCategorizer->x0fraction(materialName).at(2); - theCoolingFractionMB = myMaterialBudgetCategorizer->x0fraction(materialName).at(3); - theElectronicsFractionMB = myMaterialBudgetCategorizer->x0fraction(materialName).at(4); - theOtherFractionMB = myMaterialBudgetCategorizer->x0fraction(materialName).at(5); - theAirFractionMB = myMaterialBudgetCategorizer->x0fraction(materialName).at(6); - - if(theOtherFractionMB!=0) std::cout << " material found with no category " << materialName - << " in volume " << volumeName << std::endl; - theSupportFractionIL = myMaterialBudgetCategorizer->l0fraction(materialName).at(0); - theSensitiveFractionIL = myMaterialBudgetCategorizer->l0fraction(materialName).at(1); - theCablesFractionIL = myMaterialBudgetCategorizer->l0fraction(materialName).at(2); - theCoolingFractionIL = myMaterialBudgetCategorizer->l0fraction(materialName).at(3); - theElectronicsFractionIL = myMaterialBudgetCategorizer->l0fraction(materialName).at(4); - theOtherFractionIL = myMaterialBudgetCategorizer->l0fraction(materialName).at(5); - theAirFractionIL = myMaterialBudgetCategorizer->l0fraction(materialName).at(6); - if(theOtherFractionIL!=0) std::cout << " material found with no category " << materialName - << " in volume " << volumeName << std::endl; - } - // if(theOtherFractionMB!=0) LogDebug("MaterialBudgetData") << " material found with no category " << name + int volumeID = myMaterialBudgetCategorizer->volume( lv->GetName() ); + int materialID = myMaterialBudgetCategorizer->material( lv->GetMaterial()->GetName() ); + // rr + std::string volumeName = lv->GetName(); + std::string materialName = lv->GetMaterial()->GetName(); + // rr + + // rr + /* + std::cout << " Volume " << lv->GetName() << std::endl; + std::cout << " Material " << lv->GetMaterial()->GetName() << std::endl; + */ + theSupportFractionMB = myMaterialBudgetCategorizer->x0fraction(lv->GetMaterial()->GetName())[0]; + theSensitiveFractionMB = myMaterialBudgetCategorizer->x0fraction(lv->GetMaterial()->GetName())[1]; + theCablesFractionMB = myMaterialBudgetCategorizer->x0fraction(lv->GetMaterial()->GetName())[2]; + theCoolingFractionMB = myMaterialBudgetCategorizer->x0fraction(lv->GetMaterial()->GetName())[3]; + theElectronicsFractionMB = myMaterialBudgetCategorizer->x0fraction(lv->GetMaterial()->GetName())[4]; + theOtherFractionMB = myMaterialBudgetCategorizer->x0fraction(lv->GetMaterial()->GetName())[5]; + theAirFractionMB = myMaterialBudgetCategorizer->x0fraction(lv->GetMaterial()->GetName())[6]; + if(theOtherFractionMB!=0) std::cout << " material found with no category " << lv->GetMaterial()->GetName() + << " in volume " << lv->GetName() << std::endl; + theSupportFractionIL = myMaterialBudgetCategorizer->l0fraction(lv->GetMaterial()->GetName())[0]; + theSensitiveFractionIL = myMaterialBudgetCategorizer->l0fraction(lv->GetMaterial()->GetName())[1]; + theCablesFractionIL = myMaterialBudgetCategorizer->l0fraction(lv->GetMaterial()->GetName())[2]; + theCoolingFractionIL = myMaterialBudgetCategorizer->l0fraction(lv->GetMaterial()->GetName())[3]; + theElectronicsFractionIL = myMaterialBudgetCategorizer->l0fraction(lv->GetMaterial()->GetName())[4]; + theOtherFractionIL = myMaterialBudgetCategorizer->l0fraction(lv->GetMaterial()->GetName())[5]; + theAirFractionIL = myMaterialBudgetCategorizer->l0fraction(lv->GetMaterial()->GetName())[6]; + if(theOtherFractionIL!=0) std::cout << " material found with no category " << lv->GetMaterial()->GetName() + << " in volume " << lv->GetName() << std::endl; + // if(theOtherFractionMB!=0) LogDebug("MaterialBudgetData") << " material found with no category " << lv->GetMaterial()->GetName() // << " in volume " << lv->GetName(); // rr diff --git a/branches/withNewDZ/Validation/RecoEgamma/plugins/PhotonValidator.cc b/branches/withNewDZ/Validation/RecoEgamma/plugins/PhotonValidator.cc index cd215e84207e6..aedafc5c4a285 100755 --- a/branches/withNewDZ/Validation/RecoEgamma/plugins/PhotonValidator.cc +++ b/branches/withNewDZ/Validation/RecoEgamma/plugins/PhotonValidator.cc @@ -263,7 +263,8 @@ void PhotonValidator::bookHistograms( DQMStore::IBooker & iBooker, edm::Run cons iBooker.setCurrentFolder("EgammaV/"+fName_+"/SimulationInfo"); - + std::cout <<"made directory "<<"EgammaV/"+fName_+"/SimulationInfo"<getFullname()<size(); + if ( fName_ == "pfPhotonValidator") { + //std::cout << " photonHandle->size() " << photonHandle->size() << std::endl; + for(unsigned int lCand=0; lCand < nObj; lCand++) { + //std::cout << " I am in the loop " << std::endl; + reco::PhotonRef photonRef (reco::PhotonRef( photonHandle,lCand)); + //std::cout << " photon SC energy " << photonRef->superCluster()->energy() << " " << phoToParticleBasedIsoMap[photonRef].size() << std::endl; + for( std::vector::const_iterator i = phoToParticleBasedIsoMap[photonRef].begin(); i != phoToParticleBasedIsoMap[photonRef].end(); ++i ) { + //if ( (*i).isNonnull() ) { + // float dR= deltaR(photonRef->eta(), photonRef->phi(), (*i)->eta(), (*i)->phi() ); + // std::cout << " Debugging Candidate dR " << dR << " type " << (*i)->particleId() << " pt " << (*i)->pt() << std::endl; + // } + } + } + } + + + Handle< edm::View > outInTrkHandle; Handle< edm::View > inOutTrkHandle; if ( !fastSim_) { //// Get the Out In CKF tracks from conversions e.getByToken(conversionOITrackPr_Token_, outInTrkHandle); + //std::cout << "ConvPhoAnalyzerWithOfficialAssociation outInTrack collection size " << (*outInTrkHandle).size() << "\n"; + //// Get the In Out CKF tracks from conversions e.getByToken(conversionIOTrackPr_Token_, inOutTrkHandle); + //std::cout << " ConvPhoAnalyzerWithOfficialAssociation inOutTrack collection size " << (*inOutTrkHandle).size() << "\n"; // Loop over Out In Tracks int iTrk=0; int nHits=0; for( View::const_iterator iTk = outInTrkHandle->begin(); iTk != outInTrkHandle->end(); iTk++) { + // std::cout << " Barrel Out In Track charge " << iTk->charge() << " Num of RecHits " << iTk->recHitsSize() << " inner momentum " << sqrt( iTk->innerMomentum().Mag2() ) << "\n"; + // std::cout << " Barrel Out In Track Extra inner momentum " << sqrt(iTk->extra()->innerMomentum().Mag2()) << " inner position R " << sqrt( iTk->innerPosition().Perp2() ) << "\n"; h_OIinnermostHitR_ ->Fill ( sqrt( iTk->innerPosition().Perp2() ) ); for ( trackingRecHit_iterator itHits=iTk->extra()->recHitsBegin(); itHits!=iTk->extra()->recHitsEnd(); ++itHits ) { if ( (*itHits)->isValid() ) { nHits++; + // cout <idToDet((*itHits)->geographicalId())->surface().toGlobal((*itHits)->localPosition()) << " R "<< trackerGeom->idToDet((*itHits)->geographicalId())->surface().toGlobal((*itHits)->localPosition()).perp() << " Z " << trackerGeom->idToDet((*itHits)->geographicalId())->surface().toGlobal((*itHits)->localPosition()).z() << "\n"; } @@ -1720,11 +1748,15 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup // Loop over In Out Tracks Barrel iTrk=0; for( View::const_iterator iTk = inOutTrkHandle->begin(); iTk != inOutTrkHandle->end(); iTk++) { + //std::cout << " Barrel In Out Track charge " << iTk->charge() << " Num of RecHits " << iTk->recHitsSize() << " inner momentum " << sqrt( iTk->innerMomentum().Mag2()) << "\n"; + // std::cout << " Barrel In Out Track Extra inner momentum " << sqrt(iTk->extra()->innerMomentum().Mag2()) << "\n"; h_IOinnermostHitR_ ->Fill ( sqrt( iTk->innerPosition().Perp2() ) ); nHits=0; for ( trackingRecHit_iterator itHits=iTk->extra()->recHitsBegin(); itHits!=iTk->extra()->recHitsEnd(); ++itHits ) { if ( (*itHits)->isValid() ) { nHits++; + //cout <idToDet((*itHits)->geographicalId())->surface().toGlobal((*itHits)->localPosition()) << " R "<< trackerGeom->idToDet((*itHits)->geographicalId())->surface().toGlobal((*itHits)->localPosition()).perp() << " Z " << trackerGeom->idToDet((*itHits)->geographicalId())->surface().toGlobal((*itHits)->localPosition()).z() << "\n"; + } } iTrk++; @@ -2086,16 +2118,28 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup || (mother != 0 && mother->pdg_id() == 25) || (mother != 0 && mother->pdg_id() == 35) ) { + //std::cout << " ZERO mother or Higgs or primary photon " << std::endl; + //if (mother !=0) std::cout << mother->pdg_id() << std::endl; double dPt = fabs((*mcIter)->momentum().perp() - (*mcPho).fourMomentum().et()); float phiMother=(*mcIter)->momentum().phi(); double dPhi = phiNormalization(phiMother) - mcPhi_ ; double dEta = fabs( (*mcIter)->momentum().eta() - (*mcPho).fourMomentum().pseudoRapidity() ); + //std::cout << " HEP photon pt " << (*mcIter)->momentum().perp() << " eta " << (*mcIter)->momentum().eta() << " phi " << (*mcIter)->momentum().phi() << std::endl; + //std::cout << " (*mcPho).motherType() selection " << (*mcPho).motherType() << " pt " << (*mcPho).fourMomentum().et() << " eta " << (*mcPho).fourMomentum().pseudoRapidity() << " phi " << mcPhi_ << std::endl; + //std::cout << " dPt " << dPt << " dEta " << dEta << " dPhi " << dPhi << std::endl; if ( dEta <=0.0001 && dPhi <=0.0001 && dPt <=0.0001) isTheSame = true; } if ( ! isTheSame ) continue; + // std::cout << " HEP photon pt " << (*mcIter)->momentum().perp() << " eta " << (*mcIter)->momentum().eta() << " phi " << (*mcIter)->momentum().phi() << std::endl; + //std::cout << " (*mcPho).motherType() after " << (*mcPho).motherType() << " pt " << (*mcPho).fourMomentum().et() << " eta " << (*mcPho).fourMomentum().pseudoRapidity() << " phi " << mcPhi_ << std::endl; + + + + // if ( ! ( fabs(mcEta_) <= BARL || ( fabs(mcEta_) >= END_LO && fabs(mcEta_) <=END_HI ) ) ) + // continue; // all ecal fiducial region nSimPho_[0]++; if ( ! isRunCentrally_ ) { @@ -2133,15 +2177,25 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup theConvTP_.clear(); + //std::cout << " PhotonValidator TrackingParticles TrackingParticleCollection size "<< trackingParticles.size() << "\n"; for(size_t i = 0; i < trackingParticles.size(); ++i){ TrackingParticleRef tp (ElectronTPHandle,i); + //std::cout << " Electron pt " << tp -> pt() << " charge " << tp -> charge() << " pdgId " << tp->pdgId() << " Hits for this track: " << tp -> trackPSimHit().size() << std::endl; + //std::cout << " track vertex position x " << tp->vertex().x() << " y " << tp->vertex().y() << " z " << tp->vertex().z() << std::endl; + //std::cout << " track vertex position x " << tp->vx() << " y " << tp->vy() << " z " << tp->vz() << std::endl; + //std::cout << " conversion vertex position x " << (*mcPho).vertex().x() << " y " << (*mcPho).vertex().y() << " z " << (*mcPho).vertex().z() << std::endl; if ( fabs( tp->vx() - (*mcPho).vertex().x() ) < 0.001 && fabs( tp->vy() - (*mcPho).vertex().y() ) < 0.001 && fabs( tp->vz() - (*mcPho).vertex().z() ) < 0.001) { + //std::cout << " From conversion Electron pt " << tp -> pt() << " charge " << tp -> charge() << " pdgId " << tp->pdgId() << " Hits for this track: " << tp -> trackPSimHit().size() << std::endl; + // std::cout << " track vertex position x " << tp->vertex().x() << " y " << tp->vertex().y() << " z " << tp->vertex().z() << std::endl; + //std::cout << " conversion vertex position x " << (*mcPho).vertex().x() << " y " << (*mcPho).vertex().y() << " z " << (*mcPho).vertex().z() << " R " << (*mcPho).vertex().perp() << std::endl; theConvTP_.push_back( tp ); } } + // std::cout << " PhotonValidator theConvTP_ size " << theConvTP_.size() << std::endl; + if ( theConvTP_.size() == 2 ) visibleConversionsWithTwoSimTracks=true; goodSimConversion=false; @@ -2175,6 +2229,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup int iMatch=-1; bool matched=false; + //std::cout << " Reco photon size " << photonCollection.size() << std::endl; for(unsigned int iPho=0; iPho < photonHandle->size(); iPho++) { reco::PhotonRef aPho(reco::PhotonRef(photonHandle, iPho)); thePhotons.push_back(aPho); @@ -2195,6 +2250,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup index++; } // end loop over reco photons if ( iMatch>-1 ) matched=true; + //std::cout << " Debug 1 " << std::endl; if ( matched ) { nSimPho_[1]++; @@ -2228,6 +2284,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( matchingPho->superCluster()->position().eta() < 0) phoIsInEndcapM=true; } + //std::cout << " Debug 1.1 " << std::endl; edm::Handle ecalRecHitHandle; if ( phoIsInBarrel ) { @@ -2283,6 +2340,9 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup int nClusterOutsideMustache = matchingPho->nClusterOutsideMustache(); float pfMVA = matchingPho->pfMVA(); + /// + + //std::cout << " Debug 1.2 " << std::endl; std::vector< std::pair >::const_iterator rhIt; bool atLeastOneDeadChannel=false; for(reco::CaloCluster_iterator bcIt = matchingPho->superCluster()->clustersBegin();bcIt != matchingPho->superCluster()->clustersEnd(); ++bcIt) { @@ -2299,6 +2359,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } } + //std::cout << " Debug 1.3 " << std::endl; if ( atLeastOneDeadChannel ) { h_MatchedSimPhoBadCh_[0]->Fill( mcEta_ ) ; h_MatchedSimPhoBadCh_[1]->Fill( mcPhi_ ); @@ -2354,6 +2415,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup // h_ecalRecHitSumEtConeDR04_[type][0]->Fill( ecalIso ); + //std::cout << " Debug 1.4 " << std::endl; if ( ! isRunCentrally_ ) { h2_ecalRecHitSumEtConeDR04VsEta_[0] -> Fill (mcEta_, ecalIso ); h2_ecalRecHitSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); @@ -2419,6 +2481,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ! isRunCentrally_ ) p_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) p_sceResVsR9_[0]->Fill (r9, matchingPho->superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; // + //std::cout << " Debug 1.6 " << std::endl; if ( (*mcPho).isAConversion() == 0 ) { if ( ! isRunCentrally_ ) { h2_eResVsEta_[1]->Fill (mcEta_, photonE/ (*mcPho).fourMomentum().e() ) ; @@ -2437,6 +2500,10 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h2_hOverEVsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), hOverE); } + //std::cout << " Debug 1.7 " << std::endl; + + + // if ( ! isRunCentrally_ ) { h2_ecalRecHitSumEtConeDR04VsEta_[1] -> Fill (mcEta_, ecalIso ); h2_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); @@ -2448,11 +2515,14 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } p_ecalRecHitSumEtConeDR04VsEta_[1] -> Fill (mcEta_, ecalIso ); if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); + // + //std::cout << " Debug 1.8 " << std::endl; } if ( photonE/(*mcPho).fourMomentum().e() < 0.3 && photonE/(*mcPho).fourMomentum().e() > 0.1 ) { + // std::cout << " Eta sim " << mcEta_ << " sc eta " << matchingPho->superCluster()->eta() << " pho eta " << matchingPho->eta() << std::endl; } @@ -2486,6 +2556,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + //std::cout << " Debug 1.9 " << std::endl; + if ( phoIsInBarrel ) { h_scE_[type][1]->Fill( matchingPho->superCluster()->energy() ); h_scEt_[type][1]->Fill( matchingPho->superCluster()->energy()/cosh( matchingPho->superCluster()->eta()) ); @@ -2531,6 +2603,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup p_sigmaEoEVsEt_[1][0] ->Fill ((*mcPho).fourMomentum().et(),sigmaEoE); p_sigmaEoEVsNVtx_[1][0]->Fill ( float(vtxH->size()), sigmaEoE); + //std::cout << " Debug 1.10 " << std::endl; if ( r9 > 0.94 ) { h_phoERes_[1][1]->Fill( photonE / (*mcPho).fourMomentum().e() ); h_phoSigmaEoE_[1][1] -> Fill (sigmaEoE); @@ -2556,13 +2629,16 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_EtR9Less093_[0][1] ->Fill ( photonEt ); } } + //std::cout << " Debug 1.11 " << std::endl; } if ( phoIsInEndcap ) { + //std::cout << " Looking for troubles 1 " << std::endl; h_scE_[type][2]->Fill( matchingPho->superCluster()->energy() ); h_scEt_[type][2]->Fill( matchingPho->superCluster()->energy()/cosh( matchingPho->superCluster()->eta()) ); h_r9_[type][2]->Fill( r9 ); h_r1_[type][2]->Fill( r1 ); h_r2_[type][2]->Fill( r2 ); + //std::cout << " Looking for troubles 2 " << std::endl; h_sigmaIetaIeta_[type][2]->Fill( sigmaIetaIeta ); h_hOverE_[type][2]->Fill( hOverE ); h_newhOverE_[type][2]->Fill( newhOverE ); @@ -2570,15 +2646,18 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup p_ecalRecHitSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); h_hcalTowerSumEtConeDR04_[type][2]->Fill( hcalIso ); p_hcalTowerSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); + //std::cout << " Looking for troubles 3 " << std::endl; h_hcalTowerBcSumEtConeDR04_[type][2]->Fill( newhcalIso ); p_hcalTowerBcSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), newhcalIso); h_isoTrkSolidConeDR04_[type][2]->Fill( trkIso ); h_nTrkSolidConeDR04_[type][2]->Fill( nIsoTrk ); + //std::cout << " Looking for troubles 4 " << std::endl; h_chHadIso_[2]-> Fill (chargedHadIso); h_nHadIso_[2]-> Fill (neutralHadIso); h_phoIso_[2]-> Fill (photonIso); h_nCluOutsideMustache_[2]->Fill(float(nClusterOutsideMustache)); h_etOutsideMustache_[2]->Fill(etOutsideMustache); + //std::cout << " Looking for troubles 5 " << std::endl; h_pfMva_[2]->Fill(pfMVA); h_phoE_[type][2]->Fill( photonE ); h_phoEt_[type][2]->Fill( photonEt ); @@ -2586,8 +2665,10 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_nConv_[1][2]->Fill(float( matchingPho->conversionsOneLeg().size())); h_phoERes_[0][2]->Fill( photonE / (*mcPho).fourMomentum().e() ); h_phoSigmaEoE_[0][2] -> Fill (sigmaEoE); + //std::cout << " Looking for troubles 6 " << std::endl; h_phoEResRegr1_[0][2]->Fill( photonERegr1 / (*mcPho).fourMomentum().e() ); h_phoEResRegr2_[0][2]->Fill( photonERegr2 / (*mcPho).fourMomentum().e() ); + //std::cout << " Looking for troubles 7 " << std::endl; p_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; p_sceResVsR9_[2]->Fill (r9, matchingPho->superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) { @@ -2597,6 +2678,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h2_hcalTowerSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); h2_eResVsEt_[2][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; } + //std::cout << " Debug 1.12 " << std::endl; p_eResVsEt_[2][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; p_eResVsNVtx_[2][0]->Fill ( float(vtxH->size()), photonE/(*mcPho).fourMomentum().e() ) ; @@ -2630,6 +2712,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_EtR9Less093_[0][2] ->Fill ( photonEt ); } } + //std::cout << " Debug 1.13 " << std::endl; } /////////////////////// Particle based isolation @@ -2679,6 +2762,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup ////////// acces the value map to access the PFCandidates in overlap with the photon which need to be excluded from the isolation bool skip=false; for( std::vector::const_iterator i = phoToParticleBasedIsoMap[matchingPho].begin(); i != phoToParticleBasedIsoMap[matchingPho].end(); ++i ) { + // std::cout << " PhotonValidator PfCand pt " << pfCandRef->pt() << " id " <particleId() << " and in the map " << (*i)->pt() << " type " << (*i)->particleId() << std::endl; if ( (*i) == pfCandRef ) { skip=true; } @@ -2743,6 +2827,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ! (visibleConversion && visibleConversionsWithTwoSimTracks ) ) continue; + // std::cout << " Debug 1.14 " << std::endl; if ( ! isRunCentrally_ ) { h_r9_[1][0]->Fill( r9 ); @@ -2760,6 +2845,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ! fastSim_) { + //std::cout << " Conversion size " << matchingPho->conversions().size() << std::endl; ////////////////// plot quantities related to conversions reco::ConversionRefVector conversions = matchingPho->conversions(); bool atLeastOneRecoTwoTrackConversion=false; @@ -2790,6 +2876,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( fabs( aConv->pairCotThetaSeparation() ) > dCotCutValue_ ) continue; } + //std::cout << " PhotonValidator converison algo name " << aConv->algoName() << " " << aConv->algo() << std::endl; + nRecConv_++; std::map myAss; @@ -2809,6 +2897,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup p_nHitsVsR_[type] ->Fill (mcConvR_, float(tracks[i]->numberOfValidHits()-0.0001) ); h_tkChi2_[type] ->Fill (tracks[i]->normalizedChi2() ); + //std::cout << " Debug 1.15 " << std::endl; + RefToBase tfrb = tracks[i]; RefToBaseVector tc; tc.push_back(tfrb); @@ -2832,6 +2922,31 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + //std::cout << " Debug 1.16 " << std::endl; + + + /* + /////////// fill my local track - trackingparticle association map + TrackingParticleRef myTP; + for (size_t j = 0; j < RtoSCollPtrs.size(); j++) { + reco::RecoToSimCollection q = *(RtoSCollPtrs[j]); + + RefToBase myTk( track ); + + if( q.find(myTk ) != q.end() ) { + std::vector > tp = q[myTk]; + for (unsigned int itp=0; itppdgId() << " pt " << sqrt(myTP->momentum().perp2()) << std::endl; + myAss.insert( std::make_pair ( track , myTP) ); + nAssT2++; + } + } + } + } + */ + + type=0; // float totP = sqrt(aConv->pairMomentum().Mag2()); @@ -2847,6 +2962,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( phoIsInBarrel ) h_invMass_[type][1] ->Fill(invM); if ( phoIsInEndcap ) h_invMass_[type][2] ->Fill(invM); + //std::cout << " Debug 1.17 " << std::endl; + ////////// Numerators for conversion absolute efficiency if ( tracks.size() ==2 ) { @@ -2856,7 +2973,9 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_SimConvTwoTracks_[3]->Fill( mcConvZ_ ); h_SimConvTwoTracks_[4]->Fill( (*mcPho).fourMomentum().et()); + //std::cout << " Debug 1.17.1 " << std::endl; if (aConv->caloCluster().size() !=0) h_convEta_[1]->Fill( aConv->caloCluster()[0]->eta() ); + //std::cout << " Debug 1.17.2 " << std::endl; float trkProvenance=3; if ( tracks[0]->algoName() == "outInEcalSeededConv" && tracks[1]->algoName() == "outInEcalSeededConv" ) trkProvenance=0; @@ -2864,6 +2983,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ( tracks[0]->algoName() == "outInEcalSeededConv" && tracks[1]->algoName() == "inOutEcalSeededConv") || ( tracks[1]->algoName() == "outInEcalSeededConv" && tracks[0]->algoName() == "inOutEcalSeededConv") ) trkProvenance=2; if ( trkProvenance==3 ) { + // std::cout << " PhotonValidator provenance of tracks is " << tracks[0]->algoName() << " and " << tracks[1]->algoName() << std::endl; } h_trkProv_[0]->Fill( trkProvenance ); h_trkAlgo_->Fill ( tracks[0]->algo() ); @@ -2892,6 +3012,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_SimConvTwoMTracks_[4]->Fill( (*mcPho).fourMomentum().et()); if ( aConv->conversionVertex().isValid() ) { + //if ( trkProvenance==3 ) std::cout << " PhotonValidator provenance of tracks is mixed and vertex is valid " << std::endl; float chi2Prob = ChiSquaredProbability( aConv->conversionVertex().chi2(), aConv->conversionVertex().ndof() ); if ( chi2Prob > 0) { h_SimConvTwoMTracksAndVtxPGT0_[0]->Fill( mcEta_ ) ; @@ -2910,6 +3031,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + //std::cout << " Debug 1.18 " << std::endl; if ( chi2Prob > 0.0005 ) { if (aConv->caloCluster().size() !=0) { h_convEta_[0]->Fill( aConv->caloCluster()[0]->eta() ); @@ -2922,6 +3044,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( phoIsInBarrel ) h_EtR9Less093_[1][1] ->Fill ( photonEt ); if ( phoIsInEndcap ) h_EtR9Less093_[1][2] ->Fill ( photonEt ); } + //std::cout << " Debug 1.19 " << std::endl; if ( phoIsInBarrel ) { if (aConv->caloCluster().size() !=0) h_convERes_[0][1]->Fill(aConv->caloCluster()[0]->energy() / (*mcPho).fourMomentum().e() ); if ( ! isRunCentrally_ ) h_r9VsNofTracks_[0][1]->Fill( r9, aConv->nTracks() ) ; @@ -2932,6 +3055,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ! isRunCentrally_ ) h_r9VsNofTracks_[0][2]->Fill( r9, aConv->nTracks() ) ; h_mvaOut_[2]-> Fill(like); } + //std::cout << " Debug 1.20 " << std::endl; } @@ -2940,6 +3064,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + // std::cout << " Debug 2 " << std::endl; /////////// Quantities per conversion type =1; @@ -2968,6 +3093,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + //std::cout << " Debug 3 " << std::endl; if ( ! isRunCentrally_ ) h2_EoverEtrueVsEta_[0]->Fill (mcEta_,matchingPho->superCluster()->energy()/ (*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) h2_EoverEtrueVsR_[0]->Fill (mcConvR_,matchingPho->superCluster()->energy()/ (*mcPho).fourMomentum().e() ) ; p_EoverEtrueVsEta_[0]->Fill (mcEta_,matchingPho->superCluster()->energy()/ (*mcPho).fourMomentum().e() ) ; @@ -2976,6 +3102,22 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ! isRunCentrally_ ) h2_etaVsRsim_[0]->Fill (mcEta_,mcConvR_); + /* + reco::TrackRef track1 = tracks[0].castTo(); + reco::TrackRef track2 = tracks[1].castTo(); + reco::TransientTrack tt1 = (*theTTB).build( &track1); + reco::TransientTrack tt2 = (*theTTB).build( &track2); + TwoTrackMinimumDistance md; + md.calculate ( tt1.initialFreeState(), tt2.initialFreeState() ); + if (md.status() ) { + //cout << " Min Dist " << md.distance() << std::endl; + h_distMinAppTracks_[1][0]->Fill ( md.distance() ); + } else { + nInvalidPCA_++; + + } + */ + // here original tracks and their inner momentum is considered float dPhiTracksAtVtx = aConv->dPhiTracksAtVtx(); h_DPhiTracksAtVtx_[type][0]->Fill( dPhiTracksAtVtx); @@ -2990,6 +3132,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup p_DCotTracksVsEta_->Fill( mcEta_, aConv->pairCotThetaSeparation() ); p_DCotTracksVsR_->Fill( mcConvR_, aConv->pairCotThetaSeparation() ); + //std::cout << " Debug 4 " << std::endl; + if ( phoIsInBarrel ) { h_invMass_[type][1] ->Fill(invM); if ( aConv->conversionVertex().isValid() ) { @@ -3008,6 +3152,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + //std::cout << " Debug 5 " << std::endl; + if ( phoIsInEndcap ) { h_invMass_[type][2] ->Fill(invM); if ( aConv->conversionVertex().isValid() ) { @@ -3022,6 +3168,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + //std::cout << " Debug 6 " << std::endl; if ( aConv->conversionVertex().isValid() ) { h_convVtxdX_ ->Fill ( aConv->conversionVertex().position().x() - mcConvX_); @@ -3041,6 +3188,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_convVtxdR_endcap_ ->Fill ( sqrt(aConv->conversionVertex().position().perp2()) - mcConvR_); } + //std::cout << " Debug 7 " << std::endl; h_convVtxdPhi_ ->Fill ( aConv->conversionVertex().position().phi() - mcConvPhi_); h_convVtxdEta_ ->Fill ( aConv->conversionVertex().position().eta() - mcConvEta_); if ( ! isRunCentrally_ ) h2_convVtxdRVsR_ ->Fill (mcConvR_, sqrt(aConv->conversionVertex().position().perp2()) - mcConvR_ ); @@ -3070,6 +3218,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_zPVFromTracks_[0]->Fill ( zPV ); h_dzPVFromTracks_[0]->Fill ( zPV- (*mcPho).primaryVertex().z() ); + //std::cout << " Debug 8 " << std::endl; + if ( phoIsInBarrel ) { h_zPVFromTracks_[1]->Fill ( zPV ); h_dzPVFromTracks_[1]->Fill ( zPV - (*mcPho).primaryVertex().z() ); @@ -3084,14 +3234,20 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_dzPVFromTracks_[4]->Fill ( zPV - (*mcPho).primaryVertex().z() ); } + // std::cout << " Debug 8.1 " << std::endl; p_dzPVVsR_ ->Fill(mcConvR_, zPV - (*mcPho).primaryVertex().z() ); p_dzPVVsEta_ ->Fill(mcConvEta_, zPV - (*mcPho).primaryVertex().z() ); if ( ! isRunCentrally_ ) h2_dzPVVsR_ ->Fill(mcConvR_, zPV - (*mcPho).primaryVertex().z() ); + // std::cout << " Debug 8.2 " << std::endl; + } float dPhiTracksAtEcal=-99; float dEtaTracksAtEcal=-99; + //if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) { + //std::cout << " aConv->bcMatchingWithTracks() size " << aConv->bcMatchingWithTracks().size() << std::endl; if (aConv->bcMatchingWithTracks().size() > 0 && aConv->bcMatchingWithTracks()[0].isNonnull() && aConv->bcMatchingWithTracks()[1].isNonnull() ) { + // std::cout << " Debug 8.3 " << std::endl; nRecConvAssWithEcal_++; float recoPhi1 = aConv->ecalImpactPosition()[0].phi(); float recoPhi2 = aConv->ecalImpactPosition()[1].phi(); @@ -3108,6 +3264,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup dPhiTracksAtEcal = recoPhi1 -recoPhi2; dPhiTracksAtEcal = phiNormalization( dPhiTracksAtEcal ); dEtaTracksAtEcal = recoEta1 -recoEta2; + // std::cout << " Debug 8.4 " << std::endl; h_DPhiTracksAtEcal_[type][0]->Fill( fabs(dPhiTracksAtEcal)); if ( ! isRunCentrally_ ) h2_DPhiTracksAtEcalVsR_ ->Fill (mcConvR_, fabs(dPhiTracksAtEcal)); @@ -3117,15 +3274,24 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_DEtaTracksAtEcal_[type][0]->Fill( dEtaTracksAtEcal); + // std::cout << " Debug 8.5 " << std::endl; if ( phoIsInBarrel ) { h_DPhiTracksAtEcal_[type][1]->Fill( fabs(dPhiTracksAtEcal)); h_DEtaTracksAtEcal_[type][1]->Fill( dEtaTracksAtEcal); } + // std::cout << " Debug 8.6 " << std::endl; if ( phoIsInEndcap ) { h_DPhiTracksAtEcal_[type][2]->Fill( fabs(dPhiTracksAtEcal)); h_DEtaTracksAtEcal_[type][2]->Fill( dEtaTracksAtEcal); } + //std::cout << " Debug 8.7 " << std::endl; + } + // } + + + //std::cout << " Debug 9 " << std::endl; + /////////// Quantities per track for (unsigned int i=0; i tfrb(tracks[i] ); @@ -3138,6 +3304,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ( tracks[0]->algoName() == "outInEcalSeededConv" && tracks[1]->algoName() == "inOutEcalSeededConv") || ( tracks[1]->algoName() == "outInEcalSeededConv" && tracks[0]->algoName() == "inOutEcalSeededConv") ) trkProvenance=2; + // std::cout << " Debug 9.1 " << std::endl; + if ( ! isRunCentrally_ ) nHitsVsEta_[type] ->Fill (mcEta_, float(tracks[i]->numberOfValidHits()) ); if ( ! isRunCentrally_ ) nHitsVsR_[type] ->Fill (mcConvR_, float(tracks[i]->numberOfValidHits()) ); p_nHitsVsEta_[type] ->Fill (mcEta_, float(tracks[i]->numberOfValidHits()) -0.0001); @@ -3224,6 +3392,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup float eoverp = photonE/tracks[0]->p(); + // std::cout << " Tracks quantities " << float(tracks[0]->numberOfValidHits()-0.0001) << " " << tracks[0]->normalizedChi2() << " " << eoverp <Fill ( eoverp ); if ( phoIsInBarrel ) { h_EoverP_SL_[1]->Fill ( eoverp ); @@ -3309,6 +3478,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } else { phoIsInEndcap=true; } + //std::cout << " Debug 10 " << std::endl; if ( dCotCutOn_ ) { if ( ( fabs(mcEta_) > 1.1 && fabs (mcEta_) < 1.4 ) && @@ -3350,6 +3520,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup ( fabs(mcEta_) > BARL && fabs(mcEta_) <=END_HI && fabs( (*mcPho).vertex().z() ) < 210 ) ) ) continue; + //std::cout << " Debug 11 " << std::endl; theConvTP_.clear(); for(size_t i = 0; i < trackingParticles.size(); ++i){ TrackingParticleRef tp (ElectronTPHandle,i); @@ -3378,6 +3549,17 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( (tpr1->parentVertex()->sourceTracks_end()-tpr1->parentVertex()->sourceTracks_begin()==1) && (tpr2->parentVertex()->sourceTracks_end()-tpr2->parentVertex()->sourceTracks_begin()==1)) { if (tpr1->parentVertex().key()==tpr2->parentVertex().key() && ((*tpr1->parentVertex()->sourceTracks_begin())->pdgId()==22)) { + // std::cout << " ciao 5.6 " << std::endl; + // mcConvR_ = sqrt(tpr1->parentVertex()->position().Perp2()); + //mcConvZ_ = tpr1->parentVertex()->position().z(); + //mcConvX_ = tpr1->parentVertex()->position().x(); + //mcConvY_ = tpr1->parentVertex()->position().y(); + //mcConvEta_ = tpr1->parentVertex()->position().eta(); + //mcConvPhi_ = tpr1->parentVertex()->position().phi(); + //mcConvPt_ = sqrt((*tpr1->parentVertex()->sourceTracks_begin())->momentum().Perp2()); + //std::cout << " Reco to Sim mcconvpt " << mcConvPt_ << std::endl; + //cout << "associated track1 to " << tpr1->pdgId() << " with p=" << tpr1->p4() << " with pT=" << tpr1->pt() << endl; + //cout << "associated track2 to " << tpr2->pdgId() << " with p=" << tpr2->p4() << " with pT=" << tpr2->pt() << endl; nAssT2 = 2; break; } @@ -3386,11 +3568,33 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } } catch (Exception event) { + //cout << "do not continue: " << event.what() << endl; + //continue; } } // end loop over simulated photons + + /* + TrackingParticleRef myTP; + for (size_t j = 0; j < RtoSCollPtrs.size(); j++) { + reco::RecoToSimCollection q = *(RtoSCollPtrs[j]); + + RefToBase myTk( track ); + + if( q.find(myTk ) != q.end() ) { + std::vector > tp = q[myTk]; + for (unsigned int itp=0; itppdgId() << " pt " << sqrt(myTP->momentum().perp2()) << std::endl; + myAss.insert( std::make_pair ( track , myTP) ); + nAssT2++; + } + } + } + */ + if ( nAssT2 == 2) { @@ -3405,12 +3609,14 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup ///////////////////////////// xray if ( aConv->conversionVertex().isValid() ) { + // std::cout << " Debug 11.1 " << std::endl; float chi2Prob = ChiSquaredProbability( aConv->conversionVertex().chi2(), aConv->conversionVertex().ndof() ); double convR= sqrt(aConv->conversionVertex().position().perp2()); double scalar = aConv->conversionVertex().position().x()*aConv->pairMomentum().x() + aConv->conversionVertex().position().y()*aConv->pairMomentum().y(); + //std::cout << " Debug 11.2 " << std::endl; if ( scalar < 0 ) convR= -sqrt(aConv->conversionVertex().position().perp2()); h_convVtxRvsZ_[0] ->Fill ( fabs (aConv->conversionVertex().position().z() ), sqrt(aConv->conversionVertex().position().perp2()) ) ; @@ -3433,6 +3639,7 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( fabs(aConv->caloCluster()[0]->eta() ) > 1.) h_convVtxRvsZ_[2] ->Fill ( fabs (aConv->conversionVertex().position().z() ), convR ) ; } + //std::cout << " Debug 12 " << std::endl; h_vtxChi2Prob_[0]->Fill( chi2Prob ); h_vtxChi2_[0]->Fill( aConv->conversionVertex().normalizedChi2() ); @@ -3445,6 +3652,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_vtxChi2_[2]->Fill( aConv->conversionVertex().normalizedChi2() ); } + //std::cout << " Debug 13 " << std::endl; + } // end conversion vertex valid } // end loop over reco conversions @@ -3466,6 +3675,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup mcJetEta_= genJetIter->eta(); float mcJetPt = genJetIter->pt() ; + //std::cout << " Debug 14 " << std::endl; + h_SimJet_[0]->Fill ( mcJetEta_); h_SimJet_[1]->Fill ( mcJetPhi_); h_SimJet_[2]->Fill ( mcJetPt ); @@ -3491,6 +3702,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } } // end loop over reco photons + //std::cout << " Debug 15 " << std::endl; + if (! matched ) continue; nPho++; @@ -3534,6 +3747,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } + //std::cout << " Debug 16 " << std::endl; + const EcalRecHitCollection ecalRecHitCollection = *(ecalRecHitHandle.product()); float photonE = matchingPho.energy(); float photonEt= matchingPho.et(); @@ -3582,6 +3797,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_phoBkgDEta_->Fill ( matchingPho.eta() - mcJetEta_ ); h_phoBkgDPhi_->Fill ( matchingPho.phi() - mcJetPhi_ ); + //std::cout << " Debug 17 " << std::endl; + h_r9Bkg_[0]->Fill( r9 ); h_r1Bkg_[0]->Fill( r1 ); h_r2Bkg_[0]->Fill( r2 ); @@ -3664,6 +3881,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup p_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); p_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); } + //std::cout << " Debug 20 " << std::endl; + } else if ( phoIsInEndcap ) { h_r9Bkg_[2]->Fill( r9 ); @@ -3689,6 +3908,8 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup p_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); p_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); } + //std::cout << " Debug 21 " << std::endl; + } if ( !fastSim_) { @@ -3768,6 +3989,9 @@ void PhotonValidator::endJob() { } edm::LogInfo("PhotonValidator") << "Analyzed " << nEvt_ << "\n"; + // std::cout << "::endJob Analyzed " << nEvt_ << " events " << " with total " << nPho_ << " Photons " << "\n"; + // std::cout << "PhotonValidator::endJob Analyzed " << nEvt_ << " events " << "\n"; + return ; } @@ -3781,6 +4005,7 @@ float PhotonValidator::phiNormalization(float & phi) if(phi > PI) {phi = phi - TWOPI;} if(phi < -PI) {phi = phi + TWOPI;} + // cout << " Float_t PHInormalization out " << PHI << endl; return phi; } diff --git a/branches/withNewDZ/Validation/RecoMET/python/METRelValForDQM_cff.py b/branches/withNewDZ/Validation/RecoMET/python/METRelValForDQM_cff.py index d18180f63ac0d..4a0d2eb3de2d0 100644 --- a/branches/withNewDZ/Validation/RecoMET/python/METRelValForDQM_cff.py +++ b/branches/withNewDZ/Validation/RecoMET/python/METRelValForDQM_cff.py @@ -34,7 +34,7 @@ genMetTrueAnalyzer* #genMetCaloAnalyzer* #genMetCaloAndNonPromptAnalyzer - correctionTermsPfMetType0PFCandidateForValidation* + correctionTermsPfMetType0PFCandidate* corrPfMetType1* #pfchsMETcorr* pfMetT0pc* @@ -61,7 +61,7 @@ genMetTrueAnalyzer*#* #genMetCaloAnalyzer* #genMetCaloAndNonPromptAnalyzer - correctionTermsPfMetType0PFCandidateForValidation* + correctionTermsPfMetType0PFCandidate* corrPfMetType1* #pfchsMETcorr* pfMetT0pc* @@ -71,3 +71,7 @@ pfType1CorrectedMetAnalyzer* pfType01CorrectedMetAnalyzer ) + + + + diff --git a/branches/withNewDZ/Validation/RecoParticleFlow/python/PFElectronValidation_cff.py b/branches/withNewDZ/Validation/RecoParticleFlow/python/PFElectronValidation_cff.py index 32350f5d2ca8c..9df556a45a00f 100644 --- a/branches/withNewDZ/Validation/RecoParticleFlow/python/PFElectronValidation_cff.py +++ b/branches/withNewDZ/Validation/RecoParticleFlow/python/PFElectronValidation_cff.py @@ -20,7 +20,7 @@ pfElectronValidation1.InputCollection = cms.InputTag('pfAllElectrons') # for global Validation pfElectronValidation1.MatchCollection = cms.InputTag('gensource') # for global Validation pfElectronValidation1.BenchmarkLabel = cms.string('PFElectronValidation/CompWithGenElectron') -pfElectronValidationSequence = cms.Sequence( gensource + pfElectronValidation1 ) +pfElectronValidationSequence = cms.Sequence( pfAllElectrons + gensource + pfElectronValidation1 ) # NoTracking