Merge pull request #14616 from CTPPS/ctpps_eras

CTPPS: era-related modifications

Configuration/EventContent/python/EventContent_cff.py

@@ -59,6 +59,7 @@
 from L1Trigger.Configuration.L1Trigger_EventContent_cff import *
 from RecoVertex.BeamSpotProducer.BeamSpot_EventContent_cff import *
 from CommonTools.ParticleFlow.EITopPAG_EventContent_cff import EITopPAGEventContent
+from RecoCTPPS.Configuration.RecoCTPPS_EventContent_cff import *
 
 # raw2digi that are already the final RECO/AOD products
 from EventFilter.ScalersRawToDigi.Scalers_EventContent_cff import *
@@ -447,6 +448,7 @@
 RECOEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
 RECOEventContent.outputCommands.extend(CommonEventContent.outputCommands)
 RECOEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
+eras.ctpps_2016.toModify(RECOEventContent, outputCommands = RECOEventContent.outputCommands + RecoCTPPSRECO.outputCommands)
 
 RAWRECOEventContent.outputCommands.extend(RECOEventContent.outputCommands)
 RAWRECOEventContent.outputCommands.extend(cms.untracked.vstring(
@@ -477,6 +479,7 @@
 AODEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
 AODEventContent.outputCommands.extend(CommonEventContent.outputCommands)
 AODEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
+eras.ctpps_2016.toModify(AODEventContent, outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands)
 
 RAWSIMEventContent.outputCommands.extend(RAWEventContent.outputCommands)
 RAWSIMEventContent.outputCommands.extend(SimG4CoreRAW.outputCommands)
@@ -620,6 +623,7 @@
 FEVTEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
 FEVTEventContent.outputCommands.extend(CommonEventContent.outputCommands)
 FEVTEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
+eras.ctpps_2016.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands)
 
 FEVTHLTALLEventContent.outputCommands.extend(FEVTEventContent.outputCommands)
 FEVTHLTALLEventContent.outputCommands.append('keep *_*_*_HLT')

Configuration/StandardSequences/python/Eras.py

@@ -12,6 +12,7 @@ def __init__(self):
         self.run2_50ns_specific = cms.Modifier()
         self.run2_HI_specific = cms.Modifier()
         self.run2_HE_2017 = cms.Modifier()
+        self.ctpps_2016 = cms.Modifier()
         self.stage1L1Trigger = cms.Modifier()
         self.stage2L1Trigger = cms.Modifier()
         self.phase1Pixel = cms.Modifier()
@@ -57,7 +58,7 @@ def __init__(self):
         self.Run2_50ns = cms.ModifierChain( self.run2_common, self.run2_50ns_specific )
         self.Run2_HI = cms.ModifierChain( self.run2_common, self.run2_HI_specific, self.stage1L1Trigger )
         # Future Run 2 scenarios.
-        self.Run2_2016 = cms.ModifierChain( self.run2_common, self.run2_25ns_specific, self.stage2L1Trigger )
+        self.Run2_2016 = cms.ModifierChain( self.run2_common, self.run2_25ns_specific, self.stage2L1Trigger, self.ctpps_2016 )
         self.Run2_2017 = cms.ModifierChain( self.Run2_2016, self.phase1Pixel, self.trackingPhase1, self.run2_HE_2017 )
         # Scenarios further afield.
         # Run3 includes the GE1/1 upgrade

Configuration/StandardSequences/python/RawToDigi_cff.py

@@ -38,6 +38,8 @@
 
 from L1Trigger.Configuration.L1TRawToDigi_cff import *
 
+from EventFilter.TotemRawToDigi.totemRawToDigi_cff import *
+
 RawToDigi = cms.Sequence(L1TRawToDigi
                          +siPixelDigis
                          +siStripDigis
@@ -74,6 +76,8 @@
 muonDTDigis.inputLabel = 'rawDataCollector'
 muonRPCDigis.InputLabel = 'rawDataCollector'
 castorDigis.InputLabel = 'rawDataCollector'
+totemTriggerRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")
+totemRPRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")
 
 # until we have hcal raw data for phase 2...
 eras.phase2_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([hcalDigis]))
@@ -83,4 +87,11 @@
 eras.phase1Pixel.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([siPixelDigis])) # FIXME
 
 
