Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ def _print(ignored):
unpackCSC = EventFilter.CSCRawToDigi.cscUnpacker_cfi.muonCSCDigis.clone(
InputObjects = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))

import EventFilter.GEMRawToDigi.muonGEMDigis_cfi
unpackGEM = EventFilter.GEMRawToDigi.muonGEMDigis_cfi.muonGEMDigis.clone(
InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))

import EventFilter.EcalRawToDigi.EcalUnpackerData_cfi
unpackEcal = EventFilter.EcalRawToDigi.EcalUnpackerData_cfi.ecalEBunpacker.clone(
InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))
Expand Down Expand Up @@ -84,6 +88,9 @@ def _print(ignored):
simCaloStage2Layer1Digis.ecalToken = 'unpackEcal:EcalTriggerPrimitives'
simCaloStage2Layer1Digis.hcalToken = 'simHcalTriggerPrimitiveDigis'

# GEM
simMuonGEMPadDigis.InputCollection = 'unpackGEM'

# Finally, pack the new L1T output back into RAW
from EventFilter.L1TRawToDigi.caloStage2Raw_cfi import caloStage2Raw as packCaloStage2
from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import gmtStage2Raw as packGmtStage2
Expand All @@ -105,6 +112,7 @@ def _print(ignored):
stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackRPC
, unpackDT
, unpackCSC
, unpackGEM
, unpackEcal
, unpackHcal
#, simEcalTriggerPrimitiveDigis
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,18 @@
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')

# Please *do not* delete this toGet statement as it is needed to fetch BeamSpotOnline
# information every lumisection (instead of every run as for the other records in the GT)
process.GlobalTag.toGet = cms.VPSet(
cms.PSet(
record = cms.string("BeamSpotOnlineLegacyObjectsRcd"),
refreshTime = cms.uint64(1)
),
cms.PSet(
record = cms.string("BeamSpotOnlineHLTObjectsRcd"),
refreshTime = cms.uint64(1)
)
)

process.dqmcommon = cms.Sequence(process.dqmEnv
* process.dqmSaver * process.dqmSaverPB)
Expand Down
16 changes: 8 additions & 8 deletions DataFormats/GEMDigi/src/classes_def.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,35 @@
<class name="MuonDigiCollection<GEMDetId,GEMCoPadDigi>"/>
<class name="edm::Wrapper<MuonDigiCollection<GEMDetId,GEMCoPadDigi> >" splitLevel="0"/>

<class name="GEMAMC13Status" ClassVersion="-1">
<version ClassVersion="-1" checksum="3469985462"/>
<class name="GEMAMC13Status" ClassVersion="3">
<version ClassVersion="3" checksum="3469985462"/>
</class>
<class name="std::vector<GEMAMC13Status>"/>
<class name="std::map<uint16_t,std::vector<GEMAMC13Status> >"/>
<class name="std::pair<uint16_t,std::vector<GEMAMC13Status> >"/>
<class name="MuonDigiCollection<uint16_t,GEMAMC13Status>"/>
<class name="edm::Wrapper<MuonDigiCollection<uint16_t,GEMAMC13Status> >" splitLevel="0"/>

<class name="GEMAMCStatus" ClassVersion="-1">
<version ClassVersion="-1" checksum="2120084327"/>
<class name="GEMAMCStatus" ClassVersion="3">
<version ClassVersion="3" checksum="2120084327"/>
</class>
<class name="std::vector<GEMAMCStatus>"/>
<class name="std::map<uint16_t,std::vector<GEMAMCStatus> >"/>
<class name="std::pair<uint16_t,std::vector<GEMAMCStatus> >"/>
<class name="MuonDigiCollection<uint16_t,GEMAMCStatus>"/>
<class name="edm::Wrapper<MuonDigiCollection<uint16_t,GEMAMCStatus> >" splitLevel="0"/>

<class name="GEMOHStatus" ClassVersion="-1">
<version ClassVersion="-1" checksum="1715607020"/>
<class name="GEMOHStatus" ClassVersion="3">
<version ClassVersion="3" checksum="1715607020"/>
</class>
<class name="std::vector<GEMOHStatus>"/>
<class name="std::map<GEMDetId,std::vector<GEMOHStatus> >"/>
<class name="std::pair<GEMDetId,std::vector<GEMOHStatus> >"/>
<class name="MuonDigiCollection<GEMDetId,GEMOHStatus>"/>
<class name="edm::Wrapper<MuonDigiCollection<GEMDetId,GEMOHStatus> >" splitLevel="0"/>

