From 83f055df1cc4f2a8fc589c2ff8a37ce55a722e2b Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Tue, 3 Nov 2020 16:08:46 +0800
Subject: [PATCH] Add the variable hit_end to the function distanceTrackWire()
---
.../DetSegmentation/GridDriftChamber.h | 2 +-
Detector/DetSegmentation/src/GridDriftChamber.cpp | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h b/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h
index 465388fe..d6fcd5df 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 46d601be..4063a5ee 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;
--
GitLab