+# add CTPPS 2016 raw-to-digi modules
+_ctpps_2016_RawToDigi = RawToDigi.copy()
+_ctpps_2016_RawToDigi += totemTriggerRawToDigi + totemRPRawToDigi
+eras.ctpps_2016.toReplaceWith(RawToDigi, _ctpps_2016_RawToDigi)
 
+_ctpps_2016_RawToDigi_noTk = RawToDigi_noTk.copy()
+_ctpps_2016_RawToDigi_noTk += totemTriggerRawToDigi + totemRPRawToDigi
+eras.ctpps_2016.toReplaceWith(RawToDigi_noTk, _ctpps_2016_RawToDigi_noTk)

EventFilter/TotemRawToDigi/python/totemRawToDigi_cff.py

@@ -0,0 +1,10 @@
+import FWCore.ParameterSet.Config as cms
+
+from CondFormats.TotemReadoutObjects.TotemDAQMappingESSourceXML_cfi import *
+TotemDAQMappingESSourceXML.mappingFileNames.append("CondFormats/TotemReadoutObjects/xml/ctpps_210_mapping.xml")
+
+from EventFilter.TotemRawToDigi.totemTriggerRawToDigi_cfi import *
+totemTriggerRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")
+
+from EventFilter.TotemRawToDigi.totemRPRawToDigi_cfi import *
+totemRPRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")

RecoCTPPS/Configuration/python/RecoCTPPS_EventContent_cff.py

@@ -0,0 +1,39 @@
+import FWCore.ParameterSet.Config as cms
+
+RecoCTPPSFEVT = cms.PSet(
+  outputCommands = cms.untracked.vstring(
+    'keep TotemFEDInfos_totemRPRawToDigi_*_*',
+    'keep TotemTriggerCounters_totemTriggerRawToDigi_*_*',
+    'keep TotemRPDigiedmDetSetVector_totemRPRawToDigi_*_*',
+    'keep TotemVFATStatusedmDetSetVector_totemRPRawToDigi_*_*',
+    'keep TotemRPClusteredmDetSetVector_totemRPClusterProducer_*_*',
+    'keep TotemRPRecHitedmDetSetVector_totemRPRecHitProducer_*_*',
+    'keep TotemRPUVPatternedmDetSetVector_totemRPUVPatternFinder_*_*',
+    'keep TotemRPLocalTrackedmDetSetVector_totemRPLocalTrackFitter_*_*'
+  )
+)
+
+
+RecoCTPPSRECO = cms.PSet(
+  outputCommands = cms.untracked.vstring(
+    'keep TotemFEDInfos_totemRPRawToDigi_*_*',
+    'keep TotemTriggerCounters_totemTriggerRawToDigi_*_*',
+    'keep TotemRPDigiedmDetSetVector_totemRPRawToDigi_*_*',
+    'keep TotemVFATStatusedmDetSetVector_totemRPRawToDigi_*_*',
+    'keep TotemRPClusteredmDetSetVector_totemRPClusterProducer_*_*',
+    'keep TotemRPRecHitedmDetSetVector_totemRPRecHitProducer_*_*',
+    'keep TotemRPUVPatternedmDetSetVector_totemRPUVPatternFinder_*_*',
+    'keep TotemRPLocalTrackedmDetSetVector_totemRPLocalTrackFitter_*_*'
+  )
+)
+
+
+RecoCTPPSAOD = cms.PSet(
+  outputCommands = cms.untracked.vstring(
+    'keep TotemVFATStatusedmDetSetVector_totemRPRawToDigi_*_*',
+    'keep TotemRPClusteredmDetSetVector_totemRPClusterProducer_*_*',
+    'keep TotemRPRecHitedmDetSetVector_totemRPRecHitProducer_*_*',
+    'keep TotemRPUVPatternedmDetSetVector_totemRPUVPatternFinder_*_*',
+    'keep TotemRPLocalTrackedmDetSetVector_totemRPLocalTrackFitter_*_*'
+  )
+)