Print

Print


Author: [log in to unmask]
Date: Tue Mar  3 14:19:26 2015
New Revision: 2230

Log:
Removed SVT, By = -0.3309, added scoring planes

Modified:
    java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/HPS-ECalCommissioning-v2.lcdd
    java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/compact.xml

Modified: java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/HPS-ECalCommissioning-v2.lcdd
 =============================================================================
--- java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/HPS-ECalCommissioning-v2.lcdd	(original)
+++ java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/HPS-ECalCommissioning-v2.lcdd	Tue Mar  3 14:19:26 2015
@@ -2,12 +2,39 @@
 <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-ECalCommissioning-v2" />
-    <generator name="GeomConverter" version="1.0" file="detectors/HPS-ECalCommissioning-v2/compact.xml" checksum="4119282845" />
+    <generator name="GeomConverter" version="1.0" file="detectors/HPS-ECalCommissioning-v2/compact.xml" checksum="632153264" />
     <author name="NONE" />
-    <comment>HPS ECal commissioning for pass1</comment>
+    <comment>HPS ECal commissioning for pass2 with no SVT By=-0.3309</comment>
   </header>
   <iddict>
     <idspec name="TrackerHits" length="46">
+      <idfield signed="false" label="system" length="6" start="0" />
+      <idfield signed="false" label="barrel" length="3" start="6" />
+      <idfield signed="false" label="layer" length="4" start="9" />
+      <idfield signed="false" label="module" length="12" start="13" />
+      <idfield signed="false" label="sensor" length="1" start="25" />
+      <idfield signed="true" label="side" length="2" start="32" />
+      <idfield signed="false" label="strip" length="12" start="34" />
+    </idspec>
+    <idspec name="TrackerHitsECal" length="46">
+      <idfield signed="false" label="system" length="6" start="0" />
+      <idfield signed="false" label="barrel" length="3" start="6" />
+      <idfield signed="false" label="layer" length="4" start="9" />
+      <idfield signed="false" label="module" length="12" start="13" />
+      <idfield signed="false" label="sensor" length="1" start="25" />
+      <idfield signed="true" label="side" length="2" start="32" />
+      <idfield signed="false" label="strip" length="12" start="34" />
+    </idspec>
+    <idspec name="TrackerHitsFieldDef" length="46">
+      <idfield signed="false" label="system" length="6" start="0" />
+      <idfield signed="false" label="barrel" length="3" start="6" />
+      <idfield signed="false" label="layer" length="4" start="9" />
+      <idfield signed="false" label="module" length="12" start="13" />
+      <idfield signed="false" label="sensor" length="1" start="25" />
+      <idfield signed="true" label="side" length="2" start="32" />
+      <idfield signed="false" label="strip" length="12" start="34" />
+    </idspec>
+    <idspec name="TrackerHitsRecoil" length="46">
       <idfield signed="false" label="system" length="6" start="0" />
       <idfield signed="false" label="barrel" length="3" start="6" />
       <idfield signed="false" label="layer" length="4" start="9" />
@@ -26,6 +53,14 @@
   <sensitive_detectors>
     <tracker name="Tracker" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits">
       <idspecref ref="TrackerHits" />
+    </tracker>
+    <tracker name="TrackerFieldDef" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHitsFieldDef">
+      <idspecref ref="TrackerHitsFieldDef" />
+      <hit_processor type="ScoringTrackerHitProcessor" />
+    </tracker>
+    <tracker name="ECalScoring" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHitsECal">
+      <idspecref ref="TrackerHitsECal" />
+      <hit_processor type="ScoringTrackerHitProcessor" />
     </tracker>
     <calorimeter name="Ecal" ecut="0.0" eunit="MeV" verbose="0" hits_collection="EcalHits">
       <idspecref ref="EcalHits" />
@@ -80,8 +115,8 @@
       <constant name="y8b" value="-26.669668753164046" />
       <constant name="a5b" value="0.0" />
       <constant name="SA2" value="0.05" />
+      <constant name="SA1" value="0.1" />
       <constant name="tracking_region_min" value="50.0" />
-      <constant name="SA1" value="0.1" />
       <constant name="x4b" value="0.0" />
       <constant name="a4t" value="0.0" />
       <constant name="z3b" value="203.815" />
@@ -98,6 +133,7 @@
       <constant name="y5t" value="23.669781251898428" />
       <constant name="pivot" value="791.0" />
       <constant name="y5b" value="-23.669781251898428" />
+      <constant name="dipoleMagnetLength" value="1080.0" />
       <constant name="x_rot_top_add" value="0.0" />
       <constant name="z6b" value="311.185" />
       <constant name="sensorLength" value="98.33" />
@@ -136,6 +172,7 @@
       <constant name="y12b" value="-32.66944375569528" />
       <constant name="a8b" value="0.0" />
       <constant name="y3t" value="22.16983750126562" />
+      <constant name="electronGapLeftEdge" value="382.492" />
       <constant name="x12b" value="0.0" />
       <constant name="x7b" value="0.0" />
       <constant name="z10t" value="696.185" />
@@ -145,9 +182,11 @@
       <constant name="x8t" value="0.0" />
       <constant name="x11t" value="0.0" />
       <constant name="a1b" value="0.0" />
+      <constant name="dipoleMagnetWidth" value="1000.0" />
       <constant name="z7b" value="503.815" />
       <constant name="a9b" value="0.0" />
       <constant name="y4b" value="-22.16983750126562" />
+      <constant name="scoringThickness" value="0.001" />
       <constant name="y4t" value="22.16983750126562" />
       <constant name="x11b" value="0.0" />
       <constant name="ytar" value="0.0" />
@@ -158,6 +197,7 @@
       <constant name="a5t" value="0.0" />
       <constant name="x9t" value="0.0" />
       <constant name="x10t" value="0.0" />
+      <constant name="electronGapRightEdge" value="474.962" />
       <constant name="y1b" value="-20.66989375063281" />
       <constant name="tracking_region_radius" value="2000.0" />
       <constant name="z2t" value="96.185" />
@@ -173,8 +213,11 @@
       <constant name="y10t" value="29.669556254429665" />
       <constant name="x1t" value="0.0" />
       <constant name="y9b" value="-29.669556254429665" />
+      <constant name="dipoleMagnetHeight" value="1000.0" />
       <constant name="a6t" value="0.0" />
       <constant name="z1t" value="88.815" />
+      <constant name="dipoleMagnetPositionZ" value="457.2" />
+      <constant name="dipoleMagnetPositionX" value="21.17" />
       <constant name="y2b" value="-20.66989375063281" />
       <constant name="z9b" value="703.815" />
       <constant name="x2b" value="0.0" />
@@ -266,6 +309,42 @@
       <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
       <position name="Tracker_TestRunModule_layer12_module3_position" x="77.78176418167736" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
       <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="TestRunModuleFieldDefVolume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="TestRunModuleFieldDefVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="TestRunModuleFieldDefVolume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="TestRunModuleFieldDefVolume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="TestRunModuleFieldDefFlare2Volume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="TestRunModuleFieldDefFlare2Volume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="TestRunModuleFieldDefFlare2Volume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="TestRunModuleFieldDefFlare2Volume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_position" x="21.17" y="0.0" z="-82.80000000000001" unit="mm" />
