Merge branch 'feature/8221_schema_version' into develop

refs #8221 Conflicts: Code/Mantid/instrument/BASIS_Definition.xml Code/Mantid/instrument/NOMAD_Definition.xml Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml Code/Mantid/instrument/VISION_Definition.xml Code/Mantid/instrument/VISION_Definition_0-20131021.xml Code/Mantid/instrument/VISION_Definition_20131021-.xml
mantidproject · Oct 29, 2013 · 1d87b89 · 1d87b89
2 parents 790c808 + 28fa042
commit 1d87b89
Show file tree

Hide file tree

Showing 103 changed files with 5,310 additions and 645 deletions.
diff --git a/Code/Mantid/instrument/ALF_Definition.xml b/Code/Mantid/instrument/ALF_Definition.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="ALF" valid-from   ="1900-01-31 23:59:59"
+<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="ALF" valid-from   ="1900-01-31 23:59:59"
                         valid-to     ="2100-01-31 23:59:59"
 		        last-modified="2009-01-15 00:00:00">
 

diff --git a/Code/Mantid/instrument/ARCS_Definition_19000000-20121010.xml b/Code/Mantid/instrument/ARCS_Definition_19000000-20121010.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='ASCII'?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="ARCS" valid-from   ="1900-01-31 23:59:59"
+<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="ARCS" valid-from   ="1900-01-31 23:59:59"
                         valid-to     ="2012-10-10 20:25:59"
 		        last-modified="2012-10-16 21:52:00">
 

diff --git a/Code/Mantid/instrument/ARCS_Definition_20121010-20121011.xml b/Code/Mantid/instrument/ARCS_Definition_20121010-20121011.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='ASCII'?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="ARCS" valid-from   ="2012-10-10 20:26:00"
+<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="ARCS" valid-from   ="2012-10-10 20:26:00"
                         valid-to     ="2012-10-11 12:54:00"
 		        last-modified="2012-10-16 21:54:00">
 

diff --git a/Code/Mantid/instrument/ARCS_Definition_20121011-.xml b/Code/Mantid/instrument/ARCS_Definition_20121011-.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='ASCII'?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="ARCS" valid-from   ="2012-10-11 12:54:01"
+<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="ARCS" valid-from   ="2012-10-11 12:54:01"
                         valid-to     ="2100-01-31 23:59:59"
 		        last-modified="2012-10-16 21:55:00">
 

diff --git a/Code/Mantid/instrument/ARGUS_Definition.xml b/Code/Mantid/instrument/ARGUS_Definition.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="ARGUS" valid-from   ="1900-01-31 23:59:59"
+<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="ARGUS" valid-from   ="1900-01-31 23:59:59"
                        valid-to     ="2100-01-31 23:59:59"
 		       last-modified="2011-01-07 12:00:09">
   <defaults>

diff --git a/Code/Mantid/instrument/BASIS_Definition.xml b/Code/Mantid/instrument/BASIS_Definition.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument valid-to="2100-01-31 23:59:59" name="BASIS" valid-from="2013-07-19 00:00:00">
+<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" 
+ valid-to="2100-01-31 23:59:59" name="BASIS" valid-from="2013-07-19 00:00:00">
   <!-- Created by Stuart Campbell -->
   <defaults>
     <length unit="metre"/>

diff --git a/Code/Mantid/instrument/BIOSANS_Definition.xml b/Code/Mantid/instrument/BIOSANS_Definition.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="BioSANS" valid-from   ="1900-01-31 23:59:59"
+<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="BioSANS" valid-from   ="1900-01-31 23:59:59"
                            valid-to     ="2012-01-31 23:59:59"
 		          last-modified="2012-03-23 15:02:05">
 

diff --git a/Code/Mantid/instrument/BIOSANS_Definition_2012.xml b/Code/Mantid/instrument/BIOSANS_Definition_2012.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument name="BioSANS" valid-from   ="2012-02-01 00:00:00"
+<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="BioSANS" valid-from   ="2012-02-01 00:00:00"
                            valid-to     ="2100-01-31 23:59:59"
 		          last-modified="2012-03-23 15:02:05">
   <!---->

diff --git a/Code/Mantid/instrument/CNCS_Definition.xml b/Code/Mantid/instrument/CNCS_Definition.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument last-modified="2013-08-19 14:15:20.720735" valid-to="2100-01-31 23:59:59" name="CNCS" valid-from="2013-08-14 18:30:00">
+<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" 
+ last-modified="2013-08-19 14:15:20.720735" valid-to="2100-01-31 23:59:59" name="CNCS" valid-from="2013-08-14 18:30:00">
   <!--Created by Michael Reuter-->
   <defaults>
     <length unit="metre"/>

diff --git a/Code/Mantid/instrument/CNCS_Definition_1-35154.xml b/Code/Mantid/instrument/CNCS_Definition_1-35154.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='ASCII'?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="CNCS" valid-from   ="1900-01-31 23:59:59"
+<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="CNCS" valid-from   ="1900-01-31 23:59:59"
                         valid-to     ="2011-08-17 17:17:00"
 		        last-modified="2010-10-12 08:54:11">
   <!--Created by Michael Reuter-->

