Skip to content

Commit

Permalink
Merge CMSSW_7_6_X into CMSSW_8_0_X.
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsbuild committed Oct 25, 2015
2 parents 6b4e62b + 8b6e88d commit 4186f46
Show file tree
Hide file tree
Showing 23 changed files with 61 additions and 68 deletions.
2 changes: 1 addition & 1 deletion CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class JetDeltaRValueMapProducer : public edm::stream::EDProducer<> {
if( matched_index>=0 )
{
if ( matched_dR2 > distMax_*distMax_ )
edm::LogWarning("MatchedJetsFarApart") << "Matched jets separated by dR greater than distMax=" << distMax_;
edm::LogInfo("MatchedJetsFarApart") << "Matched jets separated by dR greater than distMax=" << distMax_;
else
{
jets1_locks.at(matched_index) = true;
Expand Down
26 changes: 13 additions & 13 deletions Configuration/AlCa/python/autoCond.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@

### NEW KEYS ###
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
'run1_design' : '76X_mcRun1_design_v8',
'run1_design' : '76X_mcRun1_design_v10',
# GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
'run1_mc' : '76X_mcRun1_realistic_v8',
'run1_mc' : '76X_mcRun1_realistic_v10',
# GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
'run1_mc_hi' : '76X_mcRun1_HeavyIon_v8',
'run1_mc_hi' : '76X_mcRun1_HeavyIon_v10',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : '76X_mcRun1_pA_v8',
'run1_mc_pa' : '76X_mcRun1_pA_v10',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : '76X_mcRun2_design_v8',
'run2_design' : '76X_mcRun2_design_v10',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : '76X_mcRun2_startup_v8',
'run2_mc_50ns' : '76X_mcRun2_startup_v10',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : '76X_mcRun2_asymptotic_v8',
'run2_mc' : '76X_mcRun2_asymptotic_v10',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : '76X_mcRun2_HeavyIon_v8',
'run2_mc_hi' : '76X_mcRun2_HeavyIon_v10',
# GlobalTag for Run1 data reprocessing
'run1_data' : '76X_dataRun1_v7',
'run1_data' : '76X_dataRun1_v9',
# GlobalTag for Run2 data reprocessing
'run2_data' : '76X_dataRun2_v7',
'run2_data' : '76X_dataRun2_v9',
# GlobalTag for Run1 HLT: it points to the online GT
'run1_hlt' : '76X_dataRun1_HLT_frozen_v7',
'run1_hlt' : '76X_dataRun1_HLT_frozen_v9',
# GlobalTag for Run2 HLT: it points to the online GT
'run2_hlt' : '76X_dataRun2_HLT_frozen_v7',
'run2_hlt' : '76X_dataRun2_HLT_frozen_v9',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
'phase1_2017_design' : '76X_upgrade2017_design_v4',
'phase1_2017_design' : '76X_upgrade2017_design_v6',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
'phase1_2019_design' : 'DES19_70_V2', # placeholder (GT not meant for standard RelVal)
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase2
Expand Down
30 changes: 15 additions & 15 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
step1Up2015Defaults = {'-s' : 'GEN,SIM',
'-n' : 10,
'--conditions' : 'auto:run2_mc',
'--beamspot' : 'NominalCollision2015',
'--beamspot' : 'Realistic50ns13TeVCollision',
'--datatier' : 'GEN-SIM',
'--eventcontent': 'FEVTDEBUG',
'--era' : 'Run2_25ns'
Expand Down Expand Up @@ -534,7 +534,7 @@ def genS(fragment,howMuch):
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO,EI,HLT:@relval25ns,VALIDATION',
'--fast':'',
'--conditions' :'auto:run2_mc_'+autoHLT['relval25ns'],
'--beamspot' : 'NominalCollision2015',
'--beamspot' : 'Realistic50ns13TeVCollision',
'--era' :'Run2_25ns',
'--eventcontent':'FEVTDEBUGHLT,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
Expand Down 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
2 changes: 1 addition & 1 deletion Configuration/StandardSequences/python/VtxSmeared.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
'Realistic50ns13TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi',

}
VtxSmearedDefaultKey='NominalCollision2015'
VtxSmearedDefaultKey='Realistic50ns13TeVCollision'
VtxSmearedHIDefaultKey='NominalHICollision2015'
12 changes: 6 additions & 6 deletions DPGAnalysis/Skims/src/LogErrorEventFilter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ LogErrorEventFilter::LogErrorEventFilter(const edm::ParameterSet & iConfig) :
categoriesToIgnore_.insert(categories.begin(), categories.end());
}
}
std::ostream_iterator<std::string> dump(std::cout, ", ");
std::cout << "\nWatch modules: " ; std::copy(modulesToWatch_.begin(), modulesToWatch_.end(), dump);
std::cout << "\nIgnore modules: " ; std::copy(modulesToIgnore_.begin(), modulesToIgnore_.end(), dump);
std::cout << "\nIgnore categories: " ; std::copy(categoriesToIgnore_.begin(), categoriesToIgnore_.end(), dump);
std::cout << "\nWatch categories: " ; std::copy(categoriesToWatch_.begin(), categoriesToWatch_.end(), dump);
std::cout << std::endl;
//std::ostream_iterator<std::string> dump(std::cout, ", ");
//std::cout << "\nWatch modules: " ; std::copy(modulesToWatch_.begin(), modulesToWatch_.end(), dump);
//std::cout << "\nIgnore modules: " ; std::copy(modulesToIgnore_.begin(), modulesToIgnore_.end(), dump);
//std::cout << "\nIgnore categories: " ; std::copy(categoriesToIgnore_.begin(), categoriesToIgnore_.end(), dump);
//std::cout << "\nWatch categories: " ; std::copy(categoriesToWatch_.begin(), categoriesToWatch_.end(), dump);
//std::cout << std::endl;

}

Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/Trigger/src/HLTTauDQMPath.cc
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ namespace {
// ignore
}
else {
edm::LogWarning("HLTTauDQMOfflineSource") << "HLTTauDQMPath.cc, inferTauLeptonMultiplicity(): module type '" << moduleType << "' not recognized, filter '" << filterName << "' in path '" << pathName << "' will be ignored for offline matching." << std::endl;
edm::LogInfo("HLTTauDQMOfflineSource") << "HLTTauDQMPath.cc, inferTauLeptonMultiplicity(): module type '" << moduleType << "' not recognized, filter '" << filterName << "' in path '" << pathName << "' will be ignored for offline matching." << std::endl;
}
return n;
}
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,13 @@ def customiseFor11497(process):
process.CaloTowerTopologyEP = cms.ESProducer( 'CaloTowerTopologyEP' )
return process


