Synchronise with CMSSW_10_4_0_pre2

Configuration/StandardSequences/python/RawToDigi_cff.py

@@ -27,6 +27,9 @@
 import EventFilter.RPCRawToDigi.rpcUnpacker_cfi
 muonRPCDigis = EventFilter.RPCRawToDigi.rpcUnpacker_cfi.rpcunpacker.clone()
 
+import EventFilter.RPCRawToDigi.rpcDigiMerger_cfi
+muonRPCNewDigis = EventFilter.RPCRawToDigi.rpcDigiMerger_cfi.rpcDigiMerger.clone()
+
 import EventFilter.GEMRawToDigi.muonGEMDigis_cfi
 muonGEMDigis = EventFilter.GEMRawToDigi.muonGEMDigis_cfi.muonGEMDigis.clone()
 
@@ -121,3 +124,23 @@
 _hgcal_RawToDigi += hgcalDigis
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toReplaceWith(RawToDigi,_hgcal_RawToDigi)
+
+# RPC New Readout Validation
+from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
+_rpc_NewReadoutVal_RawToDigi = RawToDigi.copy()
+_rpc_NewReadoutVal_RawToDigi_noTk = RawToDigi_noTk.copy()
+_rpc_NewReadoutVal_RawToDigi += muonRPCNewDigis
+_rpc_NewReadoutVal_RawToDigi_noTk += muonRPCNewDigis
+stage2L1Trigger_2017.toReplaceWith(RawToDigi, _rpc_NewReadoutVal_RawToDigi)
+stage2L1Trigger_2017.toReplaceWith(RawToDigi_noTk, _rpc_NewReadoutVal_RawToDigi)
+
+from Configuration.Eras.Modifier_fastSim_cff import fastSim
+fastSim.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([muonRPCNewDigis]))
+fastSim.toReplaceWith(RawToDigi_noTk, RawToDigi_noTk.copyAndExclude([muonRPCNewDigis]))
+
+_hfnose_RawToDigi = RawToDigi.copy()
+_hfnose_RawToDigi += hfnoseDigis
+
+from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
+phase2_hfnose.toReplaceWith(RawToDigi,_hfnose_RawToDigi)
+

DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Eras import eras
 
@@ -91,7 +92,7 @@
 if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or 
     process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1 or 
     process.runType.getRunType() == process.runType.hpu_run):
-    print "[beampixel_dqm_sourceclient-live_cfg]::running pp"
+    print("[beampixel_dqm_sourceclient-live_cfg]::running pp")
 
 
     #----------------------------
@@ -112,7 +113,7 @@
     process.siPixelDigis.InputLabel          = cms.InputTag("rawDataCollector")
     process.siStripDigis.ProductLabel        = cms.InputTag("rawDataCollector")
 
-
+    
     #----------------------------
     # pixelVertexDQM Config
     #----------------------------
@@ -144,7 +145,7 @@
 # Heavy Ion Specific Section
 #----------------------------
 if (process.runType.getRunType() == process.runType.hi_run):
-    print "[beampixel_dqm_sourceclient-live_cfg]::running HI"
+    print("[beampixel_dqm_sourceclient-live_cfg]::running HI")
 
 
     #----------------------------
@@ -200,7 +201,7 @@
     process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt")
 else:
     process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt")
-print "[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName)
+print("[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName))
 
 
 #----------------------------

DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py

@@ -1,13 +1,8 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("CSCDQMLIVE")
 
-#-------------------------------------------------
-# CSC L1 Emulator Configuration
-#-------------------------------------------------
-
-process.load("L1Trigger.CSCTriggerPrimitives.CSCTPE_setup_cfi")
-
 #-------------------------------------------------
 # DQM Module Configuration
 #-------------------------------------------------
@@ -153,8 +148,8 @@
     threshold = cms.untracked.string('ERROR')
   ),
   debugModules = cms.untracked.vstring('CSCMonitormodule'),