diff --git a/Code/Mantid/instrument/CNCS_Definition_20120215-20120313.xml b/Code/Mantid/instrument/CNCS_Definition_20120215-20120313.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument valid-to="2012-03-13 23:59:59" name="CNCS" valid-from="2012-02-15 10:45:00">
+<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" 
+ valid-to="2012-03-13 23:59:59" name="CNCS" valid-from="2012-02-15 10:45:00">
   <defaults>
     <length unit="metre"/>
     <angle unit="degree"/>

diff --git a/Code/Mantid/instrument/CNCS_Definition_20120314_20120816.xml b/Code/Mantid/instrument/CNCS_Definition_20120314_20120816.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument valid-to="2012-08-16 23:59:59" name="CNCS" valid-from="2012-03-14 00:00:01" last-modified="2012-08-28 13:23:00">
+<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" 
+ valid-to="2012-08-16 23:59:59" name="CNCS" valid-from="2012-03-14 00:00:01" last-modified="2012-08-28 13:23:00">
   <!--for 14th March 2012 onwards -->
   <defaults>
     <length unit="metre"/>

diff --git a/Code/Mantid/instrument/CNCS_Definition_20120817_20130814.xml b/Code/Mantid/instrument/CNCS_Definition_20120817_20130814.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument valid-to="2013-08-14 18:00:00" name="CNCS" valid-from="2012-08-17 00:00:01" last-modified="2013-08-19 10:23:00">
+<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" 
+ valid-to="2013-08-14 18:00:00" name="CNCS" valid-from="2012-08-17 00:00:01" last-modified="2013-08-19 10:23:00">
   <!-- for 17th August 2012 onwards -->
   <defaults>
     <length unit="metre"/>

diff --git a/Code/Mantid/instrument/CNCS_Definition_35155-44929.xml b/Code/Mantid/instrument/CNCS_Definition_35155-44929.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument valid-to="2012-02-15 10:44:59" name="CNCS" valid-from="2011-08-17 17:17:00">
+<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" 
+ valid-to="2012-02-15 10:44:59" name="CNCS" valid-from="2011-08-17 17:17:00">
   <!--for runs 35155 to 44930 -->
   <defaults>
     <length unit="metre"/>

diff --git a/Code/Mantid/instrument/CRISP_Definition.xml b/Code/Mantid/instrument/CRISP_Definition.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<instrument name="CSP" valid-from   ="1900-01-31 23:59:59"
+<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="CSP" valid-from   ="1900-01-31 23:59:59"
                           valid-to     ="2100-01-31 23:59:59"          
 						  last-modified="2010-11-04 00:00:00">
 

diff --git a/Code/Mantid/instrument/D33_Definition.xml b/Code/Mantid/instrument/D33_Definition.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- For help on the notation used to specify an Instrument Definition File see http://www.mantidproject.org/IDF -->
-<instrument name="D33" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59" last-modified="2013-07-03 08:53:09">
+<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="D33" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59" last-modified="2013-07-03 08:53:09">
   <!-- Author: ricardo.leal@ill.fr -->
   <defaults>
     <length unit="meter" />

diff --git a/Code/Mantid/instrument/EMU_Definition_32detectors.xml b/Code/Mantid/instrument/EMU_Definition_32detectors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="EMU" valid-from   ="1900-01-31 23:59:01"
+<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="EMU" valid-from   ="1900-01-31 23:59:01"
                        valid-to     ="2009-12-31 23:59:59"
 		       last-modified="2011-01-07 00:00:00">
   <defaults>

diff --git a/Code/Mantid/instrument/EMU_Definition_96detectors.xml b/Code/Mantid/instrument/EMU_Definition_96detectors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="EMU" valid-from   ="2010-01-01 23:59:59"
+<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="EMU" valid-from   ="2010-01-01 23:59:59"
                        valid-to     ="2100-01-31 23:59:59"
 		       last-modified="2011-01-07 00:00:00">
   <defaults>

diff --git a/Code/Mantid/instrument/ENGIN-X_Definition.xml b/Code/Mantid/instrument/ENGIN-X_Definition.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="ENGIN-X" valid-from   ="1900-01-31 23:59:59"
+<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="ENGIN-X" valid-from   ="1900-01-31 23:59:59"
                            valid-to     ="2100-01-31 23:59:59"
 		           last-modified="2010-10-18 17:49:49">
 <!-- Instrument description for ENGIN-X, Joe Kelleher 2010 -->

diff --git a/Code/Mantid/instrument/EQ-SANS_Definition.xml b/Code/Mantid/instrument/EQ-SANS_Definition.xml
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='ASCII'?>
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
-<instrument name="EQ-SANS" valid-from   ="1900-01-31 23:59:59"
+<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="EQ-SANS" valid-from   ="1900-01-31 23:59:59"
                           valid-to     ="2100-01-31 23:59:59"
 		          last-modified="2010-11-16 12:02:05">
 <!---->

diff --git a/Code/Mantid/instrument/FOCUS_Definition.xml b/Code/Mantid/instrument/FOCUS_Definition.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- For help on the notation used to specify an Instrument Definition File see http://www.mantidproject.org/IDF -->
-<instrument name="FOCUS" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59" last-modified="2013-05-29 15:20:14">
+<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="FOCUS" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59" last-modified="2013-05-29 15:20:14">
   <!-- Author: ricardo.leal@ill.fr -->
   <defaults>
     <length unit="meter" />