From 38364ecb504fb4a52b671f8a723098f3816671b0 Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Wed, 29 Jan 2014 14:49:44 +0000
Subject: [PATCH] refs #8527. Tims new IDF.

---
 Code/Mantid/instrument/POLREF_Definition.xml | 705 ++++++++++++++++++-
 1 file changed, 690 insertions(+), 15 deletions(-)

diff --git a/Code/Mantid/instrument/POLREF_Definition.xml b/Code/Mantid/instrument/POLREF_Definition.xml
index edc685fec410..8a1e1d5f09ce 100644
--- a/Code/Mantid/instrument/POLREF_Definition.xml
+++ b/Code/Mantid/instrument/POLREF_Definition.xml
@@ -2,9 +2,9 @@
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
 <instrument xmlns="http://www.mantidproject.org/IDF/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 Schema/IDFSchema.xsd" 
- name="POLREF" valid-from   ="1900-01-31 23:59:59"
-                          valid-to     ="2012-07-16 23:59:59"
-		          last-modified="2009-04-24 00:00:00">
+ name="POLREF" valid-from   ="2012-07-16 23:59:59"
+                          valid-to     ="2100-01-31 23:59:59"
+		          last-modified="2012-07-16 23:59:59">
 
   <defaults>
     <length unit="meter" />
@@ -35,6 +35,9 @@
       
       Note the status of the instrument during a run is stored in the 
       logfile RunNo_status.txt
+      
+      Notes from Owen Arnold 16/07/2012: This IDF has been updated to include the OSMOND Line Detector.
+      
   -->
   
   
@@ -122,7 +125,7 @@
 
 
 
-  <component type="pointdetector" idlist="pointdetector">
+  <component type="point-detector" idlist="point-detector">
   
     <location x="25.6" />  <!-- x= 23.0+2.6 -->
     
@@ -144,7 +147,7 @@
     
   </component>   
 
-  <type name="pointdetector" is="detector">
+  <type name="point-detector" is="detector">
     <!-- Not exactly sure about the dimensions of this one. But pretty sure
     it at least covers the beam. Also, just in front of it is a slit which
     at the end of day will determine which neutrons get through to this 
@@ -164,7 +167,7 @@
   
     <!-- Link to log file that stores the z position -->
     <parameter name="z">
-      <logfile id="linear_det_height" eq="0.001*value" extract-single-value-as="position 1" />
+      <logfile id="linear_det_height" eq="0.001*value" extract-single-value-as="last_value" />
     </parameter>
   
     <properties> 
@@ -429,6 +432,677 @@
     <algebra val="shape" />
   </type>    
 
