From 4b35c951a64f79cf4ad68b741b15eb7ccc57ce75 Mon Sep 17 00:00:00 2001
From: mmusich <marco.musich@cern.ch>
Date: Mon, 24 Apr 2023 15:53:01 +0200
Subject: [PATCH] put fake beamspot in the event if the arbitration returns a
 fake BS, by letting the BeamSpotOnlineProducer deal automatically with the
 arbitrated one

---
 .../plugins/BeamSpotOnlineProducer.cc         | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc
index 83aa832cfa5f2..13989a9336941 100644
--- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc
+++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc
@@ -103,39 +103,39 @@ void BeamSpotOnlineProducer::produce(Event& iEvent, const EventSetup& iSetup) {
   bool fallBackToDB = false;
   if (useTransientRecord_) {
     auto const& spotDB = iSetup.getData(beamTransientToken_);
+
     if (spotDB.beamType() != 2) {
       if (shoutMODE && beamTransientRcdESWatcher_.check(iSetup)) {
-        edm::LogWarning("BeamSpotFromDB")
-            << "Online Beam Spot producer falls back to DB value because the ESProducer returned a fake beamspot ";
+        edm::LogWarning("BeamSpotFromDB") << "Online Beam Spot producer writes a fake beamspot value because the "
+                                             "ESProducer returned a fake beamspot!";
       }
-      fallBackToDB = true;
-    } else {
-      // translate from BeamSpotObjects to reco::BeamSpot
-      // in case we need to switch to LHC reference frame
-      // ignore for the moment rotations, and translations
-      double f = 1.;
-      if (changeFrame_)
-        f = -1.;
-      reco::BeamSpot::Point apoint(f * spotDB.x(), f * spotDB.y(), f * spotDB.z());
+    }
 
-      reco::BeamSpot::CovarianceMatrix matrix;
-      for (int i = 0; i < 7; ++i) {
-        for (int j = 0; j < 7; ++j) {
-          matrix(i, j) = spotDB.covariance(i, j);
-        }
-      }
-      double sigmaZ = spotDB.sigmaZ();
-      if (theSetSigmaZ > 0)
-        sigmaZ = theSetSigmaZ;
+    // translate from BeamSpotObjects to reco::BeamSpot
+    // in case we need to switch to LHC reference frame
+    // ignore for the moment rotations, and translations
+    double f = 1.;
+    if (changeFrame_)
+      f = -1.;
+    reco::BeamSpot::Point apoint(f * spotDB.x(), f * spotDB.y(), f * spotDB.z());
 
-      // this assume beam width same in x and y
-      aSpot = reco::BeamSpot(apoint, sigmaZ, spotDB.dxdz(), spotDB.dydz(), spotDB.beamWidthX(), matrix);
-      aSpot.setBeamWidthY(spotDB.beamWidthY());
-      aSpot.setEmittanceX(spotDB.emittanceX());
-      aSpot.setEmittanceY(spotDB.emittanceY());
-      aSpot.setbetaStar(spotDB.betaStar());
-      aSpot.setType(reco::BeamSpot::Tracker);
+    reco::BeamSpot::CovarianceMatrix matrix;
+    for (int i = 0; i < 7; ++i) {
+      for (int j = 0; j < 7; ++j) {
+        matrix(i, j) = spotDB.covariance(i, j);
+      }
     }
+    double sigmaZ = spotDB.sigmaZ();
+    if (theSetSigmaZ > 0)
+      sigmaZ = theSetSigmaZ;
+
+    // this assume beam width same in x and y
+    aSpot = reco::BeamSpot(apoint, sigmaZ, spotDB.dxdz(), spotDB.dydz(), spotDB.beamWidthX(), matrix);
+    aSpot.setBeamWidthY(spotDB.beamWidthY());
+    aSpot.setEmittanceX(spotDB.emittanceX());
+    aSpot.setEmittanceY(spotDB.emittanceY());
+    aSpot.setbetaStar(spotDB.betaStar());
+    aSpot.setType(static_cast<reco::BeamSpot::BeamType>(spotDB.beamType()));
   } else {
     // get scalar collection
     Handle<BeamSpotOnlineCollection> handleScaler;