Skip to content

Commit

Permalink
Refs #6473. Minor fixes in MuonAnalysis.
Browse files Browse the repository at this point in the history
  • Loading branch information
arturbekasov committed Dec 13, 2013
1 parent 697229c commit cccb358
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
Expand Up @@ -508,10 +508,7 @@ MatrixWorkspace_sptr MuonAnalysis::createAnalysisWorkspace(ItemType itemType, in

alg->initialize();

// TODO: should really be global
const std::string loadedWSName = m_workspace_name + "Grouped";

auto loadedWS = AnalysisDataService::Instance().retrieveWS<Workspace>(loadedWSName);
auto loadedWS = AnalysisDataService::Instance().retrieveWS<Workspace>(m_grouped_name);

if ( auto group = boost::dynamic_pointer_cast<WorkspaceGroup>(loadedWS) )
{
Expand Down Expand Up @@ -576,7 +573,7 @@ MatrixWorkspace_sptr MuonAnalysis::createAnalysisWorkspace(ItemType itemType, in

QTableWidget* t = m_uiForm.pairTable;

double alpha = t->item(m_pairTableRowInFocus,3)->text().toDouble();
double alpha = t->item(tableRow,3)->text().toDouble();
int index1 = static_cast<QComboBox*>( t->cellWidget(tableRow,1) )->currentIndex();
int index2 = static_cast<QComboBox*>( t->cellWidget(tableRow,2) )->currentIndex();

Expand Down

0 comments on commit cccb358

Please sign in to comment.