From c170d7c6024aec0d3f8398469496db1a32cf2a2f Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Mon, 19 Oct 2020 11:30:13 +0800
Subject: [PATCH] Modified to Angle Unit and epsilon is set to 0
---
Detector/DetDriftChamber/compact/det.xml | 6 +++---
Detector/DetSegmentation/src/GridDriftChamber.cpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Detector/DetDriftChamber/compact/det.xml b/Detector/DetDriftChamber/compact/det.xml
index fbd0d2a4..b791565d 100644
--- a/Detector/DetDriftChamber/compact/det.xml
+++ b/Detector/DetDriftChamber/compact/det.xml
@@ -38,7 +38,7 @@
<constant name="SDT_inner_chamber_layer_number" value="67"/>
<constant name="SDT_outer_chamber_layer_number" value="63"/>
<constant name="SDT_chamber_layer_width" value="10*mm"/>
- <constant name="Epsilon" value="6*deg"/>
+ <constant name="Epsilon" value="0*deg"/>
</define>
@@ -59,9 +59,9 @@
<readouts>
<readout name="DriftChamberHitsCollection">
- <segmentation type="GridDriftChamber" cell_size="10*mm" offset_phi="0." epsilon0="Epsilon" detector_length="SDT_half_length" identifier_phi="phi" />
+ <segmentation type="GridDriftChamber" cell_size="10*mm" offset_phi="0." epsilon0="Epsilon" detector_length="SDT_half_length" identifier_phi="cellID" />
- <id>system:8,chamber:1,layer:8,phi:16</id>
+ <id>system:8,chamber:1,layer:8,cellID:16</id>
</readout>
</readouts>
diff --git a/Detector/DetSegmentation/src/GridDriftChamber.cpp b/Detector/DetSegmentation/src/GridDriftChamber.cpp
index 7dbdd154..3355482f 100644
--- a/Detector/DetSegmentation/src/GridDriftChamber.cpp
+++ b/Detector/DetSegmentation/src/GridDriftChamber.cpp
@@ -13,7 +13,7 @@ GridDriftChamber::GridDriftChamber(const std::string& cellEncoding) : Segmentati
registerParameter("cell_size", "cell size", m_cellSize, 0., SegmentationParameter::LengthUnit);
registerParameter("offset_phi", "offset in phi", m_offsetPhi, 0., SegmentationParameter::LengthUnit, true);
registerParameter("detector_length", "Length of the wire", m_detectorLength, 1., SegmentationParameter::LengthUnit);
- registerIdentifier("identifier_phi", "Cell ID identifier for phi", m_phiID, "phi");
+ registerIdentifier("identifier_phi", "Cell ID identifier for phi", m_phiID, "cellID");
}
GridDriftChamber::GridDriftChamber(const BitFieldCoder* decoder) : Segmentation(decoder) {
@@ -23,9 +23,9 @@ GridDriftChamber::GridDriftChamber(const BitFieldCoder* decoder) : Segmentation(
registerParameter("cell_size", "cell size", m_cellSize, 1., SegmentationParameter::LengthUnit);
registerParameter("offset_phi", "offset in phi", m_offsetPhi, 0., SegmentationParameter::LengthUnit, true);
- registerParameter("epsilon0", "epsilon", m_epsilon0, 0., SegmentationParameter::LengthUnit, true);
+ registerParameter("epsilon0", "epsilon", m_epsilon0, 0., SegmentationParameter::AngleUnit, true);
registerParameter("detector_length", "Length of the wire", m_detectorLength, 1., SegmentationParameter::LengthUnit);
- registerIdentifier("identifier_phi", "Cell ID identifier for phi", m_phiID, "phi");
+ registerIdentifier("identifier_phi", "Cell ID identifier for phi", m_phiID, "cellID");
}
Vector3D GridDriftChamber::position(const CellID& /*cID*/) const {
--
GitLab