From d58202ff790725eca4257d4104f799e6d996502c Mon Sep 17 00:00:00 2001 From: Stuart Campbell <campbellsi@ornl.gov> Date: Mon, 19 Sep 2011 18:21:06 +0000 Subject: [PATCH] Updated CNCS geometry to have the correct values. refs #3648 --- Code/Mantid/instrument/CNCS_Definition.xml | 200 ++++++++++----------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/Code/Mantid/instrument/CNCS_Definition.xml b/Code/Mantid/instrument/CNCS_Definition.xml index 4ca5a6d8e93..5f4b6ad9f15 100644 --- a/Code/Mantid/instrument/CNCS_Definition.xml +++ b/Code/Mantid/instrument/CNCS_Definition.xml @@ -187,351 +187,351 @@ </type> <type name="bank1"> <component type="eightpack"> - <location y="2.6410451" x="0.0" z="131.035"> - <rot axis-z="0" axis-x="0" axis-y="1" val="177.7013402"/> + <location y="0.0" x="2.6410451" z="-2.2986598"> + <rot axis-z="0" axis-x="0" axis-y="1" val="311.035"/> </location> </component> </type> <type name="bank2"> <component type="eightpack"> - <location y="2.7821302" x="0.0" z="127.445"> - <rot axis-z="0" axis-x="0" axis-y="1" val="177.8694365"/> + <location y="0.0" x="2.7821302" z="-2.1305635"> + <rot axis-z="0" axis-x="0" axis-y="1" val="307.445"/> </location> </component> </type> <type name="bank3"> <component type="eightpack"> - <location y="2.9088881" x="0.0" z="123.855"> - <rot axis-z="0" axis-x="0" axis-y="1" val="178.0486226"/> + <location y="0.0" x="2.9088881" z="-1.9513774"> + <rot axis-z="0" axis-x="0" axis-y="1" val="303.855"/> </location> </component> </type> <type name="bank4"> <component type="eightpack"> - <location y="3.0250821" x="0.0" z="120.265"> - <rot axis-z="0" axis-x="0" axis-y="1" val="178.2347629"/> + <location y="0.0" x="3.0250821" z="-1.7652371"> + <rot axis-z="0" axis-x="0" axis-y="1" val="300.265"/> </location> </component> </type> <type name="bank5"> <component type="eightpack"> - <location y="3.1256554" x="0.0" z="116.675"> - <rot axis-z="0" axis-x="0" axis-y="1" val="178.4296674"/> + <location y="0.0" x="3.1256554" z="-1.5703326"> + <rot axis-z="0" axis-x="0" axis-y="1" val="296.675"/> </location> </component> </type> <type name="bank6"> <component type="eightpack"> - <location y="3.2140048" x="0.0" z="113.085"> - <rot axis-z="0" axis-x="0" axis-y="1" val="178.6301053"/> + <location y="0.0" x="3.2140048" z="-1.3698947"> + <rot axis-z="0" axis-x="0" axis-y="1" val="293.085"/> </location> </component> </type> <type name="bank7"> <component type="eightpack"> - <location y="3.2919261" x="0.0" z="109.495"> - <rot axis-z="0" axis-x="0" axis-y="1" val="178.8345909"/> + <location y="0.0" x="3.2919261" z="-1.1654091"> + <rot axis-z="0" axis-x="0" axis-y="1" val="289.495"/> </location> </component> </type> <type name="bank8"> <component type="eightpack"> - <location y="3.3598924" x="0.0" z="105.905"> - <rot axis-z="0" axis-x="0" axis-y="1" val="179.04259253"/> + <location y="0.0" x="3.3598924" z="-0.95740747"> + <rot axis-z="0" axis-x="0" axis-y="1" val="285.905"/> </location> </component> </type> <type name="bank9"> <component type="eightpack"> - <location y="3.4141438" x="0.0" z="102.315"> - <rot axis-z="0" axis-x="0" axis-y="1" val="179.25465971"/> + <location y="0.0" x="3.4141438" z="-0.74534029"> + <rot axis-z="0" axis-x="0" axis-y="1" val="282.315"/> </location> </component> </type> <type name="bank10"> <component type="eightpack"> - <location y="3.45192" x="0.0" z="98.724998"> - <rot axis-z="0" axis-x="0" axis-y="1" val="179.47024053"/> + <location y="0.0" x="3.45192" z="-0.52975947"> + <rot axis-z="0" axis-x="0" axis-y="1" val="278.724998"/> </location> </component> </type> <type name="bank11"> <component type="eightpack"> - <location y="3.4793224" x="0.0" z="95.135002"> - <rot axis-z="0" axis-x="0" axis-y="1" val="179.68733618"/> + <location y="0.0" x="3.4793224" z="-0.31266382"> + <rot axis-z="0" axis-x="0" axis-y="1" val="275.135002"/> </location> </component> </type> <type name="bank12"> <component type="eightpack"> - <location y="3.50038" x="0.0" z="91.544998"> - <rot axis-z="0" axis-x="0" axis-y="1" val="179.905588299"/> + <location y="0.0" x="3.50038" z="-0.094411701"> + <rot axis-z="0" axis-x="0" axis-y="1" val="271.544998"/> </location> </component> </type> <type name="bank13"> <component type="eightpack"> - <location y="3.4995728" x="0.0" z="87.955002"> - <rot axis-z="0" axis-x="0" axis-y="1" val="180.12495965"/> + <location y="0.0" x="3.4995728" z="0.12495965"> + <rot axis-z="0" axis-x="0" axis-y="1" val="267.955002"/> </location> </component> </type> <type name="bank14"> <component type="eightpack"> - <location y="3.4847367" x="0.0" z="84.364998"> - <rot axis-z="0" axis-x="0" axis-y="1" val="180.34383085"/> + <location y="0.0" x="3.4847367" z="0.34383085"> + <rot axis-z="0" axis-x="0" axis-y="1" val="264.364998"/> </location> </component> </type> <type name="bank15"> <component type="eightpack"> - <location y="3.4534116" x="0.0" z="80.775002"> - <rot axis-z="0" axis-x="0" axis-y="1" val="180.56087703"/> + <location y="0.0" x="3.4534116" z="0.56087703"> + <rot axis-z="0" axis-x="0" axis-y="1" val="260.775002"/> </location> </component> </type> <type name="bank16"> <component type="eightpack"> - <location y="3.4112184" x="0.0" z="77.184998"> - <rot axis-z="0" axis-x="0" axis-y="1" val="180.77594918"/> + <location y="0.0" x="3.4112184" z="0.77594918"> + <rot axis-z="0" axis-x="0" axis-y="1" val="257.184998"/> </location> </component> </type> <type name="bank17"> <component type="eightpack"> - <location y="3.3555591" x="0.0" z="73.595001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="180.98791289"/> + <location y="0.0" x="3.3555591" z="0.98791289"> + <rot axis-z="0" axis-x="0" axis-y="1" val="253.595001"/> </location> </component> </type> <type name="bank18"> <component type="eightpack"> - <location y="3.290036" x="0.0" z="70.004997"> - <rot axis-z="0" axis-x="0" axis-y="1" val="181.1971502"/> + <location y="0.0" x="3.290036" z="1.1971502"> + <rot axis-z="0" axis-x="0" axis-y="1" val="250.004997"/> </location> </component> </type> <type name="bank19"> <component type="eightpack"> - <location y="3.2093821" x="0.0" z="66.415001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="181.401144"/> + <location y="0.0" x="3.2093821" z="1.401144"> + <rot axis-z="0" axis-x="0" axis-y="1" val="246.415001"/> </location> </component> </type> <type name="bank20"> <component type="eightpack"> - <location y="3.1096022" x="0.0" z="62.825001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="181.5964036"/> + <location y="0.0" x="3.1096022" z="1.5964036"> + <rot axis-z="0" axis-x="0" axis-y="1" val="242.825001"/> </location> </component> </type> <type name="bank21"> <component type="eightpack"> - <location y="3.0007017" x="0.0" z="59.235001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="181.7862937"/> + <location y="0.0" x="3.0007017" z="1.7862937"> + <rot axis-z="0" axis-x="0" axis-y="1" val="239.235001"/> </location> </component> </type> <type name="bank22"> <component type="eightpack"> - <location y="2.8855627" x="0.0" z="55.645"> - <rot axis-z="0" axis-x="0" axis-y="1" val="181.972459"/> + <location y="0.0" x="2.8855627" z="1.972459"> + <rot axis-z="0" axis-x="0" axis-y="1" val="235.645"/> </location> </component> </type> <type name="bank23"> <component type="eightpack"> - <location y="2.7585144" x="0.0" z="52.055"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.1509264"/> + <location y="0.0" x="2.7585144" z="2.1509264"> + <rot axis-z="0" axis-x="0" axis-y="1" val="232.055"/> </location> </component> </type> <type name="bank24"> <component type="eightpack"> - <location y="2.6161082" x="0.0" z="48.465"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.3173873"/> + <location y="0.0" x="2.6161082" z="2.3173873"> + <rot axis-z="0" axis-x="0" axis-y="1" val="228.465"/> </location> </component> </type> <type name="bank25"> <component type="eightpack"> - <location y="2.465589" x="0.0" z="44.875"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.4763708"/> + <location y="0.0" x="2.465589" z="2.4763708"> + <rot axis-z="0" axis-x="0" axis-y="1" val="224.875"/> </location> </component> </type> <type name="bank26"> <component type="eightpack"> - <location y="2.3058538" x="0.0" z="41.285"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.6260846"/> + <location y="0.0" x="2.3058538" z="2.6260846"> + <rot axis-z="0" axis-x="0" axis-y="1" val="221.285"/> </location> </component> </type> <type name="bank27"> <component type="eightpack"> - <location y="2.1376679" x="0.0" z="37.695"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.7663181"/> + <location y="0.0" x="2.1376679" z="2.7663181"> + <rot axis-z="0" axis-x="0" axis-y="1" val="217.695"/> </location> </component> </type> <type name="bank28"> <component type="eightpack"> - <location y="1.9625739" x="0.0" z="34.105"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.8981647"/> + <location y="0.0" x="1.9625739" z="2.8981647"> + <rot axis-z="0" axis-x="0" axis-y="1" val="214.105"/> </location> </component> </type> <type name="bank29"> <component type="eightpack"> - <location y="1.7761558" x="0.0" z="30.514999"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.01351"/> + <location y="0.0" x="1.7761558" z="3.01351"> + <rot axis-z="0" axis-x="0" axis-y="1" val="210.514999"/> </location> </component> </type> <type name="bank30"> <component type="eightpack"> - <location y="1.5830072" x="0.0" z="26.924999"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.1169064"/> + <location y="0.0" x="1.5830072" z="3.1169064"> + <rot axis-z="0" axis-x="0" axis-y="1" val="206.924999"/> </location> </component> </type> <type name="bank31"> <component type="eightpack"> - <location y="1.386438" x="0.0" z="23.334999"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.2138677"/> + <location y="0.0" x="1.386438" z="3.2138677"> + <rot axis-z="0" axis-x="0" axis-y="1" val="203.334999"/> </location> </component> </type> <type name="bank32"> <component type="eightpack"> - <location y="1.1804502" x="0.0" z="19.745001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.2887285"/> + <location y="0.0" x="1.1804502" z="3.2887285"> + <rot axis-z="0" axis-x="0" axis-y="1" val="199.745001"/> </location> </component> </type> <type name="bank33"> <component type="eightpack"> - <location y="0.97322243" x="0.0" z="16.155001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.3597002"/> + <location y="0.0" x="0.97322243" z="3.3597002"> + <rot axis-z="0" axis-x="0" axis-y="1" val="196.155001"/> </location> </component> </type> <type name="bank34"> <component type="eightpack"> - <location y="0.76074213" x="0.0" z="12.565"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.413157"/> + <location y="0.0" x="0.76074213" z="3.413157"> + <rot axis-z="0" axis-x="0" axis-y="1" val="192.565"/> </location> </component> </type> <type name="bank35"> <component type="eightpack"> - <location y="0.54531002" x="0.0" z="8.9750004"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.4527016"/> + <location y="0.0" x="0.54531002" z="3.4527016"> + <rot axis-z="0" axis-x="0" axis-y="1" val="188.9750004"/> </location> </component> </type> <type name="bank36"> <component type="eightpack"> - <location y="0.32854658" x="0.0" z="5.3850002"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.4853985"/> + <location y="0.0" x="0.32854658" z="3.4853985"> + <rot axis-z="0" axis-x="0" axis-y="1" val="185.3850002"/> </location> </component> </type> <type name="bank37"> <component type="eightpack"> - <location y="-0.32842949" x="0.0" z="-5.3850002"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.4841566"/> + <location y="0.0" x="-0.32842949" z="3.4841566"> + <rot axis-z="0" axis-x="0" axis-y="1" val="174.6149998"/> </location> </component> </type> <type name="bank38"> <component type="eightpack"> - <location y="-0.54453045" x="0.0" z="-8.9750004"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.4477658"/> + <location y="0.0" x="-0.54453045" z="3.4477658"> + <rot axis-z="0" axis-x="0" axis-y="1" val="171.0249996"/> </location> </component> </type> <type name="bank39"> <component type="eightpack"> - <location y="-0.75960499" x="0.0" z="-12.565"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.4080551"/> + <location y="0.0" x="-0.75960499" z="3.4080551"> + <rot axis-z="0" axis-x="0" axis-y="1" val="167.435"/> </location> </component> </type> <type name="bank40"> <component type="eightpack"> - <location y="-0.97227627" x="0.0" z="-16.155001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.3564339"/> + <location y="0.0" x="-0.97227627" z="3.3564339"> + <rot axis-z="0" axis-x="0" axis-y="1" val="163.844999"/> </location> </component> </type> <type name="bank41"> <component type="eightpack"> - <location y="-1.1807525" x="0.0" z="-19.745001"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.2895706"/> + <location y="0.0" x="-1.1807525" z="3.2895706"> + <rot axis-z="0" axis-x="0" axis-y="1" val="160.254999"/> </location> </component> </type> <type name="bank42"> <component type="eightpack"> - <location y="-1.3834515" x="0.0" z="-23.334999"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.2069447"/> + <location y="0.0" x="-1.3834515" z="3.2069447"> + <rot axis-z="0" axis-x="0" axis-y="1" val="156.665001"/> </location> </component> </type> <type name="bank43"> <component type="eightpack"> - <location y="-1.5801291" x="0.0" z="-26.924999"> - <rot axis-z="0" axis-x="0" axis-y="1" val="183.1112394"/> + <location y="0.0" x="-1.5801291" z="3.1112394"> + <rot axis-z="0" axis-x="0" axis-y="1" val="153.075001"/> </location> </component> </type> <type name="bank44"> <component type="eightpack"> - <location y="-1.7674783" x="0.0" z="-30.514999"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.9987874"/> + <location y="0.0" x="-1.7674783" z="2.9987874"> + <rot axis-z="0" axis-x="0" axis-y="1" val="149.485001"/> </location> </component> </type> <type name="bank45"> <component type="eightpack"> - <location y="-1.9479059" x="0.0" z="-34.105"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.8765042"/> + <location y="0.0" x="-1.9479059" z="2.8765042"> + <rot axis-z="0" axis-x="0" axis-y="1" val="145.895"/> </location> </component> </type> <type name="bank46"> <component type="eightpack"> - <location y="-2.121145" x="0.0" z="-37.695"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.7449362"/> + <location y="0.0" x="-2.121145" z="2.7449362"> + <rot axis-z="0" axis-x="0" axis-y="1" val="142.305"/> </location> </component> </type> <type name="bank47"> <component type="eightpack"> - <location y="-2.2870004" x="0.0" z="-41.285"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.6046128"/> + <location y="0.0" x="-2.2870004" z="2.6046128"> + <rot axis-z="0" axis-x="0" axis-y="1" val="138.715"/> </location> </component> </type> <type name="bank48"> <component type="eightpack"> - <location y="-2.4434412" x="0.0" z="-44.875"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.4541261"/> + <location y="0.0" x="-2.4434412" z="2.4541261"> + <rot axis-z="0" axis-x="0" axis-y="1" val="135.125"/> </location> </component> </type> <type name="bank49"> <component type="eightpack"> - <location y="-2.597842" x="0.0" z="-48.465"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.3012071"/> + <location y="0.0" x="-2.597842" z="2.3012071"> + <rot axis-z="0" axis-x="0" axis-y="1" val="131.535"/> </location> </component> </type> <type name="bank50"> <component type="eightpack"> - <location y="-2.7406297" x="0.0" z="-52.055"> - <rot axis-z="0" axis-x="0" axis-y="1" val="182.136981"/> + <location y="0.0" x="-2.7406297" z="2.136981"> + <rot axis-z="0" axis-x="0" axis-y="1" val="127.945"/> </location> </component> </type> -- GitLab