Running the child algorithm properly now. Re #5417.

mantidproject · Apr 16, 2013 · b00af84 · b00af84
1 parent a58529d
commit b00af84
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/ISISHistoDataListener.cpp b/Code/Mantid/Framework/DataHandling/src/ISISHistoDataListener.cpp
@@ -406,7 +406,8 @@ namespace DataHandling
         loadInst->setPropertyValue("InstrumentName", iName);
         loadInst->setProperty<MatrixWorkspace_sptr>("Workspace",localWorkspace);
         loadInst->setProperty("RewriteSpectraMap", false);
-        loadInst->executeAsChildAlg();
+        loadInst->setChild(true);
+        loadInst->execute();
       }
       catch(std::invalid_argument &)
       {
@@ -416,13 +417,6 @@ namespace DataHandling
       {
         g_log.information("Unable to successfully run LoadInstrument Child Algorithm");
       }
-      if (API::AnalysisDataService::Instance().doesExist("Anonymous"))
-      {
-          // LoadInstrument adds the workspace to ADS as Anonymous
-          // we don't want it there
-          API::AnalysisDataService::Instance().remove("Anonymous");
-          localWorkspace->setName("");
-      }
     }
 
     /// Personal wrapper for sqrt to allow msvs to compile