<class name="GEMVFATStatus" ClassVersion="-1">
<version ClassVersion="-1" checksum="2994917778"/>
<class name="GEMVFATStatus" ClassVersion="3">
<version ClassVersion="3" checksum="2994917778"/>
</class>
<class name="std::vector<GEMVFATStatus>"/>
<class name="std::map<GEMDetId,std::vector<GEMVFATStatus> >"/>
Expand Down
5 changes: 3 additions & 2 deletions EventFilter/GEMRawToDigi/plugins/GEMPackingTester.cc
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ void GEMPackingTester::analyze(const edm::Event& iEvent, const edm::EventSetup&
foundDigi = true;
}
if (!foundDigi) {
cout << "simMuonGEMDigi NOT found " << gemId << " " << digi->strip() << " " << digi->bx() << endl;
edm::LogInfo("GEMPackingTester") << "simMuonGEMDigi NOT found " << gemId << " " << digi->strip() << " "
<< digi->bx();
for (auto unpackeddigi = packed.first; unpackeddigi != packed.second; ++unpackeddigi) {
cout << "rec " << unpackeddigi->strip() << " " << unpackeddigi->bx() << endl;
edm::LogInfo("GEMPackingTester") << "rec " << unpackeddigi->strip() << " " << unpackeddigi->bx();
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/HLT --type FULL

# /dev/CMSSW_12_0_0/HLT/V5 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/HLT/V8 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V5')
tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V8')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -126991,8 +126991,8 @@
fragment.HLT_ZeroBias_FirstBXAfterTrain_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasFirstBunchAfterTrain + fragment.hltPreZeroBiasFirstBXAfterTrain + fragment.HLTEndSequence )
fragment.AlCa_RPCMuonNormalisation_v13 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu5IorSingleMu14erIorSingleMu16er + fragment.hltPreAlCaRPCMuonNormalisation + fragment.hltRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence )
fragment.AlCa_HIRPCMuonNormalisation_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu7to30 + fragment.hltPreAlCaHIRPCMuonNormalisation + fragment.hltHIRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.MC_ReducedIterativeTracking_v12 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCReducedIterativeTracking + fragment.HLTRecoJetSequenceAK4PrePF + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence + fragment.HLTDoLocalStripSequence + fragment.HLTIterativeTrackingIter02 + fragment.HLTEndSequence )
fragment.MC_PFMET_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCPFMET + fragment.HLTAK4PFJetsSequence + fragment.hltPFMETProducer + fragment.hltPFMETOpenFilter + fragment.HLTEndSequence )
fragment.MC_AK4PFJets_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCAK4PFJets + fragment.HLTAK4PFJetsSequence + fragment.hltAK4PFJetCollection20Filter + fragment.HLTEndSequence )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake1_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake1 --type Fake1

# /dev/CMSSW_12_0_0/Fake1/V4 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/Fake1/V5 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V4')
tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake2_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake2 --type Fake2

# /dev/CMSSW_12_0_0/Fake2/V4 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/Fake2/V5 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V4')
tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake --type Fake

# /dev/CMSSW_12_0_0/Fake/V4 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/Fake/V5 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V4')
tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
8 changes: 4 additions & 4 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/GRun --type GRun

# /dev/CMSSW_12_0_0/GRun/V3 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/GRun/V5 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/GRun/V3')
tableName = cms.string('/dev/CMSSW_12_0_0/GRun/V5')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -90833,8 +90833,8 @@
fragment.HLT_ZeroBias_LastCollisionInTrain_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasLastBunchInTrain + fragment.hltPreZeroBiasLastCollisionInTrain + fragment.HLTEndSequence )
fragment.HLT_ZeroBias_FirstBXAfterTrain_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasFirstBunchAfterTrain + fragment.hltPreZeroBiasFirstBXAfterTrain + fragment.HLTEndSequence )
fragment.AlCa_RPCMuonNormalisation_v13 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu5IorSingleMu14erIorSingleMu16er + fragment.hltPreAlCaRPCMuonNormalisation + fragment.hltRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.MC_ReducedIterativeTracking_v12 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCReducedIterativeTracking + fragment.HLTRecoJetSequenceAK4PrePF + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingSequence + fragment.HLTDoLocalStripSequence + fragment.HLTIterativeTrackingIter02 + fragment.HLTEndSequence )
fragment.MC_PFMET_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCPFMET + fragment.HLTAK4PFJetsSequence + fragment.hltPFMETProducer + fragment.hltPFMETOpenFilter + fragment.HLTEndSequence )
fragment.MC_AK4PFJets_v17 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreMCAK4PFJets + fragment.HLTAK4PFJetsSequence + fragment.hltAK4PFJetCollection20Filter + fragment.HLTEndSequence )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/HIon --type HIon

