Refs #8506. ScopedWorkspace: set() method.

mantidproject · Nov 28, 2013 · 019b34e · 019b34e
1 parent c914183
commit 019b34e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ScopedWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/ScopedWorkspace.h
@@ -50,6 +50,9 @@ namespace API
 
     /// Retrieve workspace from the ADS
     Workspace_sptr retrieve() const;
+
+    /// Make ADS entry to point to the given workspace
+    void set(Workspace_sptr newWS);
 
   private:
     DISABLE_COPY_AND_ASSIGN(ScopedWorkspace);

diff --git a/Code/Mantid/Framework/API/src/ScopedWorkspace.cpp b/Code/Mantid/Framework/API/src/ScopedWorkspace.cpp
@@ -64,6 +64,14 @@ namespace API
 
     return Workspace_sptr();
   }
+
+  /**
+   * Make ADS entry to point to the given workspace.
+   */
+  void ScopedWorkspace::set(Workspace_sptr newWS)
+  {
+    AnalysisDataService::Instance().addOrReplace(m_name, newWS); 
+  }
 
   /**
    * Generates a tricky name which is unique within ADS.  

diff --git a/Code/Mantid/Framework/API/test/ScopedWorkspaceTest.h b/Code/Mantid/Framework/API/test/ScopedWorkspaceTest.h
@@ -66,14 +66,14 @@ class ScopedWorkspaceTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( test.name().size(), prefix.size() + 16 );
   }
 
-  void test_retrieve()
+  void test_setAndRetrieve()
   {
     ScopedWorkspace test;
 
     TS_ASSERT( ! test.retrieve() );
 
     MockWorkspace_sptr ws = MockWorkspace_sptr(new MockWorkspace);
-    m_ads.add( test.name(), ws );
+    test.set(ws);
 
     TS_ASSERT_EQUALS( ws, test.retrieve() );
   }