Merge branch 'bugfix/7402_using_removed_property' into develop Re #7402

Conflicts: Code/Mantid/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h Code/Mantid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.ui
mantidproject · Jul 5, 2013 · ae1242b · ae1242b
2 parents cea1735 + 29aa42a
commit ae1242b
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
@@ -505,7 +505,6 @@ void AlignAndFocusPowder::exec()
     g_log.information() << "running EditInstrumentGeometry\n";
     API::IAlgorithm_sptr editAlg = createChildAlgorithm("EditInstrumentGeometry");
     editAlg->setProperty("Workspace", m_outputW);
-    editAlg->setProperty("NewInstrument", false);
     editAlg->setProperty("PrimaryFlightPath", l1);
     editAlg->setProperty("Polar", tths);
     editAlg->setProperty("SpectrumIDs", specids);
@@ -518,7 +517,6 @@ void AlignAndFocusPowder::exec()
     {
       API::IAlgorithm_sptr editAlg = createChildAlgorithm("EditInstrumentGeometry");
       editAlg->setProperty("Workspace", m_lowResW);
-      editAlg->setProperty("NewInstrument", false);
       editAlg->setProperty("PrimaryFlightPath", l1);
       editAlg->setProperty("Polar", tths);
       editAlg->setProperty("SpectrumIDs", specids);