Using predefined PPSUnitConvertion.h instead of hardcoded constant fo…

…r cm to mm
cms-sw · Oct 19, 2021 · 6861d57 · 6861d57
1 parent be1a27e
commit 6861d57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/SimTransport/PPSProtonTransport/src/HectorTransport.cc b/SimTransport/PPSProtonTransport/src/HectorTransport.cc
@@ -88,13 +88,13 @@ bool HectorTransport::transportProton(const HepMC::GenParticle* gpart) {
   double vtxYoffset_;
   double vtxZoffset_;
   if (useBeamPositionFromLHCInfo_) {
-    vtxXoffset_ = beamParameters_->getVtxOffsetX45() * 10.;
-    vtxYoffset_ = beamParameters_->getVtxOffsetY45() * 10.;
-    vtxZoffset_ = beamParameters_->getVtxOffsetZ45() * 10.;
+    vtxXoffset_ = beamParameters_->getVtxOffsetX45() * cm_to_mm;
+    vtxYoffset_ = beamParameters_->getVtxOffsetY45() * cm_to_mm;
+    vtxZoffset_ = beamParameters_->getVtxOffsetZ45() * cm_to_mm;
   } else {
-    vtxXoffset_ = beamspot_->GetX() * 10.;
-    vtxYoffset_ = beamspot_->GetY() * 10.;
-    vtxZoffset_ = beamspot_->GetZ() * 10.;
+    vtxXoffset_ = beamspot_->GetX() * cm_to_mm;
+    vtxYoffset_ = beamspot_->GetY() * cm_to_mm;
+    vtxZoffset_ = beamspot_->GetZ() * cm_to_mm;
   }
   vtxZoffset_ *= 1;  // to avoid compilation error, should be used in the future
   // Momentum in LHC ref. frame

diff --git a/SimTransport/PPSProtonTransport/src/OpticalFunctionsTransport.cc b/SimTransport/PPSProtonTransport/src/OpticalFunctionsTransport.cc
@@ -90,13 +90,13 @@ bool OpticalFunctionsTransport::transportProton(const HepMC::GenParticle* in_trk
   double vtxYoffset_;
   double vtxZoffset_;
   if (useBeamPositionFromLHCInfo_) {
-    vtxXoffset_ = -beamParameters_->getVtxOffsetX45() * 10.;
-    vtxYoffset_ = beamParameters_->getVtxOffsetY45() * 10.;
-    vtxZoffset_ = -beamParameters_->getVtxOffsetZ45() * 10.;
+    vtxXoffset_ = -beamParameters_->getVtxOffsetX45() * cm_to_mm;
+    vtxYoffset_ = beamParameters_->getVtxOffsetY45() * cm_to_mm;
+    vtxZoffset_ = -beamParameters_->getVtxOffsetZ45() * cm_to_mm;
   } else {
-    vtxXoffset_ = -beamspot_->GetX() * 10.;
-    vtxYoffset_ = beamspot_->GetY() * 10.;
-    vtxZoffset_ = -beamspot_->GetZ() * 10.;
+    vtxXoffset_ = -beamspot_->GetX() * cm_to_mm;
+    vtxYoffset_ = beamspot_->GetY() * cm_to_mm;
+    vtxZoffset_ = -beamspot_->GetZ() * cm_to_mm;
   }
   vtxZoffset_ *= 1.0;   // just to avoid compilation error, should be used in the future
                         //