-#  destinations = cms.untracked.vstring('detailedInfo', 
-#    'critical', 
+#  destinations = cms.untracked.vstring('detailedInfo',
+#    'critical',
 #    'cout')
 
 )
@@ -164,9 +159,7 @@
 #--------------------------
 
 #process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver)
-# Configuration not working due to process.lctreader
-#process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.cscTriggerPrimitiveDigis * process.lctreader * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver)
-process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.cscTriggerPrimitiveDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver)
+process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver)
 
 
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
@@ -191,7 +184,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 
 if (process.runType.getRunType() == process.runType.hi_run):
     process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker")

DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Trigger DQM sequence (L1T)
 #
 #   authors previous versions - see CVS
@@ -162,7 +163,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")

DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Emulator DQM sequence
 #
 #   authors previous versions - see CVS
@@ -176,7 +177,7 @@
 #
 # process.l1EmulatorEventInfoClient.verbose = cms.untracked.bool(True)
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")

DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Trigger DQM sequence (L1T)
 #
 #   authors previous versions - see CVS
@@ -172,7 +173,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")

DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # L1 Emulator DQM sequence
 #
 #   authors previous versions - see CVS
@@ -185,7 +186,7 @@
 #
 # process.l1EmulatorEventInfoClient.verbose = cms.untracked.bool(True)
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
 process.csctfDigis.producer = cms.InputTag("rawDataCollector")
 process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector")

DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py

@@ -139,7 +139,6 @@
     process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker")
     process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
     process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker")
-    process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
     process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker")
     process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker")
     process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
@@ -154,6 +153,8 @@
     process.l1tStage2BmtfZeroSupp.rawData = cms.InputTag("rawDataRepacker")
     process.l1tStage2BmtfZeroSuppFatEvts.rawData = cms.InputTag("rawDataRepacker")
     process.selfFatEventFilter.rawInput = cms.InputTag("rawDataRepacker")
+    process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
+    process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
 
 #--------------------------------------------------
 # L1T Online DQM Schedule

DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py

@@ -135,8 +135,8 @@
     process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker")
     process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
     process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker")
-    process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
     process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker")
+    process.valBmtfAlgoSel.feds = cms.InputTag("rawDataRepacker")
     process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker")
     process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
     process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
@@ -147,6 +147,9 @@
     process.l1tdeStage2CaloLayer1.fedRawDataLabel = cms.InputTag("rawDataRepacker")
     process.gtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
     process.selfFatEventFilter.rawInput = cms.InputTag("rawDataRepacker")
+    process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
+    process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker")
+    process.hltFatEventFilter.HLTPaths.append('HLT_HIPhysics_v*')
 
 #--------------------------------------------------
 # L1T Emulator Online DQM Schedule

DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # $Id: physics_dqm_sourceclient-live_cfg.py,v 1.11 2012/02/13 15:09:30 lilopera Exp $
 
 import FWCore.ParameterSet.Config as cms
@@ -59,7 +60,7 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())
 
 if (process.runType.getRunType() == process.runType.hi_run):
     process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")

DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py

@@ -1,10 +1,13 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("PIXELDQMLIVE", eras.Run2_2018)
+process = cms.Process("PIXELDQMLIVE", eras.Run2_2018_pp_on_AA)
 
-live=True  #set to false for lxplus offline testing
+live=True
+#set to false for lxplus offline testing
+#live=False
 offlineTesting=not live
 
 TAG ="PixelPhase1" 
@@ -47,8 +50,8 @@
 
 
 process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_pp.root'
-if (process.runType.getRunType() == process.runType.hi_run):
-    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_hi.root'
+#if (process.runType.getRunType() == process.runType.hi_run):
+#    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_hi.root'
 
 if (process.runType.getRunType() == process.runType.cosmic_run):
     process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/pixel_reference_cosmic.root'
@@ -95,17 +98,17 @@
 process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi")
 process.siPixelDigis.IncludeErrors = True
 
