Refs #5146 Remove private field GWS

modified: LoadSassena.h modified: LoadSassena.cpp
mantidproject · May 10, 2012 · 95162cb · 95162cb
1 parent 96193e8
commit 95162cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h
@@ -44,19 +44,20 @@ namespace Mantid
 
   /* Base class to Load a sassena dataset into a MatrixWorkspace
    * Derived implementations will load different scattering functions
-  */
+
   class LoadDataSet
   {
 
   };
+  */
 
   class DLLExport LoadSassena : public API::IDataFileChecker
   {
   public:
     /// Constructor
-    LoadSassena(): IDataFileChecker(), m_filename(""), GWS(NULL) {};
+    LoadSassena(): IDataFileChecker(), m_filename("") {};
     /// Virtual Destructor
-    virtual ~LoadSassena();
+    virtual ~LoadSassena() {}
     /// Algorithm's name
     virtual const std::string name() const { return "LoadSassena"; }
     /// Algorithm's version
@@ -93,8 +94,6 @@ namespace Mantid
     std::vector<const char*> m_validSets;
     /// name and path of input file
     std::string m_filename;
-    /// Group workspace being filled
-    API::WorkspaceGroup_const_sptr GWS;
 
   }; // class LoadSassena
 

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
@@ -91,7 +91,7 @@ void LoadSassena::exec()
   //populate m_validSets
   int nvalidSets = 5;
   const char* validSets[] = { "fq", "fq0", "fq2", "fqt", "qvectors" };
-  this->m_validSets(validSets, validSets+nvalidSets);
+  for(int iSet=0; iSet<nvalidSets; iSet++) this->m_validSets.push_back( validSets[iSet] );
 
   this->m_filename = this->getPropertyValue("Filename");
   hid_t h5file = H5Fopen(this->m_filename.c_str(),H5F_ACC_RDONLY,H5P_DEFAULT);
@@ -100,7 +100,6 @@ void LoadSassena::exec()
   char *cversion = new char[16];
   H5LTget_attribute_string( h5file, "/", "sassena_version", cversion );
   const std::string version(cversion);
-  int iversion=boost::lexical_cast<int>(cversion);
 
   //determine which loader protocol to use based on the version
   //to be done at a later time, maybe implement a Version class