hps-detectors/detectors/HPS-TestRun-v2

diff -u -r1.6 -r1.7
--- compact.xml	24 May 2012 14:21:13 -0000	1.6
+++ compact.xml	29 May 2012 18:26:48 -0000	1.7
@@ -177,7 +177,7 @@

                 <remove ixmin="-10" ixmax="-2" iymin="-1" iymax="1" />
             </layout>
         </detector>

-        <detector id="10" name="Target" type="SiTrackerSpectrometer" readout="TargetHits" reflect="false">

+<!--        <detector id="10" name="Target" type="SiTrackerSpectrometer" readout="TargetHits" reflect="false">

             <comment>The Tungsten fixed target</comment>
             <module name="TungstenTarget">
                 <trd x1="5*cm" x2="5*cm" z="5*cm" />

@@ -186,7 +186,7 @@

             <layer id="1">
                 <quadrant xStart="0" nx="1" xStep="moduleLength" yStart="0" ny="1" yStep="moduleWidth" phi0="0.0" z="0.0" dz="0.0*cm"  module="TungstenTarget"/>
             </layer>

-        </detector>

+        </detector>-->

 
     </detectors>
     

hps-detectors/detectors/HPS-TestRun-v2

diff -u -r1.4 -r1.5
--- HPS-TestRun-v2.lcdd	24 May 2012 14:21:13 -0000	1.4
+++ HPS-TestRun-v2.lcdd	29 May 2012 18:26:48 -0000	1.5
@@ -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-TestRun-v2" />

-    <generator name="GeomConverter" version="1.0" file="/Users/mgraham/NetBeansProjects/hps-detectors/detectors/HPS-TestRun-v2/compact.xml" checksum="1152467342" />

+    <generator name="GeomConverter" version="1.0" file="/home/meeg/lcsim/hps-detectors/detectors/HPS-TestRun-v2/compact.xml" checksum="2174022371" />

     <author name="NONE" />
     <comment>HPS Test Proposal detector explicit SVT module placements</comment>
   </header>

@@ -34,9 +34,6 @@

     </idspec>
   </iddict>
   <sensitive_detectors>

-    <tracker name="Target" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TargetHits">
-      <idspecref ref="TargetHits" />
-    </tracker>

     <tracker name="Tracker" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits">
       <idspecref ref="TrackerHits" />
     </tracker>

@@ -101,10 +98,6 @@

       <constant name="tracking_region_zmax" value="1000.0" />
       <constant name="ecal_back" value="8.0" />
       <constant name="moduleWidth" value="40.34" />

-      <position name="TungstenTargetVolume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
-      <rotation name="TungstenTargetVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
-      <position name="Target_layer1_module0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
-      <rotation name="Target_layer1_module0_rotation" x="-1.5707963267948966" y="1.5707963267948966" z="0.0" unit="radian" />

       <position name="TestRunModuleVolume_component0_position" x="0.0" y="0.0" z="-0.1" unit="mm" />
       <rotation name="TestRunModuleVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
       <position name="TestRunModuleVolume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />

@@ -1075,12 +1068,6 @@

         <D type="density" unit="g/cm3" value="0.00000001" />
         <fraction n="1" ref="H" />
       </material>

-      <material name="Tungsten">
-        <RL type="X0" unit="cm" value="0.350418" />
-        <NIL type="lambda" unit="cm" value="10.3057" />
-        <D type="density" unit="g/cm3" value="19.3" />
-        <composite n="1" ref="W" />
-      </material>

       <element name="Si" formula="Si" Z="14">
         <atom type="A" unit="g/mol" value="28.0854" />
       </element>

@@ -1103,8 +1090,6 @@

     <solids>
       <box name="world_box" x="world_x" y="world_y" z="world_z" />
       <tube name="tracking_cylinder" deltaphi="6.283185307179586" rmin="0.0" rmax="tracking_region_radius" z="2*tracking_region_zmax" />

