From 5872f6012d9bce38c3e3b797cb00fe665165678a Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Fri, 22 Jan 2021 21:59:42 +0800
Subject: [PATCH] Modify the parameters in CRD_Dimensions_v01_01.xml
---
.../compact/CRD_common_v01/DC_Simple_v01_01.xml | 13 ++++++-------
.../compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml | 6 ++++--
Detector/DetDriftChamber/compact/det.xml | 2 +-
.../src/driftchamber/DriftChamber.cpp | 4 ++--
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
index 2a87098f..d833c27f 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
@@ -14,19 +14,17 @@
<constant name="SDT_radius_min" value="InnerTracker_inner_radius"/>
<constant name="SDT_radius_max" value="OuterTracker_outer_radius"/>
- <constant name="DC_Endcap_dz" value="0.1*mm"/>
-
- <constant name="SDT_half_length" value="MainTracker_half_length+DC_Endcap_dz"/>
+ <constant name="SDT_half_length" value="MainTracker_half_length"/>
<constant name="SDT_length" value="SDT_half_length*2"/>
- <constant name="DC_length" value="SDT_length-DC_Endcap_dz*2"/>
+ <constant name="DC_length" value="DC_half_length*2"/>
<constant name="SDT_inner_chamber_radius_min" value="235*mm"/>
<constant name="SDT_inner_chamber_radius_max" value="InnerTracker_outer_radius"/>
- <constant name="SDT_inner_chamber_length" value="SDT_length"/>
+ <constant name="SDT_inner_chamber_length" value="DC_length"/>
<constant name="SDT_outer_chamber_radius_min" value="OuterTracker_inner_radius"/>
<constant name="SDT_outer_chamber_radius_max" value="1715*mm"/>
- <constant name="SDT_outer_chamber_length" value="SDT_length"/>
+ <constant name="SDT_outer_chamber_length" value="DC_length"/>
<constant name="SDT_inner_chamber_layer_number" value="67"/>
<constant name="SDT_outer_chamber_layer_number" value="63"/>
@@ -44,6 +42,7 @@
<constant name="DC_Endcap_rmin" value="SDT_radius_min"/>
<constant name="DC_Endcap_rmax" value="SDT_radius_max"/>
+ <constant name="DC_Endcap_dz" value="DC_Endcap_z"/>
</define>
@@ -74,7 +73,7 @@
<readouts>
<readout name="DriftChamberHitsCollection">
- <segmentation type="GridDriftChamber" cell_size="10*mm" epsilon0="Epsilon" detector_length="SDT_length" identifier_phi="cellID" />
+ <segmentation type="GridDriftChamber" cell_size="10*mm" epsilon0="Epsilon" detector_length="DC_length" identifier_phi="cellID" />
<id>system:8,chamber:1,layer:8,cellID:16</id>
</readout>
diff --git a/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml b/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
index d7c15e97..39f06065 100644
--- a/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
@@ -80,8 +80,10 @@
<constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/>
<constant name="Vertex_outer_radius" value="101*mm"/>
<constant name="Vertex_half_length" value="200*mm"/>
-
- <constant name="MainTracker_half_length" value="2225*mm" />
+
+ <constant name="DC_Endcap_z" value="0.1*mm"/>
+ <constant name="DC_half_length" value="2225*mm" />
+ <constant name="MainTracker_half_length" value="DC_half_length+DC_Endcap_z" />
<constant name="InnerTracker_half_length" value="MainTracker_half_length" />
<constant name="InnerTracker_inner_radius" value="234*mm"/>
<constant name="InnerTracker_outer_radius" value="906*mm"/>
diff --git a/Detector/DetDriftChamber/compact/det.xml b/Detector/DetDriftChamber/compact/det.xml
index ab79de27..96e8639b 100644
--- a/Detector/DetDriftChamber/compact/det.xml
+++ b/Detector/DetDriftChamber/compact/det.xml
@@ -103,7 +103,7 @@
<readouts>
<readout name="DriftChamberHitsCollection">
- <segmentation type="GridDriftChamber" cell_size="10*mm" epsilon0="Epsilon" detector_length="SDT_length" identifier_phi="cellID" />
+ <segmentation type="GridDriftChamber" cell_size="10*mm" epsilon0="Epsilon" detector_length="DC_length" identifier_phi="cellID" />
<id>system:8,chamber:1,layer:8,cellID:16</id>
</readout>
diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
index 8929e1ed..48a311d5 100644
--- a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
+++ b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
@@ -203,7 +203,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
// | |
// | F0 F1 F2 F3|
// -----------------------
- if(layer_id == -1) {
+// if(layer_id == -1) {
for(int icell=0; icell< numWire; icell++) {
double wire_phi = (icell+0.5)*layer_Phi + offset;
// - signal wire
@@ -221,7 +221,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
Module_phy = layer_vol.placeVolume(Module_vol,transform_Module);
}
}
- }
+// }
dd4hep::Transform3D transform_layer(dd4hep::Rotation3D(),dd4hep::Position(0.,0.,0.));
dd4hep::PlacedVolume layer_phy = (*current_vol_ptr).placeVolume(layer_vol, transform_layer);
--
GitLab