From 328a3085432234c4b2a59ddea17125c00d75c8cd Mon Sep 17 00:00:00 2001
From: Marshall Scott <mbscott@anl.gov>
Date: Fri, 9 Apr 2021 14:33:26 -0400
Subject: [PATCH] added sensor data
---
compact/ci_GEM.xml | 9 ++++++++-
compact/ci_HCAL.xml | 9 ++++++++-
reference_detector.xml | 30 +-----------------------------
src/ci_GEM.cpp | 2 ++
4 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/compact/ci_GEM.xml b/compact/ci_GEM.xml
index a42a38e..f564d86 100644
--- a/compact/ci_GEM.xml
+++ b/compact/ci_GEM.xml
@@ -42,7 +42,7 @@
<comment>
Central Ion GEM
</comment>
- <detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis">
+ <detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis" readout="ci_GEM_Hits">
<material name="Ar10CO2"/>
<dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz" z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1*cm"/>
<layer id="0" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 0) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 0) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 0) * cm" dz="1 * cm" />
@@ -55,6 +55,13 @@
<layer id="7" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 7) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 7) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 7) * cm" dz="1 * cm" />
</detector>
</detectors>
+ <readouts>
+ <readout name="ci_GEM_Hits">
+ <segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
+ <id>system:8,layer:8,x:32:-16,y:-16</id>
+ </readout>
+ </readouts>
+
<plugins>
</plugins>
diff --git a/compact/ci_HCAL.xml b/compact/ci_HCAL.xml
index 923be2c..65589d6 100644
--- a/compact/ci_HCAL.xml
+++ b/compact/ci_HCAL.xml
@@ -28,7 +28,7 @@
<comment>
Central Ion HCAL
</comment>
- <detector id="ci_HCAL_id" name="ci_HCAL" type="ci_HCAL" insideTrackingVolume="false" vis="ci_HCALVis">
+ <detector id="ci_HCAL_id" name="ci_HCAL" type="ci_HCAL" insideTrackingVolume="false" vis="ci_HCALVis" readout="ci_HCAL_Hits">
<material name="Iron"/>
<dimensions rmin="ci_HCAL_rin" rmax="ci_HCAL_rout" z_length="ci_HCAL_sizez" z_offset="ci_HCAL_shiftz" z="ci_HCAL_posz" x="ci_HCAL_posx" number="ci_HCAL_nlayers" rmin1="ci_HCAL_lay_rin" rmax1="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness"/>
<layer id="0" z="-ci_HCAL_sizez * 0.5 + (1 + 0) * ci_HCAL_lay_thickness + (1 + 0) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" />
@@ -53,6 +53,13 @@
<layer id="19" z="-ci_HCAL_sizez * 0.5 + (1 + 19) * ci_HCAL_lay_thickness + (1 + 19) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" />
</detector>
</detectors>
+ <readouts>
+ <readout name="ci_HCAL_Hits">
+ <segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
+ <id>system:8,layer:8,x:32:-16,y:-16</id>
+ </readout>
+ </readouts>
+
<plugins>
</plugins>
diff --git a/reference_detector.xml b/reference_detector.xml
index 914a542..ae1b686 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -114,52 +114,24 @@
<include ref="reference_detector/vertex_tracker.xml"/>
<include ref="compact/silicon_tracker.xml"/>
-->
-<<<<<<< HEAD
- <!--
-=======
-
->>>>>>> accc12d945b665ea0ea64496ddc2f0177aa5e3a9
<include ref="ip6/beampipe.xml"/>
- -->
<include ref="compact/solenoid.xml"/>
-
- <!--
<include ref="compact/ecal.xml"/>
<include ref="compact/cb_CTD_Si.xml"/>
<include ref="compact/ce_mrich.xml"/>
-<<<<<<< HEAD
<include ref="compact/ce_GEM.xml"/>
<include ref="compact/ffi_ZDC.xml"/>
- -->
-=======
-
<include ref="compact/ci_HCAL.xml"/>
<include ref="compact/ci_GEM.xml"/>
-
->>>>>>> accc12d945b665ea0ea64496ddc2f0177aa5e3a9
+
<!--
<include ref="compact/forward_rich.xml"/>
<include ref="compact/hcal.xml"/>
- -->
-<<<<<<< HEAD
- <include ref="compact/ci_HCAL.xml"/>
- <!--
- <include ref="compact/ci_GEM.xml"/>
- -->
-
- <!--
<include ref="compact/roman_pots.xml"/>
-->
-<!--
<include ref="eic/forward_ion_beamline.xml"/>
--->
-=======
-<!--
- <include ref="eic/forward_ion_beamline.xml"/>
--->
->>>>>>> accc12d945b665ea0ea64496ddc2f0177aa5e3a9
<detectors>
</detectors>
diff --git a/src/ci_GEM.cpp b/src/ci_GEM.cpp
index 73cb636..2bd5ab0 100644
--- a/src/ci_GEM.cpp
+++ b/src/ci_GEM.cpp
@@ -36,6 +36,8 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
Volume layer_vol(layer_name, Tube(x_layer.inner_r(), outer_r, x_layer.dz()), mat);
layer_vol.setVisAttributes(desc.visAttributes(detElem.visStr()));
+ sens.setType("tracker");
+ layer_vol.setSensitiveDetector(sens);
Position layer_pos(0, 0, x_layer.z());
PlacedVolume layer_phv = detVol.placeVolume(layer_vol, layer_pos);
layer_phv.addPhysVolID("layer", x_layer.id());
--
GitLab