-      <trd name="TungstenTargetTrd" x1="100.0" x2="100.0" y1="0.00438" y2="0.00438" z="100.0" />
-      <trd name="TungstenTargetVolume_component0_trd" x1="100.0" x2="100.0" y1="0.00438" y2="0.00438" z="100.0" />

       <box name="TestRunModuleBox" x="40.34" y="100.0" z="0.52" />
       <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" />

@@ -1112,20 +1097,6 @@

       <trd name="crystal_trap" x1="13.3" x2="16.0" y1="13.3" y2="16.0" z="160.0" />
     </solids>
     <structure>

-      <volume name="TungstenTargetVolume_component0">
-        <materialref ref="Tungsten" />
-        <solidref ref="TungstenTargetVolume_component0_trd" />
-      </volume>
-      <volume name="TungstenTargetVolume">
-        <materialref ref="Vacuum" />
-        <solidref ref="TungstenTargetTrd" />
-        <physvol>
-          <volumeref ref="TungstenTargetVolume_component0" />
-          <positionref ref="TungstenTargetVolume_component0_position" />
-          <rotationref ref="TungstenTargetVolume_component0_rotation" />
-          <physvolid field_name="component" value="0" />
-        </physvol>
-      </volume>

       <volume name="TestRunModuleVolume_component0Sensor0">
         <materialref ref="Silicon" />
         <solidref ref="TestRunModuleVolume_component0Sensor0Box" />

@@ -1171,15 +1142,6 @@

         <materialref ref="TrackingMaterial" />
         <solidref ref="tracking_cylinder" />
         <physvol>

-          <volumeref ref="TungstenTargetVolume" />
-          <positionref ref="Target_layer1_module0_position" />
-          <rotationref ref="Target_layer1_module0_rotation" />
-          <physvolid field_name="system" value="10" />
-          <physvolid field_name="barrel" value="0" />
-          <physvolid field_name="layer" value="1" />
-          <physvolid field_name="module" value="0" />
-        </physvol>
-        <physvol>

           <volumeref ref="TestRunModuleVolume" />
           <positionref ref="Tracker_TestRunModule_layer1_module0_position" />
           <rotationref ref="Tracker_TestRunModule_layer1_module0_rotation" />

hps-detectors/detectors/HPS-TestRun-v2

diff -u -r1.1 -r1.2
--- HPS-TestRun-v2.heprep	5 May 2012 11:46:26 -0000	1.1
+++ HPS-TestRun-v2.heprep	29 May 2012 18:26:48 -0000	1.2
@@ -6,16 +6,6 @@

   <typetree version="1.0" name="DetectorType">
     <type name="Barrel">
       <attvalue name="layer" value="Detector"/>

-      <type name="Target">
-        <attvalue name="color" type="Color" value="White"/>
-        <type name="Target_positive">
-          <type name="Target_positive_layer1">
-            <type name="Target_layer1_module0">
-              <attvalue name="drawAs" value="Prism"/>
-            </type>
-          </type>
-        </type>
-      </type>

       <type name="Tracker">
         <attvalue name="color" type="Color" value="White"/>
         <type name="Tracker_layer1">

@@ -179,1333 +169,1333 @@

           </type>
         </type>
       </type>

-      <type name="ECAL">

+      <type name="Ecal">

         <attvalue name="color" type="Color"
           value="204, 128, 26, 255"/>

-        <type name="ECAL_crystal1">

+        <type name="Ecal_crystal1">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal2">

+        <type name="Ecal_crystal2">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal3">

+        <type name="Ecal_crystal3">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal4">

+        <type name="Ecal_crystal4">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal5">

+        <type name="Ecal_crystal5">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal6">

+        <type name="Ecal_crystal6">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal7">

+        <type name="Ecal_crystal7">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal8">

+        <type name="Ecal_crystal8">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal9">

+        <type name="Ecal_crystal9">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal10">

+        <type name="Ecal_crystal10">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal11">

+        <type name="Ecal_crystal11">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal12">

+        <type name="Ecal_crystal12">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal13">

+        <type name="Ecal_crystal13">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal14">

+        <type name="Ecal_crystal14">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal15">

+        <type name="Ecal_crystal15">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal16">

+        <type name="Ecal_crystal16">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal17">

