From 179cdc9c07090ecfa60854b84a25295f005aea75 Mon Sep 17 00:00:00 2001
From: Jose Borreguero <borreguero@gmail.com>
Date: Fri, 31 Oct 2014 11:11:32 -0400
Subject: [PATCH] Refs #10466 Include inelastic banks in new silicon component
---
Code/Mantid/instrument/BASIS_Definition.xml | 30 +++++++++-------
.../BASIS_silicon_111_Parameters.xml | 35 +++++--------------
2 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/Code/Mantid/instrument/BASIS_Definition.xml b/Code/Mantid/instrument/BASIS_Definition.xml
index 6acf0bce38d..82684ef3a9f 100644
--- a/Code/Mantid/instrument/BASIS_Definition.xml
+++ b/Code/Mantid/instrument/BASIS_Definition.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.mantidproject.org/IDF/1.0" last-modified="2014-02-17 14:08:40.139761" valid-to="2100-01-31 23:59:59" name="BASIS" valid-from="2013-01-20 00:00:00" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
+<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.mantidproject.org/IDF/1.0" last-modified="2014-10-31 09:42:40.139761" valid-to="2100-01-31 23:59:59" name="BASIS" valid-from="2013-01-20 00:00:00" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
<!--Created by Michael Reuter-->
<defaults>
<length unit="metre"/>
@@ -28,10 +28,25 @@
<location z="-0.23368" name="monitor1"/>
</component>
</type>
- <component type="bank1" idlist="bank1">
+ <!--INELASTIC DECTECTORS-->
+ <component type="silicon">
<location/>
</component>
- <type name="bank1">
+ <type name="silicon">
+ <component type="bank1" idlist="bank1">
+ <location/>
+ </component>
+ <component type="bank2" idlist="bank2">
+ <location/>
+ </component>
+ <component type="bank3" idlist="bank3">
+ <location/>
+ </component>
+ <component type="bank4" idlist="bank4">
+ <location/>
+ </component>
+ </type>
+ <type name="bank1">
<component type="pixel">
<location p="1.04109" r="4.72838" name="5" t="11.5018">
<facing y="0.0" x="0.0" z="0.0"/>
@@ -22715,9 +22730,6 @@
<id val="3568"/>
<id val="3569"/>
</idlist>
- <component type="bank2" idlist="bank2">
- <location/>
- </component>
<type name="bank2">
<component type="pixel">
<location p="-66.5981" r="4.70977" name="4110" t="27.1236">
@@ -45402,9 +45414,6 @@
<id val="7673"/>
<id val="7674"/>
</idlist>
- <component type="bank3" idlist="bank3">
- <location/>
- </component>
<type name="bank3">
<component type="pixel">
<location p="179.356" r="4.72838" name="8197" t="161.199">
@@ -68089,9 +68098,6 @@
<id val="11760"/>
<id val="11761"/>
</idlist>
- <component type="bank4" idlist="bank4">
- <location/>
- </component>
<type name="bank4">
<component type="pixel">
<location p="-124.975" r="4.70977" name="12302" t="149.294">
diff --git a/Code/Mantid/instrument/BASIS_silicon_111_Parameters.xml b/Code/Mantid/instrument/BASIS_silicon_111_Parameters.xml
index f4ca952eead..c3f972fadbb 100644
--- a/Code/Mantid/instrument/BASIS_silicon_111_Parameters.xml
+++ b/Code/Mantid/instrument/BASIS_silicon_111_Parameters.xml
@@ -36,7 +36,6 @@
<value val="138000" />
</parameter>
-
<parameter name="analyser" type="string">
<value val="silicon" />
</parameter>
@@ -47,31 +46,13 @@
</component-link>
-
- <component-link name="bank1">
- <parameter name="Efixed">
- <value val="2.082" />
- </parameter>
- </component-link>
-
- <component-link name="bank2">
- <parameter name="Efixed">
- <value val="2.082" />
- </parameter>
- </component-link>
-
- <component-link name="bank3">
- <parameter name="Efixed">
- <value val="2.082" />
- </parameter>
- </component-link>
-
- <component-link name="bank4">
- <parameter name="Efixed">
- <value val="2.082" />
- </parameter>
- </component-link>
-
-
+<component-link name="silicon">
+ <parameter name="Efixed">
+ <value val="2.082" />
+ </parameter>
+ <parameter name="resolution">
+ <value val="0.0035" />
+ </parameter>
+</component-link>
</parameter-file>
--
GitLab