Merge pull request #40109 from francescobrivio/alca-fix_beamhlt_HI

Fix HI rawDataInputTag for beamhlt DQM client

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

@@ -132,14 +132,10 @@
 # Import raw to digi modules
 process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
 
-# Set rawDataRepacker (HI and live) or hltFEDSelectorTCDS+hltFEDSelectorOnlineMetaData (for all the rest)
-if (process.runType.getRunType() == process.runType.hi_run and live):
-    rawDataInputTag = "rawDataRepacker"
-    onlineMetaDataInputTag = "hltFEDSelectorOnlineMetaData"
-else:
-    # Use raw data from selected TCDS FEDs (1024, 1025) and OnlineMetaData FED (1022)
-    rawDataInputTag = "hltFEDSelectorTCDS"
-    onlineMetaDataInputTag = "hltFEDSelectorOnlineMetaData"
+# Set InputTags from selected TCDS FEDs (1024, 1025) and OnlineMetaData FED (1022)
+# NOTE: these collections MUST be added to streamDQMOnlineBeamspot for all HLT menus (both pp and HI)
+rawDataInputTag        = "hltFEDSelectorTCDS"
+onlineMetaDataInputTag = "hltFEDSelectorOnlineMetaData"
 
 process.onlineMetaDataDigis.onlineMetaDataInputLabel = onlineMetaDataInputTag
 process.scalersRawToDigi.scalersInputTag             = rawDataInputTag