From 650e4f310de18e8936bb21429255640c9b105335 Mon Sep 17 00:00:00 2001
From: Anders Markvardsen <anders.markvardsen@stfc.ac.uk>
Date: Wed, 10 Sep 2014 16:11:05 +0100
Subject: [PATCH] Hopefully remaining IDFs that need updating. re #9907
---
Code/Mantid/instrument/BASIS_Definition.xml | 2 +-
Code/Mantid/instrument/CHRONUS_Definition.xml | 4 ++--
Code/Mantid/instrument/CNCS_Definition.xml | 2 +-
Code/Mantid/instrument/CNCS_Definition_20140201_20140807.xml | 2 +-
Code/Mantid/instrument/CORELLI_Definition.xml | 2 +-
Code/Mantid/instrument/D17_Definition.xml | 3 ++-
Code/Mantid/instrument/D2B_Definition.xml | 2 +-
Code/Mantid/instrument/D33_Definition.xml | 4 ++--
Code/Mantid/instrument/IN16B_Definition.xml | 3 ++-
Code/Mantid/instrument/IN4_Definition.xml | 5 +++--
Code/Mantid/instrument/IN5_Definition.xml | 3 ++-
Code/Mantid/instrument/IN6_Definition.xml | 5 +++--
Code/Mantid/instrument/MUT_Definition_32_detectors.xml | 4 ++--
Code/Mantid/instrument/POLDI_Definition_2013.xml | 4 ++--
Code/Mantid/instrument/POWGEN_Definition_2014-02-01.xml | 2 +-
Code/Mantid/instrument/POWGEN_Definition_2014-03-10.xml | 2 +-
16 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/Code/Mantid/instrument/BASIS_Definition.xml b/Code/Mantid/instrument/BASIS_Definition.xml
index b2fcf71e237..6acf0bce38d 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://schema.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://schema.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-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">
<!--Created by Michael Reuter-->
<defaults>
<length unit="metre"/>
diff --git a/Code/Mantid/instrument/CHRONUS_Definition.xml b/Code/Mantid/instrument/CHRONUS_Definition.xml
index 4caf146e7ea..2798396347c 100644
--- a/Code/Mantid/instrument/CHRONUS_Definition.xml
+++ b/Code/Mantid/instrument/CHRONUS_Definition.xml
@@ -1,9 +1,9 @@
<?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 xmlns="http://schema.mantidproject.org/IDF/1.0"
+<instrument xmlns="http://www.mantidproject.org/IDF/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schema.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
name="CHRONUS"
valid-from ="1900-01-31 23:59:59"
valid-to ="2100-01-31 23:59:59"
diff --git a/Code/Mantid/instrument/CNCS_Definition.xml b/Code/Mantid/instrument/CNCS_Definition.xml
index daf3f88c713..9ba469baa2b 100644
--- a/Code/Mantid/instrument/CNCS_Definition.xml
+++ b/Code/Mantid/instrument/CNCS_Definition.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schema.mantidproject.org/IDF/1.0" last-modified="2014-08-21 16:19:31.714027" name="CNCS" valid-from="2014-08-08 00:00:00" valid-to="2100-01-31 23:59:59" xsi:schemaLocation="http://schema.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-08-21 16:19:31.714027" name="CNCS" valid-from="2014-08-08 00:00:00" valid-to="2100-01-31 23:59:59" 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"/>
diff --git a/Code/Mantid/instrument/CNCS_Definition_20140201_20140807.xml b/Code/Mantid/instrument/CNCS_Definition_20140201_20140807.xml
index 61a48e4fff4..7124e7c2899 100644
--- a/Code/Mantid/instrument/CNCS_Definition_20140201_20140807.xml
+++ b/Code/Mantid/instrument/CNCS_Definition_20140201_20140807.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schema.mantidproject.org/IDF/1.0" last-modified="2014-08-18 15:46:00" valid-to="2014-08-07 23:59:59" name="CNCS" valid-from="2014-02-01 00:00:00" xsi:schemaLocation="http://schema.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-08-18 15:46:00" valid-to="2014-08-07 23:59:59" name="CNCS" valid-from="2014-02-01 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"/>
diff --git a/Code/Mantid/instrument/CORELLI_Definition.xml b/Code/Mantid/instrument/CORELLI_Definition.xml
index 228aa70a94a..0961def4108 100644
--- a/Code/Mantid/instrument/CORELLI_Definition.xml
+++ b/Code/Mantid/instrument/CORELLI_Definition.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schema.mantidproject.org/IDF/1.0" last-modified="2014-04-03 15:21:50.935979" name="CORELLI" valid-from="2014-02-25 00:00:00" valid-to="2100-01-31 23:59:59" xsi:schemaLocation="http://schema.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-04-03 15:21:50.935979" name="CORELLI" valid-from="2014-02-25 00:00:00" valid-to="2100-01-31 23:59:59" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
<!--Created by Ross Whitfield-->
<defaults>
<length unit="metre"/>
diff --git a/Code/Mantid/instrument/D17_Definition.xml b/Code/Mantid/instrument/D17_Definition.xml
index 18030214103..9f5df514cdc 100644
--- a/Code/Mantid/instrument/D17_Definition.xml
+++ b/Code/Mantid/instrument/D17_Definition.xml
@@ -2,7 +2,8 @@
<!-- 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 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"name="D17" valid-from="1900-01-31 23:59:59"
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+name="D17" valid-from="1900-01-31 23:59:59"
valid-to="2100-01-31 23:59:59" last-modified="2014-05-26 14:06:31">
<!-- Author: ricardo.leal@ill.fr -->
<defaults>
diff --git a/Code/Mantid/instrument/D2B_Definition.xml b/Code/Mantid/instrument/D2B_Definition.xml
index 97faed1332b..ff72228f997 100644
--- a/Code/Mantid/instrument/D2B_Definition.xml
+++ b/Code/Mantid/instrument/D2B_Definition.xml
@@ -1,6 +1,6 @@
<?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 xmlns="http://schema.mantidproject.org/IDF/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schema.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+<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 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
name="D2B" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59" last-modified="2013-11-28 14:18:50">
<!-- Author: ricardo.leal@ill.fr -->
<defaults>
diff --git a/Code/Mantid/instrument/D33_Definition.xml b/Code/Mantid/instrument/D33_Definition.xml
index 322277d5adf..3bc659ec75e 100644
--- a/Code/Mantid/instrument/D33_Definition.xml
+++ b/Code/Mantid/instrument/D33_Definition.xml
@@ -1,8 +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 xmlns="http://schema.mantidproject.org/IDF/1.0"
+<instrument xmlns="http://www.mantidproject.org/IDF/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://schema.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
name="D33" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59"
last-modified="2014-01-30 20:51:16">
<!-- Author: ricardo.leal@ill.fr -->
diff --git a/Code/Mantid/instrument/IN16B_Definition.xml b/Code/Mantid/instrument/IN16B_Definition.xml
index fd4568affca..832d594df69 100644
--- a/Code/Mantid/instrument/IN16B_Definition.xml
+++ b/Code/Mantid/instrument/IN16B_Definition.xml
@@ -2,7 +2,8 @@
<!-- 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 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"name="IN16B" valid-from="1900-01-31 23:59:59"
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+name="IN16B" valid-from="1900-01-31 23:59:59"
valid-to="2100-01-31 23:59:59" last-modified="2014-03-21 13:10:51">
<!-- Author: raoul@ill.fr -->
<defaults>
diff --git a/Code/Mantid/instrument/IN4_Definition.xml b/Code/Mantid/instrument/IN4_Definition.xml
index ac901957f2d..3cd93ab4767 100644
--- a/Code/Mantid/instrument/IN4_Definition.xml
+++ b/Code/Mantid/instrument/IN4_Definition.xml
@@ -2,8 +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 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"name="IN4" valid-from="1900-01-31 23:59:59"
-valid-to="2100-01-31 23:59:59" last-modified="2014-08-28 12:07:18">
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+ name="IN4" valid-from="1900-01-31 23:59:59"
+ valid-to="2100-01-31 23:59:59" last-modified="2014-08-28 12:07:18">
<!-- Author: ricardo.leal@ill.fr -->
<defaults>
<length unit="meter" />
diff --git a/Code/Mantid/instrument/IN5_Definition.xml b/Code/Mantid/instrument/IN5_Definition.xml
index 9d82d82d296..b652240d125 100644
--- a/Code/Mantid/instrument/IN5_Definition.xml
+++ b/Code/Mantid/instrument/IN5_Definition.xml
@@ -2,7 +2,8 @@
<!-- 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 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"name="IN5" valid-from="1900-01-31 23:59:59"
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+name="IN5" valid-from="1900-01-31 23:59:59"
valid-to="2100-01-31 23:59:59" last-modified="2014-04-16 09:52:13">
<!-- Author: ricardo.leal@ill.fr -->
<defaults>
diff --git a/Code/Mantid/instrument/IN6_Definition.xml b/Code/Mantid/instrument/IN6_Definition.xml
index 8fdf1278e54..3456e5b9064 100644
--- a/Code/Mantid/instrument/IN6_Definition.xml
+++ b/Code/Mantid/instrument/IN6_Definition.xml
@@ -2,8 +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 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"name="IN6" valid-from="1900-01-31 23:59:59"
-valid-to="2100-01-31 23:59:59" last-modified="2014-09-04 07:11:39">
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+ name="IN6" valid-from="1900-01-31 23:59:59"
+ valid-to="2100-01-31 23:59:59" last-modified="2014-09-04 07:11:39">
<!-- Author: ricardo.leal@ill.fr -->
<defaults>
<length unit="meter" />
diff --git a/Code/Mantid/instrument/MUT_Definition_32_detectors.xml b/Code/Mantid/instrument/MUT_Definition_32_detectors.xml
index 12eac0cf3e1..4d040b8cef4 100644
--- a/Code/Mantid/instrument/MUT_Definition_32_detectors.xml
+++ b/Code/Mantid/instrument/MUT_Definition_32_detectors.xml
@@ -1,9 +1,9 @@
<?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 xmlns="http://schema.mantidproject.org/IDF/1.0"
+<instrument xmlns="http://www.mantidproject.org/IDF/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schema.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
name="MUT"
valid-from ="1900-01-31 23:59:59"
valid-to ="2100-01-31 23:59:59"
diff --git a/Code/Mantid/instrument/POLDI_Definition_2013.xml b/Code/Mantid/instrument/POLDI_Definition_2013.xml
index 81312d2d0a1..621e2dc671c 100644
--- a/Code/Mantid/instrument/POLDI_Definition_2013.xml
+++ b/Code/Mantid/instrument/POLDI_Definition_2013.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<instrument xmlns="http://schema.mantidproject.org/IDF/1.0"
+<instrument xmlns="http://www.mantidproject.org/IDF/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schema.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
+ xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
name="POLDI"
valid-from="2013-01-01 00:00:00"
last-modified="2013-01-01 00:00:00">
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2014-02-01.xml b/Code/Mantid/instrument/POWGEN_Definition_2014-02-01.xml
index f607ea511cb..4d248c96bb4 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2014-02-01.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2014-02-01.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schema.mantidproject.org/IDF/1.0" last-modified="2014-03-12 13:10:00" valid-to="2014-03-03 23:59:59" name="PG3" valid-from="2014-02-01 00:00:01" xsi:schemaLocation="http://schema.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-03-12 13:10:00" valid-to="2014-03-03 23:59:59" name="PG3" valid-from="2014-02-01 00:00:01" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
<!--Created by Stuart Campbell, Vickie Lynch, Peter Peterson, Janik Zikovsky-->
<!--DEFAULTS-->
<defaults>
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2014-03-10.xml b/Code/Mantid/instrument/POWGEN_Definition_2014-03-10.xml
index 64ec956c603..4b2f3872416 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2014-03-10.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2014-03-10.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schema.mantidproject.org/IDF/1.0" last-modified="2014-03-12 13:10:00" valid-to="2100-01-31 23:59:59" name="PG3" valid-from="2014-03-04 00:00:01" xsi:schemaLocation="http://schema.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-03-12 13:10:00" valid-to="2100-01-31 23:59:59" name="PG3" valid-from="2014-03-04 00:00:01" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
<!--Created by Stuart Campbell, Vickie Lynch, Peter Peterson, Janik Zikovsky-->
<!--DEFAULTS-->
<defaults>
--
GitLab