From 11845f1aa100150f6268c672db43891b25f32838 Mon Sep 17 00:00:00 2001 From: Kai-Feng Date: Fri, 10 Nov 2017 15:38:05 +0100 Subject: [PATCH] Add displacedJet skim / add relval steps / add RAW+miniAOD event content --- .../EventContent/python/EventContent_cff.py | 17 +++++++++++++++++ .../python/relval_standard.py | 1 + .../PyReleaseValidation/python/relval_steps.py | 3 +++ .../Skimming/python/PDWG_EXODisplacedJet_cff.py | 14 ++++++++++++++ Configuration/Skimming/python/Skims_PDWG_cff.py | 16 ++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 Configuration/Skimming/python/PDWG_EXODisplacedJet_cff.py diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 4f20ae6cafdd2..94c31ffaae1c4 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -173,6 +173,17 @@ ) # # +# RAWAOD Data Tier definition +# +# +RAWAODEventContent = cms.PSet( + outputCommands = cms.untracked.vstring('drop *'), + eventAutoFlushCompressedSize=cms.untracked.int32(30*1024*1024), + compressionAlgorithm=cms.untracked.string("LZMA"), + compressionLevel=cms.untracked.int32(4) +) +# +# # RAWSIM Data Tier definition # =========================== # @@ -477,6 +488,12 @@ AODEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands) ctpps_2016.toModify(AODEventContent, outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands) +RAWAODEventContent.outputCommands.extend(AODEventContent.outputCommands) +RAWAODEventContent.outputCommands.extend(cms.untracked.vstring( + 'keep FEDRawDataCollection_rawDataCollector_*_*', + 'keep FEDRawDataCollection_source_*_*' +)) + RAWSIMEventContent.outputCommands.extend(RAWEventContent.outputCommands) RAWSIMEventContent.outputCommands.extend(SimG4CoreRAW.outputCommands) RAWSIMEventContent.outputCommands.extend(SimTrackerRAW.outputCommands) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 6858d5b06fcc4..2602853fbc881 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -251,6 +251,7 @@ workflows[136.801] = ['',['RunZeroBias2017C','HLTDR2_2017','RECODR2_2017reHLT_Prompt','HARVEST2017']] workflows[136.802] = ['',['RunMuOnia2017C','HLTDR2_2017','RECODR2_2017reHLT_skimMuOnia_Prompt','HARVEST2017']] workflows[136.803] = ['',['RunNoBPTX2017C','HLTDR2_2017','RECODR2_2017reHLTAlCaTkCosmics_Prompt','HARVEST2017']] +workflows[136.804] = ['',['RunDisplacedJet2017C','HLTDR2_2017','RECODR2_2017reHLT_skimDisplacedJet_Prompt','HARVEST2017']] ### fastsim ### workflows[5.1] = ['TTbar', ['TTbarFS','HARVESTFS']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index db1c194032be9..a1f9b35bb4fdf 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -294,6 +294,7 @@ steps['RunDoubleEG2017C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017C-v1/RAW',label='doubEG2017C',events=100000,location='STD', ls=Run2017C)} steps['RunDoubleMuon2017C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017C-v1/RAW',label='doubMu2017C',events=100000,location='STD', ls=Run2017C)} steps['RunJetHT2017C']={'INPUT':InputInfo(dataSet='/JetHT/Run2017C-v1/RAW',label='jetHT2017C',events=100000,location='STD', ls=Run2017C)} +steps['RunDisplacedJet2017C']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017C-v1/RAW',label='displacedJet2017C',events=100000,location='STD', ls=Run2017C)} steps['RunMET2017C']={'INPUT':InputInfo(dataSet='/MET/Run2017C-v1/RAW',label='met2017C',events=100000,location='STD', ls=Run2017C)} steps['RunMuonEG2017C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017C-v1/RAW',label='muEG2017C',events=100000,location='STD', ls=Run2017C)} steps['RunSingleEl2017C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017C-v1/RAW',label='sigEl2017C',events=100000,location='STD', ls=Run2017C)} @@ -1457,6 +1458,7 @@ def gen2018HiMix(fragment,howMuch): steps['RECODR2_2017reHLT_skimDoubleEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZElectron,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQM+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) steps['RECODR2_2017reHLT_skimMuonEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:TopMuEG,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQM+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) steps['RECODR2_2017reHLT_skimJetHT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:JetHTJetPlusHOFilter,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQM+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimDisplacedJet']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXODisplacedJet,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQM+@miniAODDQM'},steps['RECODR2_2017reHLT']]) steps['RECODR2_2017reHLT_skimMET']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:HighMET+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQM+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) steps['RECODR2_2017reHLT_skimSinglePh']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:SinglePhotonJetPlusHOFilter+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQM+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) steps['RECODR2_2017reHLT_skimMuOnia']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:BPHSkim,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQM+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) @@ -1483,6 +1485,7 @@ def gen2018HiMix(fragment,howMuch): steps['RECODR2_2017reHLT_Prompt']=merge([{'--conditions':'auto:run2_data_promptlike'},steps['RECODR2_2017reHLT']]) steps['RECODR2_2017reHLT_skimDoubleEG_Prompt']=merge([{'--conditions':'auto:run2_data_promptlike'},steps['RECODR2_2017reHLT_skimDoubleEG']]) steps['RECODR2_2017reHLT_skimJetHT_Prompt']=merge([{'--conditions':'auto:run2_data_promptlike'},steps['RECODR2_2017reHLT_skimJetHT']]) +steps['RECODR2_2017reHLT_skimDisplacedJet_Prompt']=merge([{'--conditions':'auto:run2_data_promptlike'},steps['RECODR2_2017reHLT_skimDisplacedJet']]) steps['RECODR2_2017reHLT_skimMET_Prompt']=merge([{'--conditions':'auto:run2_data_promptlike'},steps['RECODR2_2017reHLT_skimMET']]) steps['RECODR2_2017reHLT_skimMuonEG_Prompt']=merge([{'--conditions':'auto:run2_data_promptlike'},steps['RECODR2_2017reHLT_skimMuonEG']]) steps['RECODR2_2017reHLT_skimSingleMu_Prompt']=merge([{'--conditions':'auto:run2_data_promptlike'},steps['RECODR2_2017reHLT_skimSingleMu']]) diff --git a/Configuration/Skimming/python/PDWG_EXODisplacedJet_cff.py b/Configuration/Skimming/python/PDWG_EXODisplacedJet_cff.py new file mode 100644 index 0000000000000..3634b59f9823b --- /dev/null +++ b/Configuration/Skimming/python/PDWG_EXODisplacedJet_cff.py @@ -0,0 +1,14 @@ +import FWCore.ParameterSet.Config as cms + +import HLTrigger.HLTfilters.hltHighLevel_cfi +DisplacedJetHTTrigger = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone() +DisplacedJetHTTrigger.TriggerResultsTag = cms.InputTag( "TriggerResults", "", "HLT" ) +DisplacedJetHTTrigger.HLTPaths = cms.vstring( + "HLT_HT425_v*" +) +DisplacedJetHTTrigger.throw = False +DisplacedJetHTTrigger.andOr = True + +EXODisplacedJetSkimSequence = cms.Sequence( + DisplacedJetHTTrigger +) diff --git a/Configuration/Skimming/python/Skims_PDWG_cff.py b/Configuration/Skimming/python/Skims_PDWG_cff.py index 207663a1f8b8b..7564059437c46 100644 --- a/Configuration/Skimming/python/Skims_PDWG_cff.py +++ b/Configuration/Skimming/python/Skims_PDWG_cff.py @@ -12,6 +12,11 @@ skimRawContent.outputCommands.append("drop *_MEtoEDMConverter_*_*") skimRawContent.outputCommands.append("drop *_*_*_SKIM") +from Configuration.EventContent.EventContent_cff import RAWAODEventContent +skimRawAODContent = RAWAODEventContent.clone() +skimRawAODContent.outputCommands.append("drop *_MEtoEDMConverter_*_*") +skimRawAODContent.outputCommands.append("drop *_*_*_SKIM") + ##################### # event splitting special skims @@ -244,6 +249,17 @@ dataTier = cms.untracked.string('USER') ) +from Configuration.Skimming.PDWG_EXODisplacedJet_cff import * +EXODisplacedJetPath = cms.Path(EXODisplacedJetSkimSequence) +SKIMStreamEXODisplacedJet = cms.FilteredStream( + responsible = 'PDWG', + name = 'EXODisplacedJet', + paths = (EXODisplacedJetPath), + content = skimRawAODContent.outputCommands, + selectEvents = cms.untracked.PSet(), + dataTier = cms.untracked.string('USER') +) + ##################### # For the Data on Data Mixing in TSG from HLTrigger.Configuration.HLT_Fake1_cff import fragment as _fragment