From bb552fa7ab43f9af040c87d538f6716dd5170b37 Mon Sep 17 00:00:00 2001
From: Janik Zikovsky <zikovskyjl@ornl.gov>
Date: Thu, 23 Sep 2010 17:48:58 +0000
Subject: [PATCH] Refs #1588: NXpositioner entries are also added to the sample
logs.
---
Code/Mantid/Nexus/src/LoadLogsFromSNSNexus.cpp | 2 +-
Code/Mantid/Nexus/test/LoadLogsFromSNSNexusTest.h | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/Nexus/src/LoadLogsFromSNSNexus.cpp b/Code/Mantid/Nexus/src/LoadLogsFromSNSNexus.cpp
index e7aced3fdcf..e09f714ce4b 100644
--- a/Code/Mantid/Nexus/src/LoadLogsFromSNSNexus.cpp
+++ b/Code/Mantid/Nexus/src/LoadLogsFromSNSNexus.cpp
@@ -85,7 +85,7 @@ void LoadLogsFromSNSNexus::exec()
{
std::string entry_name(it->first);
std::string entry_class(it->second);
- if (entry_class == "NXlog")
+ if ((entry_class == "NXlog") ||(entry_class == "NXpositioner"))
{
loadSampleLog(file, entry_name, entry_class);
}
diff --git a/Code/Mantid/Nexus/test/LoadLogsFromSNSNexusTest.h b/Code/Mantid/Nexus/test/LoadLogsFromSNSNexusTest.h
index 9e457f6bcc2..e079242da90 100644
--- a/Code/Mantid/Nexus/test/LoadLogsFromSNSNexusTest.h
+++ b/Code/Mantid/Nexus/test/LoadLogsFromSNSNexusTest.h
@@ -59,6 +59,12 @@ public:
TS_ASSERT_DELTA( val, 10914.857421875, 1e-6);
TS_ASSERT_EQUALS(prop->units(), "Phase,uS");
+ //NXPositioner
+ prop = run.getLogData("chi");
+ val = boost::lexical_cast<double>(prop->value());
+ TS_ASSERT_DELTA( val, 45.0, 1e-6);
+ TS_ASSERT_EQUALS(prop->units(), "degree");
+
TimeSeriesProperty<double> * tsp;
prop = run.getLogData("Phase1");
--
GitLab