+      <rotation name="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" />
+      <position name="TrackerFieldDef_TestRunModuleFieldDefFlare2_layer2_module0_position" x="21.17" y="0.0" z="997.2" unit="mm" />
+      <rotation name="TrackerFieldDef_TestRunModuleFieldDefFlare2_layer2_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" />
+      <position name="BeamLeftVolume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="BeamLeftVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="BeamLeftVolume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="BeamLeftVolume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="ElectronGapVolume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="ElectronGapVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="ElectronGapVolume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="ElectronGapVolume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="BeamRightVolume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="BeamRightVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="BeamRightVolume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />
+      <rotation name="BeamRightVolume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+      <position name="ECalScoring_BeamLeft_layer1_module0_position" x="214.099" y="122.8" z="1338.001" unit="mm" />
+      <rotation name="ECalScoring_BeamLeft_layer1_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" />
+      <position name="ECalScoring_ElectronGap_layer1_module0_position" x="-23.38199999999999" y="130.465" z="1338.001" unit="mm" />
+      <rotation name="ECalScoring_ElectronGap_layer1_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" />
+      <position name="ECalScoring_BeamRight_layer1_module0_position" x="-216.31099999999998" y="121.3" z="1338.001" unit="mm" />
+      <rotation name="ECalScoring_BeamRight_layer1_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" />
+      <position name="ECalScoring_BeamLeft_layer2_module0_position" x="214.099" y="-122.8" z="1338.001" unit="mm" />
+      <rotation name="ECalScoring_BeamLeft_layer2_module0_rotation" x="0.0" y="0.0" z="-4.7123889803850005" unit="radian" />
+      <position name="ECalScoring_ElectronGap_layer2_module0_position" x="-23.38199999999999" y="-130.465" z="1338.001" unit="mm" />
+      <rotation name="ECalScoring_ElectronGap_layer2_module0_rotation" x="0.0" y="0.0" z="-4.7123889803850005" unit="radian" />
+      <position name="ECalScoring_BeamRight_layer2_module0_position" x="-216.31099999999998" y="-121.3" z="1338.001" unit="mm" />
+      <rotation name="ECalScoring_BeamRight_layer2_module0_rotation" x="0.0" y="0.0" z="-4.7123889803850005" unit="radian" />
       <position name="crystal1-1_pos_pos_bot" x="50.052304484827026" y="-27.67473927539554" z="1473.1626281236922" unit="mm" />
       <rotation name="crystal1-1_rot_pos_bot" x="-0.0084372997827221" y="-0.0084372997827221" z="0.0" unit="radian" />
       <position name="crystal1-1_pos_neg_bot" x="35.00282593403595" y="-27.67473927539554" z="1473.1626281236922" unit="mm" />
@@ -1250,6 +1329,21 @@
       <box name="TestRunModuleVolume_component0Box" x="40.34" y="100.0" z="0.32" />
       <box name="TestRunModuleVolume_component0Sensor0Box" x="38.3399" y="98.33" z="0.32" />
       <box name="TestRunModuleVolume_component1Box" x="40.34" y="100.0" z="0.08399999999999999" />
+      <box name="TestRunModuleFieldDefBox" x="177.8" y="416.052" z="0.001" />
+      <box name="TestRunModuleFieldDefVolume_component0Box" x="177.8" y="416.052" z="0.001" />
+      <box name="TestRunModuleFieldDefVolume_component0Sensor0Box" x="177.8" y="416.052" z="0.001" />
+      <box name="TestRunModuleFieldDefFlare2Box" x="210.37903820816865" y="416.052" z="0.001" />
+      <box name="TestRunModuleFieldDefFlare2Volume_component0Box" x="210.37903820816865" y="416.052" z="0.001" />
+      <box name="TestRunModuleFieldDefFlare2Volume_component0Sensor0Box" x="210.37903820816865" y="416.052" z="0.001" />
+      <box name="BeamLeftBox" x="211.6" y="382.492" z="0.001" />
+      <box name="BeamLeftVolume_component0Box" x="211.6" y="382.492" z="0.001" />
+      <box name="BeamLeftVolume_component0Sensor0Box" x="211.6" y="382.492" z="0.001" />
+      <box name="ElectronGapBox" x="196.26999999999998" y="92.46999999999997" z="0.001" />
+      <box name="ElectronGapVolume_component0Box" x="196.26999999999998" y="92.46999999999997" z="0.001" />
+      <box name="ElectronGapVolume_component0Sensor0Box" x="196.26999999999998" y="92.46999999999997" z="0.001" />
+      <box name="BeamRightBox" x="214.6" y="293.38800000000003" z="0.001" />
+      <box name="BeamRightVolume_component0Box" x="214.6" y="293.38800000000003" z="0.001" />
+      <box name="BeamRightVolume_component0Sensor0Box" x="214.6" y="293.38800000000003" z="0.001" />
       <trd name="crystal_trap" x1="13.3" x2="16.0" y1="13.3" y2="16.0" z="160.0" />
       <eltube name="flange_egap_inside_tube" lunit="mm" dx="26.33" dy="26.33" dz="30" />
       <eltube name="flange_photontube_inside" lunit="mm" dx="11" dy="11" dz="30" />
@@ -1473,6 +1567,131 @@
           <physvolid field_name="component" value="1" />
         </physvol>
       </volume>
+      <volume name="TestRunModuleFieldDefVolume_component0Sensor0">
+        <materialref ref="Vacuum" />
+        <solidref ref="TestRunModuleFieldDefVolume_component0Sensor0Box" />
+        <sdref ref="TrackerFieldDef" />
+      </volume>
+      <volume name="TestRunModuleFieldDefVolume_component0">
+        <materialref ref="Vacuum" />
+        <solidref ref="TestRunModuleFieldDefVolume_component0Box" />
+        <physvol>
+          <volumeref ref="TestRunModuleFieldDefVolume_component0Sensor0" />
+          <positionref ref="TestRunModuleFieldDefVolume_component0Sensor0Position" />
+          <rotationref ref="TestRunModuleFieldDefVolume_component0Sensor0Rotation" />
+          <physvolid field_name="sensor" value="0" />
+        </physvol>
+      </volume>
+      <volume name="TestRunModuleFieldDefVolume">
+        <materialref ref="Vacuum" />
+        <solidref ref="TestRunModuleFieldDefBox" />
+        <physvol>
+          <volumeref ref="TestRunModuleFieldDefVolume_component0" />
+          <positionref ref="TestRunModuleFieldDefVolume_component0_position" />
+          <rotationref ref="TestRunModuleFieldDefVolume_component0_rotation" />
+          <physvolid field_name="component" value="0" />
+        </physvol>
+      </volume>
+      <volume name="TestRunModuleFieldDefFlare2Volume_component0Sensor0">
+        <materialref ref="Vacuum" />
+        <solidref ref="TestRunModuleFieldDefFlare2Volume_component0Sensor0Box" />
+        <sdref ref="TrackerFieldDef" />
+      </volume>
+      <volume name="TestRunModuleFieldDefFlare2Volume_component0">
+        <materialref ref="Vacuum" />
+        <solidref ref="TestRunModuleFieldDefFlare2Volume_component0Box" />
+        <physvol>
+          <volumeref ref="TestRunModuleFieldDefFlare2Volume_component0Sensor0" />
+          <positionref ref="TestRunModuleFieldDefFlare2Volume_component0Sensor0Position" />
+          <rotationref ref="TestRunModuleFieldDefFlare2Volume_component0Sensor0Rotation" />
+          <physvolid field_name="sensor" value="0" />
+        </physvol>
+      </volume>
+      <volume name="TestRunModuleFieldDefFlare2Volume">
+        <materialref ref="Vacuum" />
+        <solidref ref="TestRunModuleFieldDefFlare2Box" />
+        <physvol>
+          <volumeref ref="TestRunModuleFieldDefFlare2Volume_component0" />
+          <positionref ref="TestRunModuleFieldDefFlare2Volume_component0_position" />
+          <rotationref ref="TestRunModuleFieldDefFlare2Volume_component0_rotation" />
+          <physvolid field_name="component" value="0" />
+        </physvol>
+      </volume>
+      <volume name="BeamLeftVolume_component0Sensor0">
+        <materialref ref="Vacuum" />
+        <solidref ref="BeamLeftVolume_component0Sensor0Box" />
+        <sdref ref="ECalScoring" />
+      </volume>
+      <volume name="BeamLeftVolume_component0">
+        <materialref ref="Vacuum" />
+        <solidref ref="BeamLeftVolume_component0Box" />
+        <physvol>
+          <volumeref ref="BeamLeftVolume_component0Sensor0" />
+          <positionref ref="BeamLeftVolume_component0Sensor0Position" />
+          <rotationref ref="BeamLeftVolume_component0Sensor0Rotation" />
+          <physvolid field_name="sensor" value="0" />
+        </physvol>
+      </volume>
+      <volume name="BeamLeftVolume">
+        <materialref ref="Vacuum" />
+        <solidref ref="BeamLeftBox" />
+        <physvol>
+          <volumeref ref="BeamLeftVolume_component0" />
+          <positionref ref="BeamLeftVolume_component0_position" />
+          <rotationref ref="BeamLeftVolume_component0_rotation" />
+          <physvolid field_name="component" value="0" />
+        </physvol>
+      </volume>
+      <volume name="ElectronGapVolume_component0Sensor0">
+        <materialref ref="Vacuum" />
+        <solidref ref="ElectronGapVolume_component0Sensor0Box" />
+        <sdref ref="ECalScoring" />
+      </volume>
+      <volume name="ElectronGapVolume_component0">
+        <materialref ref="Vacuum" />
+        <solidref ref="ElectronGapVolume_component0Box" />
+        <physvol>
+          <volumeref ref="ElectronGapVolume_component0Sensor0" />
+          <positionref ref="ElectronGapVolume_component0Sensor0Position" />
+          <rotationref ref="ElectronGapVolume_component0Sensor0Rotation" />
+          <physvolid field_name="sensor" value="0" />
+        </physvol>
+      </volume>
+      <volume name="ElectronGapVolume">
+        <materialref ref="Vacuum" />
+        <solidref ref="ElectronGapBox" />
+        <physvol>
+          <volumeref ref="ElectronGapVolume_component0" />
+          <positionref ref="ElectronGapVolume_component0_position" />
+          <rotationref ref="ElectronGapVolume_component0_rotation" />
+          <physvolid field_name="component" value="0" />
+        </physvol>
+      </volume>
+      <volume name="BeamRightVolume_component0Sensor0">
+        <materialref ref="Vacuum" />
+        <solidref ref="BeamRightVolume_component0Sensor0Box" />
+        <sdref ref="ECalScoring" />
+      </volume>
+      <volume name="BeamRightVolume_component0">
+        <materialref ref="Vacuum" />
+        <solidref ref="BeamRightVolume_component0Box" />
+        <physvol>
+          <volumeref ref="BeamRightVolume_component0Sensor0" />
+          <positionref ref="BeamRightVolume_component0Sensor0Position" />
+          <rotationref ref="BeamRightVolume_component0Sensor0Rotation" />
+          <physvolid field_name="sensor" value="0" />
+        </physvol>
+      </volume>
+      <volume name="BeamRightVolume">
+        <materialref ref="Vacuum" />
+        <solidref ref="BeamRightBox" />
+        <physvol>
+          <volumeref ref="BeamRightVolume_component0" />
+          <positionref ref="BeamRightVolume_component0_position" />
+          <rotationref ref="BeamRightVolume_component0_rotation" />
+          <physvolid field_name="component" value="0" />
+        </physvol>
+      </volume>
       <volume name="crystal_volume">
         <materialref ref="LeadTungstate" />
         <solidref ref="crystal_trap" />
