From b8082a8b4918b4bb206eefa9290236ce3718758f Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Thu, 13 May 2021 04:20:55 +0000
Subject: [PATCH] tweak backward endcap and DIRC

---
 compact/cb_DIRC.xml    | 4 ++--
 compact/ce_mrich.xml   | 2 +-
 compact/tof_endcap.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compact/cb_DIRC.xml b/compact/cb_DIRC.xml
index a7f46ac..91c9535 100644
--- a/compact/cb_DIRC.xml
+++ b/compact/cb_DIRC.xml
@@ -7,7 +7,7 @@
   </comment>
 
   <define>
-    <constant name="cb_DIRC_length"            value="TrackerBarrelOuter_length"/>
+    <constant name="cb_DIRC_length"            value="EcalBarrelLength"/>
     <constant name="cb_DIRC_rmin"              value="82.00*cm"/>
     <constant name="cb_DIRC_rmax"              value="88.00*cm"/>
   </define>
@@ -24,7 +24,7 @@
   <detectors>
     <detector id="BarrelDIRC_ID" name="cb_DIRC" type="cb_DIRC" readout="DIRCHits" vis="AnlTeal">
       <dimensions rmin="cb_DIRC_rmin" rmax="cb_DIRC_rmax" length="cb_DIRC_length"/>
-      <position x="0" y="0" z="0"/>
+      <position x="0" y="0" z="EcalBarrel_offset"/>
     </detector>
   </detectors>
 
diff --git a/compact/ce_mrich.xml b/compact/ce_mrich.xml
index e854c6d..6f9c2b7 100644
--- a/compact/ce_mrich.xml
+++ b/compact/ce_mrich.xml
@@ -2,7 +2,7 @@
 <lccdd>
   <define>
     <constant name="ce_MRICHRMin"   value="15*cm"/>
-    <constant name="ce_MRICHRMax"   value="BarrelTrackingAndPID_rmax"/>
+    <constant name="ce_MRICHRMax"   value="BarrelTracking_rmax"/>
     <constant name="ce_MRICHLength" value="BackwardCherenkov_length"/>
     <constant name="ce_MRICHZMin"   value="-EcalEndcapN_zmin+ce_MRICHLength"/>
 
diff --git a/compact/tof_endcap.xml b/compact/tof_endcap.xml
index b3f3e88..aa4a8fb 100644
--- a/compact/tof_endcap.xml
+++ b/compact/tof_endcap.xml
@@ -11,7 +11,7 @@
     <constant name="ForwardTOF_rmax" value="Solenoid_rmin"/>
     <constant name="BackwardTOF_zmin" value="BarrelTracking_length/2.0 + BackwardTracking_length + BackwardCherenkov_length "/>
     <constant name="BackwardTOF_rmin" value="ForwardPID_rmin1"/>
-    <constant name="BackwardTOF_rmax" value="EcalBarrel_rmin"/>
+    <constant name="BackwardTOF_rmax" value="BarrelTracking_rmax"/>
   </define>
 
   <detectors>
-- 
GitLab