+        <type name="Ecal_crystal17">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal18">

+        <type name="Ecal_crystal18">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal19">

+        <type name="Ecal_crystal19">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal20">

+        <type name="Ecal_crystal20">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal21">

+        <type name="Ecal_crystal21">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal22">

+        <type name="Ecal_crystal22">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal23">

+        <type name="Ecal_crystal23">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal24">

+        <type name="Ecal_crystal24">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal25">

+        <type name="Ecal_crystal25">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal26">

+        <type name="Ecal_crystal26">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal27">

+        <type name="Ecal_crystal27">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal28">

+        <type name="Ecal_crystal28">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal29">

+        <type name="Ecal_crystal29">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal30">

+        <type name="Ecal_crystal30">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal31">

+        <type name="Ecal_crystal31">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal32">

+        <type name="Ecal_crystal32">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal33">

+        <type name="Ecal_crystal33">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal34">

+        <type name="Ecal_crystal34">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal35">

+        <type name="Ecal_crystal35">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal36">

+        <type name="Ecal_crystal36">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal37">

+        <type name="Ecal_crystal37">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal38">

+        <type name="Ecal_crystal38">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal39">

+        <type name="Ecal_crystal39">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal40">

+        <type name="Ecal_crystal40">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal41">

+        <type name="Ecal_crystal41">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal42">

+        <type name="Ecal_crystal42">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal43">

+        <type name="Ecal_crystal43">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal44">

+        <type name="Ecal_crystal44">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal45">

+        <type name="Ecal_crystal45">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal46">

+        <type name="Ecal_crystal46">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal47">

+        <type name="Ecal_crystal47">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal48">

+        <type name="Ecal_crystal48">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal49">

+        <type name="Ecal_crystal49">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal50">

+        <type name="Ecal_crystal50">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal51">

+        <type name="Ecal_crystal51">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal52">

+        <type name="Ecal_crystal52">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal53">

+        <type name="Ecal_crystal53">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal54">

+        <type name="Ecal_crystal54">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal55">

+        <type name="Ecal_crystal55">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal56">

+        <type name="Ecal_crystal56">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal57">

+        <type name="Ecal_crystal57">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal58">

+        <type name="Ecal_crystal58">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal59">

+        <type name="Ecal_crystal59">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal60">

+        <type name="Ecal_crystal60">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal61">

+        <type name="Ecal_crystal61">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal62">

+        <type name="Ecal_crystal62">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal63">

+        <type name="Ecal_crystal63">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal64">

+        <type name="Ecal_crystal64">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal65">

+        <type name="Ecal_crystal65">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal66">

+        <type name="Ecal_crystal66">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal67">

+        <type name="Ecal_crystal67">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal68">

+        <type name="Ecal_crystal68">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal69">

+        <type name="Ecal_crystal69">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal70">

+        <type name="Ecal_crystal70">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal71">

+        <type name="Ecal_crystal71">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal72">

+        <type name="Ecal_crystal72">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal73">

+        <type name="Ecal_crystal73">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal74">

+        <type name="Ecal_crystal74">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal75">

+        <type name="Ecal_crystal75">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal76">

+        <type name="Ecal_crystal76">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal77">

+        <type name="Ecal_crystal77">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal78">

+        <type name="Ecal_crystal78">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal79">

+        <type name="Ecal_crystal79">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal80">

+        <type name="Ecal_crystal80">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal81">

+        <type name="Ecal_crystal81">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal82">

+        <type name="Ecal_crystal82">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal83">

+        <type name="Ecal_crystal83">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal84">

+        <type name="Ecal_crystal84">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal85">

+        <type name="Ecal_crystal85">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal86">

+        <type name="Ecal_crystal86">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal87">

+        <type name="Ecal_crystal87">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal88">

+        <type name="Ecal_crystal88">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal89">

+        <type name="Ecal_crystal89">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal90">

+        <type name="Ecal_crystal90">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal91">

+        <type name="Ecal_crystal91">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal92">

+        <type name="Ecal_crystal92">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal93">

+        <type name="Ecal_crystal93">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal94">

