From 27342cd6e38d68e5798660bd3873c8bfc9d07244 Mon Sep 17 00:00:00 2001
From: Sarah Gaiser <s.gaiser96@gmx.de>
Date: Wed, 30 Aug 2023 14:54:10 -0700
Subject: [PATCH 1/2] I love biscuit and gravy

---
 detector-data/detectors/HPS_Run2021Pass1_v3/compact.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/detector-data/detectors/HPS_Run2021Pass1_v3/compact.xml b/detector-data/detectors/HPS_Run2021Pass1_v3/compact.xml
index 76ff56331..9a2418922 100644
--- a/detector-data/detectors/HPS_Run2021Pass1_v3/compact.xml
+++ b/detector-data/detectors/HPS_Run2021Pass1_v3/compact.xml
@@ -534,14 +534,14 @@
         <millepede_constant name="22362" value="0.0" /> <!-- rw -->
 
         <!-- L3 Top/Bottom translations and angles -->
-        <millepede_constant name="11163" value="0.0 + 0.000678 - -0.059459 - 0.012216 - 0.006668 - 0.002504" /> <!-- u  -> global Y   -->
+        <millepede_constant name="11163" value="0.0 + 0.000678 - -0.059459 - 0.012216 - 0.006668 - 0.002504 + -0.7" /> <!-- u  -> global Y   -->
         <millepede_constant name="11263" value="0.0" /> <!-- v  -> X+svtAngle -->
         <millepede_constant name="11363" value="0.0" /> <!-- w  -> Z+svtAngle -->
         <millepede_constant name="12163" value="0.0" /> <!-- ru -->
         <millepede_constant name="12263" value="0.0" /> <!-- rv -->
         <millepede_constant name="12363" value="0.0" /> <!-- rw -->
 
-        <millepede_constant name="21163" value="0.0 + -0.046884 + -0.010228 - 0.075913 - 0.001767 - 0.023862" /> <!-- u -->
+        <millepede_constant name="21163" value="0.0 + -0.046884 + -0.010228 - 0.075913 - 0.001767 - 0.023862 + -0.7" /> <!-- u -->
         <millepede_constant name="21263" value="0.0" /> <!-- v -->
         <millepede_constant name="21363" value="0.0" /> <!-- w -->
         <millepede_constant name="22163" value="0.0" /> <!-- ru -->
@@ -549,14 +549,14 @@
         <millepede_constant name="22363" value="0.0" /> <!-- rw -->
 
         <!-- L4 Top/Bottom translations and angles -->
-        <millepede_constant name="11164" value="0.0 + -0.007361 - -0.033468 - -0.017968 - -0.013564 - 0.001690" /> <!-- u  -> global Y   -->
+        <millepede_constant name="11164" value="0.0 + -0.007361 - -0.033468 - -0.017968 - -0.013564 - 0.001690 + -0.7" /> <!-- u  -> global Y   -->
         <millepede_constant name="11264" value="0.0" /> <!-- v  -> X+svtAngle -->
         <millepede_constant name="11364" value="0.0" /> <!-- w  -> Z+svtAngle -->
         <millepede_constant name="12164" value="0.0" /> <!-- ru -->
         <millepede_constant name="12264" value="0.0" /> <!-- rv -->
         <millepede_constant name="12364" value="0.0" /> <!-- rw -->
 
-        <millepede_constant name="21164" value="0.0 + -0.033974 + -0.006749 - 0.051528 - -0.004088 - 0.021074 - 0.001095" /> <!-- u -->
+        <millepede_constant name="21164" value="0.0 + -0.033974 + -0.006749 - 0.051528 - -0.004088 - 0.021074 - 0.001095 + -0.7" /> <!-- u -->
         <millepede_constant name="21264" value="0.0" /> <!-- v -->
         <millepede_constant name="21364" value="0.0" /> <!-- w -->
         <millepede_constant name="22164" value="0.0" /> <!-- ru -->

From e4990fb1466cab843fd856e94754ac7b6cb4bef2 Mon Sep 17 00:00:00 2001
From: sgaiser <sgaiser@stanford.edu>
Date: Wed, 30 Aug 2023 14:59:58 -0700
Subject: [PATCH 2/2] update lcdd

---
 .../HPS_Run2021Pass1_v3.lcdd                   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/detector-data/detectors/HPS_Run2021Pass1_v3/HPS_Run2021Pass1_v3.lcdd b/detector-data/detectors/HPS_Run2021Pass1_v3/HPS_Run2021Pass1_v3.lcdd
index df82c7951..eb190ce51 100644
--- a/detector-data/detectors/HPS_Run2021Pass1_v3/HPS_Run2021Pass1_v3.lcdd
+++ b/detector-data/detectors/HPS_Run2021Pass1_v3/HPS_Run2021Pass1_v3.lcdd
@@ -2,7 +2,7 @@
 <lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
   <header>
     <detector name="HPS_Run2021Pass1_v3" />
-    <generator name="lcsim" version="1.0" file="/sdf/group/hps/users/sgaiser/src/hps-java/detector-data/detectors/HPS_Run2021Pass1_v3/compact.xml" checksum="1541457255" />
+    <generator name="lcsim" version="1.0" file="/sdf/group/hps/users/sgaiser/src/hps-java/detector-data/detectors/HPS_Run2021Pass1_v3/compact.xml" checksum="3815100274" />
     <author name="NONE" />
     <comment>HPS detector for 2021 run with fieldmap, Tracker at nominal opening angle, no SVT survey, this detector uses the corrected fieldmap scaled for 3.74 GeV beam. Includes L0 and Hodoscope. ECAL with survey alignment for HPSEcal3 (global y/z translations). This detector has the full hierarchical alignment structure</comment>
   </header>
