Skip to content

Commit

Permalink
remove duplicated steps in relvals, add gt InputTags to Pat trigger m…
Browse files Browse the repository at this point in the history 
…odule
  • Loading branch information
@davidlange6
davidlange6 committed Oct 21, 2015
1 parent 43e3b94 commit 8e44ed5
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 25 deletions.
26 changes: 13 additions & 13 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,45 +788,45 @@ def identityFS(wf):
steps['FS_TTbar_13_PUAVE35_DRMIX_ITO']=merge([PUFSAVE35_DRMIX_ITO,Kby(100,500),steps['TTbarFS_13']] ) # needs the placeholder

# step2
step2Defaults = { '-s' : 'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco',
step2Defaults = { '-s' : 'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake',
'--datatier' : 'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--eventcontent': 'FEVTDEBUGHLT',
'--conditions' : 'auto:run1_mc',
}
#for 2015
step2Upg2015Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval25ns,RAW2DIGI,L1Reco',
step2Upg2015Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval25ns',
'--conditions' :'auto:run2_mc_'+autoHLT['relval25ns'],
'--datatier' :'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--eventcontent':'FEVTDEBUGHLT',
'--era' :'Run2_25ns',
'-n' :'10'
}
step2Upg2015Defaults50ns = merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval50ns,RAW2DIGI,L1Reco','--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step2Upg2015Defaults])
step2Upg2015Defaults50ns = merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval50ns','--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step2Upg2015Defaults])

steps['DIGIUP15']=merge([step2Upg2015Defaults])
steps['DIGIUP15PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval25ns,RAW2DIGI,L1Reco','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2015Defaults])
steps['DIGIUP15PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval25ns','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2015Defaults])
steps['DIGIUP15_PU25']=merge([PU25,step2Upg2015Defaults])
steps['DIGIUP15_PU50']=merge([PU50,step2Upg2015Defaults50ns])

steps['DIGIPROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Defaults])
steps['DIGIPROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@fake','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Defaults])
steps['DIGI']=merge([step2Defaults])
#steps['DIGI2']=merge([stCond,step2Defaults])
steps['DIGICOS']=merge([{'--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW'},stCond,step2Defaults])
steps['DIGIHAL']=merge([{'--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW'},step2Upg2015Defaults])

steps['DIGIPU1']=merge([PU,step2Defaults])
steps['DIGIPU2']=merge([PU2,step2Defaults])
steps['REDIGIPU']=merge([{'-s':'reGEN,reDIGI,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco'},steps['DIGIPU1']])
steps['REDIGIPU']=merge([{'-s':'reGEN,reDIGI,L1,DIGI2RAW,HLT:@fake'},steps['DIGIPU1']])

steps['DIGIUP15_ID']=merge([{'--restoreRND':'HLT','--process':'HLT2'},steps['DIGIUP15']])

steps['RESIM']=merge([{'-s':'reGEN,reSIM','-n':10},steps['DIGI']])
#steps['RESIMDIGI']=merge([{'-s':'reGEN,reSIM,DIGI,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco','-n':10,'--restoreRNDSeeds':'','--process':'HLT'},steps['DIGI']])


steps['DIGIHI']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:HIon,RAW2DIGI,L1Reco'}, hiDefaults, step2Upg2015Defaults])
steps['DIGIHI2011']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco'}, hiDefaults2011, step2Defaults])
steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:HIon,RAW2DIGI,L1Reco', '-n':2}, hiDefaults, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults])
steps['DIGIHI']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:HIon'}, hiDefaults, step2Upg2015Defaults])
steps['DIGIHI2011']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2011, step2Defaults])
steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:HIon', '-n':2}, hiDefaults, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults])


# PRE-MIXING : https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideSimulation#Pre_Mixing_Instructions
Expand All @@ -848,24 +848,24 @@ def identityFS(wf):

digiPremixUp2015Defaults25ns = {
'--conditions' : 'auto:run2_mc_'+autoHLT['relval25ns'],
'-s' : 'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval25ns,RAW2DIGI,L1Reco',
'-s' : 'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval25ns',
'--pileup_input' : 'das:/RelValPREMIXUP15_PU25/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[5],
'--eventcontent' : 'FEVTDEBUGHLT',
'--datatier' : 'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--datamix' : 'PreMix',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1'
}
digiPremixUp2015Defaults50ns=merge([{'-s':'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns,RAW2DIGI,L1Reco'},
digiPremixUp2015Defaults50ns=merge([{'-s':'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns'},
{'--conditions':'auto:run2_mc_'+autoHLT['relval50ns']},
{'--pileup_input' : 'das:/RelValPREMIXUP15_PU50/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[6]},
{'--customise': 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1_50ns'},
digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns])
premixProd25ns = {'-s' : 'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval25ns,RAW2DIGI,L1Reco',
premixProd25ns = {'-s' : 'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval25ns',
'--eventcontent' : 'PREMIXRAW',
'--datatier' : 'PREMIXRAW'}
premixProd50ns = merge([{'-s':'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns,RAW2DIGI,L1Reco'},premixProd25ns])
premixProd50ns = merge([{'-s':'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns'},premixProd25ns])

steps['DIGIPRMXUP15_PROD_PU25']=merge([premixProd25ns,digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PROD_PU50']=merge([premixProd50ns,digiPremixUp2015Defaults50ns])
Expand Down
10 changes: 5 additions & 5 deletions HLTrigger/HLTcore/src/HLTPrescaleProvider.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ int HLTPrescaleProvider::prescaleSet(const edm::Event& iEvent, const edm::EventS
return psfsiPhys;
} else {
/// error - notify user!
edm::LogInfo("HLTConfigData")
edm::LogError("HLTConfigData")
<< " Error in determining HLT prescale set index from L1 data using L1GtUtils: "
<< " Tech/Phys error = " << errorTech << "/" << errorPhys
<< " Tech/Phys psfsi = " << psfsiTech << "/" << psfsiPhys;
Expand Down Expand Up @@ -87,7 +87,7 @@ HLTPrescaleProvider::prescaleValues(const edm::Event& iEvent,
int l1error(0);
result.first = l1GtUtils_.prescaleFactor(iEvent,l1tname,l1error);
if (l1error!=0) {
edm::LogInfo("HLTConfigData")
edm::LogError("HLTConfigData")
<< " Error in determining L1T prescale for HLT path: '" << trigger
<< "' with L1T seed: '" << l1tname
<< "' using L1GtUtils: error code = " << l1error << "." << std::endl
Expand All @@ -102,7 +102,7 @@ HLTPrescaleProvider::prescaleValues(const edm::Event& iEvent,
for (unsigned int i=1; i!=nL1GTSeedModules; ++i) {
dump += " * '"+hltConfigProvider_.hltL1GTSeeds(trigger).at(i).second+"'";
}
edm::LogInfo("HLTConfigData")
edm::LogError("HLTConfigData")
<< " Error in determining L1T prescale for HLT path: '" << trigger
<< "' has multiple L1GTSeed modules, " << nL1GTSeedModules
<< ", with L1 seeds: " << dump
Expand Down Expand Up @@ -160,7 +160,7 @@ HLTPrescaleProvider::prescaleValuesInDetail(const edm::Event& iEvent,
<< result.first[i].second;
}
message << ".";
edm::LogInfo("HLTConfigData") << message.str();
edm::LogError("HLTConfigData") << message.str();
result.first.clear();
}
} else {
Expand All @@ -169,7 +169,7 @@ HLTPrescaleProvider::prescaleValuesInDetail(const edm::Event& iEvent,
for (unsigned int i=1; i!=nL1GTSeedModules; ++i) {
dump += " * '"+hltConfigProvider_.hltL1GTSeeds(trigger).at(i).second+"'";
}
edm::LogInfo("HLTConfigData")
edm::LogError("HLTConfigData")
<< " Error in determining L1T prescale for HLT path: '" << trigger
<< "' has multiple L1GTSeed modules, " << nL1GTSeedModules
<< ", with L1 seeds: " << dump
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ const int L1GtUtils::l1Results(const edm::Event& iEvent,

} else {

LogDebug("L1GtUtils") << "\nError: "
LogDebug("L1GtUtils") << "\nError: "
<< "\nNo valid L1GlobalTriggerRecord with \n "
<< m_l1GtUtilsHelper->l1GtRecordInputTag() << "\nfound in the event."
<< "\nNo valid L1GlobalTriggerReadoutRecord with \n "
Expand Down
10 changes: 4 additions & 6 deletions L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtilsHelper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ void L1GtUtilsHelper::operator()(
branchDescription.processName() };

if (m_foundPreferredRecord) {

// check if a preferred input tag was already found and compare it with the actual tag
// if the instance or the process names are different, one has incompatible tags - set
// the tag to empty input tag and indicate that multiple preferred input tags are found
Expand All @@ -95,9 +94,9 @@ void L1GtUtilsHelper::operator()(
!= branchDescription.productInstanceName())
|| (m_l1GtRecordInputTag.process()
!= branchDescription.processName()))) {

LogDebug("L1GtUtils")
<< "\nWARNING: Found multiple preferred input tags for L1GlobalTriggerRecord product, "
LogDebug("L1GtUtils")
<< "\nWARNING: Found multiple preferred input tags for L1GlobalTriggerRecord product, "
<< "\nwith different instaces or processes."
<< "\nInput tag already found: "
<< (m_l1GtRecordInputTag) << "\nActual tag: " << (tag)
Expand All @@ -107,8 +106,7 @@ void L1GtUtilsHelper::operator()(
m_l1GtRecordInputTag = edm::InputTag();
}
} else {
// no preferred input tag found yet, check now with the actual tag

// no preferred input tag found yet, check now with the actual tag
for (std::vector<edm::InputTag>::const_iterator itPrefTag =
preferredL1GtRecordInputTag.begin(), itPrefTagEnd =
preferredL1GtRecordInputTag.end();
Expand Down
4 changes: 4 additions & 0 deletions PhysicsTools/PatAlgos/python/triggerLayer1/triggerProducer_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

patTrigger = cms.EDProducer( "PATTriggerProducer"
, onlyStandAlone = cms.bool( False )
,l1GtRecordInputTag = cms.InputTag("gtDigis")
,l1GtReadoutRecordInputTag = cms.InputTag("gtDigis")
,l1GtTriggerMenuLiteInputTag = cms.InputTag("gtDigis")

# ## L1
# , addL1Algos = cms.bool( False ) # default; possibly superseded by 'onlyStandAlone' = True
# , l1GlobalTriggerObjectMaps = cms.InputTag( "l1L1GtObjectMap" ) # default; change only, if you know exactly, what you are doing!
Expand Down

0 comments on commit 8e44ed5

Please sign in to comment.