Skip to content

Commit

Permalink
Refs #4333 Put back in old behaviour for original mtd.
Browse files Browse the repository at this point in the history
Didn't mean to take it out and it will cause havoc at the moment if we
do
  • Loading branch information
martyngigg committed Jan 12, 2012
1 parent 0af68dc commit 8ac43e7
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions Code/Mantid/Framework/PythonAPI/MantidFramework.py
Original file line number Diff line number Diff line change
Expand Up @@ -1312,13 +1312,16 @@ def _retrieveWorkspace(self, name):
attrs = ['_getRawIPeaksWorkspacePointer', '_getRawIEventWorkspacePointer', '_getRawMatrixWorkspacePointer',
'_getRawIMDEventWorkspacePointer','_getRawIMDHistoWorkspacePointer',
'_getRawIMDWorkspacePointer', '_getRawWorkspaceGroupPointer', '_getRawTableWorkspacePointer']

for att in attrs:
retval = getattr(self, att)(name)
if retval is not None:
return retval
retval = None
try:
for att in attrs:
retval = getattr(self, att)(name)
if retval is not None:
break
except RuntimeError:
pass
# Preserve behaviour
return None
return retval

def _workspaceRemoved(self, name):
"""
Expand Down

0 comments on commit 8ac43e7

Please sign in to comment.