Refs #8506. ScopedWorkspace: boolean operator.

Code/Mantid/Framework/API/inc/MantidAPI/ScopedWorkspace.h

@@ -51,9 +51,12 @@ namespace API
     /// Retrieve workspace from the ADS
     Workspace_sptr retrieve() const;
 
+    /// Operator for conversion to boolean
+    operator bool() const;
+
     /// Make ADS entry to point to the given workspace
     void set(Workspace_sptr newWS);
- 
+
   private:
     DISABLE_COPY_AND_ASSIGN(ScopedWorkspace);
 

Code/Mantid/Framework/API/src/ScopedWorkspace.cpp

@@ -48,6 +48,20 @@ namespace API
       }
     }
   }
+
+  /**
+   * Operator for conversion to boolean. Returns true if workspace was created for the
+   * name and it is not null workspace.
+   */
+  ScopedWorkspace::operator bool() const
+  {
+    AnalysisDataServiceImpl& ads = AnalysisDataService::Instance();
+
+    if ( ads.doesExist(m_name) )
+      return ads.retrieveWS<Workspace>(m_name);
+    else
+      return false;
+  }
 
   /**
    * Retrieve workspace from the ADS. Null pointer returned if nothing was added

Code/Mantid/Framework/API/test/ScopedWorkspaceTest.h

@@ -150,6 +150,17 @@ class ScopedWorkspaceTest : public CxxTest::TestSuite
     TS_ASSERT_THROWS( ScopedWorkspace test2(ws), std::invalid_argument );
   }
 
+  void test_boolConversion()
+  {
+    ScopedWorkspace test;
+
+    TS_ASSERT( ! test );
+
+    test.set(MockWorkspace_sptr(new MockWorkspace));
+
+    TS_ASSERT( test );
+  }
+
 private:
   AnalysisDataServiceImpl& m_ads;
 };