From e7befbaf317a33c1502dfd0de6389da25f5886e6 Mon Sep 17 00:00:00 2001
From: Ricardo Leal <ricardo.leal@ill.fr>
Date: Fri, 24 May 2013 11:06:33 +0200
Subject: [PATCH] changed name FOCUS at SINQ to FOCUS Refs #7059
---
Code/Mantid/Framework/DataHandling/src/LoadPSI.cpp | 6 ++++--
...S at SINQ_Definition.xml => FOCUS_Definition.xml} | 4 ++--
Code/Mantid/instrument/Facilities.xml | 12 +++---------
3 files changed, 9 insertions(+), 13 deletions(-)
rename Code/Mantid/instrument/{FOCUS at SINQ_Definition.xml => FOCUS_Definition.xml} (99%)
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadPSI.cpp b/Code/Mantid/Framework/DataHandling/src/LoadPSI.cpp
index c0a858a322c..31deea2130c 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadPSI.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadPSI.cpp
@@ -32,7 +32,7 @@ DECLARE_LOADALGORITHM(LoadPSI)
*/
LoadPSI::LoadPSI() {
m_instrumentName = "";
- supportedInstruments.push_back("FOCUS at SINQ");
+ supportedInstruments.push_back("FOCUS");
}
//----------------------------------------------------------------------------------------------
@@ -172,7 +172,9 @@ std::string LoadPSI::getInstrumentName(NeXus::NXEntry& entry) {
break;
}
}
-
+ //std::replace( instrumentName.begin(), instrumentName.end(), ' ', '_'); // replace all ' ' to '_'
+ long unsigned int pos = instrumentName.find(" ");
+ instrumentName = instrumentName.substr (0,pos);
return instrumentName;
}
diff --git a/Code/Mantid/instrument/FOCUS at SINQ_Definition.xml b/Code/Mantid/instrument/FOCUS_Definition.xml
similarity index 99%
rename from Code/Mantid/instrument/FOCUS at SINQ_Definition.xml
rename to Code/Mantid/instrument/FOCUS_Definition.xml
index a82b962406c..b5b53f436fc 100644
--- a/Code/Mantid/instrument/FOCUS at SINQ_Definition.xml
+++ b/Code/Mantid/instrument/FOCUS_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 name="FOCUS at SINQ" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59" last-modified="2013-05-23 16:45:48">
+<instrument name="FOCUS" valid-from="1900-01-31 23:59:59" valid-to="2100-01-31 23:59:59" last-modified="2013-05-24 08:42:47">
<!-- Author: ricardo.leal@ill.fr -->
<defaults>
<length unit="meter" />
@@ -14,7 +14,7 @@
</reference-frame>
</defaults>
<component type="moderator">
- <location z="-0.499700" />
+ <location z="-0.490000" />
</component>
<type name="moderator" is="Source"></type>
<!-- Sample position -->
diff --git a/Code/Mantid/instrument/Facilities.xml b/Code/Mantid/instrument/Facilities.xml
index eae6469139e..2eca9ed4240 100644
--- a/Code/Mantid/instrument/Facilities.xml
+++ b/Code/Mantid/instrument/Facilities.xml
@@ -405,7 +405,8 @@
</instrument>
</facility>
-
+
+<!-- The loader for SINQ is LoadPSI. Might have to changed in future. -->
<facility name="SINQ" FileExtensions=".hdf">
<instrument name="HRPT">
@@ -451,7 +452,7 @@
<instrument name="FOCUS">
<technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique>
- </instrument>
+ </instrument>
<instrument name="Rita-II">
<technique>Triple Axis Spectroscopy</technique>
@@ -480,13 +481,6 @@
</facility>
-
-<facility name="PSI" FileExtensions=".nxs,.hdf">
- <instrument name="FOCUS at SINQ">
- <technique>Neutron time-of-flight Spectroscopy</technique>
- </instrument>
-</facility>
-
<facility name="TEST" FileExtensions=".nxs,.dat,.xml">
<livedata listener="MockILiveListener"/>
--
GitLab