-process.siPixelDigis.InputLabel   = cms.InputTag("rawDataCollector")
-process.siStripDigis.InputLabel   = cms.InputTag("rawDataCollector")
+if (process.runType.getRunType() == process.runType.hi_run):    
+    #--------------------------------
+    # Heavy Ion Configuration Changes
+    #--------------------------------
+    process.siPixelDigis.InputLabel   = cms.InputTag("rawDataRepacker")
+    process.siStripDigis.ProductLabel   = cms.InputTag("rawDataRepacker")
+    process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
+else :
+    process.siPixelDigis.InputLabel   = cms.InputTag("rawDataCollector")
+    process.siStripDigis.InputLabel   = cms.InputTag("rawDataCollector")
 
-#--------------------------------
-# Heavy Ion Configuration Changes
-#--------------------------------
-#
-#if (process.runType.getRunType() == process.runType.hi_run):    
-#    process.load('Configuration.StandardSequences.ReconstructionHeavyIons_cff')
-#    process.load('Configuration.StandardSequences.RawToDigi_Repacked_cff')
-#    process.siPixelDigis.InputLabel   = cms.InputTag("rawDataRepacker")
 
 ## Collision Reconstruction
 process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
@@ -144,7 +147,10 @@
 )
 
 process.load('HLTrigger.HLTfilters.hltHighLevel_cfi')
-process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*','HLT*SingleMu*')
+if (process.runType.getRunType() == process.runType.hi_run):
+    process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_HIZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*','HLT*SingleMu*' , 'HLT_HICentralityVeto*' , 'HLT_HIMinimumBias*','HLT_HIPhysics*')
+else:
+    process.hltHighLevel.HLTPaths = cms.vstring( 'HLT_ZeroBias_*' , 'HLT_ZeroBias1_*' , 'HLT_PAZeroBias_*' , 'HLT_PAZeroBias1_*', 'HLT_PAL1MinimumBiasHF_OR_SinglePixelTrack_*','HLT*SingleMu*')
 process.hltHighLevel.andOr = cms.bool(True)
 process.hltHighLevel.throw =  cms.bool(False)
 
@@ -182,9 +188,9 @@
                          process.siPixelPhase1OnlineDQM_harvesting
                          )
 
-### pp COLLISION SETTING
+### pp/hi COLLISION SETTING
 
-if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1):
+if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.hi_run):
     # Reco for pp collisions
     process.load('RecoTracker.IterativeTracking.InitialStepPreSplitting_cff')
     process.InitialStepPreSplittingTask.remove(process.initialStepTrackRefsForJetsPreSplitting)
@@ -207,9 +213,9 @@
     process.RecoForDQM_TrkReco = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEventPreSplitting*process.siPixelClusterShapeCachePreSplitting*process.recopixelvertexing*process.InitialStepPreSplitting)
 
     if (process.runType.getRunType() == process.runType.hi_run):
-        process.SiPixelClusterSource.src = cms.InputTag("siPixelClustersPreSplitting")
-        process.Reco = cms.Sequence(process.siPixelDigis*process.pixeltrackerlocalreco)
-
+        #        process.SiPixelClusterSource.src = cms.InputTag("siPixelClustersPreSplitting")
+        #        process.Reco = cms.Sequence(process.siPixelDigis*process.pixeltrackerlocalreco)
+        process.Reco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.trackerlocalreco)
     else:
         process.Reco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.trackerlocalreco)
 
@@ -236,4 +242,4 @@
 # Heavy Ion Specific Fed Raw Data Collection Label
 #--------------------------------------------------
 
-print "Running with run type = ", process.runType.getRunType()
+print("Running with run type = ", process.runType.getRunType())

DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("PixelLumiDQM")
@@ -101,7 +102,7 @@
 else:
     process.pixel_lumi_dqm.logFileName = cms.untracked.string("/nfshome0/dqmpro/pixel_lumi.txt")
 
-print process.pixel_lumi_dqm.logFileName
+print(process.pixel_lumi_dqm.logFileName)
 
 #--------------------------
 # Service