diff --git a/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py b/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py
index 0ecacf75e40d3..dff04b2a4b835 100644
--- a/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py
+++ b/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py
@@ -360,6 +360,10 @@ def getSequence(process, collection,
## put the sequence together ##
###############################
+ if "Fast" in TTRHBuilder:
+ print("PixelCPEFast has been chosen, here we must include CUDAService first")
+ process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+
modules = []
src = collection
prevsrc = None
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlBeamHalo_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlBeamHalo_Output_cff.py
index c6af9a94d0495..5adb4aa39d078 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlBeamHalo_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlBeamHalo_Output_cff.py
@@ -6,13 +6,36 @@
SelectEvents = cms.vstring('pathALCARECOTkAlBeamHalo')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlBeamHalo_*_*',
+ 'keep recoTracks_ALCARECOTkAlBeamHalo_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlBeamHalo_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlBeamHalo_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
'keep DcsStatuss_scalersRawToDigi_*_*')
)
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
import copy
+_run3_common_removedCommands = OutALCARECOTkAlBeamHalo_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlBeamHalo_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlBeamHalo_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlBeamHalo_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlBeamHalo = copy.deepcopy(OutALCARECOTkAlBeamHalo_noDrop)
OutALCARECOTkAlBeamHalo.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlDiMuonAndVertex_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlDiMuonAndVertex_Output_cff.py
index db49091c2667f..95f6611592d29 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlDiMuonAndVertex_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlDiMuonAndVertex_Output_cff.py
@@ -6,13 +6,33 @@
SelectEvents = cms.vstring('pathALCARECOTkAlDiMuonAndVertex')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlDiMuon_*_*',
- 'keep *_ALCARECOTkAlDiMuonVertexTracks_*_*',
+ 'keep recoTracks_ALCARECOTkAlDiMuon_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlDiMuon_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlDiMuon_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlDiMuon_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuon_*_*',
+ 'keep recoTracks_ALCARECOTkAlDiMuonVertexTracks_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlDiMuonVertexTracks_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlDiMuonVertexTracks_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
'keep DcsStatuss_scalersRawToDigi_*_*',
'keep *_offlinePrimaryVertices_*_*')
)
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlDiMuonAndVertex_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuon_*_*')
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlDiMuon_*_*',
+ 'keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlDiMuonAndVertex_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlDiMuonAndVertex = OutALCARECOTkAlDiMuonAndVertex_noDrop.clone()
OutALCARECOTkAlDiMuonAndVertex.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py
index 86c6f9cc81c26..48b462ebc5b02 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlJetHT')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlJetHT_*_*',
+ 'keep recoTracks_ALCARECOTkAlJetHT_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlJetHT_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlJetHT_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlJetHT_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJetHT_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -26,5 +30,15 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlJetHT_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlJetHT_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJetHT_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlJetHT_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlJetHT_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
+
OutALCARECOTkAlJetHT = OutALCARECOTkAlJetHT_noDrop.clone()
OutALCARECOTkAlJetHT.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py
index decf74539cb38..8fdb2d0bea7e0 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlJpsiMuMuHI')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlJpsiMuMuHI_*_*',
+ 'keep recoTracks_ALCARECOTkAlJpsiMuMuHI_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlJpsiMuMuHI_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlJpsiMuMuHI_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlJpsiMuMuHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlJpsiMuMuHI_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlJpsiMuMuHI_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlJpsiMuMuHI = OutALCARECOTkAlJpsiMuMuHI_noDrop.clone()
OutALCARECOTkAlJpsiMuMuHI.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py
index 2b16eaaf1a424..09895fb06e46b 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlJpsiMuMu')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlJpsiMuMu_*_*',
+ 'keep recoTracks_ALCARECOTkAlJpsiMuMu_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlJpsiMuMu_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlJpsiMuMu_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMu_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMu_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlJpsiMuMu_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlJpsiMuMu_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMu_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlJpsiMuMu_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlJpsiMuMu_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlJpsiMuMu = OutALCARECOTkAlJpsiMuMu_noDrop.clone()
OutALCARECOTkAlJpsiMuMu.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py
index fc95c1fb49e8f..8c606b2ecb2df 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlMinBiasHI')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlMinBiasHI_*_*',
+ 'keep recoTracks_ALCARECOTkAlMinBiasHI_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlMinBiasHI_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlMinBiasHI_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlMinBiasHI_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMinBiasHI_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -25,5 +29,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlMinBiasHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlMinBiasHI_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMinBiasHI_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlMinBiasHI_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlMinBiasHI_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlMinBiasHI = copy.deepcopy(OutALCARECOTkAlMinBiasHI_noDrop)
OutALCARECOTkAlMinBiasHI.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py
index 9031a6e008248..4ba13e4615575 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlMinBias')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlMinBias_*_*',
+ 'keep recoTracks_ALCARECOTkAlMinBias_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlMinBias_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlMinBias_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlMinBias_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMinBias_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -26,5 +30,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlMinBias_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlMinBias_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMinBias_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlMinBias_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlMinBias_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlMinBias = OutALCARECOTkAlMinBias_noDrop.clone()
OutALCARECOTkAlMinBias.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py
index 19ab36a222fa4..bdede16cb3e1e 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlMuonIsolatedHI')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlMuonIsolatedHI_*_*',
+ 'keep recoTracks_ALCARECOTkAlMuonIsolatedHI_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlMuonIsolatedHI_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlMuonIsolatedHI_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolatedHI_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolatedHI_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlMuonIsolatedHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlMuonIsolatedHI_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolatedHI_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlMuonIsolatedHI_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlMuonIsolatedHI_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlMuonIsolatedHI = OutALCARECOTkAlMuonIsolatedHI_noDrop.clone()
OutALCARECOTkAlMuonIsolatedHI.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedPA_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedPA_Output_cff.py
index 586c3c4534f90..6fd6675ceac76 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedPA_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedPA_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlMuonIsolatedPA')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlMuonIsolatedPA_*_*',
+ 'keep recoTracks_ALCARECOTkAlMuonIsolatedPA_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlMuonIsolatedPA_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlMuonIsolatedPA_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolatedPA_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolatedPA_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -15,5 +19,23 @@
)
import copy
+_run3_common_removedCommands = OutALCARECOTkAlMuonIsolatedPA_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlMuonIsolatedPA_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlMuonIsolatedPA_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolatedPA_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlMuonIsolatedPA_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlMuonIsolatedPA_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlMuonIsolatedPA = copy.deepcopy(OutALCARECOTkAlMuonIsolatedPA_noDrop)
OutALCARECOTkAlMuonIsolatedPA.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py
index c83697462e092..ca5958791f173 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlMuonIsolated')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlMuonIsolated_*_*',
+ 'keep recoTracks_ALCARECOTkAlMuonIsolated_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlMuonIsolated_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlMuonIsolated_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolated_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolated_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlMuonIsolated_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlMuonIsolated_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlMuonIsolated_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlMuonIsolated_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlMuonIsolated_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlMuonIsolated = OutALCARECOTkAlMuonIsolated_noDrop.clone()
OutALCARECOTkAlMuonIsolated.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py
index 7681f2bba74cc..0a58b4400dc8c 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlUpsilonMuMuHI')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlUpsilonMuMuHI_*_*',
+ 'keep recoTracks_ALCARECOTkAlUpsilonMuMuHI_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlUpsilonMuMuHI_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlUpsilonMuMuHI_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMuHI_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMuHI_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlUpsilonMuMuHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlUpsilonMuMuHI_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMuHI_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlUpsilonMuMuHI_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlUpsilonMuMuHI_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlUpsilonMuMuHI = OutALCARECOTkAlUpsilonMuMuHI_noDrop.clone()
OutALCARECOTkAlUpsilonMuMuHI.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuPA_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuPA_Output_cff.py
index e20048bfe0779..58670ce14aacc 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuPA_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuPA_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlUpsilonMuMuPA')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlUpsilonMuMuPA_*_*',
+ 'keep recoTracks_ALCARECOTkAlUpsilonMuMuPA_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlUpsilonMuMuPA_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlUpsilonMuMuPA_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMuPA_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMuPA_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -14,6 +18,25 @@
'keep *_offlinePrimaryVertices_*_*')
)
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
import copy
+_run3_common_removedCommands = OutALCARECOTkAlUpsilonMuMuPA_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlUpsilonMuMuPA_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlUpsilonMuMuPA_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMuPA_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlUpsilonMuMuPA_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlUpsilonMuMuPA_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlUpsilonMuMuPA = copy.deepcopy(OutALCARECOTkAlUpsilonMuMuPA_noDrop)
OutALCARECOTkAlUpsilonMuMuPA.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py
index 1b1c94408c7f6..10bc7b291015a 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlUpsilonMuMu')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlUpsilonMuMu_*_*',
+ 'keep recoTracks_ALCARECOTkAlUpsilonMuMu_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlUpsilonMuMu_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlUpsilonMuMu_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMu_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMu_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlUpsilonMuMu_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlUpsilonMuMu_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlUpsilonMuMu_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlUpsilonMuMu_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlUpsilonMuMu_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlUpsilonMuMu = OutALCARECOTkAlUpsilonMuMu_noDrop.clone()
OutALCARECOTkAlUpsilonMuMu.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlWMuNu_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlWMuNu_Output_cff.py
index 69bac8545bbcd..921237dfd3de4 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlWMuNu_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlWMuNu_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlWMuNu')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlWMuNu_*_*',
+ 'keep recoTracks_ALCARECOTkAlWMuNu_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlWMuNu_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlWMuNu_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlWMuNu_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlWMuNu_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -14,6 +18,26 @@
'keep *_offlinePrimaryVertices_*_*')
)
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
import copy
-OutALCARECOTkAlWMuNu = copy.deepcopy(OutALCARECOTkAlWMuNu_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlWMuNu_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlWMuNu_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlWMuNu_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlWMuNu_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlWMuNu_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlWMuNu_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
+OutALCARECOTkAlWMuNu = OutALCARECOTkAlWMuNu_noDrop.clone()
OutALCARECOTkAlWMuNu.outputCommands.insert(0, "drop *")
+
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py
index f43faff154f62..f4742411b89db 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlZMuMuHI')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlZMuMuHI_*_*',
+ 'keep recoTracks_ALCARECOTkAlZMuMuHI_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlZMuMuHI_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlZMuMuHI_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlZMuMuHI_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlZMuMuHI_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlZMuMuHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlZMuMuHI_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlZMuMuHI_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlZMuMuHI_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlZMuMuHI_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlZMuMuHI = OutALCARECOTkAlZMuMuHI_noDrop.clone()
OutALCARECOTkAlZMuMuHI.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuPA_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuPA_Output_cff.py
index 8daf5938acaaf..94d323c65d00f 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuPA_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuPA_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlZMuMuPA')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlZMuMuPA_*_*',
+ 'keep recoTracks_ALCARECOTkAlZMuMuPA_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlZMuMuPA_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlZMuMuPA_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlZMuMuPA_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlZMuMuPA_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -14,6 +18,25 @@
'keep *_offlinePrimaryVertices_*_*')
)
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
import copy
+_run3_common_removedCommands = OutALCARECOTkAlZMuMuPA_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlZMuMuPA_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlZMuMuPA_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlZMuMuPA_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlZMuMuPA_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlZMuMuPA_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlZMuMuPA = copy.deepcopy(OutALCARECOTkAlZMuMuPA_noDrop)
OutALCARECOTkAlZMuMuPA.outputCommands.insert(0, "drop *")
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py
index 0c3928776ccc1..9f85e8b1f368a 100644
--- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py
+++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py
@@ -6,7 +6,11 @@
SelectEvents = cms.vstring('pathALCARECOTkAlZMuMu')
),
outputCommands = cms.untracked.vstring(
- 'keep *_ALCARECOTkAlZMuMu_*_*',
+ 'keep recoTracks_ALCARECOTkAlZMuMu_*_*',
+ 'keep recoTrackExtras_ALCARECOTkAlZMuMu_*_*',
+ 'keep TrackingRecHitsOwned_ALCARECOTkAlZMuMu_*_*',
+ 'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlZMuMu_*_*',
+ 'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlZMuMu_*_*',
'keep L1AcceptBunchCrossings_*_*_*',
'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(OutALCARECOTkAlZMuMu_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlZMuMu_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlZMuMu_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlZMuMu_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlZMuMu_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
OutALCARECOTkAlZMuMu = OutALCARECOTkAlZMuMu_noDrop.clone()
OutALCARECOTkAlZMuMu.outputCommands.insert(0, "drop *")
diff --git a/CommonTools/RecoAlgos/BuildFile.xml b/CommonTools/RecoAlgos/BuildFile.xml
index 736edd2d2c27e..a6c0862d7e5a3 100644
--- a/CommonTools/RecoAlgos/BuildFile.xml
+++ b/CommonTools/RecoAlgos/BuildFile.xml
@@ -6,6 +6,7 @@
+
diff --git a/CommonTools/RecoAlgos/interface/ClusterStorer.h b/CommonTools/RecoAlgos/interface/ClusterStorer.h
index 6b31dde114262..6066bbb1c4e1a 100644
--- a/CommonTools/RecoAlgos/interface/ClusterStorer.h
+++ b/CommonTools/RecoAlgos/interface/ClusterStorer.h
@@ -20,6 +20,7 @@
#include "DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h"
#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h"
#include "DataFormats/Common/interface/DetSetVectorNew.h"
namespace helper {
@@ -39,7 +40,9 @@ namespace helper {
void processAllClusters(edmNew::DetSetVector &pixelDsvToFill,
edm::RefProd > refPixelClusters,
edmNew::DetSetVector &stripDsvToFill,
- edm::RefProd > refStripClusters);
+ edm::RefProd > refStripClusters,
+ edmNew::DetSetVector &phase2OTDsvToFill,
+ edm::RefProd > refPhase2OTClusters);
private:
/// A struct for clusters associated to hits
@@ -62,7 +65,7 @@ namespace helper {
/// Set the reference of the hit of this record to 'newRef',
/// will not modify the ref stored in this object.
template
- void rekey(const ClusterRefType &newRef) const;
+ void rekey(const ClusterRefType &newRef);
private:
ClusterHitRecord() {} /// private => unusable
@@ -77,7 +80,7 @@ namespace helper {
typedef ClusterHitRecord StripClusterHitRecord;
//FIXME:: this is just temporary solution for phase2,
//probably is good to add a Phase2ClusterStorer?
- typedef ClusterHitRecord Phase2OTClusterHitRecord;
+ typedef ClusterHitRecord Phase2OTClusterHitRecord;
//------------------------------------------------------------------
//! Processes all the clusters of a specific type
diff --git a/CommonTools/RecoAlgos/interface/MuonSelector.h b/CommonTools/RecoAlgos/interface/MuonSelector.h
index e508db3448024..bf5c7ff1ffa8d 100644
--- a/CommonTools/RecoAlgos/interface/MuonSelector.h
+++ b/CommonTools/RecoAlgos/interface/MuonSelector.h
@@ -22,6 +22,7 @@
#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h"
#include "DataFormats/Common/interface/DetSetVectorNew.h"
#include "CommonTools/RecoAlgos/interface/ClusterStorer.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
@@ -74,6 +75,7 @@ namespace helper {
std::unique_ptr selStandAloneTracksHits_;
std::unique_ptr> selStripClusters_;
std::unique_ptr> selPixelClusters_;
+ std::unique_ptr> selPhase2OTClusters_;
reco::MuonRefProd rMuons_;
reco::TrackRefProd rTracks_;
@@ -128,6 +130,9 @@ namespace helper {
edm::RefProd> rPixelClusters =
evt.template getRefBeforePut>();
+ edm::RefProd> rPhase2OTClusters =
+ evt.template getRefBeforePut>();
+
id_ = 0;
igbd_ = 0;
isad_ = 0;
@@ -145,7 +150,12 @@ namespace helper {
processMuon(mu);
}
//--- Clone the clusters and fixup refs
- clusterStorer_.processAllClusters(*selPixelClusters_, rPixelClusters, *selStripClusters_, rStripClusters);
+ clusterStorer_.processAllClusters(*selPixelClusters_,
+ rPixelClusters,
+ *selStripClusters_,
+ rStripClusters,
+ *selPhase2OTClusters_,
+ rPhase2OTClusters);
}
//----------------------------------------------------------------------
@@ -161,6 +171,7 @@ namespace helper {
//--- New: save clusters too
produces>().setBranchAlias(alias + "PixelClusters");
produces>().setBranchAlias(alias + "StripClusters");
+ produces>().setBranchAlias(alias + "Phase2OTClusters");
produces("GlobalMuon").setBranchAlias(alias + "GlobalMuonTracks");
produces("GlobalMuon").setBranchAlias(alias + "GlobalMuonExtras");
produces("GlobalMuon").setBranchAlias(alias + "GlobalMuonHits");
diff --git a/CommonTools/RecoAlgos/interface/TrackSelector.h b/CommonTools/RecoAlgos/interface/TrackSelector.h
index 322100a67c6de..d70b9870e5d3c 100644
--- a/CommonTools/RecoAlgos/interface/TrackSelector.h
+++ b/CommonTools/RecoAlgos/interface/TrackSelector.h
@@ -22,6 +22,7 @@
#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h"
#include "DataFormats/Common/interface/DetSetVectorNew.h"
#include "CommonTools/RecoAlgos/interface/ClusterStorer.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
@@ -71,6 +72,7 @@ namespace helper {
std::unique_ptr selHits_;
std::unique_ptr > selStripClusters_;
std::unique_ptr > selPixelClusters_;
+ std::unique_ptr > selPhase2OTClusters_;
//--- References to products (i.e. to collections):
reco::TrackRefProd rTracks_;
@@ -107,6 +109,8 @@ namespace helper {
evt.template getRefBeforePut >();
edm::RefProd > rStripClusters =
evt.template getRefBeforePut >();
+ edm::RefProd > rPhase2OTClusters =
+ evt.template getRefBeforePut >();
//--- Indices into collections handled with RefProd
idx_ = 0; //!< index to track extra coll
@@ -121,7 +125,12 @@ namespace helper {
processTrack(trk);
}
//--- Clone the clusters and fixup refs
- clusterStorer_.processAllClusters(*selPixelClusters_, rPixelClusters, *selStripClusters_, rStripClusters);
+ clusterStorer_.processAllClusters(*selPixelClusters_,
+ rPixelClusters,
+ *selStripClusters_,
+ rStripClusters,
+ *selPhase2OTClusters_,
+ rPhase2OTClusters);
}
//----------------------------------------------------------------------
@@ -135,6 +144,7 @@ namespace helper {
//--- New: save clusters too
produces >().setBranchAlias(alias + "PixelClusters");
produces >().setBranchAlias(alias + "StripClusters");
+ produces >().setBranchAlias(alias + "Phase2OTClusters");
}
}; // (end of class TrackSelectorBase)
diff --git a/CommonTools/RecoAlgos/src/ClusterStorer.cc b/CommonTools/RecoAlgos/src/ClusterStorer.cc
index e939ed8587b62..971287616b47f 100644
--- a/CommonTools/RecoAlgos/src/ClusterStorer.cc
+++ b/CommonTools/RecoAlgos/src/ClusterStorer.cc
@@ -71,13 +71,17 @@ namespace helper {
void ClusterStorer::clear() {
pixelClusterRecords_.clear();
stripClusterRecords_.clear();
+ phase2OTClusterRecords_.clear();
}
// -------------------------------------------------------------
- void ClusterStorer::processAllClusters(edmNew::DetSetVector &pixelDsvToFill,
- edm::RefProd > refPixelClusters,
- edmNew::DetSetVector &stripDsvToFill,
- edm::RefProd > refStripClusters) {
+ void ClusterStorer::processAllClusters(
+ edmNew::DetSetVector &pixelDsvToFill,
+ edm::RefProd > refPixelClusters,
+ edmNew::DetSetVector &stripDsvToFill,
+ edm::RefProd > refStripClusters,
+ edmNew::DetSetVector &phase2OTDsvToFill,
+ edm::RefProd > refPhase2OTClusters) {
if (!pixelClusterRecords_.empty()) {
this->processClusters(pixelClusterRecords_, pixelDsvToFill, refPixelClusters);
}
@@ -89,6 +93,10 @@ namespace helper {
// is specialised such that 'RecHitType' is not used...
this->processClusters(stripClusterRecords_, stripDsvToFill, refStripClusters);
}
+ if (!phase2OTClusterRecords_.empty()) {
+ this->processClusters(
+ phase2OTClusterRecords_, phase2OTDsvToFill, refPhase2OTClusters);
+ }
}
//-------------------------------------------------------------
@@ -97,7 +105,7 @@ namespace helper {
edmNew::DetSetVector &dsvToFill,
edm::RefProd > &refprod) {
std::sort(clusterRecords.begin(), clusterRecords.end()); // this sorts them by detid
- typedef typename std::vector >::const_iterator RIT;
+ typedef typename std::vector >::iterator RIT;
RIT it = clusterRecords.begin(), end = clusterRecords.end();
size_t clusters = 0;
while (it != end) {
@@ -135,7 +143,7 @@ namespace helper {
// generic rekey (in practise for pixel only...)
template // template for class
template // template for member function
- void ClusterStorer::ClusterHitRecord::rekey(const ClusterRefType &newRef) const {
+ void ClusterStorer::ClusterHitRecord::rekey(const ClusterRefType &newRef) {
TrackingRecHit &genericHit = (*hits_)[index_];
RecHitType *hit = nullptr;
if (genericHit.geographicalId().rawId() == detid_) { // a hit on this det, so it's simple
@@ -151,9 +159,7 @@ namespace helper {
// RecHitType is not used.
template <>
template // or template<> to specialise also here?
- void ClusterStorer::ClusterHitRecord::
- // rekey(const SiStripRecHit2D::ClusterRef &newRef) const
- rekey(const SiStripRecHit2D::ClusterRef &newRef) const {
+ void ClusterStorer::ClusterHitRecord::rekey(const SiStripRecHit2D::ClusterRef &newRef) {
TrackingRecHit &genericHit = (*hits_)[index_];
const std::type_info &hit_type = typeid(genericHit);
@@ -174,4 +180,28 @@ namespace helper {
(*cluRef) = OmniClusterRef(newRef);
}
+ // -------------------------------------------------------------
+ // Specific rekey for class template ClusterRefType = Phase2TrackerRecHit1D::ClusterRef
+ template <>
+ template
+ void ClusterStorer::ClusterHitRecord::rekey(
+ const Phase2TrackerRecHit1D::ClusterRef &newRef) {
+ TrackingRecHit &genericHit = (*hits_)[index_];
+ const std::type_info &hit_type = typeid(genericHit);
+
+ OmniClusterRef *cluRef = nullptr;
+ if (typeid(Phase2TrackerRecHit1D) == hit_type) {
+ cluRef = &static_cast(genericHit).omniCluster();
+ } else if (typeid(VectorHit) == hit_type) {
+ VectorHit &vHit = static_cast(genericHit);
+ // FIXME: this essentially uses a hack
+ // https://github.com/cms-sw/cmssw/blob/master/DataFormats/TrackerCommon/interface/TrackerTopology.h#L291
+ cluRef = (SiStripDetId(detid_).stereo() ? &vHit.upperClusterRef() : &vHit.lowerClusterRef());
+ }
+
+ assert(cluRef != nullptr); // to catch missing RecHit types
+ assert(cluRef->key() == ref_.key()); // otherwise something went wrong
+ (*cluRef) = OmniClusterRef(newRef);
+ }
+
} // namespace helper
diff --git a/CommonTools/RecoAlgos/src/MuonSelector.cc b/CommonTools/RecoAlgos/src/MuonSelector.cc
index 0b7d84646d158..d2af24a89aaa3 100644
--- a/CommonTools/RecoAlgos/src/MuonSelector.cc
+++ b/CommonTools/RecoAlgos/src/MuonSelector.cc
@@ -5,8 +5,7 @@
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
#include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
-
-#include
+#include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -26,6 +25,7 @@ namespace helper {
selStandAloneTracksHits_(new TrackingRecHitCollection),
selStripClusters_(new edmNew::DetSetVector),
selPixelClusters_(new edmNew::DetSetVector),
+ selPhase2OTClusters_(new edmNew::DetSetVector),
rMuons_(),
rTracks_(),
rTrackExtras_(),
@@ -202,6 +202,9 @@ namespace helper {
const ProjectedSiStripRecHit2D &pHit = static_cast(hit);
if (!pHit.originalHit().cluster().isAvailable())
return false;
+ } else if (hit_type == typeid(Phase2TrackerRecHit1D)) {
+ if (!static_cast(hit).cluster().isAvailable())
+ return false;
} else {
// std::cout << "| It is a " << hit_type.name() << " hit !?" << std::endl;
// Do nothing. We might end up here for FastSim hits.
@@ -230,6 +233,7 @@ namespace helper {
if (cloneClusters()) {
evt.put(std::move(selStripClusters_));
evt.put(std::move(selPixelClusters_));
+ evt.put(std::move(selPhase2OTClusters_));
}
return h;
}
diff --git a/CommonTools/RecoAlgos/src/TrackSelector.cc b/CommonTools/RecoAlgos/src/TrackSelector.cc
index 3e6492d40c0c8..5e61f61263b5b 100644
--- a/CommonTools/RecoAlgos/src/TrackSelector.cc
+++ b/CommonTools/RecoAlgos/src/TrackSelector.cc
@@ -10,6 +10,7 @@ namespace helper {
selHits_(new TrackingRecHitCollection),
selStripClusters_(new edmNew::DetSetVector),
selPixelClusters_(new edmNew::DetSetVector),
+ selPhase2OTClusters_(new edmNew::DetSetVector),
rTracks_(),
rTrackExtras_(),
rHits_(),
@@ -62,6 +63,7 @@ namespace helper {
evt.put(std::move(selHits_));
evt.put(std::move(selStripClusters_));
evt.put(std::move(selPixelClusters_));
+ evt.put(std::move(selPhase2OTClusters_));
return h;
}
diff --git a/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json b/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json
index de88547798705..7e09ee8d705c0 100644
--- a/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json
+++ b/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
- "BeamSpotObjects_PCL_byLumi_v1_prompt": {}
+ "BeamSpotObjects_PCL_byLumi_prep_prompt": {}
},
"inputTag": "BeamSpotObject_ByLumi",
"since": null,
diff --git a/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json b/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json
index b8311de996706..9fa54d09bcd85 100644
--- a/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json
+++ b/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json
@@ -3,7 +3,7 @@
"destinationTags": {
"BeamSpotObjects_PCL_byRun_v1_express": {},
"BeamSpotObjects_PCL_byRun_v1_hlt": {},
- "BeamSpotObjects_PCL_byRun_v1_prompt": {}
+ "BeamSpotObjects_PCL_byRun_prep_prompt": {}
},
"inputTag": "BeamSpotObject_ByRun",
"since": null,
diff --git a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
index a630f909a4f6e..1bf56f86ddd2a 100644
--- a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
+++ b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
- "CTPPSRPAlignment_byPCL_v1_prompt": {}
+ "CTPPSRPAlignment_byPCL_prep_prompt": {}
},
"inputTag": "CTPPSRPAlignment_real_pcl",
"since": null,
diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
index 23fc587ef7bb0..9813725254731 100644
--- a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
+++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
- "CTPPPSTimingCalibration_SAMPIC_byPCL_v1_prompt": {}
+ "CTPPPSTimingCalibration_SAMPIC_byPCL_prep_prompt": {}
},
"inputTag": "PPSDiamondSampicCalibration_pcl",
"since": null,
diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json
index ae3b18c2788bb..d9669bbdd7467 100644
--- a/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json
+++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
- "CTPPPSTimingCalibration_HPTDC_byPCL_v1_prompt": {}
+ "CTPPPSTimingCalibration_HPTDC_byPCL_prep_prompt": {}
},
"inputTag": "PPSDiamondTimingCalibration_pcl",
"since": null,
diff --git a/CondFormats/Common/data/SiStripBadStripRcd_prep.json b/CondFormats/Common/data/SiStripBadStripRcd_prep.json
index 7a7031a6e720b..6b1313b955730 100644
--- a/CondFormats/Common/data/SiStripBadStripRcd_prep.json
+++ b/CondFormats/Common/data/SiStripBadStripRcd_prep.json
@@ -2,7 +2,7 @@
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
"SiStripBadChannel_PCL_v1_hlt": {},
- "SiStripBadChannel_PCL_v1_prompt": {}
+ "SiStripBadChannel_PCL_prep_prompt": {}
},
"inputTag": "SiStripBadStrip_pcl",
"since": null,
diff --git a/Configuration/AlCa/python/autoAlca.py b/Configuration/AlCa/python/autoAlca.py
index 4fc3ea2030669..4011e6923f988 100644
--- a/Configuration/AlCa/python/autoAlca.py
+++ b/Configuration/AlCa/python/autoAlca.py
@@ -1,23 +1,30 @@
AlCaRecoMatrix = {
- "ALCALumiPixelsCountsExpress" : "AlCaPCCRandom",
+ "AlCaLumiPixelsCountsExpress" : "AlCaPCCRandom",
"AlCaLumiPixelsCountsPrompt" : "AlCaPCCZeroBias+RawPCCProducer",
# These two (AlCaPhiSym, AlCaP0) cannot run on RAW, they are just meant to run on the dedicated AlcaRAW so they do not enter the allForPrompt list
"AlCaPhiSym" : "",
"AlCaP0" : "",
- "ALCAPPSExpress" : "PPSCalMaxTracks", # Express producer
+ "AlCaPPSExpress" : "PPSCalMaxTracks", # Express producer
"AlCaPPSPrompt" : "PPSCalMaxTracks", # Prompt producer
"Commissioning" : "HcalCalIsoTrk+TkAlMinBias+SiStripCalMinBias",
"Cosmics" : "SiPixelCalCosmics+SiStripCalCosmics+TkAlCosmics0T+MuAlGlobalCosmics",
+ "DoubleMuon" : "TkAlZMuMu+TkAlDiMuonAndVertex+MuAlCalIsolatedMu",
+ "DoubleMuonLowMass" : "TkAlJpsiMuMu+TkAlUpsilonMuMu",
"EGamma" : "EcalESAlign+EcalUncalWElectron+EcalUncalZElectron+HcalCalIsoTrkProducerFilter+HcalCalIterativePhiSym",
"Express" : "SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+Hotline+SiPixelCalZeroBias",
"ExpressAlignment" : "TkAlMinBias",
"ExpressCosmics" : "SiStripPCLHistos+SiStripCalZeroBias+TkAlCosmics0T+SiPixelCalZeroBias",
"HcalNZS" : "HcalCalMinBias",
"HLTPhysics" : "TkAlMinBias",
+ "JetHT" : "HcalCalIsoTrkProducerFilter+TkAlJetHT",
"JetMET" : "HcalCalIsoTrkProducerFilter+TkAlJetHT+HcalCalNoise",
+ "MinimumBias" : "SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias",
+ "MET" : "HcalCalNoise",
"Muon" : "TkAlZMuMu+TkAlDiMuonAndVertex+MuAlCalIsolatedMu+SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+TkAlMuonIsolated+HcalCalHO+HcalCalIterativePhiSym+HcalCalHBHEMuonProducerFilter",
"NoBPTX" : "TkAlCosmicsInCollisions",
"ParkingDoubleMuonLowMass" : "TkAlJpsiMuMu+TkAlUpsilonMuMu",
+ "SingleMuon" : "SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+TkAlMuonIsolated+MuAlCalIsolatedMu+HcalCalHO+HcalCalIterativePhiSym+HcalCalHBHEMuonProducerFilter",
+ "SpecialHLTPhysics" : "LumiPixelsMinBias",
"StreamExpress" : "SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+Hotline+SiPixelCalZeroBias+SiPixelCalSingleMuon",
"StreamExpressHI" : "SiStripCalZeroBias+TkAlMinBiasHI+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+SiPixelCalZeroBias",
# These (TestEnablesTracker, TestEnablesEcalHcal) are in the AlCaRecoMatrix, but no RelVals are produced
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
index a7a822fab13f3..83f9a2c7a9b76 100644
--- a/Configuration/AlCa/python/autoCond.py
+++ b/Configuration/AlCa/python/autoCond.py
@@ -33,18 +33,18 @@
'run2_data_promptlike_hi' : '124X_dataRun2_PromptLike_HI_v1',
# GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu
'run2_hlt_relval' : '123X_dataRun2_HLT_relval_v3',
- # GlobalTag for Run3 HLT: identical to the online GT (124X_dataRun3_HLT_v7) but with snapshot at 2022-11-09 21:24:02 (UTC)
- 'run3_hlt' : '124X_dataRun3_HLT_frozen_v8',
+ # GlobalTag for Run3 HLT: identical to the online GT (126X_dataRun3_HLT_v1) but with snapshot at 2023-01-06 18:15:00 (UTC)
+ 'run3_hlt' : '126X_dataRun3_HLT_frozen_v1',
# GlobalTag with fixed snapshot time for Run3 HLT RelVals: customizations to run with fixed L1 Menu
- 'run3_hlt_relval' : '125X_dataRun3_HLT_relval_v3',
- # GlobalTag for Run3 data relvals (express GT) - identical to 124X_dataRun3_Express_v9 but with snapshot at 2022-11-09 21:24:02 (UTC)
- 'run3_data_express' : '124X_dataRun3_Express_frozen_v8',
- # GlobalTag for Run3 data relvals (prompt GT) - identical to 124X_dataRun3_Prompt_v8 but with snapshot at 2022-11-09 21:24:02 (UTC)
- 'run3_data_prompt' : '124X_dataRun3_Prompt_frozen_v7',
- # GlobalTag for Run3 offline data reprocessing - snapshot at 2022-11-01 12:00:00 (UTC)
- 'run3_data' : '124X_dataRun3_v11',
+ 'run3_hlt_relval' : '126X_dataRun3_HLT_relval_v2',
+ # GlobalTag for Run3 data relvals (express GT) - identical to 126X_dataRun3_Express_v1 but with snapshot at 2023-01-06 18:15:00 (UTC)
+ 'run3_data_express' : '126X_dataRun3_Express_frozen_v1',
+ # GlobalTag for Run3 data relvals (prompt GT) - identical to 126X_dataRun3_Prompt_v1 but with snapshot at 2023-01-06 18:15:00 (UTC)
+ 'run3_data_prompt' : '126X_dataRun3_Prompt_frozen_v1',
+ # GlobalTag for Run3 offline data reprocessing - snapshot at 2023-01-06 18:15:00 (UTC)
+ 'run3_data' : '126X_dataRun3_v1',
# GlobalTag for Run3 data relvals: allows customization to run with fixed L1 menu
- 'run3_data_relval' : '125X_dataRun3_relval_v4',
+ 'run3_data_relval' : '126X_dataRun3_relval_v2',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
'phase1_2017_design' : '123X_mc2017_design_v2',
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
index 0eb00a5504d73..9b3adf64f7704 100644
--- a/Configuration/Applications/python/ConfigBuilder.py
+++ b/Configuration/Applications/python/ConfigBuilder.py
@@ -1976,7 +1976,8 @@ def prepare_DQM(self, stepSpec = 'DQMOffline'):
# any 'DQM' job should use DQMStore in non-legacy mode (but not HARVESTING)
self.loadAndRemember("DQMServices/Core/DQMStoreNonLegacy_cff")
_,_dqmSeq,_ = self.loadDefaultOrSpecifiedCFF(stepSpec,self.DQMOFFLINEDefaultCFF)
- sequenceList=postSequenceList=_dqmSeq.split('+')
+ sequenceList=_dqmSeq.split('+')
+ postSequenceList=_dqmSeq.split('+')
from DQMOffline.Configuration.autoDQM import autoDQM
self.expandMapping(sequenceList,autoDQM,index=0)
self.expandMapping(postSequenceList,autoDQM,index=1)
diff --git a/Configuration/Applications/scripts/cmsDriver.py b/Configuration/Applications/scripts/cmsDriver.py
index f20e353075101..90009fe476106 100755
--- a/Configuration/Applications/scripts/cmsDriver.py
+++ b/Configuration/Applications/scripts/cmsDriver.py
@@ -45,10 +45,8 @@ def run():
commandString = options.prefix+" cmsRun "+options.suffix
print("Starting "+commandString+' '+options.python_filename)
commands = commandString.lstrip().split()
+ sys.stdout.flush()
os.execvpe(commands[0],commands+[options.python_filename],os.environ)
sys.exit()
run()
-
-
-
diff --git a/Configuration/Eras/python/Era_Run3_cff.py b/Configuration/Eras/python/Era_Run3_cff.py
index 513b5ab810dd8..82f28c2662500 100644
--- a/Configuration/Eras/python/Era_Run3_cff.py
+++ b/Configuration/Eras/python/Era_Run3_cff.py
@@ -11,7 +11,9 @@
from Configuration.Eras.Modifier_ctpps_2022_cff import ctpps_2022
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
from Configuration.Eras.Modifier_run3_egamma_cff import run3_egamma
+from Configuration.Eras.Modifier_run2_egamma_2018_cff import run2_egamma_2018
from Configuration.Eras.Modifier_run3_RPC_cff import run3_RPC
-Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018]), run3_common, run3_egamma, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC)
+Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018, run2_egamma_2018]),
+ run3_common, run3_egamma, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC)
diff --git a/Configuration/HLT/python/addOnTestsHLT.py b/Configuration/HLT/python/addOnTestsHLT.py
index 3345d12392f63..7a0fcc942a445 100644
--- a/Configuration/HLT/python/addOnTestsHLT.py
+++ b/Configuration/HLT/python/addOnTestsHLT.py
@@ -22,25 +22,25 @@ def addOnTestsHLT():
'hlt_mc_PRef' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_PRef --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3 --fileout file:RelVal_Raw_PRef_MC.root',
'HLTrigger/Configuration/test/OnLine_HLT_PRef.py',
'cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run3_mc_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run3 --processName=HLTRECO --filein file:RelVal_Raw_PRef_MC.root --fileout file:RelVal_Raw_PRef_MC_HLT_RECO.root'],
- 'hlt_data_Fake' : ['cmsDriver.py RelVal -s L1REPACK:GT1 --data --scenario=pp -n 10 --conditions auto:run1_hlt_Fake --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --fileout file:RelVal_Raw_Fake_DATA.root --filein root://eoscms.cern.ch//eos/cms/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/RAW/Run2012A_MuEG_run191718/14932935-E289-E111-830C-5404A6388697.root',
+ 'hlt_data_Fake' : ['cmsDriver.py RelVal -s L1REPACK:GT1 --data --scenario=pp -n 10 --conditions auto:run1_hlt_Fake --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --fileout file:RelVal_Raw_Fake_DATA.root --filein /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root',
'HLTrigger/Configuration/test/OnLine_HLT_Fake.py',
'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 --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --processName=HLTRECO --filein file:RelVal_Raw_Fake_DATA.root --fileout file:RelVal_Raw_Fake_DATA_HLT_RECO.root'],
- 'hlt_data_Fake1': ['cmsDriver.py RelVal -s L1REPACK:GCTGT --data --scenario=pp -n 10 --conditions auto:run2_hlt_Fake1 --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_25ns --fileout file:RelVal_Raw_Fake1_DATA.root --filein root://eoscms.cern.ch//eos/cms/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/RAW/Run2015D_MuonEG_run256677/80950A90-745D-E511-92FD-02163E011C5D.root',
+ 'hlt_data_Fake1': ['cmsDriver.py RelVal -s L1REPACK:GCTGT --data --scenario=pp -n 10 --conditions auto:run2_hlt_Fake1 --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_25ns --fileout file:RelVal_Raw_Fake1_DATA.root --filein /store/data/Run2015D/MuonEG/RAW/v1/000/256/677/00000/80950A90-745D-E511-92FD-02163E011C5D.root',
'HLTrigger/Configuration/test/OnLine_HLT_Fake1.py',
'cmsDriver.py RelVal -s HLT:Fake1,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_Fake1 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run2_25ns --processName=HLTRECO --filein file:RelVal_Raw_Fake1_DATA.root --fileout file:RelVal_Raw_Fake1_DATA_HLT_RECO.root'],
- 'hlt_data_Fake2': ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_Fake2 --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2016 --fileout file:RelVal_Raw_Fake2_DATA.root --filein root://eoscms.cern.ch//eos/cms/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/RAW/Run2016B_JetHT_run272762/C666CDE2-E013-E611-B15A-02163E011DBE.root',
+ 'hlt_data_Fake2': ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_Fake2 --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2016 --fileout file:RelVal_Raw_Fake2_DATA.root --filein /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root',
'HLTrigger/Configuration/test/OnLine_HLT_Fake2.py',
'cmsDriver.py RelVal -s HLT:Fake2,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_Fake2 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run2_2016 --processName=HLTRECO --filein file:RelVal_Raw_Fake2_DATA.root --fileout file:RelVal_Raw_Fake2_DATA_HLT_RECO.root'],
- 'hlt_data_GRun' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_GRun --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3 --fileout file:RelVal_Raw_GRun_DATA.root --filein root://eoscms.cern.ch//eos/cms/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/RAW/Run2022B_HLTPhysics0_run355558/cd851cf4-0fca-4d76-b80e-1d33e1371929.root',
+ 'hlt_data_GRun' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_GRun --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3 --fileout file:RelVal_Raw_GRun_DATA.root --filein /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root',
'HLTrigger/Configuration/test/OnLine_HLT_GRun.py',
'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3 --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 L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_HIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_pp_on_PbPb --fileout file:RelVal_Raw_HIon_DATA.root --filein root://eoscms.cern.ch//eos/cms/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/RAW/Run2022B_HLTPhysics0_run355558/cd851cf4-0fca-4d76-b80e-1d33e1371929.root', # --customise_commands=\'from FWCore.ParameterSet.MassReplace import massSearchReplaceAnyInputTag; massSearchReplaceAnyInputTag(process.SimL1Emulator,"rawDataCollector","rawDataRepacker",False,True)\'',
+ 'hlt_data_HIon' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_HIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_pp_on_PbPb --fileout file:RelVal_Raw_HIon_DATA.root --filein /store/hidata/HIRun2022A/HITestRaw0/RAW/v1/000/362/321/00000/f467ee64-fc64-47a6-9d8a-7ca73ebca2bd.root --customise=HLTrigger/Configuration/CustomConfigs.customiseL1TforHIonRepackedRAW',
'HLTrigger/Configuration/test/OnLine_HLT_HIon.py',
'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3_pp_on_PbPb --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 L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PIon --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3 --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein root://eoscms.cern.ch//eos/cms/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/RAW/Run2022B_HLTPhysics0_run355558/cd851cf4-0fca-4d76-b80e-1d33e1371929.root',
+ 'hlt_data_PIon' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PIon --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3 --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root',
'HLTrigger/Configuration/test/OnLine_HLT_PIon.py',
'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root'],
- 'hlt_data_PRef' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PRef --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3 --eventcontent RAW --fileout file:RelVal_Raw_PRef_DATA.root --filein root://eoscms.cern.ch//eos/cms/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/RAW/Run2022B_HLTPhysics0_run355558/cd851cf4-0fca-4d76-b80e-1d33e1371929.root',
+ 'hlt_data_PRef' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PRef --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3 --eventcontent RAW --fileout file:RelVal_Raw_PRef_DATA.root --filein /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root',
'HLTrigger/Configuration/test/OnLine_HLT_PRef.py',
'cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3 --processName=HLTRECO --filein file:RelVal_Raw_PRef_DATA.root --fileout file:RelVal_Raw_PRef_DATA_HLT_RECO.root'],
}
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
index 51b583f3608b7..50b7fe055e8e5 100644
--- a/Configuration/HLT/python/autoCondHLT.py
+++ b/Configuration/HLT/python/autoCondHLT.py
@@ -18,8 +18,8 @@
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
- 'FULL' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
- 'GRun' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
+ 'FULL' : ( ','.join( [ 'L1Menu_Collisions2022_v1_4_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-11-22 09:57:54.000"] ), ),
+ 'GRun' : ( ','.join( [ 'L1Menu_Collisions2022_v1_4_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-11-22 09:57:54.000"] ), ),
'2022v15' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2022_v1_1_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-10-26 10:46:29.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py
index 5b6acf523c5cd..4f7e7218deb78 100644
--- a/Configuration/HLT/python/autoHLT.py
+++ b/Configuration/HLT/python/autoHLT.py
@@ -10,7 +10,7 @@
'relval2016' : 'Fake2',
'relval2017' : 'Fake2',
'relval2018' : 'Fake2',
- 'relval2022' : 'GRun',
+ 'relval2022' : '2022v15',
'relval2026' : '75e33',
'test' : 'GRun',
}
diff --git a/Configuration/PyReleaseValidation/python/relval_nano.py b/Configuration/PyReleaseValidation/python/relval_nano.py
index 9498ebbe8aa52..69aa09f6f09ee 100644
--- a/Configuration/PyReleaseValidation/python/relval_nano.py
+++ b/Configuration/PyReleaseValidation/python/relval_nano.py
@@ -100,7 +100,7 @@
##12.4 INPUT
steps['TTbarMINIAOD12.4'] = {'INPUT':InputInfo(location='STD',
## to be updated as soon as some TTbar appears in a 12.4 campaign
- dataSet='/MinBias_TuneCP5_14TeV-pythia8/Run3Summer22MiniAODv3-NoPU_Pilot_124X_mcRun3_2022_realistic_v11-v2/MINIAODSIM ')}
+ dataSet='/RelValTTbar_14TeV/CMSSW_12_4_9_patch1-124X_mcRun3_2022_realistic_v10_BS2022-v1/MINIAODSIM')}
steps['NANO_mc12.4_v10']=merge([{'--era':'Run3,run3_nanoAOD_124',
'--conditions':'auto:phase1_2022_realistic',
'-s':'NANO:PhysicsTools/NanoAOD/V10/nano_cff,DQM:@nanoAODDQM'},
@@ -122,14 +122,14 @@
##12.6 workflows ("from scratch")
steps['TTBarMINIAOD12.6'] = {'INPUT':InputInfo(location='STD',ls=run3_lumis,
## this is a dataset from the last pre-release: to be updated much too often IMO
- dataSet='/RelValTTbar_14TeV/CMSSW_12_6_0_pre2-PU_125X_mcRun3_2022_realistic_v3-v1/MINIAODSIM')}
+ dataSet='/RelValTTbar_14TeV/CMSSW_12_6_0_pre4-PU_125X_mcRun3_2022_realistic_v4-v1/MINIAODSIM')}
steps['NANO_mc12.6_v10']=merge([{'--era':'Run3',
'--conditions':'auto:phase1_2022_realistic',
'-s':'NANO:PhysicsTools/NanoAOD/V10/nano_cff,DQM:@nanoAODDQM'},
- _NANO_data])
+ _NANO_mc])
steps['NANO_mc12.6']=merge([{'--era':'Run3',
'--conditions':'auto:phase1_2022_realistic'},
- _NANO_data])
+ _NANO_mc])
################
diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index edf7a8a6010da..9bc7c2fc4069b 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -26,6 +26,8 @@
'2024PU',
'2021FS',
'2021FSPU',
+ '2021postEE',
+ '2021postEEPU',
]
upgradeKeys[2026] = [
@@ -2114,6 +2116,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
},
+ '2021postEE' : {
+ 'Geom' : 'DB:Extended',
+ 'GT' : 'auto:phase1_2022_realistic_postEE',
+ 'HLTmenu': '@relval2022',
+ 'Era' : 'Run3',
+ 'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
+ 'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
+ },
}
# standard PU sequences
diff --git a/Configuration/StandardSequences/python/Mixing.py b/Configuration/StandardSequences/python/Mixing.py
index d25cf5fdb87f0..b77da12aa86c6 100644
--- a/Configuration/StandardSequences/python/Mixing.py
+++ b/Configuration/StandardSequences/python/Mixing.py
@@ -127,6 +127,9 @@ def addMixingScenario(label,dict):
addMixingScenario("ProdStep2",{'file': 'SimGeneral.MixingModule.mixProdStep2_cfi'})
addMixingScenario("fromDB",{'file': 'SimGeneral.MixingModule.mix_fromDB_cfi'})
addMixingScenario("2022_LHC_Simulation_10h_2h",{'file': 'SimGeneral.MixingModule.Run3_2022_LHC_Simulation_10h_2h_cfi'})
+addMixingScenario("2023_LHC_Simulation_14h_10h_hybrid2p05",{'file': 'SimGeneral.MixingModule.Run3_2023_LHC_Simulation_14h_10h_hybrid2p05_cfi'})
+addMixingScenario("2023_LHC_Simulation_12p5h_9h_hybrid2p23",{'file': 'SimGeneral.MixingModule.Run3_2023_LHC_Simulation_12p5h_9h_hybrid2p23_cfi'})
+addMixingScenario("2023_LHC_Simulation_11h_8h_hybrid2p40",{'file': 'SimGeneral.MixingModule.Run3_2023_LHC_Simulation_11h_8h_hybrid2p40_cfi'})
#scenarios for L1 tdr work
addMixingScenario("AVE_4_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 4})
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py
index 99f52f8196b20..106932da70449 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py
@@ -1,15 +1,14 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms
-## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW
-
+## L1REPACK CalouGT : Re-Emulate all of L1 and repack into RAW
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-def _print(ignored):
- print("# L1T WARN: L1REPACK:CalouGT (intended for 2016/2017 data) only supports Stage 2 eras for now.")
- print("# L1T WARN: Use a legacy version of L1REPACK for now.")
-stage2L1Trigger.toModify(None, _print)
-(~stage2L1Trigger).toModify(None, lambda x: print("# L1T INFO: L1REPACK:CalouGT (intended for 2016/2017 data), reemulates the Calo part, uses unpacked Muons, and reemulates uGT."))
+
+(~stage2L1Trigger).toModify(None, lambda x:
+ print("# L1T WARN: L1REPACK:CalouGT (intended for 2016/2017 data) only supports Stage 2 eras for now.\n# L1T WARN: Use a legacy version of L1REPACK for now."))
+stage2L1Trigger.toModify(None, lambda x:
+ print("# L1T INFO: L1REPACK:CalouGT (intended for 2016/2017 data), reemulates the Calo part, uses unpacked Muons, and reemulates uGT."))
# First, Unpack all inputs to L1:
import EventFilter.L1TRawToDigi.bmtfDigis_cfi
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py
index 961b0815944eb..2a38f819206cd 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py
@@ -1,15 +1,14 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms
-## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW
-
+## L1REPACK Full2015Data : Re-Emulate all of L1 and repack into RAW
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-def _print(ignored):
- print("# L1T WARN: L1REPACK:Full2015Data only supports Stage 2 eras for now.")
- print("# L1T WARN: Use a legacy version of L1REPACK for now.")
-stage2L1Trigger.toModify(None, _print)
-(~stage2L1Trigger).toModify(None, lambda x: print("# L1T INFO: L1REPACK:Full2015Data will unpack all L1T inputs, re-emulated (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
+
+(~stage2L1Trigger).toModify(None, lambda x:
+ print("# L1T WARN: L1REPACK:Full2015Data only supports Stage-2 eras for now.\n# L1T WARN: Use a legacy version of L1REPACK for now."))
+stage2L1Trigger.toModify(None, lambda x:
+ print("# L1T INFO: L1REPACK:Full2015Data will unpack all L1T inputs, re-emulated (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
# First, Unpack all inputs to L1:
import EventFilter.DTTFRawToDigi.dttfunpacker_cfi
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py
index 828ccfd38a0f6..28c4e0debd63e 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py
@@ -1,15 +1,15 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms
-## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW
-
+## L1REPACK FullMC : Re-Emulate all of L1 and repack into RAW
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-def _print(ignored):
- print("# L1T WARN: L1REPACK:FullMC (intended for MC events with RAW eventcontent) only supports Stage 2 eras for now.")
- print("# L1T WARN: Use a legacy version of L1REPACK for now.")
-stage2L1Trigger.toModify(None, _print)
-(~stage2L1Trigger).toModify(None, lambda x: print("# L1T INFO: L1REPACK:FullMC will unpack Calorimetry and Muon L1T inputs, re-emulate L1T (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
+from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
+
+(~stage2L1Trigger).toModify(None, lambda x:
+ print("# L1T WARN: L1REPACK:FullMC (intended for MC events with RAW eventcontent) only supports Stage-2 eras for now.\n# L1T WARN: Use a legacy version of L1REPACK for now."))
+stage2L1Trigger.toModify(None, lambda x:
+ print("# L1T INFO: L1REPACK:FullMC will unpack Calorimetry and Muon L1T inputs, re-emulate L1T (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
# First, Unpack all inputs to L1:
@@ -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()))
@@ -60,6 +64,8 @@ def _print(ignored):
# CSC TPs
simCscTriggerPrimitiveDigis.CSCComparatorDigiProducer = 'unpackCSC:MuonCSCComparatorDigi'
simCscTriggerPrimitiveDigis.CSCWireDigiProducer = 'unpackCSC:MuonCSCWireDigi'
+# GEM
+(stage2L1Trigger & run3_GEM).toModify(simMuonGEMPadDigis, InputCollection = 'unpackGEM')
# TWIN-MUX
simTwinMuxDigis.RPC_Source = 'unpackRPC'
@@ -114,4 +120,9 @@ def _print(ignored):
, packGmtStage2
, packGtStage2
, rawDataCollector))
+
+_SimL1EmulatorTaskWithGEM = SimL1EmulatorTask.copy()
+_SimL1EmulatorTaskWithGEM.add(unpackGEM)
+(stage2L1Trigger & run3_GEM).toReplaceWith(SimL1EmulatorTask, _SimL1EmulatorTaskWithGEM)
+
SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py
index bd905384e2958..ac763f93af934 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py
@@ -1,15 +1,14 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms
-## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW
-
+## L1REPACK FullSimTP : Re-Emulate all of L1 and repack into RAW
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-def _print(ignored):
- print("# L1T WARN: L1REPACK:FullSimTP (intended for 2016 data) only supports Stage 2 eras for now.")
- print("# L1T WARN: Use a legacy version of L1REPACK for now.")
-stage2L1Trigger.toModify(None, _print)
-(~stage2L1Trigger).toModify(None, lambda x: print("# L1T INFO: L1REPACK:FullSimTP (intended for 2016 data) will unpack all L1T inputs, re-emulate Trigger Primitives, re-emulate L1T (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
+
+(~stage2L1Trigger).toModify(None, lambda x:
+ print("# L1T WARN: L1REPACK:FullSimTP (intended for data) only supports Stage-2 eras for now.\n# L1T WARN: Use a legacy version of L1REPACK for now."))
+stage2L1Trigger.toModify(None, lambda x:
+ print("# L1T INFO: L1REPACK:FullSimTP (intended for data) will unpack all L1T inputs, re-emulate Trigger Primitives, re-emulate L1T (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
# First, Unpack all inputs to L1:
import EventFilter.L1TRawToDigi.bmtfDigis_cfi
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py
index 4b658c5e1df77..ba8a355a65dfd 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py
@@ -1,17 +1,17 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms
-## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW
+## L1REPACK Full : Re-Emulate all of L1 and repack into RAW
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
-def _print(ignored):
- print("# L1T WARN: L1REPACK:Full (intended for 2016 data) only supports Stage 2 eras for now.")
- print("# L1T WARN: Use a legacy version of L1REPACK for now.")
-stage2L1Trigger.toModify(None, _print)
-(~stage2L1Trigger).toModify(None, lambda x: print("# L1T INFO: L1REPACK:Full (intended for 2016 & 2017 data) will unpack all L1T inputs, re-emulated (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
+(~stage2L1Trigger).toModify(None, lambda x:
+ print("# L1T WARN: L1REPACK:Full only supports Stage-2 eras for now.\n# L1T WARN: Use a legacy version of L1REPACK for now."))
+
+stage2L1Trigger.toModify(None, lambda x:
+ print("# L1T INFO: L1REPACK:Full will unpack all L1T inputs, re-emulated (Stage-2), and pack uGT, uGMT, and Calo Stage-2 output."))
# First, Unpack all inputs to L1:
@@ -97,7 +97,7 @@ def _print(ignored):
simTwinMuxDigis.DTDigi_Source = "unpackTwinMux:PhIn"
simTwinMuxDigis.DTThetaDigi_Source = "unpackTwinMux:ThIn"
-run3_GEM.toModify(simMuonGEMPadDigis,
+(stage2L1Trigger & run3_GEM).toModify(simMuonGEMPadDigis,
InputCollection = 'unpackGEM'
)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py
index 875ec18f8d8d7..2ff5372a5aaba 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py
@@ -1,16 +1,14 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms
-## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW
-
+## L1REPACK uGT : Re-Emulate L1 uGT and repack into RAW
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-def _print(ignored):
- print("# L1T WARN: L1REPACK:Full (intended for 2016 data) only supports Stage 2 eras for now.")
- print("# L1T WARN: Use a legacy version of L1REPACK for now.")
-stage2L1Trigger.toModify(None, _print)
-(~stage2L1Trigger).toModify(None, lambda x: print("# L1T INFO: L1REPACK:uGT (intended for 2016 data) will unpack uGMT and CaloLaye2 outputs and re-emulate uGT"))
+(~stage2L1Trigger).toModify(None, lambda x:
+ print("# L1T WARN: L1REPACK:uGT only supports Stage-2 eras for now.\n# L1T WARN: Use a legacy version of L1REPACK for now."))
+stage2L1Trigger.toModify(None, lambda x:
+ print("# L1T INFO: L1REPACK:uGT will unpack uGMT and CaloLayer2 outputs, and re-emulate uGT"))
# First, inputs to uGT:
import EventFilter.L1TRawToDigi.gtStage2Digis_cfi
diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py
index b2354d564ac48..8b40cb43f17a9 100644
--- a/Configuration/StandardSequences/python/VtxSmeared.py
+++ b/Configuration/StandardSequences/python/VtxSmeared.py
@@ -68,6 +68,7 @@
'Realistic25ns900GeV2021Collision' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic25ns900GeV2021Collision_cfi',
'Realistic25ns13p6TeVEarly2022Collision' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi',
'Nominal2022PbPbCollision' : 'IOMC.EventVertexGenerators.VtxSmearedNominal2022PbPbCollision_cfi',
+ 'Realistic2022PbPbCollision' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic2022PbPbCollision_cfi',
}
VtxSmearedDefaultKey='Realistic50ns13TeVCollision'
VtxSmearedHIDefaultKey='RealisticPbPbCollision2018'
diff --git a/DQM/EcalMonitorClient/interface/IntegrityClient.h b/DQM/EcalMonitorClient/interface/IntegrityClient.h
index 1a49d53629002..d3c47007ffd18 100644
--- a/DQM/EcalMonitorClient/interface/IntegrityClient.h
+++ b/DQM/EcalMonitorClient/interface/IntegrityClient.h
@@ -23,6 +23,7 @@ namespace ecaldqm {
void setTokens(edm::ConsumesCollector&) override;
float errFractionThreshold_;
+ int processedEvents;
};
} // namespace ecaldqm
diff --git a/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py b/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py
index d91cfb18521c9..7f631d75a86da 100644
--- a/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py
+++ b/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py
@@ -18,7 +18,8 @@
ChId = ecalIntegrityTask.MEs.ChId,
TowerId = ecalIntegrityTask.MEs.TowerId,
BXSRP = ecalRawDataTask.MEs.BXSRP,
- BXTCC = ecalRawDataTask.MEs.BXTCC
+ BXTCC = ecalRawDataTask.MEs.BXTCC,
+ NumEvents = ecalOccupancyTask.MEs.NEvents
),
MEs = cms.untracked.PSet(
QualitySummary = cms.untracked.PSet(
@@ -41,6 +42,13 @@
otype = cms.untracked.string('Ecal3P'),
btype = cms.untracked.string('Crystal'),
description = cms.untracked.string('Map of channel status as given by the Ecal Channel Status Record. LEGEND:
0: Channel ok,
1: DAC settings problem, pedestal not in the design range,
2: Channel with no laser, ok elsewhere,
3: Noisy,
4: Very noisy,
5-7: Reserved for more categories of noisy channels,
8: Channel at fixed gain 6 (or 6 and 1),
9: Channel at fixed gain 1,
10: Channel at fixed gain 0 (dead of type this),
11: Non-responding isolated channel (dead of type other),
12: Channel and one or more neigbors not responding (e.g.: in a dead VFE 5x1 channel),
13: Channel in TT with no data link, TP data ok,
14: Channel in TT with no data link and no TP data.')
- )
+ ),
+ TowerIdNormalized = cms.untracked.PSet(
+ path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityTask/TTId/%(prefix)sIT TTId Normalized %(sm)s'),
+ kind = cms.untracked.string('TH2F'),
+ otype = cms.untracked.string('SM'),
+ btype = cms.untracked.string('SuperCrystal'),
+ description = cms.untracked.string('TTID errors normalized by total no.of processed events per run.')
+ )
)
)
diff --git a/DQM/EcalMonitorClient/src/IntegrityClient.cc b/DQM/EcalMonitorClient/src/IntegrityClient.cc
index ff90ebdc3dad2..159904346cce8 100644
--- a/DQM/EcalMonitorClient/src/IntegrityClient.cc
+++ b/DQM/EcalMonitorClient/src/IntegrityClient.cc
@@ -8,9 +8,10 @@
#include "DataFormats/EcalDetId/interface/EEDetId.h"
#include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
+#include "DQM/EcalCommon/interface/MESetNonObject.h"
namespace ecaldqm {
- IntegrityClient::IntegrityClient() : DQWorkerClient(), errFractionThreshold_(0.) {
+ IntegrityClient::IntegrityClient() : DQWorkerClient(), errFractionThreshold_(0.), processedEvents(0) {
qualitySummaries_.insert("Quality");
qualitySummaries_.insert("QualitySummary");
}
@@ -44,7 +45,21 @@ namespace ecaldqm {
MESet const& sGainSwitch(sources_.at("GainSwitch"));
MESet const& sTowerId(sources_.at("TowerId"));
MESet const& sBlockSize(sources_.at("BlockSize"));
-
+ MESetNonObject const& sNumEvents(static_cast(sources_.at("NumEvents")));
+
+ //Get the no.of events per LS calculated in OccupancyTask
+ int nEv = sNumEvents.getFloatValue();
+ processedEvents += nEv; //Sum it up to get the total processed events for the whole run.
+
+ //TTID errors nomalized by total no.of events in a run.
+ MESet& meTTIDNorm(MEs_.at("TowerIdNormalized"));
+ MESet::iterator tEnd(meTTIDNorm.end(GetElectronicsMap()));
+ for (MESet::iterator tItr(meTTIDNorm.beginChannel(GetElectronicsMap())); tItr != tEnd;
+ tItr.toNextChannel(GetElectronicsMap())) {
+ DetId id(tItr->getId());
+ float towerid(sTowerId.getBinContent(getEcalDQMSetupObjects(), id));
+ tItr->setBinContent(towerid / processedEvents);
+ }
// Fill Channel Status Map MEs
// Record is checked for updates at every endLumi and filled here
MESet::iterator chSEnd(meChStatus.end(GetElectronicsMap()));
diff --git a/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py b/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py
index 42387f2bd0323..e3613293938d1 100644
--- a/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py
+++ b/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py
@@ -70,6 +70,21 @@
otype = cms.untracked.string('SM'),
btype = cms.untracked.string('SuperCrystal'),
description = cms.untracked.string('')
+ ),
+ TTIDTotal = cms.untracked.PSet(
+ path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityTask/%(prefix)sIT weighted TTID errors'),
+ kind = cms.untracked.string('TH1F'),
+ otype = cms.untracked.string('Ecal2P'),
+ btype = cms.untracked.string('DCC'),
+ description = cms.untracked.string('Total number of TTID errors for each FED. Histogram filled weighted by no.of crystals per tower to be compatible with the other integrity errors which are binned by crystals.')
+ ),
+ TTIDByLumi = cms.untracked.PSet(
+ path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityTask/%(prefix)sIT weighted TTID errors by lumi'),
+ kind = cms.untracked.string('TH1F'),
+ otype = cms.untracked.string('Ecal2P'),
+ btype = cms.untracked.string('DCC'),
+ perLumi = cms.untracked.bool(True),
+ description = cms.untracked.string('Total number of TTID errors for each FED in this lumi section. Histogram filled weighted by no.of crystals per tower to be compatible with the other integrity errors which are binned by crystals.')
)
)
)
diff --git a/DQM/EcalMonitorTasks/src/IntegrityTask.cc b/DQM/EcalMonitorTasks/src/IntegrityTask.cc
index c4228f45890e6..032cd64872c93 100644
--- a/DQM/EcalMonitorTasks/src/IntegrityTask.cc
+++ b/DQM/EcalMonitorTasks/src/IntegrityTask.cc
@@ -13,6 +13,7 @@ namespace ecaldqm {
if (ByLumiResetSwitch) {
MEs_.at("MapByLumi").reset(GetElectronicsMap());
MEs_.at("ByLumi").reset(GetElectronicsMap());
+ MEs_.at("TTIDByLumi").reset(GetElectronicsMap());
}
}
@@ -78,6 +79,8 @@ namespace ecaldqm {
MESet& meByLumi(MEs_.at("ByLumi"));
MESet& meTotal(MEs_.at("Total"));
MESet& meTrendNErrors(MEs_.at("TrendNErrors"));
+ MESet& meTTIDTotal(MEs_.at("TTIDTotal"));
+ MESet& meTTIDByLumi(MEs_.at("TTIDByLumi"));
std::for_each(_ids.begin(), _ids.end(), [&](EcalElectronicsIdCollection::value_type const& id) {
set->fill(getEcalDQMSetupObjects(), id);
@@ -90,6 +93,11 @@ namespace ecaldqm {
nCrystals = 25.;
meByLumi.fill(getEcalDQMSetupObjects(), dccid, nCrystals);
meTotal.fill(getEcalDQMSetupObjects(), dccid, nCrystals);
+
+ if (_collection == kTowerIdErrors) {
+ meTTIDByLumi.fill(getEcalDQMSetupObjects(), dccid, nCrystals);
+ meTTIDTotal.fill(getEcalDQMSetupObjects(), dccid, nCrystals);
+ }
// Fill Integrity Errors Map with tower errors for this lumi
// Since binned by crystal for compatibility with channel errors,
// fill with constituent channels of tower
diff --git a/DQM/HcalTasks/plugins/DigiTask.cc b/DQM/HcalTasks/plugins/DigiTask.cc
index 3782c185b91f3..7b9daa4e19052 100644
--- a/DQM/HcalTasks/plugins/DigiTask.cc
+++ b/DQM/HcalTasks/plugins/DigiTask.cc
@@ -790,7 +790,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
lumiCache->EvtCntLS == 1) { // Reset the bin for _cCapid_BadvsFEDvsLSmod60 at the beginning of each new LS
for (std::vector::const_iterator it = _vhashFEDs.begin(); it != _vhashFEDs.end(); ++it) {
HcalElectronicsId eid = HcalElectronicsId(*it);
- _cCapid_BadvsFEDvsLSmod60.setBinContent(eid, _currentLS % 50, 0);
+ _cCapid_BadvsFEDvsLSmod60.setBinContent(eid, _currentLS % 60, 0);
}
}
diff --git a/DQM/HcalTasks/plugins/HcalGPUComparisonTask.cc b/DQM/HcalTasks/plugins/HcalGPUComparisonTask.cc
index 6a57cd01b7a9c..162266f0e2119 100644
--- a/DQM/HcalTasks/plugins/HcalGPUComparisonTask.cc
+++ b/DQM/HcalTasks/plugins/HcalGPUComparisonTask.cc
@@ -93,13 +93,14 @@ HcalGPUComparisonTask::HcalGPUComparisonTask(edm::ParameterSet const& ps)
/* virtual */ void HcalGPUComparisonTask::_resetMonitors(hcaldqm::UpdateFreq uf) { DQTask::_resetMonitors(uf); }
/* virtual */ void HcalGPUComparisonTask::_process(edm::Event const& e, edm::EventSetup const&) {
- edm::Handle chbhe_ref;
- edm::Handle chbhe_target;
+ auto const chbhe_ref = e.getHandle(tokHBHE_ref_);
+ auto const chbhe_target = e.getHandle(tokHBHE_target_);
- if (!(e.getByToken(tokHBHE_ref_, chbhe_ref)))
- _logger.dqmthrow("The CPU HBHERecHitCollection \"" + tagHBHE_ref_.encode() + "\" is not available");
- if (!(e.getByToken(tokHBHE_target_, chbhe_target)))
- _logger.dqmthrow("The GPU HBHERecHitCollection \"" + tagHBHE_target_.encode() + "\" is not available");
+ if (not(chbhe_ref.isValid() and chbhe_target.isValid())) {
+ edm::LogWarning("HcalGPUComparisonTask")
+ << "Either CPU or GPU RecHit Collection is unavailable, will not fill this event.";
+ return;
+ }
auto lumiCache = luminosityBlockCache(e.getLuminosityBlock().index());
_currentLS = lumiCache->currentLS;
@@ -115,7 +116,8 @@ HcalGPUComparisonTask::HcalGPUComparisonTask(edm::ParameterSet const& ps)
if (mRecHitEnergy.find(did) == mRecHitEnergy.end())
mRecHitEnergy.insert(std::make_pair(did, energy));
else
- edm::LogError("HcalDQM|RechitTask") << "Duplicate Rechit from the same HcalDetId";
+ edm::LogError("HcalGPUComparisonTask") << "Duplicate Rechit from the same HcalDetId";
+ ;
}
for (HBHERecHitCollection::const_iterator it = chbhe_target->begin(); it != chbhe_target->end(); ++it) {
@@ -140,11 +142,19 @@ HcalGPUComparisonTask::HcalGPUComparisonTask(edm::ParameterSet const& ps)
}
mRecHitEnergy.erase(did);
- } else
- edm::LogError("HcalDQM|RechitTask") << "GPU Rechit id not found in CPU Rechit id collection";
+ } else {
+ if (energy > 2.)
+ edm::LogError("HcalGPUComparisonTask")
+ << "Energetic GPU Rechit exist, but not reconstructed by CPU. DetId = " << did;
+ }
+ }
+ if (!mRecHitEnergy.empty()) {
+ for (auto const& rhpair : mRecHitEnergy) {
+ if (rhpair.second > 2.)
+ edm::LogError("HcalGPUComparisonTask")
+ << "Energetic CPU Rechit exist, but not reconstructed by GPU. DetId = " << rhpair.first;
+ }
}
- if (!mRecHitEnergy.empty())
- edm::LogError("HcalDQM|RechitTask") << "CPU Rechit id not found in GPU Rechit id collection";
}
std::shared_ptr HcalGPUComparisonTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
diff --git a/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py
index 0dd5cf010e661..ce4c84b1e9003 100644
--- a/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py
@@ -102,8 +102,8 @@
# New Style Modules
#-------------------------------------
oldsubsystem = subsystem
-process.hcalGPUComparisonTask.tagHBHE_ref = "hltHbherecoFromGPU"
-process.hcalGPUComparisonTask.tagHBHE_target = "hltHbherecoLegacy"
+process.hcalGPUComparisonTask.tagHBHE_ref = "hltHbherecoLegacy"
+process.hcalGPUComparisonTask.tagHBHE_target = "hltHbherecoFromGPU"
process.hcalGPUComparisonTask.runkeyVal = runType
process.hcalGPUComparisonTask.runkeyName = runTypeName
diff --git a/DQMOffline/Configuration/python/DQMOfflineMC_cff.py b/DQMOffline/Configuration/python/DQMOfflineMC_cff.py
index 0dfa065e9425f..89023a8d61850 100644
--- a/DQMOffline/Configuration/python/DQMOfflineMC_cff.py
+++ b/DQMOffline/Configuration/python/DQMOfflineMC_cff.py
@@ -33,3 +33,5 @@
from PhysicsTools.NanoAOD.nanoDQM_cff import nanoDQMMC
DQMOfflineNanoAOD.replace(nanoDQM, nanoDQMMC)
#PostDQMOfflineNanoAOD.replace(nanoDQM, nanoDQMMC)
+from PhysicsTools.NanoAOD.nanojmeDQM_cff import nanojmeDQMMC
+DQMOfflineNanoJME.replace(nanojmeDQM, nanojmeDQMMC)
\ No newline at end of file
diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
index e6a3b577b712f..80bbde7e7504f 100644
--- a/DQMOffline/Configuration/python/DQMOffline_cff.py
+++ b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -275,3 +275,5 @@
#PostDQMOfflineNanoAOD = cms.Sequence(nanoDQM)
from PhysicsTools.NanoAOD.nanogenDQM_cff import nanogenDQM
DQMOfflineNanoGen = cms.Sequence(nanogenDQM)
+from PhysicsTools.NanoAOD.nanojmeDQM_cff import nanojmeDQM
+DQMOfflineNanoJME = cms.Sequence(nanojmeDQM)
\ No newline at end of file
diff --git a/DQMOffline/Configuration/python/autoDQM.py b/DQMOffline/Configuration/python/autoDQM.py
index 7e9fb164a556a..e999936f299c0 100644
--- a/DQMOffline/Configuration/python/autoDQM.py
+++ b/DQMOffline/Configuration/python/autoDQM.py
@@ -178,9 +178,9 @@
'PostDQMOffline',
'@common+@muon+@L1TMon+@hcal+@jetmet+@ecal+@egamma'],
- 'rerecoCommon': ['@common+@muon+@L1TMon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps',
+ 'rerecoCommon': ['@common+@muon+@L1TMon+@hcal+@hcal2+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps',
'PostDQMOffline',
- '@common+@muon+@L1TMon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps'],
+ '@common+@muon+@L1TMon+@hcal+@hcal2+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps'],
'rerecoSingleMuon': ['@common+@muon+@hcal+@jetmet+@ecal+@egamma+@lumi+@L1TMuon+@L1TEgamma+@ctpps',
'PostDQMOffline',
@@ -206,6 +206,10 @@
'PostDQMOffline',
'DQMHarvestNanoAOD'],
+ 'nanojmeDQM': ['DQMOfflineNanoJME',
+ 'PostDQMOffline',
+ 'DQMHarvestNanoAOD'],
+
'pfDQM': ['DQMOfflinePF+DQMOfflinePFExtended',
'PostDQMOffline',
'DQMHarvestPF'],
diff --git a/DQMOffline/Trigger/plugins/BuildFile.xml b/DQMOffline/Trigger/plugins/BuildFile.xml
index 25abaa9e8463f..4fe2dd3f1cf14 100644
--- a/DQMOffline/Trigger/plugins/BuildFile.xml
+++ b/DQMOffline/Trigger/plugins/BuildFile.xml
@@ -1,27 +1,30 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
-
-
+
+
diff --git a/DQMOffline/Trigger/plugins/HLTFiltersDQMonitor.cc b/DQMOffline/Trigger/plugins/HLTFiltersDQMonitor.cc
index 0fd32999bdd50..9b6072a607c7b 100644
--- a/DQMOffline/Trigger/plugins/HLTFiltersDQMonitor.cc
+++ b/DQMOffline/Trigger/plugins/HLTFiltersDQMonitor.cc
@@ -1,53 +1,56 @@
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
-#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-
+#include "DQMServices/Core/interface/DQMStore.h"
#include "DataFormats/Common/interface/TriggerResults.h"
#include "DataFormats/HLTReco/interface/TriggerEvent.h"
#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
+#include
#include
+#include
#include
-#include