diff --git a/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h b/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h
index 465388fef4aaa563dae9e45b1e0b5b646cbbb160..d6fcd5dffaa115de4883f358ee1ce4cf9ea27910 100644
--- a/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h
+++ b/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h
@@ -44,7 +44,7 @@ public:
   virtual Vector3D position(const CellID& aCellID) const;
   virtual CellID cellID(const Vector3D& aLocalPosition, const Vector3D& aGlobalPosition,
                         const VolumeID& aVolumeID) const;
-  virtual double distanceTrackWire(const CellID& cID, const TVector3& hit_start/*, const TVector3& hit_end*/) const;
+  virtual double distanceTrackWire(const CellID& cID, const TVector3& hit_start, const TVector3& hit_end) const;
 
 //  double phi(const CellID& cID) const;
   inline double cell_Size() const { return m_cellSize; }
diff --git a/Detector/DetSegmentation/src/GridDriftChamber.cpp b/Detector/DetSegmentation/src/GridDriftChamber.cpp
index 46d601beffd86599453ee9e2c7563308248c4f49..4063a5ee229b86e67dc8664e5c50d345ebf085a6 100644
--- a/Detector/DetSegmentation/src/GridDriftChamber.cpp
+++ b/Detector/DetSegmentation/src/GridDriftChamber.cpp
@@ -72,8 +72,8 @@ double GridDriftChamber::phi(const CellID& cID) const {
   return binToPosition(phiValue, _currentLayerphi, m_offset);
 }
 
-double GridDriftChamber::distanceTrackWire(const CellID& cID, const TVector3& hit_start/*,
-                                           const TVector3& hit_end*/) const {
+double GridDriftChamber::distanceTrackWire(const CellID& cID, const TVector3& hit_start,
+                                           const TVector3& hit_end) const {
 
   auto layerIndex = _decoder->get(cID, "layer");
   updateParams(layerIndex);
@@ -84,14 +84,14 @@ double GridDriftChamber::distanceTrackWire(const CellID& cID, const TVector3& hi
   TVector3 Wstart = returnWirePosition(phi_start, -1); // The default centimeter unit in DD4hep
   TVector3 Wend = returnWirePosition(phi_end, 1);   // The default centimeter unit in DD4hep
 
-//  TVector3 a = hit_end - hit_start;
+  TVector3 a = hit_end - hit_start;
   TVector3 b = Wend - Wstart;
   TVector3 c = Wstart - hit_start;
 
-//  double num = std::abs(c.Dot(a.Cross(b)));
-//  double denum = (a.Cross(b)).Mag();
-  double num = (b.Cross(c)).Mag();
-  double denum = b.Mag();
+  double num = std::abs(c.Dot(a.Cross(b)));
+  double denum = (a.Cross(b)).Mag();
+//  double num = (b.Cross(c)).Mag();
+//  double denum = b.Mag();
 
   double DCA = 0;