diff --git a/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc b/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc index bb58df213db9d..51bdae97de3ad 100644 --- a/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc +++ b/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc @@ -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; diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index 850c788e395a2..b015fe70159be 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -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 diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 3552e10e32699..3c2e81f7d6b18 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -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' @@ -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', @@ -788,27 +788,27 @@ 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]) @@ -816,7 +816,7 @@ def identityFS(wf): 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']]) @@ -824,9 +824,9 @@ def identityFS(wf): #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 @@ -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]) diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py index 7a0eaf0b2e2af..cb96f76b02c8b 100644 --- a/Configuration/StandardSequences/python/VtxSmeared.py +++ b/Configuration/StandardSequences/python/VtxSmeared.py @@ -44,5 +44,5 @@ 'Realistic50ns13TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi', } -VtxSmearedDefaultKey='NominalCollision2015' +VtxSmearedDefaultKey='Realistic50ns13TeVCollision' VtxSmearedHIDefaultKey='NominalHICollision2015' diff --git a/DPGAnalysis/Skims/src/LogErrorEventFilter.cc b/DPGAnalysis/Skims/src/LogErrorEventFilter.cc index 58af7da50ba2a..ccff8d499e036 100644 --- a/DPGAnalysis/Skims/src/LogErrorEventFilter.cc +++ b/DPGAnalysis/Skims/src/LogErrorEventFilter.cc @@ -127,12 +127,12 @@ LogErrorEventFilter::LogErrorEventFilter(const edm::ParameterSet & iConfig) : categoriesToIgnore_.insert(categories.begin(), categories.end()); } } - std::ostream_iterator 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 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; } diff --git a/DQMOffline/Trigger/src/HLTTauDQMPath.cc b/DQMOffline/Trigger/src/HLTTauDQMPath.cc index 81e048c16d982..6393feefc1e5f 100644 --- a/DQMOffline/Trigger/src/HLTTauDQMPath.cc +++ b/DQMOffline/Trigger/src/HLTTauDQMPath.cc @@ -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; } diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 84c71d3ae8518..cca106a29dbd7 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -184,7 +184,6 @@ 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'): @@ -192,7 +191,6 @@ def customiseFor12044(process): module.calibrationsLabel = cms.string('') return process - # CMSSW version specific customizations def customiseHLTforCMSSW(process, menuType="GRun", fastSim=False): import os diff --git a/HLTriggerOffline/Egamma/src/EmDQM.cc b/HLTriggerOffline/Egamma/src/EmDQM.cc index f01b2336237ed..699cd7a784518 100644 --- a/HLTriggerOffline/Egamma/src/EmDQM.cc +++ b/HLTriggerOffline/Egamma/src/EmDQM.cc @@ -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("cutnum") << ", determined from path name."; filterPSet.addParameter("ncandcut", paramSet.getParameter("cutnum")); } else if (filterPSet.getParameter("ncandcut") > paramSet.getParameter("cutnum")) { - edm::LogPrint("EmDQM") << "Changed required number of candidates from " << paramSet.getParameter("cutnum") << " to " << filterPSet.getParameter("ncandcut") << " for filter " << moduleLabel; + edm::LogInfo("EmDQM") << "Changed required number of candidates from " << paramSet.getParameter("cutnum") << " to " << filterPSet.getParameter("ncandcut") << " for filter " << moduleLabel; paramSet.addParameter("cutnum", filterPSet.getParameter("ncandcut")); paramSet.addParameter("reqNum", (unsigned)filterPSet.getParameter("ncandcut")); } diff --git a/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtils.cc b/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtils.cc index c3c3a43fc3637..dddefc343fa05 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtils.cc +++ b/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtils.cc @@ -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 " diff --git a/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtilsHelper.cc b/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtilsHelper.cc index f5154f43fab9e..8a135643eb9e8 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtilsHelper.cc +++ b/L1Trigger/GlobalTriggerAnalyzer/src/L1GtUtilsHelper.cc @@ -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 @@ -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) @@ -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::const_iterator itPrefTag = preferredL1GtRecordInputTag.begin(), itPrefTagEnd = preferredL1GtRecordInputTag.end(); diff --git a/PhysicsTools/JetMCAlgos/plugins/HadronAndPartonSelector.cc b/PhysicsTools/JetMCAlgos/plugins/HadronAndPartonSelector.cc index a77fd8797b4a4..695976ca279b2 100644 --- a/PhysicsTools/JetMCAlgos/plugins/HadronAndPartonSelector.cc +++ b/PhysicsTools/JetMCAlgos/plugins/HadronAndPartonSelector.cc @@ -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() ); diff --git a/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc b/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc index d992476a10e79..34db11f63cf47 100644 --- a/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc @@ -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"; diff --git a/PhysicsTools/PatAlgos/python/triggerLayer1/triggerProducer_cfi.py b/PhysicsTools/PatAlgos/python/triggerLayer1/triggerProducer_cfi.py index ad0d5f82c7c9c..e699fe4ec16a9 100644 --- a/PhysicsTools/PatAlgos/python/triggerLayer1/triggerProducer_cfi.py +++ b/PhysicsTools/PatAlgos/python/triggerLayer1/triggerProducer_cfi.py @@ -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! diff --git a/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h b/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h index 5e0b5026e544b..5fd349c1bb2d8 100644 --- a/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h +++ b/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h @@ -57,13 +57,9 @@ template jetCorrInputFileName_ = cfg.getParameter("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("jetCorrPayloadName"); } } diff --git a/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForNoPileUpPFMEt.cc b/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForNoPileUpPFMEt.cc index 37bbc24fbdf10..f1985191c78ca 100644 --- a/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForNoPileUpPFMEt.cc +++ b/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForNoPileUpPFMEt.cc @@ -15,13 +15,9 @@ ShiftedPFCandidateProducerForNoPileUpPFMEt::ShiftedPFCandidateProducerForNoPileU jetCorrInputFileName_ = cfg.getParameter("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("jetCorrPayloadName"); } diff --git a/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForPFNoPUMEt.cc b/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForPFNoPUMEt.cc index c45eb764eec94..da7119be58453 100644 --- a/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForPFNoPUMEt.cc +++ b/PhysicsTools/PatUtils/plugins/ShiftedPFCandidateProducerForPFNoPUMEt.cc @@ -19,13 +19,13 @@ ShiftedPFCandidateProducerForPFNoPUMEt::ShiftedPFCandidateProducerForPFNoPUMEt(c jetCorrInputFileName_ = cfg.getParameter("jetCorrInputFileName"); if ( jetCorrInputFileName_.location() == edm::FileInPath::Unknown) throw cms::Exception("ShiftedJetProducerT") << " Failed to find JEC parameter file = " << jetCorrInputFileName_ << " !!\n"; - edm::LogWarning("ShiftedPFCandidateProducerForPFNoPUMEt") + edm::LogInfo("ShiftedPFCandidateProducerForPFNoPUMEt") << "Reading JEC parameters = " << jetCorrUncertaintyTag_ << " from file = " << jetCorrInputFileName_.fullPath() << "." << std::endl; jetCorrParameters_ = new JetCorrectorParameters(jetCorrInputFileName_.fullPath().data(), jetCorrUncertaintyTag_); jecUncertainty_ = new JetCorrectionUncertainty(*jetCorrParameters_); } else { - edm::LogWarning("ShiftedPFCandidateProducerForPFNoPUMEt") + edm::LogInfo("ShiftedPFCandidateProducerForPFNoPUMEt") << "Reading JEC parameters = " << jetCorrUncertaintyTag_ << " from DB/SQLlite file." << std::endl; jetCorrPayloadName_ = cfg.getParameter("jetCorrPayloadName"); diff --git a/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h b/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h index 8f392249d09d9..b0e70b48958f1 100644 --- a/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h +++ b/PhysicsTools/SelectorUtils/interface/VersionedIdProducer.h @@ -86,7 +86,7 @@ VersionedIdProducer(const edm::ParameterSet& iConfig) { } if( idMD5 != calculated_md5 ) { - edm::LogError("IdConfigurationNotValidated") + edm::LogInfo("IdConfigurationNotValidated") << "ID: " << ids_.back()->name() << "\n" << "The expected md5: " << idMD5 << " does not match the md5\n" << "calculated by the ID: " << calculated_md5 << " please\n" diff --git a/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py b/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py index 85f2c757688b5..f838fc93640e5 100644 --- a/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py +++ b/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py @@ -23,7 +23,7 @@ def setupVIDSelection(vidproducer,cutflow): isPOGApproved = isPOGApproved, idMD5 = cms.string(cutflow_md5) ) ) - sys.stderr.write('Added ID \'%s\' to %s\n'%(cutflow.idName.value(),vidproducer.label())) +# sys.stderr.write('Added ID \'%s\' to %s\n'%(cutflow.idName.value(),vidproducer.label())) def addVIDSelectionToPATProducer(patProducer,idProducer,idName,addUserData=True): patProducerIDs = None @@ -83,7 +83,7 @@ def switchOnVIDElectronIdProducer(process, dataFormat): else: raise Exception('InvalidVIDDataFormat', 'The requested data format is different from AOD or MiniAOD') # - sys.stderr.write('Added \'egmGsfElectronIDs\' to process definition (%s format)!\n' % dataFormatString) +# sys.stderr.write('Added \'egmGsfElectronIDs\' to process definition (%s format)!\n' % dataFormatString) def setupVIDElectronSelection(process,cutflow,patProducer=None,addUserData=True): if not hasattr(process,'egmGsfElectronIDs'): @@ -119,7 +119,7 @@ def switchOnVIDMuonIdProducer(process, dataFormat): else: raise Exception('InvalidVIDDataFormat', 'The requested data format is different from AOD or MiniAOD') # - sys.stderr.write('Added \'muoMuonIDs\' to process definition (%s format)!\n' % dataFormatString) +# sys.stderr.write('Added \'muoMuonIDs\' to process definition (%s format)!\n' % dataFormatString) def setupVIDMuonSelection(process,cutflow,patProducer=None): moduleName = "muoMuonIDs" diff --git a/RecoPixelVertexing/PixelVertexFinding/src/PixelVertexProducer.cc b/RecoPixelVertexing/PixelVertexFinding/src/PixelVertexProducer.cc index 8af808772512a..d60a87f5896ed 100644 --- a/RecoPixelVertexing/PixelVertexFinding/src/PixelVertexProducer.cc +++ b/RecoPixelVertexing/PixelVertexFinding/src/PixelVertexProducer.cc @@ -41,7 +41,7 @@ PixelVertexProducer::PixelVertexProducer(const edm::ParameterSet& conf) track_pt_min = PVcomparerPSet.getParameter("track_pt_min"); if (track_pt_min != ptMin_) { if (track_pt_min < ptMin_) - edm::LogWarning("PixelVertexProducer") << "minimum track pT setting differs between PixelVertexProducer (" << ptMin_ << ") and PVcomparer (" << track_pt_min << ") [PVcomparer considers tracks w/ lower threshold than PixelVertexProducer does] !!!"; + edm::LogInfo("PixelVertexProducer") << "minimum track pT setting differs between PixelVertexProducer (" << ptMin_ << ") and PVcomparer (" << track_pt_min << ") [PVcomparer considers tracks w/ lower threshold than PixelVertexProducer does] !!!"; else edm::LogInfo("PixelVertexProducer") << "minimum track pT setting differs between PixelVertexProducer (" << ptMin_ << ") and PVcomparer (" << track_pt_min << ") !!!"; } diff --git a/SimMuon/MCTruth/src/RPCHitAssociator.cc b/SimMuon/MCTruth/src/RPCHitAssociator.cc index 7713b4dcf6d94..f0ae76604b7e6 100644 --- a/SimMuon/MCTruth/src/RPCHitAssociator.cc +++ b/SimMuon/MCTruth/src/RPCHitAssociator.cc @@ -93,7 +93,7 @@ std::vector RPCHitAssociator::associateRecHit(cons for(int i = fstrip; i < fstrip+cls; ++i) { std::set links = findRPCDigiSimLink(rpcDetId.rawId(),i,bx); - if (links.empty()) edm::LogWarning("RPCHitAssociator") + if (links.empty()) edm::LogInfo("RPCHitAssociator") <<"*** WARNING in RPCHitAssociator::associateRecHit, RPCRecHit "<<*rpcrechit<<", strip "<::iterator itlink = links.begin(); itlink != links.end(); ++itlink) { diff --git a/TrackingTools/TrajectoryState/src/TrajectoryStateClosestToPoint.cc b/TrackingTools/TrajectoryState/src/TrajectoryStateClosestToPoint.cc index a4bbbc0b8536d..98029e4f96258 100644 --- a/TrackingTools/TrajectoryState/src/TrajectoryStateClosestToPoint.cc +++ b/TrackingTools/TrajectoryState/src/TrajectoryStateClosestToPoint.cc @@ -18,7 +18,7 @@ TrajectoryStateClosestToPoint(const FTS& originalFTS, const GlobalPoint& referen theField = &(originalFTS.parameters().magneticField()); } catch (const cms::Exception &ex) { if (ex.category() != "PerigeeConversions") throw; - edm::LogWarning("TrajectoryStateClosestToPoint_PerigeeConversions") << "Caught exception " << ex.explainSelf() << ".\n"; + edm::LogInfo("TrajectoryStateClosestToPoint_PerigeeConversions") << "Caught exception " << ex.explainSelf() << ".\n"; valid = false; } } diff --git a/Utilities/XrdAdaptor/src/XrdRequestManager.cc b/Utilities/XrdAdaptor/src/XrdRequestManager.cc index db20a47f6df08..e720464a51fb5 100644 --- a/Utilities/XrdAdaptor/src/XrdRequestManager.cc +++ b/Utilities/XrdAdaptor/src/XrdRequestManager.cc @@ -295,7 +295,8 @@ RequestManager::updateSiteInfo(std::string orig_site) } else if (!orig_site.size() && (siteList != m_activeSites)) { - edm::LogWarning("XrdAdaptor") << "Data is now served from " << siteList << " instead of previous " << m_activeSites; + if (m_activeSites.size() >0 ) + edm::LogWarning("XrdAdaptor") << "Data is now served from " << siteList << " instead of previous " << m_activeSites; m_activeSites = siteList; } } diff --git a/Validation/EcalDigis/src/EcalSelectiveReadoutValidation.cc b/Validation/EcalDigis/src/EcalSelectiveReadoutValidation.cc index 953dc2c201bfc..ec6d4be70393e 100644 --- a/Validation/EcalDigis/src/EcalSelectiveReadoutValidation.cc +++ b/Validation/EcalDigis/src/EcalSelectiveReadoutValidation.cc @@ -1383,7 +1383,7 @@ EcalSelectiveReadoutValidation::analyzeTP(edm::Event const & event, } else { // FindFixBin might return an overflow bin (outside tpEtCount range). // To prevent a memory overflow / segfault, these values are ignored. - std::cout << "EcalSelectiveReadoutValidation: Invalid iE value: " << iE << std::endl; + //std::cout << "EcalSelectiveReadoutValidation: Invalid iE value: " << iE << std::endl; } fill(meTpVsEtSum_, etSum, tpEt);