# /dev/CMSSW_12_0_0/HIon/V3 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/HIon/V5 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/HIon/V3')
tableName = cms.string('/dev/CMSSW_12_0_0/HIon/V5')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/PIon --type PIon

# /dev/CMSSW_12_0_0/PIon/V3 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/PIon/V5 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/PIon/V3')
tableName = cms.string('/dev/CMSSW_12_0_0/PIon/V5')
)

fragment.transferSystem = cms.PSet(
Expand Down
8 changes: 4 additions & 4 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/PRef --type PRef

# /dev/CMSSW_12_0_0/PRef/V3 (CMSSW_12_0_0_pre4)
# /dev/CMSSW_12_0_0/PRef/V5 (CMSSW_12_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_0_0/PRef/V3')
tableName = cms.string('/dev/CMSSW_12_0_0/PRef/V5')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -10983,8 +10983,8 @@
fragment.AlCa_EcalPhiSym_v9 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sZeroBiasIorAlwaysTrueIorIsolatedBunch + fragment.hltPreAlCaEcalPhiSym + fragment.HLTDoFullUnpackingEgammaEcalSequence + fragment.hltEcalPhiSymFilter + fragment.HLTEndSequence )
fragment.HLT_ZeroBias_FirstCollisionAfterAbortGap_v5 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBiasFirstCollisionAfterAbortGap + fragment.hltPreZeroBiasFirstCollisionAfterAbortGap + fragment.HLTEndSequence )
fragment.AlCa_HIRPCMuonNormalisation_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu7to30 + fragment.hltPreAlCaHIRPCMuonNormalisation + fragment.hltHIRPCMuonNormaL1Filtered0 + fragment.HLTMuonLocalRecoSequence + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_Random_v1 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltPreAlCaLumiPixelsCountsRandom + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.AlCa_LumiPixelsCounts_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltScalersRawToDigi + fragment.hltPixelTrackerHVOn + fragment.hltL1sZeroBias + fragment.hltPreAlCaLumiPixelsCountsZeroBias + fragment.hltSiPixelDigis + fragment.hltSiPixelClusters + fragment.hltAlcaPixelClusterCounts + fragment.HLTEndSequence )
fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltScalersRawToDigi + fragment.hltFEDSelector + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltPreHLTAnalyzerEndpath + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )

Expand Down
1 change: 1 addition & 0 deletions HLTrigger/Configuration/python/Tools/confdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,7 @@ def buildOptions(self):
self.options['esmodules'].append( "-SiStripRecHitMatcherESProducer" )
self.options['esmodules'].append( "-SiStripQualityESProducer" )
self.options['esmodules'].append( "-StripCPEfromTrackAngleESProducer" )
self.options['esmodules'].append( "-TrackerAdditionalParametersPerDetESModule" )
self.options['esmodules'].append( "-TrackerDigiGeometryESModule" )
self.options['esmodules'].append( "-TrackerGeometricDetESModule" )
self.options['esmodules'].append( "-VolumeBasedMagneticFieldESProducer" )
Expand Down
18 changes: 12 additions & 6 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,24 @@ def customiseFor2018Input(process):

return process

def customiseFor34120(process):
"""Ensure TrackerAdditionalParametersPerDetRcd ESProducer is run"""
process.load("Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi")

#temporary solution to add GEM geometry for hltGetConfiguration
def customiseForRun3GEMGeometry34785(process):
"""Add GEM geometry to output from hltGetConfiguration"""
process.GEMGeometryESModule = cms.ESProducer(
"GEMGeometryESModule",
fromDD4Hep = cms.bool( False ),
appendToDataLabel = cms.string( "" ),
fromDDD = cms.bool( False )
)

return process

# CMSSW version specific customizations
def customizeHLTforCMSSW(process, menuType="GRun"):

# add call to action function in proper order: newest last!
# process = customiseFor12718(process)

if menuType in ["GRun","HIon","PIon","PRef"]:
process = customiseFor34120(process)
process = customiseForRun3GEMGeometry34785(process)

return process
Loading