From c464d5fb0ba69da1efd229bed9d87fb86a8fe79c Mon Sep 17 00:00:00 2001 From: matthieu Date: Mon, 29 Sep 2014 09:19:18 +0200 Subject: [PATCH 1/6] add JECpayload protection in PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h --- PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h b/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h index e8b6c0e0a9861..cccb507f03b49 100644 --- a/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h +++ b/PhysicsTools/PatUtils/interface/ShiftedJetProducerT.h @@ -133,7 +133,7 @@ class ShiftedJetProducerT : public edm::EDProducer std::cout << "shift = " << shift << std::endl; } - if ( addResidualJES_ ) { + if ( evt.isRealData() && addResidualJES_ ) { const static SmearedJetProducer_namespace::RawJetExtractorT rawJetExtractor; reco::Candidate::LorentzVector rawJetP4 = rawJetExtractor(*originalJet); if ( rawJetP4.E() > 1.e-1 ) { From f9294823ff307cf1035486c548f3620aa3de2791 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Mon, 29 Sep 2014 09:57:29 +0200 Subject: [PATCH 2/6] Fix IB addOn tests --- .../test/ExampleWithHLT_GRun_cfg.py | 6 ++- .../test/IntegrationTestIdealWithHLT_cfg.py | 5 ++- .../test/IntegrationTestWithHLT_cfg.py | 5 ++- .../Configuration/test/IntegrationTest_cfg.py | 2 +- .../ReleaseScripts/scripts/addOnTests.py | 40 +++++++++---------- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/FastSimulation/Configuration/test/ExampleWithHLT_GRun_cfg.py b/FastSimulation/Configuration/test/ExampleWithHLT_GRun_cfg.py index ec93ffca6679c..709113cb7d6f7 100644 --- a/FastSimulation/Configuration/test/ExampleWithHLT_GRun_cfg.py +++ b/FastSimulation/Configuration/test/ExampleWithHLT_GRun_cfg.py @@ -27,7 +27,7 @@ # Get frontier conditions from HLTrigger.Configuration.AutoCondGlobalTag import AutoCondGlobalTag -process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:startup_GRun') +process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:run2_mc_GRun') # L1 Emulator and HLT Setup #process.load("FastSimulation.HighLevelTrigger.HLTSetup_cff") @@ -103,3 +103,7 @@ # Make the job crash in case of missing product process.options = cms.untracked.PSet( Rethrow = cms.untracked.vstring('ProductNotFound') ) + +# PostLS1 +from SLHCUpgradeSimulations.Configuration.postLS1Customs import customisePostLS1 +process = customisePostLS1(process) diff --git a/FastSimulation/Configuration/test/IntegrationTestIdealWithHLT_cfg.py b/FastSimulation/Configuration/test/IntegrationTestIdealWithHLT_cfg.py index 937cd0553f612..df0a4aa3d2351 100644 --- a/FastSimulation/Configuration/test/IntegrationTestIdealWithHLT_cfg.py +++ b/FastSimulation/Configuration/test/IntegrationTestIdealWithHLT_cfg.py @@ -35,7 +35,7 @@ # Get frontier conditions (STARTUP conditions, not Fake or IDEAL anymore, otherwise we cannot set them for HLT!) from HLTrigger.Configuration.AutoCondGlobalTag import AutoCondGlobalTag -process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:startup_GRun') +process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:run2_mc_GRun') #from Configuration.AlCa.autoCond import autoCond #process.GlobalTag.globaltag = autoCond['mc'] @@ -144,3 +144,6 @@ # Make the job crash in case of missing product process.options = cms.untracked.PSet( Rethrow = cms.untracked.vstring('ProductNotFound') ) +# PostLS1 +from SLHCUpgradeSimulations.Configuration.postLS1Customs import customisePostLS1 +process = customisePostLS1(process) diff --git a/FastSimulation/Configuration/test/IntegrationTestWithHLT_cfg.py b/FastSimulation/Configuration/test/IntegrationTestWithHLT_cfg.py index a2bd180605b2a..c4a7a984db42b 100644 --- a/FastSimulation/Configuration/test/IntegrationTestWithHLT_cfg.py +++ b/FastSimulation/Configuration/test/IntegrationTestWithHLT_cfg.py @@ -80,7 +80,7 @@ # Get frontier conditions - not applied in the HCAL, see below from HLTrigger.Configuration.AutoCondGlobalTag import AutoCondGlobalTag -process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:startup_GRun') +process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:run2_mc_GRun') # Apply ECAL miscalibration from FastSimulation.CaloRecHitsProducer.CaloRecHits_cff import * @@ -119,3 +119,6 @@ # Make the job crash in case of missing product process.options = cms.untracked.PSet( Rethrow = cms.untracked.vstring('ProductNotFound') ) +# PostLS1 +from SLHCUpgradeSimulations.Configuration.postLS1Customs import customisePostLS1 +process = customisePostLS1(process) diff --git a/FastSimulation/Configuration/test/IntegrationTest_cfg.py b/FastSimulation/Configuration/test/IntegrationTest_cfg.py index 174153cd9339a..d42edef567119 100644 --- a/FastSimulation/Configuration/test/IntegrationTest_cfg.py +++ b/FastSimulation/Configuration/test/IntegrationTest_cfg.py @@ -36,7 +36,7 @@ # Get frontier conditions - not applied in the HCAL, see below from HLTrigger.Configuration.AutoCondGlobalTag import AutoCondGlobalTag -process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:startup_GRun') +process.GlobalTag = AutoCondGlobalTag(process.GlobalTag,'auto:run1_mc') # Allow reading of the tracker geometry from the DB process.load('CalibTracker/Configuration/Tracker_DependentRecords_forGlobalTag_nofakes_cff') diff --git a/Utilities/ReleaseScripts/scripts/addOnTests.py b/Utilities/ReleaseScripts/scripts/addOnTests.py index ccad545007688..e2d6654d7e56d 100755 --- a/Utilities/ReleaseScripts/scripts/addOnTests.py +++ b/Utilities/ReleaseScripts/scripts/addOnTests.py @@ -94,24 +94,24 @@ def prepare(self): } hltTests = { - 'hlt_mc_2014' : ['cmsDriver.py TTbar_Tauola.cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run1_mc_2014 --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_2014_MC.root', - 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_2014.py'), + 'hlt_mc_2014' : ['cmsDriver.py TTbar_Tauola_8TeV_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run1_mc_2014 --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_2014_MC.root', + 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnMc_HLT_2014.py'), 'cmsDriver.py RelVal -s HLT:2014,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run1_mc_2014 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --processName=HLTRECO --filein file:RelVal_Raw_2014_MC.root --fileout file:RelVal_Raw_2014_MC_HLT_RECO.root'], - 'hlt_mc_Fake' : ['cmsDriver.py TTbar_Tauola.cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run1_mc_Fake --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_Fake_MC.root', - 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_Fake.py'), + 'hlt_mc_Fake' : ['cmsDriver.py TTbar_Tauola_8TeV_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run1_mc_Fake --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_Fake_MC.root', + 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnMc_HLT_Fake.py'), 'cmsDriver.py RelVal -s HLT:Fake,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run1_mc_Fake --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --processName=HLTRECO --filein file:RelVal_Raw_Fake_MC.root --fileout file:RelVal_Raw_Fake_MC_HLT_RECO.root'], - 'hlt_mc_FULL' : ['cmsDriver.py TTbar_Tauola.cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_FULL --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_FULL_MC.root', - 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_FULL.py'), - 'cmsDriver.py RelVal -s HLT:FULL,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_FULL --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_FULL_MC.root --fileout file:RelVal_Raw_FULL_MC_HLT_RECO.root'], - 'hlt_mc_GRun' : ['cmsDriver.py TTbar_Tauola.cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_GRun --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_GRun_MC.root', - 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_GRun.py'), - 'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_MC.root --fileout file:RelVal_Raw_GRun_MC_HLT_RECO.root'], - 'hlt_mc_HIon' : ['cmsDriver.py TTbar_Tauola.cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=HeavyIons -n 10 --conditions auto:run2_mc_HIon --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_HIon_MC.root', - 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_HIon.py'), - 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --mc --scenario=HeavyIons -n 10 --conditions auto:run2_mc_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_MC.root --fileout file:RelVal_Raw_HIon_MC_HLT_RECO.root'], - 'hlt_mc_PIon' : ['cmsDriver.py TTbar_Tauola.cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_PIon --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --fileout file:RelVal_Raw_PIon_MC.root', - 'cmsRun ' + self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_PIon.py'), - 'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_Pion --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_MC.root --fileout file:RelVal_Raw_PIon_MC_HLT_RECO.root'], + 'hlt_mc_FULL' : ['cmsDriver.py TTbar_Tauola_13TeV_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_FULL --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --fileout file:RelVal_Raw_FULL_MC.root', + 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnMc_HLT_FULL.py'), + 'cmsDriver.py RelVal -s HLT:FULL,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_FULL --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_FULL_MC.root --fileout file:RelVal_Raw_FULL_MC_HLT_RECO.root'], + 'hlt_mc_GRun' : ['cmsDriver.py TTbar_Tauola_13TeV_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_GRun --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --fileout file:RelVal_Raw_GRun_MC.root', + 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnMc_HLT_GRun.py'), + 'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_MC.root --fileout file:RelVal_Raw_GRun_MC_HLT_RECO.root'], + 'hlt_mc_HIon' : ['cmsDriver.py TTbar_Tauola_13TeV_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=HeavyIons -n 10 --conditions auto:run2_mc_HIon --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --fileout file:RelVal_Raw_HIon_MC.root', + 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnMc_HLT_HIon.py'), + 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --mc --scenario=HeavyIons -n 10 --conditions auto:run2_mc_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_MC.root --fileout file:RelVal_Raw_HIon_MC_HLT_RECO.root'], + 'hlt_mc_PIon' : ['cmsDriver.py TTbar_Tauola_13TeV_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_PIon --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAW --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --fileout file:RelVal_Raw_PIon_MC.root', + 'cmsRun ' + self.file2Path('HLTrigger/Configuration/test/OnMc_HLT_PIon.py'), + 'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_MC.root --fileout file:RelVal_Raw_PIon_MC_HLT_RECO.root'], 'hlt_data_2014' : ['cmsDriver.py RelVal -s L1REPACK --data --scenario=pp -n 10 --conditions auto:run1_hlt_2014 --relval 9000,50 --datatier "RAW" --eventcontent RAW --fileout file:RelVal_Raw_2014_DATA.root --filein /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnData_HLT_2014.py'), 'cmsDriver.py RelVal -s HLT:2014,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run1_data_2014 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --processName=HLTRECO --filein file:RelVal_Raw_2014_DATA.root --fileout file:RelVal_Raw_2014_DATA_HLT_RECO.root'], @@ -120,16 +120,16 @@ def prepare(self): 'cmsDriver.py RelVal -s HLT:Fake,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run1_data_Fake --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --processName=HLTRECO --filein file:RelVal_Raw_Fake_DATA.root --fileout file:RelVal_Raw_Fake_DATA_HLT_RECO.root'], 'hlt_data_FULL' : ['cmsDriver.py RelVal -s NONE --data --scenario=pp -n 10 --conditions auto:run2_hlt_FULL --relval 9000,50 --datatier "RAW" --eventcontent RAW --fileout file:RelVal_Raw_FULL_DATA.root --filein /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnData_HLT_FULL.py'), - 'cmsDriver.py RelVal -s HLT:FULL,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_FULL --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_FULL_DATA.root --fileout file:RelVal_Raw_FULL_DATA_HLT_RECO.root'], + 'cmsDriver.py RelVal -s HLT:FULL,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_FULL --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_FULL_DATA.root --fileout file:RelVal_Raw_FULL_DATA_HLT_RECO.root'], 'hlt_data_GRun' : ['cmsDriver.py RelVal -s NONE --data --scenario=pp -n 10 --conditions auto:run2_hlt_GRun --relval 9000,50 --datatier "RAW" --eventcontent RAW --fileout file:RelVal_Raw_GRun_DATA.root --filein /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnData_HLT_GRun.py'), - 'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root'], + 'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root'], 'hlt_data_HIon' : ['cmsDriver.py RelVal -s NONE --data --scenario=HeavyIons -n 10 --conditions auto:run2_hlt_HIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --fileout file:RelVal_Raw_HIon_DATA.root --filein /store/hidata/HIRun2011/HIHighPt/RAW/v1/000/182/838/F20AAF66-F71C-E111-9704-BCAEC532971D.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnData_HLT_HIon.py'), - 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=HeavyIons -n 10 --conditions auto:crun2_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root'], + 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=HeavyIons -n 10 --conditions auto:run2_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root'], 'hlt_data_PIon' : ['cmsDriver.py RelVal -s NONE --data --scenario=pp -n 10 --conditions auto:run2_hlt_PIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root', 'cmsRun ' + self.file2Path('HLTrigger/Configuration/test/OnData_HLT_PIon.py'), - 'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root'], + 'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root'], } self.commands={} From 1506b7b2f9f0e5e479fe7271d7f7d592eb6ca7f6 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Mon, 29 Sep 2014 13:44:46 +0200 Subject: [PATCH 3/6] Fix special case of HIon data --- Utilities/ReleaseScripts/scripts/addOnTests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/ReleaseScripts/scripts/addOnTests.py b/Utilities/ReleaseScripts/scripts/addOnTests.py index e2d6654d7e56d..cb5a0734f31b6 100755 --- a/Utilities/ReleaseScripts/scripts/addOnTests.py +++ b/Utilities/ReleaseScripts/scripts/addOnTests.py @@ -126,7 +126,7 @@ def prepare(self): 'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root'], 'hlt_data_HIon' : ['cmsDriver.py RelVal -s NONE --data --scenario=HeavyIons -n 10 --conditions auto:run2_hlt_HIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --fileout file:RelVal_Raw_HIon_DATA.root --filein /store/hidata/HIRun2011/HIHighPt/RAW/v1/000/182/838/F20AAF66-F71C-E111-9704-BCAEC532971D.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnData_HLT_HIon.py'), - 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=HeavyIons -n 10 --conditions auto:run2_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root'], + 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=HeavyIons -n 10 --conditions auto:run2_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --customise=HLTrigger/Configuration/CustomConfigs.MassReplaceInputTag --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root'], 'hlt_data_PIon' : ['cmsDriver.py RelVal -s NONE --data --scenario=pp -n 10 --conditions auto:run2_hlt_PIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root', 'cmsRun ' + self.file2Path('HLTrigger/Configuration/test/OnData_HLT_PIon.py'), 'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root'], From aa25efa413cf16abe902046ee97eb2f40e8ebbf0 Mon Sep 17 00:00:00 2001 From: Andrea Date: Mon, 29 Sep 2014 15:59:53 +0200 Subject: [PATCH 4/6] set track_ as transient --- DataFormats/PatCandidates/src/classes_def_objects.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DataFormats/PatCandidates/src/classes_def_objects.xml b/DataFormats/PatCandidates/src/classes_def_objects.xml index ae307bb567be1..787de4a6db6f7 100644 --- a/DataFormats/PatCandidates/src/classes_def_objects.xml +++ b/DataFormats/PatCandidates/src/classes_def_objects.xml @@ -166,7 +166,8 @@ - + + @@ -188,6 +189,7 @@ + Date: Mon, 29 Sep 2014 19:49:47 +0200 Subject: [PATCH 5/6] re-enabled patMet uncertainty test --- PhysicsTools/PatAlgos/test/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PhysicsTools/PatAlgos/test/runtests.sh b/PhysicsTools/PatAlgos/test/runtests.sh index 13de0c482256f..956379837d8b4 100755 --- a/PhysicsTools/PatAlgos/test/runtests.sh +++ b/PhysicsTools/PatAlgos/test/runtests.sh @@ -31,7 +31,7 @@ cmsRun ${LOCAL_TEST_DIR}/patTuple_addVertexInfo_cfg.py || die 'Failure using pat # cmsRun ${LOCAL_TEST_DIR}/patTuple_userData_cfg.py || die 'Failure using patTuple_userData_cfg.py' $? -#cmsRun ${LOCAL_TEST_DIR}/patTuple_metUncertainties_cfg.py || die 'Failure using patTuple_metUncertainties_cfg.py' $? +cmsRun ${LOCAL_TEST_DIR}/patTuple_metUncertainties_cfg.py || die 'Failure using patTuple_metUncertainties_cfg.py' $? # Not needed in IBs # cmsRun ${LOCAL_TEST_DIR}/patTuple_onlyElectrons_cfg.py || die 'Failure using patTuple_onlyElectrons_cfg.py' $? From 31a79f5dc73dfb891f6a8fcf019a392e75d9903e Mon Sep 17 00:00:00 2001 From: batinkov Date: Tue, 30 Sep 2014 15:23:35 +0200 Subject: [PATCH 6/6] A script that manages a FU/BU appliance is added. --- DQM/Integration/scripts/dqmd_manager.py | 100 ++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100755 DQM/Integration/scripts/dqmd_manager.py diff --git a/DQM/Integration/scripts/dqmd_manager.py b/DQM/Integration/scripts/dqmd_manager.py new file mode 100755 index 0000000000000..26d15604a01c2 --- /dev/null +++ b/DQM/Integration/scripts/dqmd_manager.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python + +from __future__ import print_function +import sys +import subprocess + + +COLOR_PURPLE = '\033[95m' +COLOR_BLUE = '\033[94m' +COLOR_GREEN = '\033[92m' +COLOR_YELLOW = '\033[93m' +COLOR_RED = '\033[91m' +COLOR_DEF = '\033[0m' + +# This variable is used only when the daemon is installed/updated +# by hand and needs to be explicitly specified by the user. +rpm_path = '' # '/nfshome0/smorovic/gcc481/dqm/hltd-1.5.0-2.x86_64.rpm' + +def rpm_install(machine): + return 'sudo rpm --install {0}'.format(rpm_path) + +def rpm_update(machine): + return 'sudo rpm -Uhv --force {0}'.format(rpm_path) + + +machines = { 'bu' : ['dqm-c2d07-22', 'bu-c2f13-31-01', 'bu-c2f13-29-01'], + 'dev' : ['dqm-c2d07-21', 'dqm-c2d07-22', 'dqm-c2d07-23', 'dqm-c2d07-24', 'dqm-c2d07-25', 'dqm-c2d07-26', 'dqm-c2d07-27'], + 'dev_current' : ['dqm-c2d07-22', 'dqm-c2d07-23'], + 'ed' : ['bu-c2f13-29-01', 'fu-c2f13-41-01', 'fu-c2f13-41-02', 'fu-c2f13-41-03', 'fu-c2f13-41-04'], + 'ed_current' : ['bu-c2f13-29-01', 'fu-c2f13-41-03'], + 'prod' : ['bu-c2f13-31-01', 'fu-c2f13-39-01', 'fu-c2f13-39-02', 'fu-c2f13-39-03', 'fu-c2f13-39-04'], + 'prod_current' : ['bu-c2f13-31-01', 'fu-c2f13-39-04'] + } + + +actions = { 'rpm_install' : rpm_install, + 'rpm_update' : rpm_update, + 'rpm_install_status' : 'rpm -qa hltd', + 'rpm_remove' : 'sudo rpm --erase hltd', + 'daemon_status' : 'sudo /sbin/service hltd status', + 'daemon_start' : 'sudo /sbin/service hltd start', + 'daemon_stop' : 'sudo /sbin/service hltd stop', + 'daemon_stop-light' : 'sudo /sbin/service hltd stop-light', + 'daemon_restart' : 'sudo /sbin/service hltd restart'} + + +def usage(): + print('Usage: ' + sys.argv[0] + ' MACHINES ACTIONS') + + print('\tMACHINES:') + for target in machines.keys(): + print('\t\t' + target + ': ' + ', '.join(machines[target])) + + print('\tACTIONS:') + for action in actions.keys(): + print('\t\t' + action) + + +def info(info=None): + if None != info: + print(COLOR_BLUE + '***************************** ' + info + ' *****************************' + COLOR_DEF) + else: + print(COLOR_BLUE + '*********************************************************************************' + COLOR_DEF) + + +def exec_func(machine, action): + info('Machine: ' + machine) + call_list = [] + call_list.append('ssh') + call_list.append(machine) + + if hasattr(action, '__call__'): + call_list.append(action(machine)) + else: + call_list.append(action) + + # print(call_list) # DEBUG_CODE + subprocess.call(call_list, stderr=subprocess.STDOUT) + + info() + + +if __name__ == '__main__': + if len(sys.argv) < 3: + usage() + exit(1) + + targets = machines.get(sys.argv[1]) + if targets == None: + print('Wrong target machines') + exit(2) + + action = actions.get(sys.argv[2]) + if action == None: + print('Wrong action') + exit(3) + + for target in targets: + exec_func(target, action) +