Minor modifed and test with clang. Refs #10622.

mantidproject · Dec 22, 2014 · 43dd54d · 43dd54d
1 parent 4d5109c
commit 43dd54d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadHFIRPDD.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadHFIRPDD.h
@@ -82,7 +82,7 @@ namespace DataHandling
     void readTableInfo(DataObjects::TableWorkspace_const_sptr tablews, size_t& ipt, size_t& irotangle,
                        std::vector<std::pair<size_t, size_t> >& anodelist);
 
-    ///
+    /// Load one run (one pt.) to a matrix workspace
     API::MatrixWorkspace_sptr loadRunToMatrixWS(DataObjects::TableWorkspace_const_sptr tablews, size_t irow,
                                                 API::MatrixWorkspace_const_sptr parentws,
                                                 size_t ipt, size_t irotangle, const std::vector<std::pair<size_t, size_t> > anodelist);

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadHFIRPDD.cpp b/Code/Mantid/Framework/DataHandling/src/LoadHFIRPDD.cpp
@@ -3,6 +3,7 @@
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidGeometry/IDetector.h"
+#include "MantidKernel/TimeSeriesProperty.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 
@@ -36,9 +37,7 @@ namespace DataHandling
   void LoadHFIRPDD::init()
   {
     std::vector<std::string> exts;
-    exts.push_back(".gsa");
-    exts.push_back(".gss");
-    exts.push_back(".gda");
+    exts.push_back(".dat");
     exts.push_back(".txt");
     declareProperty(
         new API::FileProperty("Filename", "", API::FileProperty::Load, exts),
@@ -128,7 +127,11 @@ namespace DataHandling
 
     // Set up angle
     double twotheta = tablews->cell<double>(irow, irotangle);
-    tempws->getRun()->setPropertyValue("rotangle", twotheta);
+    TimeSeriesProperty<double> *prop2theta =
+        new TimeSeriesProperty<double>("rotangle");
+    prop2theta->addValue(time0, twotheta);
+    tempws->run().addProperty(prop2theta);
+    //  tempws->getRun()->setPropertyValue("rotangle", twotheta);
 
     // Load instrument
     IAlgorithm_sptr instloader = this->createChildAlgorithm("LoadInstrument");