From d3ed443ca4f05c0d5fafdbd90672df45d3935c5a Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Mon, 12 Apr 2021 19:34:22 -0500
Subject: [PATCH] modified: compact/definitions.xml modified:
src/ci_GEM.cpp
---
compact/definitions.xml | 5 ++++-
src/ci_GEM.cpp | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 9d56c83..36d9cf5 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -320,6 +320,9 @@
Tracking Parameters
============================
</comment>
+
+ <constant name="ForwardTrackingGEMLength" value="30.0*cm"/>
+
<constant name="tracker_region_rmax" value="Solenoid_rmax/2.0"/>
<constant name="tracker_region_zmax" value="Solenoid_length/2.0"/>
@@ -341,7 +344,7 @@
<constant name="SiliconTrackerInnerRadius" value="95.0*mm"/>
<constant name="SiliconTrackerInnerBarrelLength" value="300.0*mm"/>
<constant name="SiliconTrackerOuterRadius" value="Solenoid_rmax/3.0"/>
- <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5"/>
+ <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5 - ForwardTrackingGEMLength"/>
<constant name="SiliconTrackerOuterBarrel_zmax" value="SiliconTrackerOuterBarrelLength/2.0"/>
<comment>
diff --git a/src/ci_GEM.cpp b/src/ci_GEM.cpp
index 1b8e320..39a8e77 100644
--- a/src/ci_GEM.cpp
+++ b/src/ci_GEM.cpp
@@ -16,7 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
double SizeZ = dims.z_length(); // Size in Z direction
double ROut = dims.rmax(); // Outer radius
double RIn = dims.rmin(); // Inner radius
- double ShiftZ = dims.z_offset();
+ double ShiftZ = dims.z_offset();
double X = dims.x();
double Z = dims.z();
int Nlayers = dims.number();
--
GitLab