@@ -274,7 +274,7 @@
       <rotation name="module_L2t_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L2t_halfmodule_stereo_sensor_active_position" x="0.0" y="0.0" z="0.0" unit="mm" />
       <rotation name="module_L2t_halfmodule_stereo_sensor_active_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L3b_halfmodule_axial_position" x="-44.86759285327909" y="137.05265840995352" z="-25.657600684042034" unit="mm" />
+      <position name="module_L3b_halfmodule_axial_position" x="-44.86759285327909" y="137.0536356096361" z="-24.957601366127523" unit="mm" />
       <rotation name="module_L3b_halfmodule_axial_rotation" x="-1.5694003267948966" y="-0.030540399450088344" z="1.5711065567948967" unit="radian" />
       <position name="module_L3b_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L3b_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
@@ -286,7 +286,7 @@
       <rotation name="module_L3b_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L3b_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
       <rotation name="module_L3b_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L3b_halfmodule_stereo_position" x="-45.31882614216685" y="145.4286602317937" z="-21.81164059547696" unit="mm" />
+      <position name="module_L3b_halfmodule_stereo_position" x="-45.31882614216685" y="145.42963743147627" z="-21.11164127756245" unit="mm" />
       <rotation name="module_L3b_halfmodule_stereo_rotation" x="1.5721923267948965" y="0.030540399450088067" z="1.6698869167948966" unit="radian" />
       <position name="module_L3b_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L3b_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
@@ -298,7 +298,7 @@
       <rotation name="module_L3b_halfmodule_stereo_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L3b_halfmodule_stereo_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
       <rotation name="module_L3b_halfmodule_stereo_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L3t_halfmodule_axial_position" x="-45.61509443396861" y="161.2256457394047" z="25.624050108259635" unit="mm" />
+      <position name="module_L3t_halfmodule_axial_position" x="-45.61509443396861" y="161.22537133941174" z="24.924050162042032" unit="mm" />
       <rotation name="module_L3t_halfmodule_axial_rotation" x="1.5711883267948965" y="0.030433306424175646" z="1.5703268067948968" unit="radian" />
       <position name="module_L3t_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L3t_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
@@ -310,7 +310,7 @@
       <rotation name="module_L3t_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L3t_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
       <rotation name="module_L3t_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L3t_halfmodule_stereo_position" x="-45.54419110509312" y="152.84192874151745" z="21.816924567072267" unit="mm" />
+      <position name="module_L3t_halfmodule_stereo_position" x="-45.54419110509312" y="152.84165434152447" z="21.116924620854665" unit="mm" />
       <rotation name="module_L3t_halfmodule_stereo_rotation" x="-1.5704043267948962" y="-0.03043330642417559" z="1.6696788267948965" unit="radian" />
       <position name="module_L3t_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L3t_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
@@ -322,7 +322,7 @@
       <rotation name="module_L3t_halfmodule_stereo_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L3t_halfmodule_stereo_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
       <rotation name="module_L3t_halfmodule_stereo_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L4b_halfmodule_axial_position" x="-41.81382572864449" y="37.09719501187135" z="-27.09337795824303" unit="mm" />
+      <position name="module_L4b_halfmodule_axial_position" x="-41.81382572864449" y="37.09817221155395" z="-26.393378640328518" unit="mm" />
       <rotation name="module_L4b_halfmodule_axial_rotation" x="-1.5694003267948966" y="-0.030540399450088344" z="1.5710472567948965" unit="radian" />
       <position name="module_L4b_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L4b_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
@@ -334,7 +334,7 @@
       <rotation name="module_L4b_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L4b_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
       <rotation name="module_L4b_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L4b_halfmodule_stereo_position" x="-42.26712459616005" y="45.473173837080616" z="-23.21868819829955" unit="mm" />
+      <position name="module_L4b_halfmodule_stereo_position" x="-42.26712459616005" y="45.474151036763224" z="-22.51868888038504" unit="mm" />
       <rotation name="module_L4b_halfmodule_stereo_rotation" x="1.5721923267948967" y="0.030540399450088178" z="1.6703765067948966" unit="radian" />
       <position name="module_L4b_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L4b_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
@@ -346,7 +346,7 @@
       <rotation name="module_L4b_halfmodule_stereo_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L4b_halfmodule_stereo_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
       <rotation name="module_L4b_halfmodule_stereo_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L4t_halfmodule_axial_position" x="-42.573509153530566" y="61.272479984063985" z="27.090948571885203" unit="mm" />
+      <position name="module_L4t_halfmodule_axial_position" x="-42.573509153530566" y="61.27220558407102" z="26.3909486256676" unit="mm" />
       <rotation name="module_L4t_halfmodule_axial_rotation" x="1.5711883267948965" y="0.03043330642417548" z="1.5706995817948965" unit="radian" />
       <position name="module_L4t_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L4t_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
@@ -358,7 +358,7 @@
       <rotation name="module_L4t_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
       <position name="module_L4t_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
       <rotation name="module_L4t_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
-      <position name="module_L4t_halfmodule_stereo_position" x="-42.508444308019406" y="52.888599465777084" z="23.320095589818212" unit="mm" />
+      <position name="module_L4t_halfmodule_stereo_position" x="-42.508444308019406" y="52.888325065784116" z="22.62009564360061" unit="mm" />
       <rotation name="module_L4t_halfmodule_stereo_rotation" x="-1.5704043267948964" y="-0.030433306424175813" z="1.6701931267948968" unit="radian" />
       <position name="module_L4t_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
       <rotation name="module_L4t_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />