From 257ecf0724472c5af83530ebc25cd6a2de92f0b0 Mon Sep 17 00:00:00 2001
From: Gustavo <diemort@gmail.com>
Date: Fri, 25 Aug 2023 18:15:26 +0200
Subject: [PATCH] getting beam spot information from simulation based on
 SimBeamSpotObjects

---
 .../PPSProtonTransport/interface/HectorTransport.h        | 8 ++++----
 .../interface/OpticalFunctionsTransport.h                 | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SimTransport/PPSProtonTransport/interface/HectorTransport.h b/SimTransport/PPSProtonTransport/interface/HectorTransport.h
index c53c91377bcfb..a16d0198f268c 100644
--- a/SimTransport/PPSProtonTransport/interface/HectorTransport.h
+++ b/SimTransport/PPSProtonTransport/interface/HectorTransport.h
@@ -1,8 +1,8 @@
 #ifndef HECTOR_TRANSPORT
 #define HECTOR_TRANSPORT
 #include "SimTransport/PPSProtonTransport/interface/BaseProtonTransport.h"
-#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
-#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h"
+#include "CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h"
+#include "CondFormats/DataRecord/interface/SimBeamSpotObjectsRcd.h"
 #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h"
 #include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h"
 
@@ -57,9 +57,9 @@ class HectorTransport : public BaseProtonTransport {
   std::unique_ptr<H_BeamLine> m_beamline56;
 
   edm::ESGetToken<CTPPSBeamParameters, CTPPSBeamParametersRcd> beamParametersToken_;
-  edm::ESGetToken<BeamSpotObjects, BeamSpotObjectsRcd> beamspotToken_;
+  edm::ESGetToken<SimBeamSpotObjects, SimBeamSpotObjectsRcd> beamspotToken_;
 
   const CTPPSBeamParameters* beamParameters_{nullptr};
-  const BeamSpotObjects* beamspot_{nullptr};
+  const SimBeamSpotObjects* beamspot_{nullptr};
 };
 #endif
diff --git a/SimTransport/PPSProtonTransport/interface/OpticalFunctionsTransport.h b/SimTransport/PPSProtonTransport/interface/OpticalFunctionsTransport.h
index 60b269af8e6e6..1510b6ea63212 100644
--- a/SimTransport/PPSProtonTransport/interface/OpticalFunctionsTransport.h
+++ b/SimTransport/PPSProtonTransport/interface/OpticalFunctionsTransport.h
@@ -1,7 +1,7 @@
 #ifndef OPTICALFUNCTION_TRANSPORT
 #define OPTICALFUNCTION_TRANSPORT
-#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
-#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h"
+#include "CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h"
+#include "CondFormats/DataRecord/interface/SimBeamSpotObjectsRcd.h"
 #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h"
 #include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h"
 #include "CondFormats/DataRecord/interface/CTPPSInterpolatedOpticsRcd.h"
@@ -29,12 +29,12 @@ class OpticalFunctionsTransport : public BaseProtonTransport {
   edm::ESGetToken<LHCInfo, LHCInfoRcd> lhcInfoToken_;
   edm::ESGetToken<CTPPSBeamParameters, CTPPSBeamParametersRcd> beamParametersToken_;
   edm::ESGetToken<LHCInterpolatedOpticalFunctionsSetCollection, CTPPSInterpolatedOpticsRcd> opticsToken_;
-  edm::ESGetToken<BeamSpotObjects, BeamSpotObjectsRcd> beamspotToken_;
+  edm::ESGetToken<SimBeamSpotObjects, SimBeamSpotObjectsRcd> beamspotToken_;
 
   const LHCInfo* lhcInfo_{nullptr};
   const CTPPSBeamParameters* beamParameters_{nullptr};
   const LHCInterpolatedOpticalFunctionsSetCollection* opticalFunctions_{nullptr};
-  const BeamSpotObjects* beamspot_{nullptr};
+  const SimBeamSpotObjects* beamspot_{nullptr};
 
   unsigned int optFunctionId45_{0};
   unsigned int optFunctionId56_{0};