+    <!-- OSMOND definition -->
+
+ <component type="OSMOND" idlist="OSMOND">
+  
+    <!-- Link to log file that stores the y position -->
+     <parameter name="z">
+      <logfile id="linear_det_height" eq="0.001*value-0.18" extract-single-value-as="last_value" />
+    </parameter>
+  
+    <properties> 
+      Thin slabs 50mm wide, one for each spectrum 0.5 mm pixel pitch growing upward    
+    </properties>
+    
+    <location x="26.0" /> <!-- x=23.0+3.0  -->
+  </component>    
+  
+  <type name="OSMOND">
+    <component type="OSMOND-pixel" > 
+		<location z="0.32" />
+		<location z="0.3195" />
+		<location z="0.319" />
+		<location z="0.3185" />
+		<location z="0.318" />
+		<location z="0.3175" />
+		<location z="0.317" />
+		<location z="0.3165" />
+		<location z="0.316" />
+		<location z="0.3155" />
+		<location z="0.315" />
+		<location z="0.3145" />
+		<location z="0.314" />
+		<location z="0.3135" />
+		<location z="0.313" />
+		<location z="0.3125" />
+		<location z="0.312" />
+		<location z="0.3115" />
+		<location z="0.311" />
+		<location z="0.3105" />
+		<location z="0.31" />
+		<location z="0.3095" />
+		<location z="0.309" />
+		<location z="0.3085" />
+		<location z="0.308" />
+		<location z="0.3075" />
+		<location z="0.307" />
+		<location z="0.3065" />
+		<location z="0.306" />
+		<location z="0.3055" />
+		<location z="0.305" />
+		<location z="0.3045" />
+		<location z="0.304" />
+		<location z="0.3035" />
+		<location z="0.303" />
+		<location z="0.3025" />
+		<location z="0.302" />
+		<location z="0.3015" />
+		<location z="0.301" />
+		<location z="0.3005" />
+		<location z="0.3" />
+		<location z="0.2995" />
+		<location z="0.299" />
+		<location z="0.2985" />
+		<location z="0.298" />
+		<location z="0.2975" />
+		<location z="0.297" />
+		<location z="0.2965" />
+		<location z="0.296" />
+		<location z="0.2955" />
+		<location z="0.295" />
+		<location z="0.2945" />
+		<location z="0.294" />
+		<location z="0.2935" />
+		<location z="0.293" />
+		<location z="0.2925" />
+		<location z="0.292" />
+		<location z="0.2915" />
+		<location z="0.291" />
+		<location z="0.2905" />
+		<location z="0.29" />
+		<location z="0.2895" />
+		<location z="0.289" />
+		<location z="0.2885" />
+		<location z="0.288" />
+		<location z="0.2875" />
+		<location z="0.287" />
+		<location z="0.2865" />
+		<location z="0.286" />
+		<location z="0.2855" />
+		<location z="0.285" />
+		<location z="0.2845" />
+		<location z="0.284" />
+		<location z="0.2835" />
+		<location z="0.283" />
+		<location z="0.2825" />
+		<location z="0.282" />
+		<location z="0.2815" />
+		<location z="0.281" />
+		<location z="0.2805" />
+		<location z="0.28" />
+		<location z="0.2795" />
+		<location z="0.279" />
+		<location z="0.2785" />
+		<location z="0.278" />
+		<location z="0.2775" />
+		<location z="0.277" />
+		<location z="0.2765" />
+		<location z="0.276" />
+		<location z="0.2755" />
+		<location z="0.275" />
+		<location z="0.2745" />
+		<location z="0.274" />
+		<location z="0.2735" />
+		<location z="0.273" />
+		<location z="0.2725" />
+		<location z="0.272" />
+		<location z="0.2715" />
+		<location z="0.271" />
+		<location z="0.2705" />
+		<location z="0.27" />
+		<location z="0.2695" />
+		<location z="0.269" />
+		<location z="0.2685" />
+		<location z="0.268" />
+		<location z="0.2675" />
+		<location z="0.267" />
+		<location z="0.2665" />
+		<location z="0.266" />
+		<location z="0.2655" />
+		<location z="0.265" />
+		<location z="0.2645" />
+		<location z="0.264" />
+		<location z="0.2635" />
+		<location z="0.263" />
+		<location z="0.2625" />
+		<location z="0.262" />
+		<location z="0.2615" />
+		<location z="0.261" />
+		<location z="0.2605" />
+		<location z="0.26" />
+		<location z="0.2595" />
+		<location z="0.259" />
+		<location z="0.2585" />
+		<location z="0.258" />
+		<location z="0.2575" />
+		<location z="0.257" />
+		<location z="0.2565" />
+		<location z="0.256" />
+		<location z="0.2555" />
+		<location z="0.255" />
+		<location z="0.2545" />
+		<location z="0.254" />
+		<location z="0.2535" />
+		<location z="0.253" />
+		<location z="0.2525" />
+		<location z="0.252" />
+		<location z="0.2515" />
+		<location z="0.251" />
+		<location z="0.2505" />
+		<location z="0.25" />
+		<location z="0.2495" />
+		<location z="0.249" />
+		<location z="0.2485" />
+		<location z="0.248" />
+		<location z="0.2475" />
+		<location z="0.247" />
+		<location z="0.2465" />
+		<location z="0.246" />
+		<location z="0.2455" />
+		<location z="0.245" />
+		<location z="0.2445" />
+		<location z="0.244" />
+		<location z="0.2435" />
+		<location z="0.243" />
+		<location z="0.2425" />
+		<location z="0.242" />
+		<location z="0.2415" />
+		<location z="0.241" />
+		<location z="0.2405" />
+		<location z="0.24" />
+		<location z="0.2395" />
+		<location z="0.239" />
+		<location z="0.2385" />
+		<location z="0.238" />
+		<location z="0.2375" />
+		<location z="0.237" />
+		<location z="0.2365" />
+		<location z="0.236" />
+		<location z="0.2355" />
+		<location z="0.235" />
+		<location z="0.2345" />
+		<location z="0.234" />
+		<location z="0.2335" />
+		<location z="0.233" />
+		<location z="0.2325" />
+		<location z="0.232" />
+		<location z="0.2315" />
+		<location z="0.231" />
+		<location z="0.2305" />
+		<location z="0.23" />
+		<location z="0.2295" />
+		<location z="0.229" />
+		<location z="0.2285" />
+		<location z="0.228" />
+		<location z="0.2275" />
+		<location z="0.227" />
+		<location z="0.2265" />
+		<location z="0.226" />
+		<location z="0.2255" />
+		<location z="0.225" />
+		<location z="0.2245" />
+		<location z="0.224" />
+		<location z="0.2235" />
+		<location z="0.223" />
+		<location z="0.2225" />
+		<location z="0.222" />
+		<location z="0.2215" />
+		<location z="0.221" />
+		<location z="0.2205" />
+		<location z="0.22" />
+		<location z="0.2195" />
+		<location z="0.219" />
+		<location z="0.2185" />
+		<location z="0.218" />
+		<location z="0.2175" />
+		<location z="0.217" />
+		<location z="0.2165" />
+		<location z="0.216" />
+		<location z="0.2155" />
+		<location z="0.215" />
+		<location z="0.2145" />
+		<location z="0.214" />
+		<location z="0.2135" />
+		<location z="0.213" />
+		<location z="0.2125" />
+		<location z="0.212" />
+		<location z="0.2115" />
+		<location z="0.211" />
+		<location z="0.2105" />
+		<location z="0.21" />
+		<location z="0.2095" />
+		<location z="0.209" />
+		<location z="0.2085" />
+		<location z="0.208" />
+		<location z="0.2075" />
+		<location z="0.207" />
+		<location z="0.2065" />
+		<location z="0.206" />
+		<location z="0.2055" />
+		<location z="0.205" />
+		<location z="0.2045" />
+		<location z="0.204" />
+		<location z="0.2035" />
+		<location z="0.203" />
+		<location z="0.2025" />
+		<location z="0.202" />
+		<location z="0.2015" />
+		<location z="0.201" />
+		<location z="0.2005" />
+		<location z="0.2" />
+		<location z="0.1995" />
+		<location z="0.199" />
+		<location z="0.1985" />
+		<location z="0.198" />
+		<location z="0.1975" />
+		<location z="0.197" />
+		<location z="0.1965" />
+		<location z="0.196" />
+		<location z="0.1955" />
+		<location z="0.195" />
+		<location z="0.1945" />
+		<location z="0.194" />
+		<location z="0.1935" />
+		<location z="0.193" />
+		<location z="0.1925" />
+		<location z="0.192" />
+		<location z="0.1915" />
+		<location z="0.191" />
+		<location z="0.1905" />
+		<location z="0.19" />
+		<location z="0.1895" />
+		<location z="0.189" />
+		<location z="0.1885" />
+		<location z="0.188" />
+		<location z="0.1875" />
+		<location z="0.187" />
+		<location z="0.1865" />
+		<location z="0.186" />
+		<location z="0.1855" />
+		<location z="0.185" />
+		<location z="0.1845" />
+		<location z="0.184" />
+		<location z="0.1835" />
+		<location z="0.183" />
+		<location z="0.1825" />
+		<location z="0.182" />
+		<location z="0.1815" />
+		<location z="0.181" />
+		<location z="0.1805" />
+		<location z="0.18" />
+		<location z="0.1795" />
+		<location z="0.179" />
+		<location z="0.1785" />
+		<location z="0.178" />
+		<location z="0.1775" />
+		<location z="0.177" />
+		<location z="0.1765" />
+		<location z="0.176" />
+		<location z="0.1755" />
+		<location z="0.175" />
+		<location z="0.1745" />
+		<location z="0.174" />
+		<location z="0.1735" />
+		<location z="0.173" />
+		<location z="0.1725" />
+		<location z="0.172" />
+		<location z="0.1715" />
+		<location z="0.171" />
+		<location z="0.1705" />
+		<location z="0.17" />
+		<location z="0.1695" />
+		<location z="0.169" />
+		<location z="0.1685" />
+		<location z="0.168" />
+		<location z="0.1675" />
+		<location z="0.167" />
+		<location z="0.1665" />
+		<location z="0.166" />
+		<location z="0.1655" />
+		<location z="0.165" />
+		<location z="0.1645" />
+		<location z="0.164" />
+		<location z="0.1635" />
+		<location z="0.163" />
+		<location z="0.1625" />
+		<location z="0.162" />
+		<location z="0.1615" />
+		<location z="0.161" />
+		<location z="0.1605" />
+		<location z="0.16" />
+		<location z="0.1595" />
+		<location z="0.159" />
+		<location z="0.1585" />
+		<location z="0.158" />
+		<location z="0.1575" />
+		<location z="0.157" />
+		<location z="0.1565" />
+		<location z="0.156" />
+		<location z="0.1555" />
+		<location z="0.155" />
+		<location z="0.1545" />
+		<location z="0.154" />
+		<location z="0.1535" />
+		<location z="0.153" />
+		<location z="0.1525" />
+		<location z="0.152" />
+		<location z="0.1515" />
+		<location z="0.151" />
+		<location z="0.1505" />
+		<location z="0.15" />
+		<location z="0.1495" />
+		<location z="0.149" />
+		<location z="0.1485" />
+		<location z="0.148" />
+		<location z="0.1475" />
+		<location z="0.147" />
+		<location z="0.1465" />
+		<location z="0.146" />
+		<location z="0.1455" />
+		<location z="0.145" />
+		<location z="0.1445" />
+		<location z="0.144" />
+		<location z="0.1435" />
+		<location z="0.143" />
+		<location z="0.1425" />
+		<location z="0.142" />
+		<location z="0.1415" />
+		<location z="0.141" />
+		<location z="0.1405" />
+		<location z="0.14" />
+		<location z="0.1395" />
+		<location z="0.139" />
+		<location z="0.1385" />
+		<location z="0.138" />
+		<location z="0.1375" />
+		<location z="0.137" />
+		<location z="0.1365" />
+		<location z="0.136" />
+		<location z="0.1355" />
+		<location z="0.135" />
+		<location z="0.1345" />
+		<location z="0.134" />
+		<location z="0.1335" />
+		<location z="0.133" />
+		<location z="0.1325" />
+		<location z="0.132" />
+		<location z="0.1315" />
+		<location z="0.131" />
+		<location z="0.1305" />
+		<location z="0.13" />
+		<location z="0.1295" />
+		<location z="0.129" />
+		<location z="0.1285" />
+		<location z="0.128" />
+		<location z="0.1275" />
+		<location z="0.127" />
+		<location z="0.1265" />
+		<location z="0.126" />
+		<location z="0.1255" />
+		<location z="0.125" />
+		<location z="0.1245" />
+		<location z="0.124" />
+		<location z="0.1235" />
+		<location z="0.123" />
+		<location z="0.1225" />
+		<location z="0.122" />
+		<location z="0.1215" />
+		<location z="0.121" />
+		<location z="0.1205" />
+		<location z="0.12" />
+		<location z="0.1195" />
+		<location z="0.119" />
+		<location z="0.1185" />
+		<location z="0.118" />
+		<location z="0.1175" />
+		<location z="0.117" />
+		<location z="0.1165" />
+		<location z="0.116" />
+		<location z="0.1155" />
+		<location z="0.115" />
+		<location z="0.1145" />
+		<location z="0.114" />
+		<location z="0.1135" />
+		<location z="0.113" />
+		<location z="0.1125" />
+		<location z="0.112" />
+		<location z="0.1115" />
+		<location z="0.111" />
+		<location z="0.1105" />
+		<location z="0.11" />
+		<location z="0.1095" />
+		<location z="0.109" />
+		<location z="0.1085" />
+		<location z="0.108" />
+		<location z="0.1075" />
+		<location z="0.107" />
+		<location z="0.1065" />
+		<location z="0.106" />
+		<location z="0.1055" />
+		<location z="0.105" />
+		<location z="0.1045" />
+		<location z="0.104" />
+		<location z="0.1035" />
+		<location z="0.103" />
+		<location z="0.1025" />
+		<location z="0.102" />
+		<location z="0.1015" />
+		<location z="0.101" />
+		<location z="0.1005" />
+		<location z="0.0999999999999998" />
+		<location z="0.0994999999999998" />
+		<location z="0.0989999999999998" />
+		<location z="0.0984999999999998" />
+		<location z="0.0979999999999998" />
+		<location z="0.0974999999999998" />
+		<location z="0.0969999999999998" />
+		<location z="0.0964999999999998" />
+		<location z="0.0959999999999998" />
+		<location z="0.0954999999999998" />
+		<location z="0.0949999999999998" />
+		<location z="0.0944999999999998" />
+		<location z="0.0939999999999998" />
+		<location z="0.0934999999999998" />
+		<location z="0.0929999999999998" />
+		<location z="0.0924999999999998" />
+		<location z="0.0919999999999998" />
+		<location z="0.0914999999999998" />
+		<location z="0.0909999999999998" />
+		<location z="0.0904999999999998" />
+		<location z="0.0899999999999998" />
+		<location z="0.0894999999999998" />
+		<location z="0.0889999999999998" />
+		<location z="0.0884999999999998" />
+		<location z="0.0879999999999998" />
+		<location z="0.0874999999999998" />
+		<location z="0.0869999999999998" />
+		<location z="0.0864999999999998" />
+		<location z="0.0859999999999998" />
+		<location z="0.0854999999999998" />
+		<location z="0.0849999999999998" />
+		<location z="0.0844999999999998" />
+		<location z="0.0839999999999998" />
+		<location z="0.0834999999999998" />
+		<location z="0.0829999999999998" />
+		<location z="0.0824999999999998" />
+		<location z="0.0819999999999998" />
+		<location z="0.0814999999999998" />
+		<location z="0.0809999999999998" />
+		<location z="0.0804999999999998" />
+		<location z="0.0799999999999998" />
+		<location z="0.0794999999999998" />
+		<location z="0.0789999999999998" />
+		<location z="0.0784999999999998" />
+		<location z="0.0779999999999998" />
+		<location z="0.0774999999999998" />
+		<location z="0.0769999999999998" />
+		<location z="0.0764999999999998" />
+		<location z="0.0759999999999998" />
+		<location z="0.0754999999999998" />
+		<location z="0.0749999999999998" />
+		<location z="0.0744999999999998" />
+		<location z="0.0739999999999998" />
+		<location z="0.0734999999999998" />
+		<location z="0.0729999999999998" />
+		<location z="0.0724999999999998" />
+		<location z="0.0719999999999998" />
+		<location z="0.0714999999999998" />
+		<location z="0.0709999999999998" />
+		<location z="0.0704999999999998" />
+		<location z="0.0699999999999998" />
+		<location z="0.0694999999999998" />
+		<location z="0.0689999999999998" />
+		<location z="0.0684999999999998" />
+		<location z="0.0679999999999998" />
+		<location z="0.0674999999999998" />
+		<location z="0.0669999999999998" />
+		<location z="0.0664999999999998" />
+		<location z="0.0659999999999998" />
+		<location z="0.0654999999999998" />
+		<location z="0.0649999999999998" />
+		<location z="0.0644999999999998" />
+		<location z="0.0639999999999998" />
+		<location z="0.0634999999999998" />
+		<location z="0.0629999999999998" />
+		<location z="0.0624999999999998" />
+		<location z="0.0619999999999998" />
+		<location z="0.0614999999999998" />
+		<location z="0.0609999999999998" />
+		<location z="0.0604999999999998" />
+		<location z="0.0599999999999998" />
+		<location z="0.0594999999999998" />
+		<location z="0.0589999999999998" />
+		<location z="0.0584999999999998" />
+		<location z="0.0579999999999998" />
+		<location z="0.0574999999999998" />
+		<location z="0.0569999999999998" />
+		<location z="0.0564999999999998" />
+		<location z="0.0559999999999998" />
+		<location z="0.0554999999999998" />
+		<location z="0.0549999999999998" />
+		<location z="0.0544999999999998" />
+		<location z="0.0539999999999998" />
+		<location z="0.0534999999999998" />
+		<location z="0.0529999999999998" />
+		<location z="0.0524999999999998" />
+		<location z="0.0519999999999998" />
+		<location z="0.0514999999999998" />
+		<location z="0.0509999999999998" />
+		<location z="0.0504999999999998" />
+		<location z="0.0499999999999998" />
+		<location z="0.0494999999999998" />
+		<location z="0.0489999999999998" />
+		<location z="0.0484999999999998" />
+		<location z="0.0479999999999998" />
+		<location z="0.0474999999999998" />
+		<location z="0.0469999999999998" />
+		<location z="0.0464999999999998" />
+		<location z="0.0459999999999998" />
+		<location z="0.0454999999999998" />
+		<location z="0.0449999999999998" />
+		<location z="0.0444999999999998" />
+		<location z="0.0439999999999998" />
+		<location z="0.0434999999999998" />
+		<location z="0.0429999999999998" />
+		<location z="0.0424999999999998" />
+		<location z="0.0419999999999998" />
+		<location z="0.0414999999999998" />
+		<location z="0.0409999999999998" />
+		<location z="0.0404999999999998" />
+		<location z="0.0399999999999998" />
+		<location z="0.0394999999999998" />
+		<location z="0.0389999999999998" />
+		<location z="0.0384999999999998" />
+		<location z="0.0379999999999998" />
+		<location z="0.0374999999999998" />
+		<location z="0.0369999999999998" />
+		<location z="0.0364999999999998" />
+		<location z="0.0359999999999998" />
+		<location z="0.0354999999999998" />
+		<location z="0.0349999999999998" />
+		<location z="0.0344999999999998" />
+		<location z="0.0339999999999998" />
+		<location z="0.0334999999999998" />
+		<location z="0.0329999999999998" />
+		<location z="0.0324999999999998" />
+		<location z="0.0319999999999998" />
+		<location z="0.0314999999999998" />
+		<location z="0.0309999999999997" />
+		<location z="0.0304999999999997" />
+		<location z="0.0299999999999997" />
+		<location z="0.0294999999999997" />
+		<location z="0.0289999999999997" />
+		<location z="0.0284999999999997" />
+		<location z="0.0279999999999997" />
+		<location z="0.0274999999999997" />
+		<location z="0.0269999999999997" />
+		<location z="0.0264999999999997" />
+		<location z="0.0259999999999997" />
+		<location z="0.0254999999999997" />
+		<location z="0.0249999999999997" />
+		<location z="0.0244999999999997" />
+		<location z="0.0239999999999997" />
+		<location z="0.0234999999999997" />
+		<location z="0.0229999999999997" />
+		<location z="0.0224999999999997" />
+		<location z="0.0219999999999997" />
+		<location z="0.0214999999999997" />
+		<location z="0.0209999999999997" />
+		<location z="0.0204999999999997" />
+		<location z="0.0199999999999997" />
+		<location z="0.0194999999999997" />
+		<location z="0.0189999999999997" />
+		<location z="0.0184999999999997" />
+		<location z="0.0179999999999997" />
+		<location z="0.0174999999999997" />
+		<location z="0.0169999999999997" />
+		<location z="0.0164999999999997" />
+		<location z="0.0159999999999997" />
+		<location z="0.0154999999999997" />
+		<location z="0.0149999999999997" />
+		<location z="0.0144999999999997" />
+		<location z="0.0139999999999997" />
+		<location z="0.0134999999999997" />
+		<location z="0.0129999999999997" />
+		<location z="0.0124999999999997" />
+		<location z="0.0119999999999997" />
+		<location z="0.0114999999999997" />
+		<location z="0.0109999999999997" />
+		<location z="0.0104999999999997" />
+		<location z="0.00999999999999973" />
+		<location z="0.00949999999999973" />
+		<location z="0.00899999999999973" />
+		<location z="0.00849999999999973" />
+		<location z="0.00799999999999973" />
+		<location z="0.00749999999999973" />
+		<location z="0.00699999999999973" />
+		<location z="0.00649999999999973" />
+		<location z="0.00599999999999973" />
+		<location z="0.00549999999999973" />
+		<location z="0.00499999999999973" />
+		<location z="0.00449999999999973" />
+		<location z="0.00399999999999973" />
+		<location z="0.00349999999999973" />
+		<location z="0.00299999999999973" />
+		<location z="0.00249999999999973" />
+		<location z="0.00199999999999973" />
+		<location z="0.00149999999999973" />
+		<location z="0.000999999999999726" />
+		<location z="0.000499999999999726" />
+		<location z="-2.74086309204336E-16" />
+      </component>
+  </type>
+
+  <type name="OSMOND-pixel" is="detector">
+    <cuboid id="shape">
+      <left-front-bottom-point x="0.01" y="-0.025" z="-0.00025"  />
+      <left-front-top-point  x="0.01" y="-0.025" z="0.00025"  />
+      <left-back-bottom-point  x="-0.01" y="-0.025" z="-0.00025"  />
+      <right-front-bottom-point  x="0.01" y="0.025" z="-0.00025"  />      
+    </cuboid>
+    <algebra val="shape" />
+  </type>      
   
   <!-- source and sample-position components -->
 