def customiseFor12044(process):
# add a label to indentify the PFProducer calibrations
for module in producers_by_type(process, 'PFProducer'):
if not 'calibrationsLabel' in module.__dict__:
module.calibrationsLabel = cms.string('')
return process


# CMSSW version specific customizations
def customiseHLTforCMSSW(process, menuType="GRun", fastSim=False):
import os
Expand Down
2 changes: 1 addition & 1 deletion HLTriggerOffline/Egamma/src/EmDQM.cc
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ EmDQM::dqmBeginRun(edm::Run const &iRun, edm::EventSetup const &iSetup)
edm::LogPrint("EmDQM") << "No number of candidates for filter " << moduleLabel << " found. Set to " << paramSet.getParameter<int>("cutnum") << ", determined from path name.";
filterPSet.addParameter<int>("ncandcut", paramSet.getParameter<int>("cutnum"));
} else if (filterPSet.getParameter<int>("ncandcut") > paramSet.getParameter<int>("cutnum")) {
edm::LogPrint("EmDQM") << "Changed required number of candidates from " << paramSet.getParameter<int>("cutnum") << " to " << filterPSet.getParameter<int>("ncandcut") << " for filter " << moduleLabel;
edm::LogInfo("EmDQM") << "Changed required number of candidates from " << paramSet.getParameter<int>("cutnum") << " to " << filterPSet.getParameter<int>("ncandcut") << " for filter " << moduleLabel;
paramSet.addParameter<int>("cutnum", filterPSet.getParameter<int>("ncandcut"));
paramSet.addParameter<unsigned>("reqNum", (unsigned)filterPSet.getParameter<int>("ncandcut"));
}
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtils.cc
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
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
2 changes: 1 addition & 1 deletion PhysicsTools/JetMCAlgos/plugins/HadronAndPartonSelector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ HadronAndPartonSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSet
if( !partonSelector_ )
{
if ( partonMode_=="Undefined" )
edm::LogWarning("UndefinedPartonMode") << "Could not automatically determine the hadronizer type and set the correct parton selection mode. Parton-based jet flavour will not be defined.";
edm::LogInfo("UndefinedPartonMode") << "Could not automatically determine the hadronizer type and set the correct parton selection mode. Parton-based jet flavour will not be defined.";
else if ( partonMode_=="Pythia6" )
{
partonSelector_ = PartonSelectorPtr( new Pythia6PartonSelector() );
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ JetCorrFactorsProducer::JetCorrFactorsProducer(const edm::ParameterSet& cfg):
}
}
else{
edm::LogWarning message( "Parameter rho not used" );
edm::LogInfo message( "Parameter rho not used" );
message << "Module is configured to use the parameter rho, but rho is only used \n"
<< "for L1FastJet corrections. The configuration of levels does not contain \n"
<< "L1FastJet corrections though, so rho will not be used by this module. \n";
Expand Down
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
4 changes: 0 additions & 4 deletions PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,9 @@ template <typename T, typename Textractor>
jetCorrInputFileName_ = cfg.getParameter<edm::FileInPath>("jetCorrInputFileName");
if ( jetCorrInputFileName_.location() == edm::FileInPath::Unknown) throw cms::Exception("ShiftedJetProducerT")
<< " Failed to find JEC parameter file = " << jetCorrInputFileName_ << " !!\n";
std::cout << "Reading JEC parameters = " << jetCorrUncertaintyTag_
<< " from file = " << jetCorrInputFileName_.fullPath() << "." << std::endl;
jetCorrParameters_ = new JetCorrectorParameters(jetCorrInputFileName_.fullPath().data(), jetCorrUncertaintyTag_);
jecUncertainty_ = new JetCorrectionUncertainty(*jetCorrParameters_);
} else {
std::cout << "Reading JEC parameters = " << jetCorrUncertaintyTag_
<< " from DB/SQLlite file." << std::endl;
jetCorrPayloadName_ = cfg.getParameter<std::string>("jetCorrPayloadName");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@ ShiftedPFCandidateProducerForNoPileUpPFMEt::ShiftedPFCandidateProducerForNoPileU
jetCorrInputFileName_ = cfg.getParameter<edm::FileInPath>("jetCorrInputFileName");
if ( jetCorrInputFileName_.location() == edm::FileInPath::Unknown) throw cms::Exception("ShiftedJetProducerT")
<< " Failed to find JEC parameter file = " << jetCorrInputFileName_ << " !!\n";
std::cout << "Reading JEC parameters = " << jetCorrUncertaintyTag_
<< " from file = " << jetCorrInputFileName_.fullPath() << "." << std::endl;
jetCorrParameters_ = new JetCorrectorParameters(jetCorrInputFileName_.fullPath().data(), jetCorrUncertaintyTag_);
jecUncertainty_ = new JetCorrectionUncertainty(*jetCorrParameters_);
} else {
std::cout << "Reading JEC parameters = " << jetCorrUncertaintyTag_
<< " from DB/SQLlite file." << std::endl;
jetCorrPayloadName_ = cfg.getParameter<std::string>("jetCorrPayloadName");
}

Expand Down
Loading

0 comments on commit 4186f46

Please sign in to comment.