Merge pull request #38103 from francescobrivio/alca-collisions_900GeV_12_3_X

[12_3_X] update BeamSpot HLT client to use correct raw data from TCDS

Author: cmsbuild

DQM/BeamMonitor/plugins/BeamMonitor.cc

@@ -668,6 +668,13 @@ void BeamMonitor::beginLuminosityBlock(const LuminosityBlock& lumiSeg, const Eve
 void BeamMonitor::analyze(const Event& iEvent, const EventSetup& iSetup) {
   const TCDSRecord& tcdsData = iEvent.get(tcdsToken_);
   int beamMode = tcdsData.getBST().getBeamMode();
+
+  // Check that the beamMode information is available in the event content
+  if (beamMode == BSTRecord::BeamMode::NOMODE)
+    edm::LogError("BeamMonitor") << "No BeamMode identified from BSTRecord!"
+                                    "Please check that the event content has the raw data from TCDS FEDs (1024,1025)!";
+
+  // Check if stable beams are present
   if (beamMode == BSTRecord::BeamMode::STABLE)
     logToDb_ = true;
 

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

@@ -150,8 +150,12 @@
 # Set rawDataRepacker (HI and live) or rawDataCollector (for all the rest)
 if (process.runType.getRunType() == process.runType.hi_run and live):
     rawDataInputTag = "rawDataRepacker"
-else:
+elif unitTest:
+    # This is needed until we update the streamer files used for the unitTest
     rawDataInputTag = "rawDataCollector"
+else:
+    # Use raw data from selected TCDS FEDs (1024, 1025)
+    rawDataInputTag = "hltFEDSelectorTCDS"
 
 process.tcdsDigis.InputLabel = rawDataInputTag