@@ -438,7 +1112,7 @@
 
   <type name="source" is="Source">
     <properties>
-      40mm(H) x 60mm(W)
+      30mm(H) x 60mm(W)
     </properties>
   </type> 
   
@@ -460,7 +1134,7 @@
     <location x="18.29"/> <!-- x= 23.0 - 4.710 -->
      <!-- This log file stores the vertical opening of slit -->
     <parameter name="opening height"> 
-      <logfile id="s1" extract-single-value-as="position 1" />
+      <logfile id="s1vg" extract-single-value-as="last_value" />
     </parameter>
   </component>
   
@@ -470,7 +1144,7 @@
      slit can also be translated in the z. However this info not stored
      in log file since it is not used in the data analysis process. -->
     <parameter name="opening height">
-      <logfile id="s2" extract-single-value-as="position 1" />         
+      <logfile id="s2vg" extract-single-value-as="last_value" />         
     </parameter>  
   </component>    
   
@@ -478,7 +1152,7 @@
     <location x="23.960"/> <!-- x=23.0+0.960   -->
     <!-- This log file stores the vertical opening of slit -->  
     <parameter name="opening height">
-      <logfile id="s3" extract-single-value-as="position 1" />        
+      <logfile id="s3vg" extract-single-value-as="last_value" />        
     </parameter>
   </component>    
   
@@ -487,7 +1161,7 @@
     <!-- This log file stores the vertical opening of slit. Note this slit
      is fixed to the point detector. -->
     <parameter name="opening height">
-      <logfile id="s4" extract-single-value-as="position 1" />    
+      <logfile id="s4vg" extract-single-value-as="last_value" />    
     </parameter>
   </component>
   
@@ -505,9 +1179,6 @@
 
   <type name="supermirror" /> 
 
-
-
-  
   <!-- DETECTOR and MONITOR ID LISTS -->
 
   <idlist idname="monitor1">
@@ -522,7 +1193,7 @@
     <id val="3" />  
   </idlist>
 
-  <idlist idname="pointdetector">
+  <idlist idname="point-detector">
     <id val="1001" />  
   </idlist>
   
@@ -530,5 +1201,9 @@
     <id start="2001" end="2240" />
   </idlist>  
   
+    <idlist idname="OSMOND">
+    <id start="3001" end="3641" />
+  </idlist> 
+  
 </instrument>