Skip to content

Commit

Permalink
Merge branch 'CMSSW_13_0_X' into manage2023WFs
Browse files Browse the repository at this point in the history
  • Loading branch information
sunilUIET authored Jun 26, 2023
2 parents 7c9f537 + f39e6b7 commit 781fa71
Show file tree
Hide file tree
Showing 12 changed files with 317 additions and 47 deletions.
12 changes: 6 additions & 6 deletions Configuration/PyReleaseValidation/python/relval_standard.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@
### run3 (2022) ###
workflows[140.001] = ['',['RunMinimumBias2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.002] = ['',['RunSingleMuon2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.003] = ['',['RunZeroBias2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.003] = ['',['RunZeroBias2022A','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']]
workflows[140.004] = ['',['RunBTagMu2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.005] = ['',['RunJetHT2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.006] = ['',['RunDisplacedJet2022A','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
Expand All @@ -464,7 +464,7 @@

workflows[140.021] = ['',['RunMinimumBias2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.022] = ['',['RunSingleMuon2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.023] = ['',['RunZeroBias2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.023] = ['',['RunZeroBias2022B','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']]
workflows[140.024] = ['',['RunBTagMu2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.025] = ['',['RunJetHT2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.026] = ['',['RunDisplacedJet2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
Expand All @@ -475,7 +475,7 @@
workflows[140.031] = ['',['RunMuonEG2022B','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]

workflows[140.042] = ['',['RunSingleMuon2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.043] = ['',['RunZeroBias2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.043] = ['',['RunZeroBias2022C','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']]
workflows[140.044] = ['',['RunBTagMu2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.045] = ['',['RunJetHT2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.046] = ['',['RunDisplacedJet2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
Expand All @@ -486,7 +486,7 @@
workflows[140.051] = ['',['RunMuonEG2022C','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]

workflows[140.062] = ['',['RunMuon2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.063] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.063] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']]
workflows[140.064] = ['',['RunBTagMu2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.065] = ['',['RunJetMET2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.066] = ['',['RunDisplacedJet2022D','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
Expand All @@ -500,7 +500,7 @@
workflows[140.065521] = ['Run3-2023_JetMET2022D_RecoHCALOnlyCPU',['RunJetMET2022D','HLTDR3_2023','RECODR3_reHLT_HCALOnlyCPU','HARVESTRUN3_HCALOnly']]

workflows[140.071] = ['',['RunMuon2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.072] = ['',['RunZeroBias2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.072] = ['',['RunZeroBias2022E','HLTDR3_2023','RECONANORUN3_ZB_reHLT','HARVESTRUN3_ZB']]
workflows[140.073] = ['',['RunBTagMu2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.074] = ['',['RunJetMET2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
workflows[140.075] = ['',['RunDisplacedJet2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]
Expand All @@ -509,7 +509,7 @@
workflows[140.078] = ['',['RunMuonEG2022E','HLTDR3_2023','RECONANORUN3_reHLT','HARVESTRUN3']]

### run3 (2023) skims ###
workflows[140.104] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMZEROBIASRUN3_reHLT']]
workflows[140.104] = ['',['RunZeroBias2022D','HLTDR3_2023','RECONANORUN3_ZB_reHLT','SKIMZEROBIASRUN3_reHLT']]
workflows[140.105] = ['',['RunBTagMu2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMBTAGMURUN3_reHLT']]
workflows[140.106] = ['',['RunJetMET2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMJETMET0RUN3_reHLT']]
workflows[140.107] = ['',['RunDisplacedJet2022D','HLTDR3_2023','RECONANORUN3_reHLT','SKIMDISPLACEDJETRUN3_reHLT']]
Expand Down
4 changes: 1 addition & 3 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -2877,11 +2877,9 @@ def gen2021HiMix(fragment,howMuch):
steps['RECODR3_reHLT_ECALOnlyGPU']=merge([step3_gpu, steps['RECODR3_reHLT_ECALOnlyCPU']])
steps['RECODR3_reHLT_HCALOnlyCPU']=merge([{'-s': 'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly,DQM:@hcalOnly+@hcal2Only'},steps['RECODR3_reHLT']])
steps['RECODR3_reHLT_HCALOnlyGPU']=merge([step3_gpu, steps['RECODR3_reHLT_HCALOnlyCPU']])

steps['RECONANORUN3_reHLT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQMFakeHLT+@miniAODDQM+@nanoAODDQM','--datatier':'RECO,MINIAOD,NANOAOD,DQMIO','--eventcontent':'RECO,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT']])
steps['RECONANORUN3_ZB_reHLT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM+@nanoAODDQM'},steps['RECONANORUN3_reHLT']])
steps['RECOCOSMRUN3_reHLT']=merge([{'--scenario':'cosmics','-s':'RAW2DIGI,L1Reco,RECO,DQM','--datatier':'RECO,DQMIO','--eventcontent':'RECO,DQM'},steps['RECONANORUN3_reHLT']])

steps['RECONANORUN3_reHLT_2023']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM','--datatier':'RECO,MINIAOD,NANOAOD,DQMIO','--eventcontent':'RECO,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT_2023']])
steps['RECONANORUN3_reHLT_2023B']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM','--datatier':'RECO,MINIAOD,NANOAOD,DQMIO','--eventcontent':'RECO,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT_2023B']])
steps['RECONANORUN3_ZB_reHLT_2023B']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['RECONANORUN3_reHLT_2023B']])
Expand Down Expand Up @@ -3460,7 +3458,7 @@ def gen2021HiMix(fragment,howMuch):

steps['HARVESTRUN3']=merge([{'--data':'', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM','--era':'Run3'},steps['HARVESTDRUN3']])
steps['HARVESTRUN3_ZB']=merge([{'--data':'', '-s':'HARVESTING:@rerecoZeroBiasFakeHLT+@miniAODDQM+@nanoAODDQM','--era':'Run3'},steps['HARVESTDRUN3']])
steps['HARVESTRUN3_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3']])
steps['HARVESTRUN3_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3']])
steps['HARVESTRUN3_2023B']=merge([{'--era':'Run3', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3']])
steps['HARVESTRUN3_ZB_2023B']=merge([{'--era':'Run3', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3']])
steps['HARVESTRUN3_ZB_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3']])
Expand Down
62 changes: 62 additions & 0 deletions Configuration/Skimming/python/PDWG_ReserveDMu_SD_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import FWCore.ParameterSet.Config as cms

#Trigger bit requirement
import HLTrigger.HLTfilters.hltHighLevel_cfi as hlt
ReserveDMu = hlt.hltHighLevel.clone()
ReserveDMu.TriggerResultsTag = cms.InputTag( "TriggerResults", "", "HLT" )
ReserveDMu.HLTPaths = cms.vstring(
'HLT_Dimuon0_Jpsi3p5_Muon2_v*',
'HLT_Dimuon0_Jpsi_L1_4R_0er1p5R_v*',
'HLT_Dimuon0_Jpsi_L1_NoOS_v*',
'HLT_Dimuon0_Jpsi_NoVertexing_L1_4R_0er1p5R_v*',
'HLT_Dimuon0_Jpsi_NoVertexing_NoOS_v*',
'HLT_Dimuon0_Jpsi_NoVertexing_v*',
'HLT_Dimuon0_Jpsi_v*',
'HLT_Dimuon0_LowMass_L1_0er1p5R_v*',
'HLT_Dimuon0_LowMass_L1_0er1p5_v*',
'HLT_Dimuon0_LowMass_L1_4R_v*',
'HLT_Dimuon0_LowMass_L1_4_v*',
'HLT_Dimuon0_LowMass_L1_TM530_v*',
'HLT_Dimuon0_LowMass_v*',
'HLT_Dimuon0_Upsilon_L1_4p5_v*',
'HLT_Dimuon0_Upsilon_L1_4p5er2p0M_v*',
'HLT_Dimuon0_Upsilon_L1_4p5er2p0_v*',
'HLT_Dimuon0_Upsilon_Muon_NoL1Mass_v*',
'HLT_Dimuon0_Upsilon_NoVertexing_v*',
'HLT_Dimuon12_Upsilon_y1p4_v*',
'HLT_Dimuon14_Phi_Barrel_Seagulls_v*',
'HLT_Dimuon18_PsiPrime_noCorrL1_v*',
'HLT_Dimuon18_PsiPrime_v*',
'HLT_Dimuon24_Phi_noCorrL1_v*',
'HLT_Dimuon24_Upsilon_noCorrL1_v*',
'HLT_Dimuon25_Jpsi_noCorrL1_v*',
'HLT_Dimuon25_Jpsi_v*',
'HLT_DoubleMu2_Jpsi_DoubleTrk1_Phi1p05_v*',
'HLT_DoubleMu3_DoubleEle7p5_CaloIdL_TrackIdL_Upsilon_v*',
'HLT_DoubleMu3_TkMu_DsTau3Mu_v*',
'HLT_DoubleMu3_Trk_Tau3mu_NoL1Mass_v*',
'HLT_DoubleMu3_Trk_Tau3mu_v*',
'HLT_DoubleMu4_3_Bs_v*',
'HLT_DoubleMu4_3_Jpsi_v*',
'HLT_DoubleMu4_JpsiTrkTrk_Displaced_v*',
'HLT_DoubleMu4_Jpsi_Displaced_v*',
'HLT_DoubleMu4_Jpsi_NoVertexing_v*',
'HLT_DoubleMu4_MuMuTrk_Displaced_v*',
'HLT_DoubleMu5_Upsilon_DoubleEle3_CaloIdL_TrackIdL_v*',
'HLT_Mu25_TkMu0_Phi_v*',
'HLT_Mu30_TkMu0_Psi_v*',
'HLT_Mu30_TkMu0_Upsilon_v*',
'HLT_Mu4_L1DoubleMu_v*',
'HLT_Mu7p5_L2Mu2_Jpsi_v*',
'HLT_Mu7p5_L2Mu2_Upsilon_v*',
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_IsoTau15_Charge1_v*',
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_IsoTau15_v*',
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_Tau15_Charge1_v*',
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_Tau15_v*',
'HLT_Trimuon5_3p5_2_Upsilon_Muon_v*',
'HLT_TrimuonOpen_5_3p5_2_Upsilon_Muon_v*')
ReserveDMu.andOr = cms.bool( True )
# we want to intentionally throw and exception
# in case it does not match one of the HLT Paths
# set to False now, switch to on once matrix is updated
ReserveDMu.throw = cms.bool( False )
13 changes: 13 additions & 0 deletions Configuration/Skimming/python/Skims_PDWG_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,19 @@

#####################

from Configuration.Skimming.PDWG_ReserveDMu_SD_cff import *
ReserveDMuPath = cms.Path(ReserveDMu)
SKIMStreamReserveDMu = cms.FilteredStream(
responsible = 'PDWG',
name = 'ReserveDMu',
paths = (ReserveDMuPath),
content = skimRawContent.outputCommands,
selectEvents = cms.untracked.PSet(),
dataTier = cms.untracked.string('RAW')
)

#####################

from Configuration.Skimming.PDWG_DiPhoton_SD_cff import *
CaloIdIsoPhotonPairsPath = cms.Path(CaloIdIsoPhotonPairsFilter)
R9IdPhotonPairsPath = cms.Path(R9IdPhotonPairsFilter)
Expand Down
8 changes: 8 additions & 0 deletions Configuration/Skimming/python/autoSkim.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
'ZeroBias' : 'LogError+LogErrorMonitor',
'Commissioning' : 'EcalActivity+LogError+LogErrorMonitor',
'Cosmics':'CosmicSP+CosmicTP+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass0': 'ReserveDMu+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass1': 'ReserveDMu+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass2': 'ReserveDMu+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass3': 'ReserveDMu+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass4': 'ReserveDMu+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass5': 'ReserveDMu+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass6': 'ReserveDMu+LogError+LogErrorMonitor',
'ParkingDoubleMuonLowMass7': 'ReserveDMu+LogError+LogErrorMonitor',

# These should be uncommented when 2022 data reprocessing
# Dedicated skim for 2022
Expand Down
147 changes: 147 additions & 0 deletions Configuration/Skimming/test/test_ReserveDMu_SD_cfg.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
# Auto generated configuration file
# using:
# Revision: 1.19
# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v
# with command line options: SKIM --filein file:/eos/cms/tier0/store/backfill/1/data/Tier0_REPLAY_2023/ParkingDoubleMuonLowMass0/RAW/v9121550/000/368/389/00000/fce19dd3-8384-45ce-b705-e4accb9c3ec9.root --fileout file:SD_ReservedDMu.root --nThreads 8 --no_exec --number 10 --python_filename SD_ReserveDMu_cfg.py --scenario pp --step SKIM:ReserveDMu --data --conditions 130X_dataRun3_Prompt_v3
import FWCore.ParameterSet.Config as cms



process = cms.Process('SKIM')

# import of standard configurations
process.load('Configuration.StandardSequences.Services_cff')
process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Skims_cff')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(10),
output = cms.optional.untracked.allowed(cms.int32,cms.PSet)
)

# Input source
process.source = cms.Source("PoolSource",
fileNames = cms.untracked.vstring('file:/eos/cms/tier0/store/backfill/1/data/Tier0_REPLAY_2023/ParkingDoubleMuonLowMass0/RAW/v9121550/000/368/389/00000/fce19dd3-8384-45ce-b705-e4accb9c3ec9.root'),
secondaryFileNames = cms.untracked.vstring()
)

process.options = cms.untracked.PSet(
FailPath = cms.untracked.vstring(),
IgnoreCompletely = cms.untracked.vstring(),
Rethrow = cms.untracked.vstring(),
SkipEvent = cms.untracked.vstring(),
accelerators = cms.untracked.vstring('*'),
allowUnscheduled = cms.obsolete.untracked.bool,
canDeleteEarly = cms.untracked.vstring(),
deleteNonConsumedUnscheduledModules = cms.untracked.bool(True),
dumpOptions = cms.untracked.bool(False),
emptyRunLumiMode = cms.obsolete.untracked.string,
eventSetup = cms.untracked.PSet(
forceNumberOfConcurrentIOVs = cms.untracked.PSet(
allowAnyLabel_=cms.required.untracked.uint32
),
numberOfConcurrentIOVs = cms.untracked.uint32(0)
),
fileMode = cms.untracked.string('FULLMERGE'),
forceEventSetupCacheClearOnNewRun = cms.untracked.bool(False),
holdsReferencesToDeleteEarly = cms.untracked.VPSet(),
makeTriggerResults = cms.obsolete.untracked.bool,
modulesToIgnoreForDeleteEarly = cms.untracked.vstring(),
numberOfConcurrentLuminosityBlocks = cms.untracked.uint32(0),
numberOfConcurrentRuns = cms.untracked.uint32(1),
numberOfStreams = cms.untracked.uint32(0),
numberOfThreads = cms.untracked.uint32(1),
printDependencies = cms.untracked.bool(False),
sizeOfStackForThreadsInKB = cms.optional.untracked.uint32,
throwIfIllegalParameter = cms.untracked.bool(True),
wantSummary = cms.untracked.bool(False)
)

# Production Info
process.configurationMetadata = cms.untracked.PSet(
annotation = cms.untracked.string('SKIM nevts:10'),
name = cms.untracked.string('Applications'),
version = cms.untracked.string('$Revision: 1.19 $')
)

# Output definition

process.RECOSIMoutput = cms.OutputModule("PoolOutputModule",
dataset = cms.untracked.PSet(
dataTier = cms.untracked.string(''),
filterName = cms.untracked.string('')
),
fileName = cms.untracked.string('file:SD_ReservedDMu.root'),
outputCommands = process.RECOSIMEventContent.outputCommands,
splitLevel = cms.untracked.int32(0)
)

# Additional output definition
process.SKIMStreamReserveDMu = cms.OutputModule("PoolOutputModule",
SelectEvents = cms.untracked.PSet(
SelectEvents = cms.vstring('ReserveDMuPath')
),
dataset = cms.untracked.PSet(
dataTier = cms.untracked.string('RAW'),
filterName = cms.untracked.string('ReserveDMu')
),
eventAutoFlushCompressedSize = cms.untracked.int32(5242880),
fileName = cms.untracked.string('ReserveDMu.root'),
outputCommands = cms.untracked.vstring(
'drop *',
'keep FEDRawDataCollection_rawDataCollector_*_*',
'keep FEDRawDataCollection_source_*_*',
'keep FEDRawDataCollection_rawDataCollector_*_*',
'keep FEDRawDataCollection_source_*_*',
'drop *_hlt*_*_*',
'keep FEDRawDataCollection_rawDataCollector_*_*',
'keep FEDRawDataCollection_source_*_*',
'keep GlobalObjectMapRecord_hltGtStage2ObjectMap_*_*',
'keep edmTriggerResults_*_*_*',
'keep triggerTriggerEvent_*_*_*',
'keep *_hltFEDSelectorL1_*_*',
'keep *_hltScoutingEgammaPacker_*_*',
'keep *_hltScoutingMuonPacker_*_*',
'keep *_hltScoutingPFPacker_*_*',
'keep *_hltScoutingPrimaryVertexPacker_*_*',
'keep *_hltScoutingTrackPacker_*_*',
'keep edmTriggerResults_*_*_*',
'drop *_MEtoEDMConverter_*_*',
'drop *_*_*_SKIM'
)
)

# Other statements
from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, '130X_dataRun3_Prompt_v3', '')

# Path and EndPath definitions
process.RECOSIMoutput_step = cms.EndPath(process.RECOSIMoutput)
process.SKIMStreamReserveDMuOutPath = cms.EndPath(process.SKIMStreamReserveDMu)

# Schedule definition
process.schedule = cms.Schedule(process.ReserveDMuPath,process.RECOSIMoutput_step,process.SKIMStreamReserveDMuOutPath)
from PhysicsTools.PatAlgos.tools.helpers import associatePatAlgosToolsTask
associatePatAlgosToolsTask(process)

#Setup FWK for multithreaded
process.options.numberOfThreads = 8
process.options.numberOfStreams = 0



# Customisation from command line

#Have logErrorHarvester wait for the same EDProducers to finish as those providing data for the OutputModule
from FWCore.Modules.logErrorHarvester_cff import customiseLogErrorHarvesterUsingOutputCommands
process = customiseLogErrorHarvesterUsingOutputCommands(process)

# Add early deletion of temporary data products to reduce peak memory need
from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete
process = customiseEarlyDelete(process)
# End adding early deletion
6 changes: 3 additions & 3 deletions DataFormats/Common/interface/DetSetNew.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ namespace edmNew {
set(icont, item, update);
}

//FIXME (it may confuse users as size_type is same type as id_type...)
inline void set(Container const &icont, typename Container::Item const &item, bool update = true);

bool isValid() const { return m_offset >= 0; }

inline data_type &operator[](size_type i) { return data()[i]; }
Expand Down Expand Up @@ -79,6 +76,9 @@ namespace edmNew {
unsigned int makeKeyOf(const_iterator ci) const { return ci - &(container().front()); }

private:
//FIXME (it may confuse users as size_type is same type as id_type...)
inline void set(Container const &icont, typename Container::Item const &item, bool update = true);

DataContainer const &container() const { return *m_data; }

data_type const *data() const {
Expand Down
6 changes: 1 addition & 5 deletions DataFormats/Common/interface/DetSetVectorNew.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,10 @@ namespace edmNew {
IterHelp() : m_v(nullptr), m_update(false) {}
IterHelp(DetSetVector<T> const& iv, bool iup) : m_v(&iv), m_update(iup) {}

result_type& operator()(Item const& item) const {
m_detset.set(*m_v, item, m_update);
return m_detset;
}
result_type operator()(Item const& item) const { return result_type(*m_v, item, m_update); }

private:
DetSetVector<T> const* m_v;
mutable result_type m_detset;
bool m_update;
};

Expand Down
4 changes: 4 additions & 0 deletions EventFilter/SiPixelRawToDigi/interface/ErrorChecker.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ class ErrorChecker : public ErrorCheckerBase {

protected:
cms_uint32_t errorDetId(const SiPixelFrameConverter* converter, int errorType, const Word32& word) const override;
cms_uint32_t errorDetIdSimple(const SiPixelFrameConverter* converter,
int errorType,
unsigned int channel,
unsigned int roc) const;
};

#endif // EventFilter_SiPixelRawToDigi_interface_ErrorChecker_h
Loading

0 comments on commit 781fa71

Please sign in to comment.