Skip to content

Commit

Permalink
Refs #8936. A few minor improvements.
Browse files Browse the repository at this point in the history
  • Loading branch information
arturbekasov committed Feb 17, 2014
1 parent c3157f8 commit 54ed2d1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
Expand Up @@ -70,7 +70,7 @@ private slots:
void populateTables();

private:
/// Postfix used by Fit fot result workspaces
/// Postfix used by Fit for result workspaces
static const std::string WORKSPACE_POSTFIX;

/// Postfix used by Fit for tables with fitted parameters
Expand Down
Expand Up @@ -309,11 +309,12 @@ QStringList MuonAnalysisResultTableTab::getIndividualFitWorkspaces()

for(auto it = allWorkspaces.begin(); it != allWorkspaces.end(); it++)
{
// Should end with WORKSPACE_POSTFIX
if ( !boost::ends_with(*it, WORKSPACE_POSTFIX) )
continue;

// Ignore sequential fit results
if ( boost::starts_with(*it, MuonSequentialFitDialog::SEQUENTIAL_PREFIX))
if ( boost::starts_with(*it, MuonSequentialFitDialog::SEQUENTIAL_PREFIX) )
continue;

auto ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(*it);
Expand Down Expand Up @@ -419,8 +420,8 @@ void MuonAnalysisResultTableTab::populateLogsAndValues(const QStringList& fitted
QMap<QString, QVariant> wsLogValues;

// Get log information
Mantid::API::ExperimentInfo_sptr ws = boost::dynamic_pointer_cast<Mantid::API::ExperimentInfo>(
AnalysisDataService::Instance().retrieve(fittedWsList[i].toStdString() + "_Workspace"));
auto ws = AnalysisDataService::Instance().retrieveWS<ExperimentInfo>(fittedWsList[i].toStdString()
+ WORKSPACE_POSTFIX);
if (!ws)
{
throw std::runtime_error("Wrong type of Workspace");
Expand Down

0 comments on commit 54ed2d1

Please sign in to comment.