@@ -1823,6 +2042,24 @@
           <physvolid field_name="module" value="3" />
         </physvol>
         <physvol>
+          <volumeref ref="TestRunModuleFieldDefVolume" />
+          <positionref ref="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_position" />
+          <rotationref ref="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_rotation" />
+          <physvolid field_name="system" value="30" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="1" />
+          <physvolid field_name="module" value="0" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleFieldDefFlare2Volume" />
+          <positionref ref="TrackerFieldDef_TestRunModuleFieldDefFlare2_layer2_module0_position" />
+          <rotationref ref="TrackerFieldDef_TestRunModuleFieldDefFlare2_layer2_module0_rotation" />
+          <physvolid field_name="system" value="30" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="2" />
+          <physvolid field_name="module" value="0" />
+        </physvol>
+        <physvol>
           <volumeref ref="svt_chamber_vol" />
           <position name="svt_chamber_position" x="21.17" y="0" z="323.778" />
         </physvol>
@@ -1836,6 +2073,60 @@
           <volumeref ref="tracking_volume" />
           <positionref ref="identity_pos" />
           <rotationref ref="identity_rot" />
+        </physvol>
+        <physvol>
+          <volumeref ref="BeamLeftVolume" />
+          <positionref ref="ECalScoring_BeamLeft_layer1_module0_position" />
+          <rotationref ref="ECalScoring_BeamLeft_layer1_module0_rotation" />
+          <physvolid field_name="system" value="29" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="1" />
+          <physvolid field_name="module" value="0" />
+        </physvol>
+        <physvol>
+          <volumeref ref="ElectronGapVolume" />
+          <positionref ref="ECalScoring_ElectronGap_layer1_module0_position" />
+          <rotationref ref="ECalScoring_ElectronGap_layer1_module0_rotation" />
+          <physvolid field_name="system" value="29" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="1" />
+          <physvolid field_name="module" value="0" />
+        </physvol>
+        <physvol>
+          <volumeref ref="BeamRightVolume" />
+          <positionref ref="ECalScoring_BeamRight_layer1_module0_position" />
+          <rotationref ref="ECalScoring_BeamRight_layer1_module0_rotation" />
+          <physvolid field_name="system" value="29" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="1" />
+          <physvolid field_name="module" value="0" />
+        </physvol>
+        <physvol>
+          <volumeref ref="BeamLeftVolume" />
+          <positionref ref="ECalScoring_BeamLeft_layer2_module0_position" />
+          <rotationref ref="ECalScoring_BeamLeft_layer2_module0_rotation" />
+          <physvolid field_name="system" value="29" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="2" />
+          <physvolid field_name="module" value="0" />
+        </physvol>
+        <physvol>
+          <volumeref ref="ElectronGapVolume" />
+          <positionref ref="ECalScoring_ElectronGap_layer2_module0_position" />
+          <rotationref ref="ECalScoring_ElectronGap_layer2_module0_rotation" />
+          <physvolid field_name="system" value="29" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="2" />
+          <physvolid field_name="module" value="0" />
+        </physvol>
+        <physvol>
+          <volumeref ref="BeamRightVolume" />
+          <positionref ref="ECalScoring_BeamRight_layer2_module0_position" />
+          <rotationref ref="ECalScoring_BeamRight_layer2_module0_rotation" />
+          <physvolid field_name="system" value="29" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="2" />
+          <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
           <volumeref ref="crystal_volume" />

Modified: java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/compact.xml
 =============================================================================
