Merge pull request #42664 from CTPPS/133X-FS-SimBeamSpot

PPS full simulation with beam spot information deom SimBeamSpotObjects
cms-sw · Nov 17, 2023 · 9ccab08 · 9ccab08
2 parents 6876682 + 257ecf0
commit 9ccab08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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};