Final preparations for pull request

varnes · Jun 26, 2024 · 9c8a5dd · 9c8a5dd
1 parent 3222e88
commit 9c8a5dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/detectorSegmentations/src/FCCSWEndcapTurbine_k4geo.cpp b/detectorSegmentations/src/FCCSWEndcapTurbine_k4geo.cpp
@@ -87,7 +87,7 @@ CellID FCCSWEndcapTurbine_k4geo::cellID(const Vector3D& /* localPosition */, con
 double FCCSWEndcapTurbine_k4geo::phi(const CellID& cID) const {
 
   CellID iModule = _decoder->get(cID, m_moduleID);
-  double phiCent = twopi*iModule/78336;
+  double phiCent = twopi*(iModule+0.5)/78336;
 
   CellID iWheel = _decoder->get(cID, m_wheelID);
   double rhoLoc = rho(cID);
@@ -117,17 +117,6 @@ double FCCSWEndcapTurbine_k4geo::z(const CellID& cID) const {
   return ((long long int)sideValue)*binToPosition(zValue,m_gridSizeZ,m_offsetZ);
 }
 
-/// determine local y in plane of blade based on cellID
-double FCCSWEndcapTurbine_k4geo::y(const CellID& cID) const {
-
-  CellID zValue = _decoder->get(cID, m_zID);
-  CellID rhoValue = _decoder->get(cID, m_rhoID);
-  CellID iWheel = _decoder->get(cID, m_wheelID);
-  double zGlob=  binToPosition(zValue,m_gridSizeZ);
-  double rho= binToPosition(rhoValue,m_gridSizeRho[iWheel])+m_offsetRho[iWheel];
-
-  return -TMath::Sqrt(rho*rho-zGlob*zGlob) - m_offsetRho[iWheel];
-
-}
 }
 }
+
diff --git a/detectorSegmentations/src/FCCSWGridModuleThetaMerged_k4geo.cpp b/detectorSegmentations/src/FCCSWGridModuleThetaMerged_k4geo.cpp
@@ -66,9 +66,6 @@ Vector3D FCCSWGridModuleThetaMerged_k4geo::position(const CellID& cID) const {
   // std::cout << "cellID: " << cID << std::endl;
 
   // cannot return for R=0 otherwise will lose phi info, return for R=1
-  Vector3D dummyPos = positionFromRThetaPhi(1.0, theta(cID), phi(cID));
-  std::cout << "For barrel, theta, phi, x,y,z= " << theta(cID) << " " << phi(cID) << " " << dummyPos.X << " " << dummyPos.Y << " " << dummyPos.Z << std::endl;
-  //  return dummyPos;
 
   return positionFromRThetaPhi(1.0, theta(cID), phi(cID));
 }