--- java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/compact.xml	(original)
+++ java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2/compact.xml	Tue Mar  3 14:19:26 2015
@@ -1,352 +1,423 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
-       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
-    
-    <info name="HPS-ECalCommissioning-v2">
-        <comment>HPS ECal commissioning for pass1 </comment>
-    </info>
-
-    <define>
-    
-        <!-- world -->
-        <constant name="world_side" value="500.0*cm" />
-        <constant name="world_x" value="world_side" />
-        <constant name="world_y" value="world_side" />
-        <constant name="world_z" value="world_side" />
-
-        <!-- beam -->
-        <constant name="beam_angle" value="0.03052"/> <!--30.52 mrad-->
-
-        <!-- tracking region -->
-        <constant name="tracking_region_radius" value="200.0*cm"/>
-        <constant name="tracking_region_min" value="5.0*cm"/>
-        <constant name="tracking_region_zmax" value="131.8*cm"/>
-        
-        <!-- ECAL crystal dimensions -->
-        <constant name="ecal_front" value="13.3/2*mm" />
-        <constant name="ecal_back" value="16/2*mm" />
-        <constant name="ecal_z" value="160/2*mm" />
-                
-        <!-- ECal position -->
-        <constant name="ecal_dface" value="139.3*cm"/>
-                    
-        <!-- SVT module dimensions -->
-        <constant name="moduleLength" value="100.0"/>
-        <constant name="moduleWidth" value="40.34"/>
-        
-        <!-- SVT sensor dimensions -->
-        <constant name="sensorLength" value="98.33"/>
-        
-        
-        <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
-        <constant name="sensorWidth" value="38.3399"/>
-        
-        
-        <!-- SVT module dimensions -->
-        <constant name="vertModLength" value="40.34"/>
-        <constant name="vertModWidth" value="40.34"/>
-       
-        
-        <!-- SVT sensor dimensions -->
-        <constant name="vertSensLength" value="38.3399"/>
-        <constant name="vertSensWidth" value="38.3399"/>        
-        <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
-        <constant name="zst" value="1" />
-        <constant name="SA1" value="0.1" />
-        <constant name="SA2" value="0.05" />
-        <constant name="PI" value="3.14159265359" />
-        <!-- positions derived from drawing assuming 1.35/1.2 degress open on top/bottom -->
-
-        <constant name="x_rot_top" value="0" />  
-        <constant name="x_rot_bot" value="0" />    
-
-        <!--  monkey with the rotations  -->    
-        <constant name="x_rot_top_add" value="0.00" />  <!-- -ive means further closed -->
-        <constant name="x_rot_bot_add" value="0.00" /> <!-- +ive means further closed -->
-        <!--  distance from target to pivot...this is from an email schematic from Tim on may 12, 2012 -->
-        <constant name="pivot" value="791" /> 
-      
-        <constant name="y_rot" value = "beam_angle"/>
-        <!--        <constant name="x_off" value = "-15.0"/> -->
-        <constant name="x_off" value = "0.0"/> 
-
-        <constant name="xtar" value="0" />
-        <constant name="ytar" value="0" />
-        <constant name="ztar" value="0" />
-        <!-- Positions of sensor centers above/below nominal beam -->
-        <!-- ...these are from the test run survey -->
-<!--        <constant name="y1t" value="36.894" />
-        <constant name="y2t" value="36.746" />
-        <constant name="y3t" value="35.833" />
-        <constant name="y4t" value="35.669" />
-        <constant name="y5t" value="34.984" />
-        <constant name="y6t" value="34.845" />
-        <constant name="y7t" value="33.359" />
-        <constant name="y8t" value="33.183" />
-        <constant name="y9t" value="31.764" />
-        <constant name="y10t" value="31.596" />
-        
-        <constant name="y1b" value="-34.787" />
-        <constant name="y2b" value="-34.633" />
-        <constant name="y3b" value="-34.346" />
-        <constant name="y4b" value="-34.179" />
-        <constant name="y5b" value="-33.842" />
-        <constant name="y6b" value="-33.700" />
-        <constant name="y7b" value="-32.766" />
-        <constant name="y8b" value="-32.595" />
-        <constant name="y9b" value="-31.217" />
-        <constant name="y10b" value="-31.052" />      -->
-        <!-- these are the nominal (15mrad) -->
-        <constant name="y1t" value="100*sin(0.015)+38.3399/2" />
-        <constant name="y2t" value="100*sin(0.015)+38.3399/2" />
-        <constant name="y3t" value="200*sin(0.015)+38.3399/2" />
-        <constant name="y4t" value="200*sin(0.015)+38.3399/2" />
-        <constant name="y5t" value="300*sin(0.015)+38.3399/2" />
-        <constant name="y6t" value="300*sin(0.015)+38.3399/2" />
-        <constant name="y7t" value="500*sin(0.015)+38.3399/2" />
-        <constant name="y8t" value="500*sin(0.015)+38.3399/2" />
-        <constant name="y9t" value="700*sin(0.015)+38.3399/2" />
-        <constant name="y10t" value="700*sin(0.015)+38.3399/2" />
-        <constant name="y11t" value="900*sin(0.015)+38.3399/2" />
-        <constant name="y12t" value="900*sin(0.015)+38.3399/2" />
-        
-        <constant name="y1b" value="-(100*sin(0.015)+38.3399/2)" />
-        <constant name="y2b" value="-(100*sin(0.015)+38.3399/2)" />
-        <constant name="y3b" value="-(200*sin(0.015)+38.3399/2)" />
-        <constant name="y4b" value="-(200*sin(0.015)+38.3399/2)" />
-        <constant name="y5b" value="-(300*sin(0.015)+38.3399/2)" />
-        <constant name="y6b" value="-(300*sin(0.015)+38.3399/2)" />
-        <constant name="y7b" value="-(500*sin(0.015)+38.3399/2)" />
-        <constant name="y8b" value="-(500*sin(0.015)+38.3399/2)" />
-        <constant name="y9b" value="-(700*sin(0.015)+38.3399/2)" />
-        <constant name="y10b" value="-(700*sin(0.015)+38.3399/2)" />  
-        <constant name="y11b" value="-(900*sin(0.015)+38.3399/2)" />
-        <constant name="y12b" value="-(900*sin(0.015)+38.3399/2)" />  
- 
-        <!-- Positions of sensor centers along beam relative to nominal target position -->
-        <constant name="z1t" value="92.5-3.685" />
-        <constant name="z2t" value="92.5+3.685" />
-        <constant name="z3t" value="192.5-3.685" />
-        <constant name="z4t" value="192.5+3.685" />
-        <constant name="z5t" value="292.5-3.685" />
-        <constant name="z6t" value="292.5+3.685" />
-        <constant name="z7t" value="492.5-3.685" />
-        <constant name="z8t" value="492.5+3.685" />
-        <constant name="z9t" value="692.5-3.685" />
-        <constant name="z10t" value="692.5+3.685" />
-        <constant name="z11t" value="892.5-3.685" />
-        <constant name="z12t" value="892.5+3.685" />
-
-        <constant name="z1b" value="107.5-3.685" />
-        <constant name="z2b" value="107.5+3.685" />
-        <constant name="z3b" value="207.5-3.685" />
-        <constant name="z4b" value="207.5+3.685" />
-        <constant name="z5b" value="307.5-3.685" />
-        <constant name="z6b" value="307.5+3.685" />
-        <constant name="z7b" value="507.5-3.685" />
-        <constant name="z8b" value="507.5+3.685" />
-        <constant name="z9b" value="707.5-3.685" />
-        <constant name="z10b" value="707.5+3.685" />
-        <constant name="z11b" value="907.5-3.685" />
-        <constant name="z12b" value="907.5+3.685" />
-        
-        <!-- Lateral positions relative to nominal beamline -->
-        <constant name="x1t" value="0" />
-        <constant name="x2t" value="0" />
-        <constant name="x3t" value="0" />
-        <constant name="x4t" value="0" />
-        <constant name="x5t" value="0" />
-        <constant name="x6t" value="0" />
-        <constant name="x7t" value="0" />
-        <constant name="x8t" value="0" />
-        <constant name="x9t" value="0" />
-        <constant name="x10t" value="0" />
-        <constant name="x11t" value="0" />
-        <constant name="x12t" value="0" />
-    
-        <constant name="x1b" value="0" />
-        <constant name="x2b" value="0" />
-        <constant name="x3b" value="0" />
-        <constant name="x4b" value="0" />
-        <constant name="x5b" value="0" />
-        <constant name="x6b" value="0" />
-        <constant name="x7b" value="0" />
-        <constant name="x8b" value="0" />
-        <constant name="x9b" value="0" />
-        <constant name="x10b" value="0" />
-        <constant name="x11b" value="0" />
-        <constant name="x12b" value="0" />
-    
-        <!-- Corrections to stereo angle -->
-        <constant name="a1t" value="0" />
-        <constant name="a2t" value="0" />
-        <constant name="a3t" value="0" />
-        <constant name="a4t" value="0" />
-        <constant name="a5t" value="0" />
-        <constant name="a6t" value="0" />
-        <constant name="a7t" value="0" />
-        <constant name="a8t" value="0" />
-        <constant name="a9t" value="0" />
-        <constant name="a10t" value="0" />
-        <constant name="a11t" value="0" />
-        <constant name="a12t" value="0" />
-
-        <constant name="a1b" value="0" />
-        <constant name="a2b" value="0." />
-        <constant name="a3b" value="0" />
-        <constant name="a4b" value="0" />
-        <constant name="a5b" value="0" />
-        <constant name="a6b" value="0" />
-        <constant name="a7b" value="0" />
-        <constant name="a8b" value="0" />
-        <constant name="a9b" value="0" />
-        <constant name="a10b" value="0" />
-        <constant name="a11b" value="0" />
-        <constant name="a12b" value="0" />
-    
-    </define>
-    
-    <materials>
-        <!-- Set tracking material to vacuum. -->
-        <material name="TrackingMaterial">
-            <D type="density" unit="g/cm3" value="0.0000000000000001"/>
-            <fraction n="1.0" ref="Air" />
-        </material>
-        <!-- ECal crystal material. -->
-        <material name="LeadTungstate">
-            <D value="8.28" unit="g/cm3"/>
-            <composite n="1" ref="Pb"/>
-            <composite n="1" ref="W"/>
-            <composite n="4" ref="O"/>
-        </material>
-    </materials>
-  
-    <display>
-        <vis name="ECALVis" r="0.8" g="0.5" b="0.1" />
-    </display>
-   
-    <detectors>
-        <!--
-            <detector id="10" name="Target" type="HPSTracker2" reflect="false" combineHits="true" insideTrackingVolume="true">
-                <comment>The HPS Target</comment>
-                <module name="TungstenTarget">
-                    <box x="10.0" y="10.0" />
-                    <module_component thickness="0.3504*cm*0.00125" material="Tungsten" sensitive="false"/>      
-                </module>                   
-                <layer id="99">
-                    <module_placement name="TungstenTarget" id="0" x="xtar" y="ytar" z="ztar" rx="0" ry="y_rot" rz="0"/>               
-                </layer>
-            </detector>        
-        -->    
-        <detector id="1" name="Tracker" type="HPSTracker2" readout="TrackerHits" combineHits="true">
-            <comment>The Silicon Vertex Tracker</comment>
-            <module name="TestRunModule">
-                <box x="moduleLength" y="moduleWidth" />
-                <module_component thickness="0.032*cm" material = "Silicon" sensitive="true">
-                    <dimensions x="sensorLength" y="sensorWidth" /> 
-                </module_component>
-                <module_component thickness="0.0084*cm" material = "Carbon" sensitive="false"/> 
-            </module>            
-            <layer id="1">
-                <module_placement name="TestRunModule" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t" z="z1t*cos(y_rot)-(x1t+x_off)*sin(y_rot)" rx="x_rot_top+x_rot_top_add" ry="-y_rot" rz="-PI/2-a1t"/>
-                <module_placement name="TestRunModule" id="1" x="z1b*sin(y_rot)+(x1b+x_off)*cos(y_rot)" y="y1b" z="z1b*cos(y_rot)-(x1b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a1b"/>
-            </layer>
-            <layer id="2">
-                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
-                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>
-            </layer>
-            <layer id="3">
-                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
-                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>
-            </layer>
-            <layer id="4">
-                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
-                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>
-            </layer>
-            <layer id="5">
-                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
-                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>
-            </layer>
-            <layer id="6">
-                <module_placement name="TestRunModule" id="0" x="z6t*sin(y_rot)+(x6t+x_off)*cos(y_rot)" y="y6t" z="z6t*cos(y_rot)-(x6t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a6t"/>
-                <module_placement name="TestRunModule" id="1" x="z6b*sin(y_rot)+(x6b+x_off)*cos(y_rot)" y="y6b" z="z6b*cos(y_rot)-(x6b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a6b"/>
-            </layer>
-            <layer id="7">
-                <module_placement name="TestRunModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off-moduleLength/2)*cos(y_rot)" y="y7t" z="(z7t+zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/>
-                <module_placement name="TestRunModule" id="1" x="z7b*sin(y_rot)+(x7b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b-moduleLength/2*sin(SA2)" z="(z7b+zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/>
-                <module_placement name="TestRunModule" id="2" x="z7t*sin(y_rot)+(x7t+x_off+moduleLength/2)*cos(y_rot)" y="y7t" z="(z7t-zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/>
-                <module_placement name="TestRunModule" id="3" x="z7b*sin(y_rot)+(x7b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b+moduleLength/2*sin(SA2)" z="(z7b-zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/>
-            </layer>
-            <layer id="8">
-                <module_placement name="TestRunModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t+moduleLength/2*sin(SA2)" z="(z8t+zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a8t"/>
-                <module_placement name="TestRunModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off-moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b+zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>
-                <module_placement name="TestRunModule" id="2" x="z8t*sin(y_rot)+(x8t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t-moduleLength/2*sin(SA2)" z="(z8t-zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a8t"/>
-                <module_placement name="TestRunModule" id="3" x="z8b*sin(y_rot)+(x8b+x_off+moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b-zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>
-            </layer>
-            <layer id="9">
-                <module_placement name="TestRunModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off-moduleLength/2)*cos(y_rot)" y="y9t" z="(z9t+zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/>
-                <module_placement name="TestRunModule" id="1" x="z9b*sin(y_rot)+(x9b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b-moduleLength/2*sin(SA2)" z="(z9b+zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/>
-                <module_placement name="TestRunModule" id="2" x="z9t*sin(y_rot)+(x9t+x_off+moduleLength/2)*cos(y_rot)" y="y9t" z="(z9t-zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/>
-                <module_placement name="TestRunModule" id="3" x="z9b*sin(y_rot)+(x9b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b+moduleLength/2*sin(SA2)" z="(z9b-zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/>
-            </layer>
-            <layer id="10">
-                <module_placement name="TestRunModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t+moduleLength/2*sin(SA2)" z="(z10t+zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a10t"/>
-                <module_placement name="TestRunModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off-moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b+zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>
-                <module_placement name="TestRunModule" id="2" x="z10t*sin(y_rot)+(x10t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t-moduleLength/2*sin(SA2)" z="(z10t-zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a10t"/>
-                <module_placement name="TestRunModule" id="3" x="z10b*sin(y_rot)+(x10b+x_off+moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b-zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>
-            </layer>
-            <layer id="11">
-                <module_placement name="TestRunModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off-moduleLength/2)*cos(y_rot)" y="y11t" z="(z11t+zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/>
-                <module_placement name="TestRunModule" id="1" x="z11b*sin(y_rot)+(x11b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b-moduleLength/2*sin(SA2)" z="(z11b+zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/>
-                <module_placement name="TestRunModule" id="2" x="z11t*sin(y_rot)+(x11t+x_off+moduleLength/2)*cos(y_rot)" y="y11t" z="(z11t-zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/>
-                <module_placement name="TestRunModule" id="3" x="z11b*sin(y_rot)+(x11b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b+moduleLength/2*sin(SA2)" z="(z11b-zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/>
-            </layer>
-            <layer id="12">
-                <module_placement name="TestRunModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t+moduleLength/2*sin(SA2)" z="(z12t+zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a12t"/>
-                <module_placement name="TestRunModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off-moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b+zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
-                <module_placement name="TestRunModule" id="2" x="z12t*sin(y_rot)+(x12t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t-moduleLength/2*sin(SA2)" z="(z12t-zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a12t"/>
-                <module_placement name="TestRunModule" id="3" x="z12b*sin(y_rot)+(x12b+x_off+moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b-zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
-            </layer>
-        </detector>     
-        
-       
-        <detector id="13" name="Ecal" type="HPSEcal3" insideTrackingVolume="false" readout="EcalHits" vis="ECALVis">
-            <comment>The crystal ECal</comment>
-            <material name="LeadTungstate" />
-            <dimensions x1="ecal_front" y1="ecal_front" x2="ecal_back" y2="ecal_back" z="ecal_z" />          
-            <layout beamgapBottom="20.0*mm" beamgapTop="23.0*mm" nx="46" ny="5" dface="ecal_dface">
-                <remove ixmin="-10" ixmax="-2" iymin="-1" iymax="1" />
-                <top dx="ecal_dface*tan(beam_angle)" dy="0." dz="0."/>
-                <bottom dx="ecal_dface*tan(beam_angle)" dy="0." dz="0."/>
-            </layout>
-        </detector>
-      
-                      
-     
-    </detectors>
-    
-    <readouts>   
-        <readout name="TrackerHits">
-            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
-        </readout>
-        <!--         <readout name="TargetHits">
-            <id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12</id>
-        </readout>-->
-       
-        <readout name="EcalHits">
-            <segmentation type="GridXYZ" gridSizeX="0.0" gridSizeY="0.0" gridSizeZ="0.0" />
-            <id>system:6,layer:2,ix:-8,iy:-6</id>
-        </readout>
-       
-    </readouts>
-
-    <fields>
-        <field type="BoxDipole" name="AnalyzingDipole" x="2.117*cm" y="0*cm" z="45.72*cm" dx="22.86*cm" dy="10.2743*cm" dz="45.72*cm" bx="0.0" by="-0.3309" bz="0.0">     
-        </field>
-    </fields>
-
-    <includes>
-        <gdmlFile file="gdml/ecal_vacuum_flange_simple_v2.gdml" />
-        <gdmlFile file="gdml/svt_chamber.gdml" />
-    </includes>
-</lccdd>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+    
+    <info name="HPS-ECalCommissioning-v2">
+        <comment>HPS ECal commissioning for pass2 with no SVT By=-0.3309  </comment>
+    </info>
+
+    <define>
+    
+        <!-- world -->
+        <constant name="world_side" value="500.0*cm" />
+        <constant name="world_x" value="world_side" />
+        <constant name="world_y" value="world_side" />
+        <constant name="world_z" value="world_side" />
+
+        <!-- beam -->
+        <constant name="beam_angle" value="0.03052"/> <!--30.52 mrad-->
+
+        <!-- tracking region -->
+        <constant name="tracking_region_radius" value="200.0*cm"/>
+        <constant name="tracking_region_min" value="5.0*cm"/>
+        <constant name="tracking_region_zmax" value="131.8*cm"/>
+      
+        <!--  dipole magnet  -->
+        <constant name="dipoleMagnetPositionX" value="2.117*cm"/>
+        <constant name="dipoleMagnetPositionZ" value="45.72*cm"/>
+        <constant name="dipoleMagnetHeight" value="100*cm"/>
+        <constant name="dipoleMagnetWidth" value="100*cm"/>
+        <constant name="dipoleMagnetLength" value="108*cm"/>
+                  
+        <!--scoring plane thickness-->
+        <constant name="scoringThickness" value="0.001"/>
+        <!--left and right edges of the electron gap for the ECal scoring plane, measured as distances from the BL edge of the flange-->
+        <constant name="electronGapLeftEdge" value="382.16+20*0.0166"/>
+        <constant name="electronGapRightEdge" value="471.94+20*0.1511"/>
+                
+        <!-- ECAL crystal dimensions -->
+        <constant name="ecal_front" value="13.3/2*mm" />
+        <constant name="ecal_back" value="16/2*mm" />
+        <constant name="ecal_z" value="160/2*mm" />
+                
+        <!-- ECal position -->
+        <constant name="ecal_dface" value="139.3*cm"/>
+                    
+        <!-- SVT module dimensions -->
+        <constant name="moduleLength" value="100.0"/>
+        <constant name="moduleWidth" value="40.34"/>
+        
+        <!-- SVT sensor dimensions -->
+        <constant name="sensorLength" value="98.33"/>
+        
+        
+        <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
+        <constant name="sensorWidth" value="38.3399"/>
+        
+        
+        <!-- SVT module dimensions -->
+        <constant name="vertModLength" value="40.34"/>
+        <constant name="vertModWidth" value="40.34"/>
+       
+        
+        <!-- SVT sensor dimensions -->
+        <constant name="vertSensLength" value="38.3399"/>
+        <constant name="vertSensWidth" value="38.3399"/>        
+        <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
+        <constant name="zst" value="1" />
+        <constant name="SA1" value="0.1" />
+        <constant name="SA2" value="0.05" />
+        <constant name="PI" value="3.14159265359" />
+        <!-- positions derived from drawing assuming 1.35/1.2 degress open on top/bottom -->
+
+        <constant name="x_rot_top" value="0" />  
+        <constant name="x_rot_bot" value="0" />    
+
+        <!--  monkey with the rotations  -->    
+        <constant name="x_rot_top_add" value="0.00" />  <!-- -ive means further closed -->
+        <constant name="x_rot_bot_add" value="0.00" /> <!-- +ive means further closed -->
+        <!--  distance from target to pivot...this is from an email schematic from Tim on may 12, 2012 -->
+        <constant name="pivot" value="791" /> 
+      
+        <constant name="y_rot" value = "beam_angle"/>
+        <!--        <constant name="x_off" value = "-15.0"/> -->
+        <constant name="x_off" value = "0.0"/> 
+
+        <constant name="xtar" value="0" />
+        <constant name="ytar" value="0" />
+        <constant name="ztar" value="0" />
+        <!-- Positions of sensor centers above/below nominal beam -->
+        <!-- ...these are from the test run survey -->
+<!--        <constant name="y1t" value="36.894" />
+        <constant name="y2t" value="36.746" />
+        <constant name="y3t" value="35.833" />
+        <constant name="y4t" value="35.669" />
+        <constant name="y5t" value="34.984" />
+        <constant name="y6t" value="34.845" />
+        <constant name="y7t" value="33.359" />
+        <constant name="y8t" value="33.183" />
+        <constant name="y9t" value="31.764" />
+        <constant name="y10t" value="31.596" />
+        
+        <constant name="y1b" value="-34.787" />
+        <constant name="y2b" value="-34.633" />
+        <constant name="y3b" value="-34.346" />
+        <constant name="y4b" value="-34.179" />
+        <constant name="y5b" value="-33.842" />
+        <constant name="y6b" value="-33.700" />
+        <constant name="y7b" value="-32.766" />
+        <constant name="y8b" value="-32.595" />
+        <constant name="y9b" value="-31.217" />
+        <constant name="y10b" value="-31.052" />      -->
+        <!-- these are the nominal (15mrad) -->
+        <constant name="y1t" value="100*sin(0.015)+38.3399/2" />
+        <constant name="y2t" value="100*sin(0.015)+38.3399/2" />
+        <constant name="y3t" value="200*sin(0.015)+38.3399/2" />
+        <constant name="y4t" value="200*sin(0.015)+38.3399/2" />
+        <constant name="y5t" value="300*sin(0.015)+38.3399/2" />
+        <constant name="y6t" value="300*sin(0.015)+38.3399/2" />
+        <constant name="y7t" value="500*sin(0.015)+38.3399/2" />
+        <constant name="y8t" value="500*sin(0.015)+38.3399/2" />
+        <constant name="y9t" value="700*sin(0.015)+38.3399/2" />
+        <constant name="y10t" value="700*sin(0.015)+38.3399/2" />
+        <constant name="y11t" value="900*sin(0.015)+38.3399/2" />
+        <constant name="y12t" value="900*sin(0.015)+38.3399/2" />
+        
+        <constant name="y1b" value="-(100*sin(0.015)+38.3399/2)" />
+        <constant name="y2b" value="-(100*sin(0.015)+38.3399/2)" />
+        <constant name="y3b" value="-(200*sin(0.015)+38.3399/2)" />
+        <constant name="y4b" value="-(200*sin(0.015)+38.3399/2)" />
+        <constant name="y5b" value="-(300*sin(0.015)+38.3399/2)" />
+        <constant name="y6b" value="-(300*sin(0.015)+38.3399/2)" />
+        <constant name="y7b" value="-(500*sin(0.015)+38.3399/2)" />
+        <constant name="y8b" value="-(500*sin(0.015)+38.3399/2)" />
+        <constant name="y9b" value="-(700*sin(0.015)+38.3399/2)" />
+        <constant name="y10b" value="-(700*sin(0.015)+38.3399/2)" />  
+        <constant name="y11b" value="-(900*sin(0.015)+38.3399/2)" />
+        <constant name="y12b" value="-(900*sin(0.015)+38.3399/2)" />  
+ 
+        <!-- Positions of sensor centers along beam relative to nominal target position -->
+        <constant name="z1t" value="92.5-3.685" />
+        <constant name="z2t" value="92.5+3.685" />
+        <constant name="z3t" value="192.5-3.685" />
+        <constant name="z4t" value="192.5+3.685" />
+        <constant name="z5t" value="292.5-3.685" />
+        <constant name="z6t" value="292.5+3.685" />
+        <constant name="z7t" value="492.5-3.685" />
+        <constant name="z8t" value="492.5+3.685" />
+        <constant name="z9t" value="692.5-3.685" />
+        <constant name="z10t" value="692.5+3.685" />
+        <constant name="z11t" value="892.5-3.685" />
+        <constant name="z12t" value="892.5+3.685" />
+
+        <constant name="z1b" value="107.5-3.685" />
+        <constant name="z2b" value="107.5+3.685" />
+        <constant name="z3b" value="207.5-3.685" />
+        <constant name="z4b" value="207.5+3.685" />
+        <constant name="z5b" value="307.5-3.685" />
+        <constant name="z6b" value="307.5+3.685" />
+        <constant name="z7b" value="507.5-3.685" />
+        <constant name="z8b" value="507.5+3.685" />
+        <constant name="z9b" value="707.5-3.685" />
+        <constant name="z10b" value="707.5+3.685" />
+        <constant name="z11b" value="907.5-3.685" />
+        <constant name="z12b" value="907.5+3.685" />
+        
+        <!-- Lateral positions relative to nominal beamline -->
+        <constant name="x1t" value="0" />
+        <constant name="x2t" value="0" />
+        <constant name="x3t" value="0" />
+        <constant name="x4t" value="0" />
+        <constant name="x5t" value="0" />
+        <constant name="x6t" value="0" />
+        <constant name="x7t" value="0" />
+        <constant name="x8t" value="0" />
+        <constant name="x9t" value="0" />
+        <constant name="x10t" value="0" />
+        <constant name="x11t" value="0" />
+        <constant name="x12t" value="0" />
+    
+        <constant name="x1b" value="0" />
+        <constant name="x2b" value="0" />
+        <constant name="x3b" value="0" />
+        <constant name="x4b" value="0" />
+        <constant name="x5b" value="0" />
+        <constant name="x6b" value="0" />
+        <constant name="x7b" value="0" />
+        <constant name="x8b" value="0" />
+        <constant name="x9b" value="0" />
+        <constant name="x10b" value="0" />
+        <constant name="x11b" value="0" />
+        <constant name="x12b" value="0" />
+    
+        <!-- Corrections to stereo angle -->
+        <constant name="a1t" value="0" />
+        <constant name="a2t" value="0" />
+        <constant name="a3t" value="0" />
+        <constant name="a4t" value="0" />
+        <constant name="a5t" value="0" />
+        <constant name="a6t" value="0" />
+        <constant name="a7t" value="0" />
+        <constant name="a8t" value="0" />
+        <constant name="a9t" value="0" />
+        <constant name="a10t" value="0" />
+        <constant name="a11t" value="0" />
+        <constant name="a12t" value="0" />
+
+        <constant name="a1b" value="0" />
+        <constant name="a2b" value="0." />
+        <constant name="a3b" value="0" />
+        <constant name="a4b" value="0" />
+        <constant name="a5b" value="0" />
+        <constant name="a6b" value="0" />
+        <constant name="a7b" value="0" />
+        <constant name="a8b" value="0" />
+        <constant name="a9b" value="0" />
+        <constant name="a10b" value="0" />
+        <constant name="a11b" value="0" />
+        <constant name="a12b" value="0" />
+    
+    </define>
+    
+    <materials>
+        <!-- Set tracking material to vacuum. -->
+        <material name="TrackingMaterial">
+            <D type="density" unit="g/cm3" value="0.0000000000000001"/>
+            <fraction n="1.0" ref="Air" />
+        </material>
+        <!-- ECal crystal material. -->
+        <material name="LeadTungstate">
+            <D value="8.28" unit="g/cm3"/>
+            <composite n="1" ref="Pb"/>
+            <composite n="1" ref="W"/>
+            <composite n="4" ref="O"/>
+        </material>
+    </materials>
+  
+    <display>
+        <vis name="ECALVis" r="0.8" g="0.5" b="0.1" />
+    </display>
+   
+    <detectors>
+        <!--
+            <detector id="10" name="Target" type="HPSTracker2" reflect="false" combineHits="true" insideTrackingVolume="true">
+                <comment>The HPS Target</comment>
+                <module name="TungstenTarget">
+                    <box x="10.0" y="10.0" />
+                    <module_component thickness="0.3504*cm*0.00125" material="Tungsten" sensitive="false"/>      
+                </module>                   
+                <layer id="99">
+                    <module_placement name="TungstenTarget" id="0" x="xtar" y="ytar" z="ztar" rx="0" ry="y_rot" rz="0"/>               
+                </layer>
+            </detector>        
+        -->    
+        <detector id="1" name="Tracker" type="HPSTracker2" readout="TrackerHits" combineHits="true">
+            <comment>The Silicon Vertex Tracker</comment>
+            <module name="TestRunModule">
+                <box x="moduleLength" y="moduleWidth" />
+                <module_component thickness="0.032*cm" material = "Silicon" sensitive="true">
+                    <dimensions x="sensorLength" y="sensorWidth" /> 
+                </module_component>
+                <module_component thickness="0.0084*cm" material = "Carbon" sensitive="false"/> 
+            </module>            
+            <layer id="1">
+                <module_placement name="TestRunModule" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t" z="z1t*cos(y_rot)-(x1t+x_off)*sin(y_rot)" rx="x_rot_top+x_rot_top_add" ry="-y_rot" rz="-PI/2-a1t"/>
+                <module_placement name="TestRunModule" id="1" x="z1b*sin(y_rot)+(x1b+x_off)*cos(y_rot)" y="y1b" z="z1b*cos(y_rot)-(x1b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a1b"/>
+            </layer>
+            <layer id="2">
+                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
+                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>
+            </layer>
+            <layer id="3">
+                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
+                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>
+            </layer>
+            <layer id="4">
+                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
+                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>
+            </layer>
+            <layer id="5">
+                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
+                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>
+            </layer>
+            <layer id="6">
+                <module_placement name="TestRunModule" id="0" x="z6t*sin(y_rot)+(x6t+x_off)*cos(y_rot)" y="y6t" z="z6t*cos(y_rot)-(x6t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a6t"/>
+                <module_placement name="TestRunModule" id="1" x="z6b*sin(y_rot)+(x6b+x_off)*cos(y_rot)" y="y6b" z="z6b*cos(y_rot)-(x6b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a6b"/>
+            </layer>
+            <layer id="7">
+                <module_placement name="TestRunModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off-moduleLength/2)*cos(y_rot)" y="y7t" z="(z7t+zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/>
+                <module_placement name="TestRunModule" id="1" x="z7b*sin(y_rot)+(x7b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b-moduleLength/2*sin(SA2)" z="(z7b+zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/>
+                <module_placement name="TestRunModule" id="2" x="z7t*sin(y_rot)+(x7t+x_off+moduleLength/2)*cos(y_rot)" y="y7t" z="(z7t-zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/>
+                <module_placement name="TestRunModule" id="3" x="z7b*sin(y_rot)+(x7b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b+moduleLength/2*sin(SA2)" z="(z7b-zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/>
+            </layer>
+            <layer id="8">
+                <module_placement name="TestRunModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t+moduleLength/2*sin(SA2)" z="(z8t+zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a8t"/>
+                <module_placement name="TestRunModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off-moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b+zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>
+                <module_placement name="TestRunModule" id="2" x="z8t*sin(y_rot)+(x8t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t-moduleLength/2*sin(SA2)" z="(z8t-zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a8t"/>
+                <module_placement name="TestRunModule" id="3" x="z8b*sin(y_rot)+(x8b+x_off+moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b-zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>
+            </layer>
+            <layer id="9">
+                <module_placement name="TestRunModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off-moduleLength/2)*cos(y_rot)" y="y9t" z="(z9t+zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/>
+                <module_placement name="TestRunModule" id="1" x="z9b*sin(y_rot)+(x9b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b-moduleLength/2*sin(SA2)" z="(z9b+zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/>
+                <module_placement name="TestRunModule" id="2" x="z9t*sin(y_rot)+(x9t+x_off+moduleLength/2)*cos(y_rot)" y="y9t" z="(z9t-zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/>
+                <module_placement name="TestRunModule" id="3" x="z9b*sin(y_rot)+(x9b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b+moduleLength/2*sin(SA2)" z="(z9b-zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/>
+            </layer>
+            <layer id="10">
+                <module_placement name="TestRunModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t+moduleLength/2*sin(SA2)" z="(z10t+zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a10t"/>
+                <module_placement name="TestRunModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off-moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b+zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>
+                <module_placement name="TestRunModule" id="2" x="z10t*sin(y_rot)+(x10t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t-moduleLength/2*sin(SA2)" z="(z10t-zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a10t"/>
+                <module_placement name="TestRunModule" id="3" x="z10b*sin(y_rot)+(x10b+x_off+moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b-zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>
+            </layer>
+            <layer id="11">
+                <module_placement name="TestRunModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off-moduleLength/2)*cos(y_rot)" y="y11t" z="(z11t+zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/>
+                <module_placement name="TestRunModule" id="1" x="z11b*sin(y_rot)+(x11b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b-moduleLength/2*sin(SA2)" z="(z11b+zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/>
+                <module_placement name="TestRunModule" id="2" x="z11t*sin(y_rot)+(x11t+x_off+moduleLength/2)*cos(y_rot)" y="y11t" z="(z11t-zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/>
+                <module_placement name="TestRunModule" id="3" x="z11b*sin(y_rot)+(x11b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b+moduleLength/2*sin(SA2)" z="(z11b-zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/>
+            </layer>
+            <layer id="12">
+                <module_placement name="TestRunModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t+moduleLength/2*sin(SA2)" z="(z12t+zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a12t"/>
+                <module_placement name="TestRunModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off-moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b+zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
+                <module_placement name="TestRunModule" id="2" x="z12t*sin(y_rot)+(x12t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t-moduleLength/2*sin(SA2)" z="(z12t-zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a12t"/>
+                <module_placement name="TestRunModule" id="3" x="z12b*sin(y_rot)+(x12b+x_off+moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b-zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
+            </layer>
+        </detector>    
+        
+           <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
+            <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
+<!--        <constant name="dipoleMagnetHeight" value="17.78*cm"/>
+        <constant name="dipoleMagnetWidth" value="41.6052*cm"/>-->
+            <module name="TestRunModuleFieldDef">
+                <box x="416.052" y="177.8" />
+                <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+            </module>            
+            <module name="TestRunModuleFieldDefFlare2">
+                <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
+                <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+            </module>            
+            <layer id="1">
+                <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+            </layer>
+            <layer id="2">
+                <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+            </layer>
+        </detector>  
+        
+    <detector id="29" name="ECalScoring" type="HPSTracker2" readout="TrackerHitsECal" insideTrackingVolume="false" >
+            <comment>Scoring plane after ECal flange for calibration studies</comment>
+            <module name="BeamLeft">
+                <box x="electronGapLeftEdge" y="457.2/2-17" />
+                <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+            </module>            
+            <module name="ElectronGap">
+                <box x="electronGapRightEdge-electronGapLeftEdge" y="(457.2-64.66)/2" />
+                <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+            </module>            
+            <module name="BeamRight">
+                <box x="768.35-electronGapRightEdge" y="457.2/2-14" />
+                <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+            </module>            
+            <layer id="1"><!--top-->
+                <module_placement name="BeamLeft" id="0" x="(768.35-electronGapLeftEdge)/2+21.17" y="(457.2/2+17)/2" z="1318+20+scoringThickness" rx="0" ry="0" rz="-PI/2"/>
+                <module_placement name="ElectronGap" id="0" x="768.35/2-electronGapRightEdge+(electronGapRightEdge-electronGapLeftEdge)/2+21.17" y="(457.2/2+64.66/2)/2" z="1318+20+scoringThickness" rx="0" ry="0" rz="-PI/2"/>
+                <module_placement name="BeamRight" id="0" x="-1*electronGapRightEdge/2+21.17" y="(457.2/2+14)/2" z="1318+20+scoringThickness" rx="0" ry="0" rz="-PI/2"/>
+            </layer>
+            <layer id="2"><!--bottom-->
+                <module_placement name="BeamLeft" id="0" x="(768.35-electronGapLeftEdge)/2+21.17" y="-1*(457.2/2+17)/2" z="1318+20+scoringThickness" rx="0" ry="0" rz="-3*PI/2"/>
+                <module_placement name="ElectronGap" id="0" x="768.35/2-electronGapRightEdge+(electronGapRightEdge-electronGapLeftEdge)/2+21.17" y="-1*(457.2/2+64.66/2)/2" z="1318+20+scoringThickness" rx="0" ry="0" rz="-3*PI/2"/>
+                <module_placement name="BeamRight" id="0" x="-1*electronGapRightEdge/2+21.17" y="-1*(457.2/2+14)/2" z="1318+20+scoringThickness" rx="0" ry="0" rz="-3*PI/2"/>
+            </layer>
+        </detector>         
+                  
+       
+        <detector id="13" name="Ecal" type="HPSEcal3" insideTrackingVolume="false" readout="EcalHits" vis="ECALVis">
+            <comment>The crystal ECal</comment>
+            <material name="LeadTungstate" />
+            <dimensions x1="ecal_front" y1="ecal_front" x2="ecal_back" y2="ecal_back" z="ecal_z" />          
+            <layout beamgapBottom="20.0*mm" beamgapTop="23.0*mm" nx="46" ny="5" dface="ecal_dface">
+                <remove ixmin="-10" ixmax="-2" iymin="-1" iymax="1" />
+                <top dx="ecal_dface*tan(beam_angle)" dy="0." dz="0."/>
+                <bottom dx="ecal_dface*tan(beam_angle)" dy="0." dz="0."/>
+            </layout>
+        </detector>
+      
+                      
+     
+    </detectors>
+    
+    <readouts>   
+        <readout name="TrackerHits">
+            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
+        </readout>
+        <readout name="TrackerHitsFieldDef">
+            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
+            <processor type="ScoringTrackerHitProcessor" />        
+        </readout>
+        <readout name="TrackerHitsRecoil">
+            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
+        </readout>
+        <readout name="TrackerHitsECal">
+            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
+            <processor type="ScoringTrackerHitProcessor" />        
+        </readout>        
+        <!--         <readout name="TargetHits">
+            <id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12</id>
+        </readout>-->
+       
+        <readout name="EcalHits">
+            <segmentation type="GridXYZ" gridSizeX="0.0" gridSizeY="0.0" gridSizeZ="0.0" />
+            <id>system:6,layer:2,ix:-8,iy:-6</id>
+        </readout>
+       
+    </readouts>
+
+    <fields>
+        <field type="BoxDipole" name="AnalyzingDipole" x="2.117*cm" y="0*cm" z="45.72*cm" dx="22.86*cm" dy="10.2743*cm" dz="45.72*cm" bx="0.0" by="-0.3309" bz="0.0">     
+        </field>
+    </fields>
+ 
+
+    <includes>
+        <gdmlFile file="gdml/ecal_vacuum_flange_simple_v2.gdml" />
+        <gdmlFile file="gdml/svt_chamber.gdml" />
+    </includes>
+</lccdd>