+        <type name="Ecal_crystal94">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal95">

+        <type name="Ecal_crystal95">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal96">

+        <type name="Ecal_crystal96">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal97">

+        <type name="Ecal_crystal97">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal98">

+        <type name="Ecal_crystal98">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal99">

+        <type name="Ecal_crystal99">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal100">

+        <type name="Ecal_crystal100">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal101">

+        <type name="Ecal_crystal101">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal102">

+        <type name="Ecal_crystal102">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal103">

+        <type name="Ecal_crystal103">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal104">

+        <type name="Ecal_crystal104">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal105">

+        <type name="Ecal_crystal105">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal106">

+        <type name="Ecal_crystal106">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal107">

+        <type name="Ecal_crystal107">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal108">

+        <type name="Ecal_crystal108">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal109">

+        <type name="Ecal_crystal109">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal110">

+        <type name="Ecal_crystal110">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal111">

+        <type name="Ecal_crystal111">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal112">

+        <type name="Ecal_crystal112">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal113">

+        <type name="Ecal_crystal113">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal114">

+        <type name="Ecal_crystal114">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal115">

+        <type name="Ecal_crystal115">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal116">

+        <type name="Ecal_crystal116">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal117">

+        <type name="Ecal_crystal117">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal118">

+        <type name="Ecal_crystal118">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal119">

+        <type name="Ecal_crystal119">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal120">

+        <type name="Ecal_crystal120">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal121">

+        <type name="Ecal_crystal121">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal122">

+        <type name="Ecal_crystal122">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal123">

+        <type name="Ecal_crystal123">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal124">

+        <type name="Ecal_crystal124">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal125">

+        <type name="Ecal_crystal125">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal126">

+        <type name="Ecal_crystal126">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal127">

+        <type name="Ecal_crystal127">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal128">

+        <type name="Ecal_crystal128">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal129">

+        <type name="Ecal_crystal129">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal130">

+        <type name="Ecal_crystal130">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal131">

+        <type name="Ecal_crystal131">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal132">

+        <type name="Ecal_crystal132">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal133">

+        <type name="Ecal_crystal133">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal134">

+        <type name="Ecal_crystal134">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal135">

+        <type name="Ecal_crystal135">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal136">

+        <type name="Ecal_crystal136">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal137">

+        <type name="Ecal_crystal137">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal138">

+        <type name="Ecal_crystal138">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal139">

+        <type name="Ecal_crystal139">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal140">

+        <type name="Ecal_crystal140">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal141">

+        <type name="Ecal_crystal141">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal142">

+        <type name="Ecal_crystal142">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal143">

+        <type name="Ecal_crystal143">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal144">

+        <type name="Ecal_crystal144">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal145">

+        <type name="Ecal_crystal145">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal146">

+        <type name="Ecal_crystal146">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal147">

+        <type name="Ecal_crystal147">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal148">

+        <type name="Ecal_crystal148">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal149">

+        <type name="Ecal_crystal149">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal150">

+        <type name="Ecal_crystal150">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal151">

+        <type name="Ecal_crystal151">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal152">

+        <type name="Ecal_crystal152">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal153">

+        <type name="Ecal_crystal153">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal154">

+        <type name="Ecal_crystal154">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal155">

+        <type name="Ecal_crystal155">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal156">

+        <type name="Ecal_crystal156">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal157">

+        <type name="Ecal_crystal157">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal158">

+        <type name="Ecal_crystal158">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal159">

+        <type name="Ecal_crystal159">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal160">

+        <type name="Ecal_crystal160">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal161">

+        <type name="Ecal_crystal161">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal162">

+        <type name="Ecal_crystal162">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal163">

+        <type name="Ecal_crystal163">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal164">

+        <type name="Ecal_crystal164">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal165">

+        <type name="Ecal_crystal165">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal166">

+        <type name="Ecal_crystal166">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal167">

+        <type name="Ecal_crystal167">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal168">

+        <type name="Ecal_crystal168">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal169">

+        <type name="Ecal_crystal169">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal170">

+        <type name="Ecal_crystal170">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal171">

