From 59a07106cc99011c2e4a450ee872be6197d765ee Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Thu, 25 Feb 2021 16:56:13 +0800
Subject: [PATCH] =?UTF-8?q?Change=20=E2=80=98salf=E2=80=99=20to=20?=
=?UTF-8?q?=E2=80=98safe=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml | 2 +-
Detector/DetDriftChamber/compact/det.xml | 2 +-
Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp | 6 +++---
3 files changed, 5 insertions(+), 5 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 fef7af29..6a533eb7 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
@@ -47,7 +47,7 @@
<constant name="DC_inner_chamber_enabled" value="1"/>
<constant name="DC_outer_chamber_enabled" value="1"/>
- <constant name="Salf_distance" value="0.02*mm"/>
+ <constant name="Safe_distance" value="0.02*mm"/>
</define>
diff --git a/Detector/DetDriftChamber/compact/det.xml b/Detector/DetDriftChamber/compact/det.xml
index b13e239e..74921522 100644
--- a/Detector/DetDriftChamber/compact/det.xml
+++ b/Detector/DetDriftChamber/compact/det.xml
@@ -63,7 +63,7 @@
<constant name="DC_inner_chamber_enabled" value="1"/>
<constant name="DC_outer_chamber_enabled" value="1"/>
- <constant name="Salf_distance" value="0.02*mm"/>
+ <constant name="Safe_distance" value="0.02*mm"/>
</define>
diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
index b6227597..ff66dad1 100644
--- a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
+++ b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
@@ -66,8 +66,8 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
int inner_chamber_enabled = theDetector.constant<int>("DC_inner_chamber_enabled");
int outer_chamber_enabled = theDetector.constant<int>("DC_outer_chamber_enabled");
- // - salf distance
- double salf_diatance = theDetector.constant<double>("Salf_distance");
+ // - safe distance
+ double safe_diatance = theDetector.constant<double>("Salf_distance");
// =======================================================================
// Detector Construction
@@ -213,7 +213,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
dd4hep::PlacedVolume module_phy = layer_vol.placeVolume(module_vol,transform_module);
// - Field wire
dd4hep::PlacedVolume Module_phy;
- double radius[9] = {rmid-chamber_layer_width*0.5+salf_diatance,rmid-chamber_layer_width*0.5+salf_diatance,rmid-chamber_layer_width*0.5+salf_diatance,rmid-chamber_layer_width*0.5+salf_diatance,rmid,rmid+chamber_layer_width*0.5-salf_diatance,rmid+chamber_layer_width*0.5-salf_diatance,rmid+chamber_layer_width*0.5-salf_diatance,rmid+chamber_layer_width*0.5-salf_diatance};
+ double radius[9] = {rmid-chamber_layer_width*0.5+safe_diatance,rmid-chamber_layer_width*0.5+safe_diatance,rmid-chamber_layer_width*0.5+safe_diatance,rmid-chamber_layer_width*0.5+safe_diatance,rmid,rmid+chamber_layer_width*0.5-safe_diatance,rmid+chamber_layer_width*0.5-safe_diatance,rmid+chamber_layer_width*0.5-safe_diatance,rmid+chamber_layer_width*0.5-safe_diatance};
double phi[9] = {wire_phi+layer_Phi*0.25,wire_phi,wire_phi-layer_Phi*0.25,wire_phi-layer_Phi*0.5,wire_phi-layer_Phi*0.5,wire_phi-layer_Phi*0.5,wire_phi-layer_Phi*0.25,wire_phi,wire_phi+layer_Phi*0.25};
int num = 5;
if(layer_id==(inner_chamber_layer_number-1)||layer_id==(outer_chamber_layer_number-1)) { num = 9; }
--
GitLab