Checkpointing work till largely finished. Refs #6968.

mantidproject · Aug 13, 2013 · 93c0c04 · 93c0c04
1 parent ff7a0a8
commit 93c0c04
Show file tree

Hide file tree

Showing 2 changed files with 193 additions and 124 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SaveGSASInstrumentFile.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SaveGSASInstrumentFile.h
@@ -106,7 +106,7 @@ class DLLExport SaveGSASInstrumentFile : public API::Algorithm
   ChopperConfiguration_sptr setupNOMConstants(int intfrequency);
 
   /// Parse profile table workspace to a map
-  std::map<std::string, double> parseProfileTableWorkspace(DataObjects::TableWorkspace_sptr ws);
+  void parseProfileTableWorkspace(DataObjects::TableWorkspace_sptr ws, std::map<unsigned int, std::map<std::string, double> > profilemap)
 
   /// Convert to GSAS instrument file
   void convertToGSAS(std::vector<unsigned int> banks, std::string gsasinstrfilename);
@@ -130,7 +130,10 @@ class DLLExport SaveGSASInstrumentFile : public API::Algorithm
   double aaba(double n, double ea1, double ea2, double ta1, double ta2, double dsp);
 
   /// Get parameter value from a map
-  double getParameterValue(std::map<std::string, double> profilemap, std::string parname);
+  double getValueFromMap(std::map<std::string, double> profilemap, std::string parname);
+
+  /// Get parameter value from class storage
+  double getProfileParameterValue(unsigned int bankid, std::string paramname);
 
   /// Input workspace
   DataObjects::TableWorkspace_sptr m_inpWS;
@@ -159,6 +162,9 @@ class DLLExport SaveGSASInstrumentFile : public API::Algorithm
   /// Chopper configuration
   ChopperConfiguration_sptr m_configuration;
 
+  /// Profile parameter map
+  std::map<unsigned int, std::map<std::string, double> > m_profileMap;
+
   //
   std::vector<double> m_gdsp;
   std::vector<double> m_gdt;