Skip to content

Commit

Permalink
Made change due to change in LoadFullprofResolution. Refs #7948.
Browse files Browse the repository at this point in the history
  • Loading branch information
wdzhou committed Oct 29, 2013
1 parent ef3a618 commit 851f1f7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidDataObjects/TableWorkspace.h"

namespace Mantid
Expand Down Expand Up @@ -71,7 +72,7 @@ class DLLExport SaveGSASInstrumentFile : public API::Algorithm
boost::shared_ptr<ChopperConfiguration> setupNOMConstants(int intfrequency);

/// Parse profile table workspace to a map
void parseProfileTableWorkspace(DataObjects::TableWorkspace_sptr ws,
void parseProfileTableWorkspace(API::ITableWorkspace_sptr ws,
std::map<unsigned int, std::map<std::string, double> >& profilemap);

/// Convert to GSAS instrument file
Expand Down Expand Up @@ -114,7 +115,8 @@ class DLLExport SaveGSASInstrumentFile : public API::Algorithm
double erfc(double xx);

/// Input workspace
DataObjects::TableWorkspace_sptr m_inpWS;
API::ITableWorkspace_sptr m_inpWS;
// DataObjects::TableWorkspace_sptr m_inpWS;

/// Instrument
std::string m_instrument;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ ChopperConfiguration::ChopperConfiguration(const int freq, const std::string& ba
*/
void SaveGSASInstrumentFile::init()
{
declareProperty(new WorkspaceProperty<TableWorkspace>("InputWorkspace", "", Direction::Input, PropertyMode::Optional),
declareProperty(new WorkspaceProperty<ITableWorkspace>("InputWorkspace", "", Direction::Input, PropertyMode::Optional),
"Name of the table workspace containing the parameters.");

vector<string> infileexts;
Expand Down Expand Up @@ -571,7 +571,7 @@ ChopperConfiguration::ChopperConfiguration(const int freq, const std::string& ba
//----------------------------------------------------------------------------------------------
/** Parse profile table workspace to a map (the new ...
*/
void SaveGSASInstrumentFile::parseProfileTableWorkspace(TableWorkspace_sptr ws,
void SaveGSASInstrumentFile::parseProfileTableWorkspace(ITableWorkspace_sptr ws,
map<unsigned int, map<string, double> >& profilemap)
{
size_t numbanks = ws->columnCount()-1;
Expand Down

0 comments on commit 851f1f7

Please sign in to comment.