+        <type name="Ecal_crystal171">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal172">

+        <type name="Ecal_crystal172">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal173">

+        <type name="Ecal_crystal173">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal174">

+        <type name="Ecal_crystal174">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal175">

+        <type name="Ecal_crystal175">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal176">

+        <type name="Ecal_crystal176">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal177">

+        <type name="Ecal_crystal177">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal178">

+        <type name="Ecal_crystal178">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal179">

+        <type name="Ecal_crystal179">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal180">

+        <type name="Ecal_crystal180">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal181">

+        <type name="Ecal_crystal181">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal182">

+        <type name="Ecal_crystal182">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal183">

+        <type name="Ecal_crystal183">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal184">

+        <type name="Ecal_crystal184">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal185">

+        <type name="Ecal_crystal185">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal186">

+        <type name="Ecal_crystal186">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal187">

+        <type name="Ecal_crystal187">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal188">

+        <type name="Ecal_crystal188">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal189">

+        <type name="Ecal_crystal189">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal190">

+        <type name="Ecal_crystal190">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal191">

+        <type name="Ecal_crystal191">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal192">

+        <type name="Ecal_crystal192">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal193">

+        <type name="Ecal_crystal193">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal194">

+        <type name="Ecal_crystal194">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal195">

+        <type name="Ecal_crystal195">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal196">

+        <type name="Ecal_crystal196">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal197">

+        <type name="Ecal_crystal197">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal198">

+        <type name="Ecal_crystal198">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal199">

+        <type name="Ecal_crystal199">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal200">

+        <type name="Ecal_crystal200">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal201">

+        <type name="Ecal_crystal201">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal202">

+        <type name="Ecal_crystal202">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal203">

+        <type name="Ecal_crystal203">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal204">

+        <type name="Ecal_crystal204">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal205">

+        <type name="Ecal_crystal205">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal206">

+        <type name="Ecal_crystal206">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal207">

+        <type name="Ecal_crystal207">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal208">

+        <type name="Ecal_crystal208">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal209">

+        <type name="Ecal_crystal209">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal210">

+        <type name="Ecal_crystal210">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal211">

+        <type name="Ecal_crystal211">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal212">

+        <type name="Ecal_crystal212">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal213">

+        <type name="Ecal_crystal213">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal214">

+        <type name="Ecal_crystal214">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal215">

+        <type name="Ecal_crystal215">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal216">

+        <type name="Ecal_crystal216">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal217">

+        <type name="Ecal_crystal217">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal218">

+        <type name="Ecal_crystal218">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal219">

+        <type name="Ecal_crystal219">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal220">

+        <type name="Ecal_crystal220">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal221">

+        <type name="Ecal_crystal221">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal222">

+        <type name="Ecal_crystal222">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal223">

+        <type name="Ecal_crystal223">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal224">

+        <type name="Ecal_crystal224">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal225">

+        <type name="Ecal_crystal225">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal226">

+        <type name="Ecal_crystal226">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal227">

+        <type name="Ecal_crystal227">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal228">

+        <type name="Ecal_crystal228">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal229">

+        <type name="Ecal_crystal229">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal230">

+        <type name="Ecal_crystal230">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal231">

+        <type name="Ecal_crystal231">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal232">

+        <type name="Ecal_crystal232">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal233">

+        <type name="Ecal_crystal233">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal234">

+        <type name="Ecal_crystal234">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal235">

+        <type name="Ecal_crystal235">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal236">

+        <type name="Ecal_crystal236">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal237">

+        <type name="Ecal_crystal237">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal238">

+        <type name="Ecal_crystal238">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal239">

+        <type name="Ecal_crystal239">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal240">

+        <type name="Ecal_crystal240">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal241">

+        <type name="Ecal_crystal241">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal242">

+        <type name="Ecal_crystal242">

           <attvalue name="drawAs" value="Prism"/>
         </type>

-        <type name="ECAL_crystal243">

+        <type name="Ecal_crystal243">

           <attvalue name="drawAs" value="Prism"/>
         </type>

[truncated at 1000 lines; 10413 more skipped]