From 34a88d5eec8a30f2808551b8d924c594f9039ca7 Mon Sep 17 00:00:00 2001
From: "yudian2002@sjtu.edu.cn" <yudian2002@sjtu.edu.cn>
Date: Thu, 26 Sep 2024 02:46:22 +0000
Subject: [PATCH] Change name OTKEndCap into OTKEndcap
---
.../CRD_common_v01/OTKEndCap_v01_01.xml | 98 -------------------
.../CRD_common_v01/OTKEndcap_v01_01.xml | 98 +++++++++++++++++++
.../TDR_o1_v01/TDR_Dimensions_v01_01.xml | 2 +-
.../DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml | 2 +-
.../Tracker/SiTracker_otkendcap_v01_geo.cpp | 78 +++++++--------
.../src/Edm4hepWriterAnaElemTool.cpp | 4 +-
.../DetSimAna/src/Edm4hepWriterAnaElemTool.h | 2 +-
.../DetSimAna/src/ExampleAnaElemTool.cpp | 4 +-
Simulation/DetSimAna/src/ExampleAnaElemTool.h | 2 +-
9 files changed, 145 insertions(+), 145 deletions(-)
delete mode 100644 Detector/DetCRD/compact/CRD_common_v01/OTKEndCap_v01_01.xml
create mode 100644 Detector/DetCRD/compact/CRD_common_v01/OTKEndcap_v01_01.xml
diff --git a/Detector/DetCRD/compact/CRD_common_v01/OTKEndCap_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/OTKEndCap_v01_01.xml
deleted file mode 100644
index b73df32e..00000000
--- a/Detector/DetCRD/compact/CRD_common_v01/OTKEndCap_v01_01.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<lccdd>
- <info name="OTKEndCap_v01_01"
- title="CepC OTKEndCap"
- author="D.Yu, "
- url="http://cepc.ihep.ac.cn"
- contact="yudian2002@sjtu.edu.cn"
- status="developing"
- version="v01">
- <!-- OTKEndCap stands for outer tracker endcap, OTK_EndCap -->
- </info>
- <define>
- <constant name="OTKEndCap_total_sections" value="10" />
- <constant name="OTKEndCap_r0" value="400*mm" />
- <constant name="OTKEndCap_r1" value="540*mm" />
- <constant name="OTKEndCap_r2" value="680*mm" />
- <constant name="OTKEndCap_r3" value="820*mm" />
- <constant name="OTKEndCap_r4" value="960*mm" />
- <constant name="OTKEndCap_r5" value="1100*mm" />
- <constant name="OTKEndCap_r6" value="1240*mm" />
- <constant name="OTKEndCap_r7" value="1380*mm" />
- <constant name="OTKEndCap_r8" value="1520*mm" />
- <constant name="OTKEndCap_r9" value="1660*mm" />
- <constant name="OTKEndCap_r10" value="1800*mm" />
- <constant name="OTKEndCap_inner_radius" value="OTKEndCap_r0" />
- <constant name="OTKEndCap_outer_radius" value="OTKEndCap_r10" />
- <constant name="OTKEndCap_half_length" value="2900*mm" />
- <constant name="OTKEndCap_piece_deg" value="7.5" /><!-- variable OTKEndCap_piece_deg needs no dimension -->
- <constant name="OTKEndCap_dead_deg" value="0.5" />
- <constant name="OTKEndCap_dead_thickness" value="1*mm" />
- <constant name="OTKEndCap_piece_num" value="24" />
- <constant name="OTKEndCap_asic_num_0" value="5" />
- <constant name="OTKEndCap_asic_num_1" value="7" />
- <constant name="OTKEndCap_asic_num_2" value="9" />
- <constant name="OTKEndCap_asic_num_3" value="11" />
- <constant name="OTKEndCap_asic_num_4" value="13" />
- <constant name="OTKEndCap_asic_num_5" value="15" />
- <constant name="OTKEndCap_asic_num_6" value="17" />
- <constant name="OTKEndCap_asic_num_7" value="19" />
- <constant name="OTKEndCap_asic_num_8" value="21" />
- <constant name="OTKEndCap_asic_num_9" value="23" />
- <constant name="OTKEndCap_module_num_0" value="1" />
- <constant name="OTKEndCap_module_num_1" value="1" />
- <constant name="OTKEndCap_module_num_2" value="1" />
- <constant name="OTKEndCap_module_num_3" value="1" />
- <constant name="OTKEndCap_module_num_4" value="1" />
- <constant name="OTKEndCap_module_num_5" value="2" />
- <constant name="OTKEndCap_module_num_6" value="2" />
- <constant name="OTKEndCap_module_num_7" value="2" />
- <constant name="OTKEndCap_module_num_8" value="2" />
- <constant name="OTKEndCap_module_num_9" value="2" />
- <constant name="OTKEndCap_layer_thickness" value="25*mm" />
- <constant name="OTKEndCap_layer0_zpos" value="2850*mm" />
- <constant name="OTKEndCap_layer1_zpos" value="2875*mm" />
- <constant name="OTKEndCap_support_thickness" value="1*mm" />
- <constant name="OTKEndCap_sensor_thickness" value="500*um" />
- <constant name="OTKEndCap_sensor_gap" value="0.5*mm" />
- <constant name="OTKEndCap_sensor_dead_width" value="0.5*mm" /><!-- do not set it to 0 -->
- <constant name="OTKEndCap_pcb_thickness" value="500*um" />
- <constant name="OTKEndCap_pcb_rlength" value="10*mm" />
- <constant name="OTKEndCap_pcb_rgap" value="10*mm" />
- <constant name="OTKEndCap_asic_thickness" value="500*um" />
- <constant name="OTKEndCap_asic_width" value="6*mm" />
- <constant name="OTKEndCap_asic_rlength" value="6*mm" />
- <constant name="OTKEndCap_asic_rgap" value="12*mm" />
-
- </define>
-
- <detectors>
- <detector id="DetID_OTKEndCap" limits="otk_limits" name="OTKEndCap" type="SiTracker_otkendcap_v01" vis="OTKEndCapVis" readout="OTKEndCapCollection" insideTrackingVolume="true">
- <envelope>
- <shape type="BooleanShape" operation="Union" material="Air" >
- <shape type="Tube" rmin="OTKEndCap_inner_radius" rmax="OTKEndCap_outer_radius" dz="OTKEndCap_half_length" />
- </shape>
- </envelope>
- <display support="WhiteVis" sens_env="SeeThrough" sens="GrayVis" deadsensor="GreenVis"
- pcb="GreenVis" asic="YellowVis" dead="BlackVis"/>
- <type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_STRIP "/>
- <global sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV"/>
- <support thickness="OTKEndCap_support_thickness" inner_radius="OTKEndCap_inner_radius" outer_radius="OTKEndCap_outer_radius" mat="CarbonFiber" dead_mat="epoxy"/>
- <layer id="0" thickness="OTKEndCap_layer_thickness" zpos="OTKEndCap_layer0_zpos">
- <sensor gap="OTKEndCap_sensor_gap" thickness="OTKEndCap_sensor_thickness" dead_width="OTKEndCap_sensor_dead_width" mat="G4_Si"/>
- <pcb thickness="OTKEndCap_pcb_thickness" rlength="OTKEndCap_pcb_rlength" rgap="OTKEndCap_pcb_rgap" mat="epoxy"/>
- <asic thickness="OTKEndCap_asic_thickness" width="OTKEndCap_asic_width" rlength="OTKEndCap_asic_rlength" rgap="OTKEndCap_asic_rgap" mat="G4_Si"/>
- </layer>
- <layer id="1" thickness="OTKEndCap_layer_thickness" zpos="OTKEndCap_layer1_zpos">
- <sensor gap="OTKEndCap_sensor_gap" thickness="OTKEndCap_sensor_thickness" dead_width="OTKEndCap_sensor_dead_width" mat="G4_Si"/>
- <pcb thickness="OTKEndCap_pcb_thickness" rlength="OTKEndCap_pcb_rlength" rgap="OTKEndCap_pcb_rgap" mat="epoxy"/>
- <asic thickness="OTKEndCap_asic_thickness" width="OTKEndCap_asic_width" rlength="OTKEndCap_asic_rlength" rgap="OTKEndCap_asic_rgap" mat="G4_Si"/>
- </layer>
- </detector>
- </detectors>
-
- <readouts>
- <readout name="OTKEndCapCollection">
- <id>system:5,side:-2,layer:9,module:8,active:8,sensor:8</id>
- </readout>
- </readouts>
-</lccdd>
\ No newline at end of file
diff --git a/Detector/DetCRD/compact/CRD_common_v01/OTKEndcap_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/OTKEndcap_v01_01.xml
new file mode 100644
index 00000000..5f6b2f83
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/OTKEndcap_v01_01.xml
@@ -0,0 +1,98 @@
+<lccdd>
+ <info name="OTKEndcap_v01_01"
+ title="CepC OTKEndcap"
+ author="D.Yu, "
+ url="http://cepc.ihep.ac.cn"
+ contact="yudian2002@sjtu.edu.cn"
+ status="developing"
+ version="v01">
+ <!-- OTKEndcap stands for outer tracker endcap, OTK_Endcap -->
+ </info>
+ <define>
+ <constant name="OTKEndcap_total_sections" value="10" />
+ <constant name="OTKEndcap_r0" value="400*mm" />
+ <constant name="OTKEndcap_r1" value="540*mm" />
+ <constant name="OTKEndcap_r2" value="680*mm" />
+ <constant name="OTKEndcap_r3" value="820*mm" />
+ <constant name="OTKEndcap_r4" value="960*mm" />
+ <constant name="OTKEndcap_r5" value="1100*mm" />
+ <constant name="OTKEndcap_r6" value="1240*mm" />
+ <constant name="OTKEndcap_r7" value="1380*mm" />
+ <constant name="OTKEndcap_r8" value="1520*mm" />
+ <constant name="OTKEndcap_r9" value="1660*mm" />
+ <constant name="OTKEndcap_r10" value="1800*mm" />
+ <constant name="OTKEndcap_inner_radius" value="OTKEndcap_r0" />
+ <constant name="OTKEndcap_outer_radius" value="OTKEndcap_r10" />
+ <constant name="OTKEndcap_half_length" value="2900*mm" />
+ <constant name="OTKEndcap_piece_deg" value="7.5" /><!-- variable OTKEndcap_piece_deg needs no dimension -->
+ <constant name="OTKEndcap_dead_deg" value="0.5" />
+ <constant name="OTKEndcap_dead_thickness" value="1*mm" />
+ <constant name="OTKEndcap_piece_num" value="24" />
+ <constant name="OTKEndcap_asic_num_0" value="5" />
+ <constant name="OTKEndcap_asic_num_1" value="7" />
+ <constant name="OTKEndcap_asic_num_2" value="9" />
+ <constant name="OTKEndcap_asic_num_3" value="11" />
+ <constant name="OTKEndcap_asic_num_4" value="13" />
+ <constant name="OTKEndcap_asic_num_5" value="15" />
+ <constant name="OTKEndcap_asic_num_6" value="17" />
+ <constant name="OTKEndcap_asic_num_7" value="19" />
+ <constant name="OTKEndcap_asic_num_8" value="21" />
+ <constant name="OTKEndcap_asic_num_9" value="23" />
+ <constant name="OTKEndcap_module_num_0" value="1" />
+ <constant name="OTKEndcap_module_num_1" value="1" />
+ <constant name="OTKEndcap_module_num_2" value="1" />
+ <constant name="OTKEndcap_module_num_3" value="1" />
+ <constant name="OTKEndcap_module_num_4" value="1" />
+ <constant name="OTKEndcap_module_num_5" value="2" />
+ <constant name="OTKEndcap_module_num_6" value="2" />
+ <constant name="OTKEndcap_module_num_7" value="2" />
+ <constant name="OTKEndcap_module_num_8" value="2" />
+ <constant name="OTKEndcap_module_num_9" value="2" />
+ <constant name="OTKEndcap_layer_thickness" value="25*mm" />
+ <constant name="OTKEndcap_layer0_zpos" value="2850*mm" />
+ <constant name="OTKEndcap_layer1_zpos" value="2875*mm" />
+ <constant name="OTKEndcap_support_thickness" value="1*mm" />
+ <constant name="OTKEndcap_sensor_thickness" value="500*um" />
+ <constant name="OTKEndcap_sensor_gap" value="0.5*mm" />
+ <constant name="OTKEndcap_sensor_dead_width" value="0.5*mm" /><!-- do not set it to 0 -->
+ <constant name="OTKEndcap_pcb_thickness" value="500*um" />
+ <constant name="OTKEndcap_pcb_rlength" value="10*mm" />
+ <constant name="OTKEndcap_pcb_rgap" value="10*mm" />
+ <constant name="OTKEndcap_asic_thickness" value="500*um" />
+ <constant name="OTKEndcap_asic_width" value="6*mm" />
+ <constant name="OTKEndcap_asic_rlength" value="6*mm" />
+ <constant name="OTKEndcap_asic_rgap" value="12*mm" />
+
+ </define>
+
+ <detectors>
+ <detector id="DetID_OTKEndcap" limits="otk_limits" name="OTKEndcap" type="SiTracker_otkendcap_v01" vis="OTKEndcapVis" readout="OTKEndcapCollection" insideTrackingVolume="true">
+ <envelope>
+ <shape type="BooleanShape" operation="Union" material="Air" >
+ <shape type="Tube" rmin="OTKEndcap_inner_radius" rmax="OTKEndcap_outer_radius" dz="OTKEndcap_half_length" />
+ </shape>
+ </envelope>
+ <display support="WhiteVis" sens_env="SeeThrough" sens="GrayVis" deadsensor="GreenVis"
+ pcb="GreenVis" asic="YellowVis" dead="BlackVis"/>
+ <type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_STRIP "/>
+ <global sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV"/>
+ <support thickness="OTKEndcap_support_thickness" inner_radius="OTKEndcap_inner_radius" outer_radius="OTKEndcap_outer_radius" mat="CarbonFiber" dead_mat="epoxy"/>
+ <layer id="0" thickness="OTKEndcap_layer_thickness" zpos="OTKEndcap_layer0_zpos">
+ <sensor gap="OTKEndcap_sensor_gap" thickness="OTKEndcap_sensor_thickness" dead_width="OTKEndcap_sensor_dead_width" mat="G4_Si"/>
+ <pcb thickness="OTKEndcap_pcb_thickness" rlength="OTKEndcap_pcb_rlength" rgap="OTKEndcap_pcb_rgap" mat="epoxy"/>
+ <asic thickness="OTKEndcap_asic_thickness" width="OTKEndcap_asic_width" rlength="OTKEndcap_asic_rlength" rgap="OTKEndcap_asic_rgap" mat="G4_Si"/>
+ </layer>
+ <layer id="1" thickness="OTKEndcap_layer_thickness" zpos="OTKEndcap_layer1_zpos">
+ <sensor gap="OTKEndcap_sensor_gap" thickness="OTKEndcap_sensor_thickness" dead_width="OTKEndcap_sensor_dead_width" mat="G4_Si"/>
+ <pcb thickness="OTKEndcap_pcb_thickness" rlength="OTKEndcap_pcb_rlength" rgap="OTKEndcap_pcb_rgap" mat="epoxy"/>
+ <asic thickness="OTKEndcap_asic_thickness" width="OTKEndcap_asic_width" rlength="OTKEndcap_asic_rlength" rgap="OTKEndcap_asic_rgap" mat="G4_Si"/>
+ </layer>
+ </detector>
+ </detectors>
+
+ <readouts>
+ <readout name="OTKEndcapCollection">
+ <id>system:5,side:-2,layer:9,module:8,active:8,sensor:8</id>
+ </readout>
+ </readouts>
+</lccdd>
\ No newline at end of file
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
index 48ba95b0..010a5019 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
@@ -37,7 +37,7 @@
<constant name="DetID_ITKBarrel" value=" 2"/>
<constant name="DetID_ITKEndCap" value=" 3"/>
<constant name="DetID_OTKBarrel" value=" 5"/>
- <constant name="DetID_OTKEndCap" value=" 6"/>
+ <constant name="DetID_OTKEndcap" value=" 6"/>
<constant name="DetID_ECAL" value=" 20"/>
<constant name="DetID_ECAL_PLUG" value=" 21"/>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
index c17c2548..ed188dd0 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
@@ -39,7 +39,7 @@
<include ref="../CRD_common_v02/TPC_ModularEndcap_o1_v02.xml"/>
<!--include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/-->
<include ref="../CRD_common_v01/OTKBarrel_v01_01.xml"/>
- <!--include ref="../CRD_common_v01/OTKEndCap_v01_01.xml"/-->
+ <!--include ref="../CRD_common_v01/OTKEndcap_v01_01.xml"/-->
<include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_02.xml"/>
<include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/>
diff --git a/Detector/DetCRD/src/Tracker/SiTracker_otkendcap_v01_geo.cpp b/Detector/DetCRD/src/Tracker/SiTracker_otkendcap_v01_geo.cpp
index 720675f7..e8d2be84 100644
--- a/Detector/DetCRD/src/Tracker/SiTracker_otkendcap_v01_geo.cpp
+++ b/Detector/DetCRD/src/Tracker/SiTracker_otkendcap_v01_geo.cpp
@@ -53,46 +53,46 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
//*****************************************************************//
//fetch the geometry parameters
- const double inner_radius = theDetector.constant<double>("OTKEndCap_inner_radius");
- const double outer_radius = theDetector.constant<double>("OTKEndCap_outer_radius");
- const double total_length = theDetector.constant<double>("OTKEndCap_half_length")*2.;
- const int total_sections = theDetector.constant<int>("OTKEndCap_total_sections");
- const double deg = theDetector.constant<double>("OTKEndCap_piece_deg")*dd4hep::degree;
- const double dead_deg = theDetector.constant<double>("OTKEndCap_dead_deg")*dd4hep::degree;
- const double dead_thickness = theDetector.constant<double>("OTKEndCap_dead_thickness");
- const double piece_number = theDetector.constant<double>("OTKEndCap_piece_num");
+ const double inner_radius = theDetector.constant<double>("OTKEndcap_inner_radius");
+ const double outer_radius = theDetector.constant<double>("OTKEndcap_outer_radius");
+ const double total_length = theDetector.constant<double>("OTKEndcap_half_length")*2.;
+ const int total_sections = theDetector.constant<int>("OTKEndcap_total_sections");
+ const double deg = theDetector.constant<double>("OTKEndcap_piece_deg")*dd4hep::degree;
+ const double dead_deg = theDetector.constant<double>("OTKEndcap_dead_deg")*dd4hep::degree;
+ const double dead_thickness = theDetector.constant<double>("OTKEndcap_dead_thickness");
+ const double piece_number = theDetector.constant<double>("OTKEndcap_piece_num");
const double deg_interval = 360 / piece_number * dd4hep::degree;
- const double r0 = theDetector.constant<double>("OTKEndCap_r0");
- const double r1 = theDetector.constant<double>("OTKEndCap_r1");
- const double r2 = theDetector.constant<double>("OTKEndCap_r2");
- const double r3 = theDetector.constant<double>("OTKEndCap_r3");
- const double r4 = theDetector.constant<double>("OTKEndCap_r4");
- const double r5 = theDetector.constant<double>("OTKEndCap_r5");
- const double r6 = theDetector.constant<double>("OTKEndCap_r6");
- const double r7 = theDetector.constant<double>("OTKEndCap_r7");
- const double r8 = theDetector.constant<double>("OTKEndCap_r8");
- const double r9 = theDetector.constant<double>("OTKEndCap_r9");
- const double r10 = theDetector.constant<double>("OTKEndCap_r10");
- const int asic_num_0 = theDetector.constant<int>("OTKEndCap_asic_num_0");
- const int asic_num_1 = theDetector.constant<int>("OTKEndCap_asic_num_1");
- const int asic_num_2 = theDetector.constant<int>("OTKEndCap_asic_num_2");
- const int asic_num_3 = theDetector.constant<int>("OTKEndCap_asic_num_3");
- const int asic_num_4 = theDetector.constant<int>("OTKEndCap_asic_num_4");
- const int asic_num_5 = theDetector.constant<int>("OTKEndCap_asic_num_5");
- const int asic_num_6 = theDetector.constant<int>("OTKEndCap_asic_num_6");
- const int asic_num_7 = theDetector.constant<int>("OTKEndCap_asic_num_7");
- const int asic_num_8 = theDetector.constant<int>("OTKEndCap_asic_num_8");
- const int asic_num_9 = theDetector.constant<int>("OTKEndCap_asic_num_9");
- const int module_num_0 = theDetector.constant<int>("OTKEndCap_module_num_0");
- const int module_num_1 = theDetector.constant<int>("OTKEndCap_module_num_1");
- const int module_num_2 = theDetector.constant<int>("OTKEndCap_module_num_2");
- const int module_num_3 = theDetector.constant<int>("OTKEndCap_module_num_3");
- const int module_num_4 = theDetector.constant<int>("OTKEndCap_module_num_4");
- const int module_num_5 = theDetector.constant<int>("OTKEndCap_module_num_5");
- const int module_num_6 = theDetector.constant<int>("OTKEndCap_module_num_6");
- const int module_num_7 = theDetector.constant<int>("OTKEndCap_module_num_7");
- const int module_num_8 = theDetector.constant<int>("OTKEndCap_module_num_8");
- const int module_num_9 = theDetector.constant<int>("OTKEndCap_module_num_9");
+ const double r0 = theDetector.constant<double>("OTKEndcap_r0");
+ const double r1 = theDetector.constant<double>("OTKEndcap_r1");
+ const double r2 = theDetector.constant<double>("OTKEndcap_r2");
+ const double r3 = theDetector.constant<double>("OTKEndcap_r3");
+ const double r4 = theDetector.constant<double>("OTKEndcap_r4");
+ const double r5 = theDetector.constant<double>("OTKEndcap_r5");
+ const double r6 = theDetector.constant<double>("OTKEndcap_r6");
+ const double r7 = theDetector.constant<double>("OTKEndcap_r7");
+ const double r8 = theDetector.constant<double>("OTKEndcap_r8");
+ const double r9 = theDetector.constant<double>("OTKEndcap_r9");
+ const double r10 = theDetector.constant<double>("OTKEndcap_r10");
+ const int asic_num_0 = theDetector.constant<int>("OTKEndcap_asic_num_0");
+ const int asic_num_1 = theDetector.constant<int>("OTKEndcap_asic_num_1");
+ const int asic_num_2 = theDetector.constant<int>("OTKEndcap_asic_num_2");
+ const int asic_num_3 = theDetector.constant<int>("OTKEndcap_asic_num_3");
+ const int asic_num_4 = theDetector.constant<int>("OTKEndcap_asic_num_4");
+ const int asic_num_5 = theDetector.constant<int>("OTKEndcap_asic_num_5");
+ const int asic_num_6 = theDetector.constant<int>("OTKEndcap_asic_num_6");
+ const int asic_num_7 = theDetector.constant<int>("OTKEndcap_asic_num_7");
+ const int asic_num_8 = theDetector.constant<int>("OTKEndcap_asic_num_8");
+ const int asic_num_9 = theDetector.constant<int>("OTKEndcap_asic_num_9");
+ const int module_num_0 = theDetector.constant<int>("OTKEndcap_module_num_0");
+ const int module_num_1 = theDetector.constant<int>("OTKEndcap_module_num_1");
+ const int module_num_2 = theDetector.constant<int>("OTKEndcap_module_num_2");
+ const int module_num_3 = theDetector.constant<int>("OTKEndcap_module_num_3");
+ const int module_num_4 = theDetector.constant<int>("OTKEndcap_module_num_4");
+ const int module_num_5 = theDetector.constant<int>("OTKEndcap_module_num_5");
+ const int module_num_6 = theDetector.constant<int>("OTKEndcap_module_num_6");
+ const int module_num_7 = theDetector.constant<int>("OTKEndcap_module_num_7");
+ const int module_num_8 = theDetector.constant<int>("OTKEndcap_module_num_8");
+ const int module_num_9 = theDetector.constant<int>("OTKEndcap_module_num_9");
std::cout << "inner_radius: " << inner_radius/mm << "mm" << std::endl;
std::cout << "outer_radius: " << outer_radius/mm << "mm" << std::endl;
diff --git a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
index ff61a5f5..e3728357 100644
--- a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
+++ b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
@@ -118,7 +118,7 @@ Edm4hepWriterAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
auto tpccols = m_TPCCol.createAndPut();
auto setcols = m_SETCol.createAndPut();
auto otkbarrelcols = m_OTKBarrelCol.createAndPut();
- auto otkendcapcols = m_OTKEndCapCol.createAndPut();
+ auto otkendcapcols = m_OTKEndcapCol.createAndPut();
auto ecalbarrelcol = m_EcalBarrelCol.createAndPut();
auto ecalbarrelcontribcols = m_EcalBarrelContributionCol.createAndPut();
@@ -196,7 +196,7 @@ Edm4hepWriterAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
tracker_col_ptr = setcols;
} else if (collect->GetName() == "OTKBarrelCollection") {
tracker_col_ptr = otkbarrelcols;
- } else if (collect->GetName() == "OTKEndCapCollection") {
+ } else if (collect->GetName() == "OTKEndcapCollection") {
tracker_col_ptr = otkendcapcols;
} else if (collect->GetName() == "CaloHitsCollection") {
calo_col_ptr = calorimetercols;
diff --git a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
index c4e5bce5..dffb1a82 100644
--- a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
+++ b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
@@ -74,7 +74,7 @@ private:
Gaudi::DataHandle::Writer, this};
DataHandle<edm4hep::SimTrackerHitCollection> m_OTKBarrelCol{"OTKBarrelCollection",
Gaudi::DataHandle::Writer, this};
- DataHandle<edm4hep::SimTrackerHitCollection> m_OTKEndCapCol{"OTKEndCapCollection",
+ DataHandle<edm4hep::SimTrackerHitCollection> m_OTKEndcapCol{"OTKEndcapCollection",
Gaudi::DataHandle::Writer, this};
// Ecal
diff --git a/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp b/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp
index e63e6802..2617d4c1 100644
--- a/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp
+++ b/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp
@@ -45,7 +45,7 @@ ExampleAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
auto tpccols = m_TPCCol.createAndPut();
auto setcols = m_SETCol.createAndPut();
auto otkbarrelcols = m_OTKBarrelCol.createAndPut();
- auto otkendcapcols = m_OTKEndCapCol.createAndPut();
+ auto otkendcapcols = m_OTKEndcapCol.createAndPut();
// readout defined in DD4hep
auto lcdd = &(dd4hep::Detector::getInstance());
@@ -96,7 +96,7 @@ ExampleAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
tracker_col_ptr = setcols;
} else if (collect->GetName() == "OTKBarrelCollection") {
tracker_col_ptr = otkbarrelcols;
- } else if (collect->GetName() == "OTKEndCapCollection") {
+ } else if (collect->GetName() == "OTKEndcapCollection") {
tracker_col_ptr = otkendcapcols;
} else if (collect->GetName() == "CaloHitsCollection") {
calo_col_ptr = calorimetercols;
diff --git a/Simulation/DetSimAna/src/ExampleAnaElemTool.h b/Simulation/DetSimAna/src/ExampleAnaElemTool.h
index fba1f1e5..1a1ce0af 100644
--- a/Simulation/DetSimAna/src/ExampleAnaElemTool.h
+++ b/Simulation/DetSimAna/src/ExampleAnaElemTool.h
@@ -63,7 +63,7 @@ private:
Gaudi::DataHandle::Writer, this};
DataHandle<plcio::SimTrackerHitCollection> m_OTKBarrelCol{"OTKBarrelCollection",
Gaudi::DataHandle::Writer, this};
- DataHandle<edm4hep::SimTrackerHitCollection> m_OTKEndCapCol{"OTKEndCapCollection",
+ DataHandle<edm4hep::SimTrackerHitCollection> m_OTKEndcapCol{"OTKEndcapCollection",
Gaudi::DataHandle::Writer, this};
};
--
GitLab