Refs #5660 remove boost::serialize statements

mantidproject · Jul 31, 2012 · efca19e · efca19e
1 parent b7ef4df
commit efca19e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassenaParams.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassenaParams.h
@@ -1152,7 +1152,7 @@ class Params
   std::string config_rootpath;
   static Kernel::Logger& g_log; /// Reference to the logger class
 public:
-  // interface for initiatilzation and interfacing
+  // interface for initialization and interfacing
   static Params* Inst() { static Params instance; return &instance;}
   void get_rawconfig(std::vector<char>& rc) { rc = rawconfig; }
   void get_config(std::vector<char>& c) { c=config; }
@@ -1215,6 +1215,7 @@ class DLLExport LoadSassenaParams : public API::Algorithm
   /// Execution code
   void exec();             // Overwrites Algorithm method
   std::string m_filename;
+  Params* m_parameters;
 }; // class LoadSassena
 
 } // namespace DataHandling

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSassenaParams.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSassenaParams.cpp
@@ -1767,15 +1767,24 @@ void LoadSassenaParams::initDocs()
 void LoadSassenaParams::init()
 {
   this->declareProperty(new API::FileProperty("Filename", "Anonymous", API::FileProperty::Load, ".xml"),"A Sassena XML input file");
-  this->declareProperty(new API::WorkspaceProperty<API::WorkspaceGroup>("OutputWorkspace","",Kernel::Direction::Output, API::PropertyMode::Optional), "Optional, group workspace to append the parameters as logs.");
+  this->declareProperty(new API::WorkspaceProperty<API::WorkspaceGroup>("InputWorkspace","",Kernel::Direction::Input, API::PropertyMode::Optional), "Optional, group workspace to append the parameters as logs.");
 }
 
 /// Execute the algorithm
 void LoadSassenaParams::exec()
 {
-  filename = this->getProperty("Filename");
-  const std::string gwsName = this->getPropertyValue("OutputWorkspace");
-
+  m_filename = this->getPropertyValue("Filename");
+  m_parameters = Params::Inst();
+  m_parameters->read_xml(m_filename);
+  const std::string gwsName = this->getPropertyValue("InputWorkspace");
+  if (gwsName)
+  {
+    API::IAlgorithm_sptr logsLoader = this->createSubAlgorithm("LoadSassenaLogs");
+    API::WorkspaceGroup_sptr gws = this->getProperty("InputWorkspace");
+    logsLoader->setPropertyValue("InputWorkspace", gwsName);
+    logsLoader->setPropertyValue("Filename", m_filename);
+    logsLoader->executeAsSubAlg();
+  }
 
 } // end of LoadSassena::exec()