From ba0c17f0a87b77e95197b0ae4501d42193bd7e6b Mon Sep 17 00:00:00 2001
From: Peter Peterson <petersonpf@ornl.gov>
Date: Thu, 24 Oct 2013 12:02:30 -0400
Subject: [PATCH] Re #8215. Fixing NOMAD and POWGEN monitors.

---
 Code/Mantid/instrument/NOMAD_Definition.xml      | 16 ++++++----------
 .../NOMAD_Definition_20120701-20120731.xml       | 14 +++++---------
 .../instrument/POWGEN_Definition_2013-06-01.xml  |  6 ++----
 .../instrument/POWGEN_Definition_2013-08-01.xml  |  8 +++-----
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/Code/Mantid/instrument/NOMAD_Definition.xml b/Code/Mantid/instrument/NOMAD_Definition.xml
index 0a5ec63e4980..38cebad31d82 100644
--- a/Code/Mantid/instrument/NOMAD_Definition.xml
+++ b/Code/Mantid/instrument/NOMAD_Definition.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument last-modified="2012-09-14 09:09:15.855742" valid-to="2100-01-31 23:59:59" name="NOMAD" valid-from="2012-08-01 00:00:01">
+<instrument last-modified="2013-10-24 11:23:56.045220" valid-to="2100-01-31 23:59:59" name="NOMAD" valid-from="2012-08-01 00:00:01">
   <!-- Created by Peter Peterson and Vickie Lynch-->
   <!--DEFAULTS-->
   <defaults>
@@ -27,15 +27,11 @@
   </component>
   <type name="monitors">
     <component type="monitor">
-      <location name="monitor1">
-        <parameter name="z">
-          <logfile id="-0.879475"/>
-        </parameter>
+      <location z="-0.879475" name="monitor1">
+        <neutronic z="-0.879475"/>
       </location>
-      <location name="monitor2">
-        <parameter name="z">
-          <logfile id="5.748782"/>
-        </parameter>
+      <location z="5.748782" name="monitor2">
+        <neutronic z="5.748782"/>
       </location>
     </component>
   </type>
@@ -985,7 +981,7 @@
   <!--TODO: Update to real shape-->
   <type is="monitor" name="monitor">
     <cylinder id="cyl-approx">
-      <centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
+      <centre-of-bottom-base p="0.0" r="0.0" t="0.0"/>
       <axis y="0.0" x="0.0" z="1.0"/>
       <radius val="0.01"/>
       <height val="0.03"/>
diff --git a/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml b/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml
index 4482b898c5cd..c6ffaba14a06 100644
--- a/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml
+++ b/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml
@@ -27,15 +27,11 @@
   </component>
   <type name="monitors">
     <component type="monitor">
-      <location name="monitor1">
-        <parameter name="z">
-          <logfile id="-0.879475"/>
-        </parameter>
-      </location>
-      <location name="monitor2">
-        <parameter name="z">
-          <logfile id="5.748782"/>
-        </parameter>
+      <location z="-0.879475" name="monitor1">
+        <neutronic z="-0.879475"/>
+      </location>
+      <location z="5.748782" name="monitor2">
+        <neutronic z="5.748782"/>
       </location>
     </component>
   </type>
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml b/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml
index 3b57d4fc6694..656d6c2407cd 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml
@@ -27,10 +27,8 @@
   </component>
   <type name="monitors">
     <component type="monitor">
-      <location name="monitor1">
-        <parameter name="z">
-          <logfile id="-1.0"/>
-        </parameter>
+      <location z="-1.5077" name="monitor1">
+        <neutronic z="-1.5077"/>
       </location>
     </component>
   </type>
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml b/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
index 2ed7dab35c1d..f36b5e5ae7a3 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument last-modified="2013-08-16 11:37:23.203751" valid-to="2100-01-31 23:59:59" name="PG3" valid-from="2013-08-01 00:00:01">
+<instrument last-modified="2013-10-24 11:23:55.838956" valid-to="2100-01-31 23:59:59" name="PG3" valid-from="2013-08-01 00:00:01">
   <!--Created by Stuart Campbell, Vickie Lynch, Peter Peterson, Janik Zikovsky-->
   <!--DEFAULTS-->
   <defaults>
@@ -27,10 +27,8 @@
   </component>
   <type name="monitors">
     <component type="monitor">
-      <location name="monitor1">
-        <parameter name="z">
-          <logfile id="-1.0"/>
-        </parameter>
+      <location z="-1.5077" name="monitor1">
+        <neutronic z="-1.5077"/>
       </location>
     </component>
   </type>