Skip to content

Commit

Permalink
Checkpointing work. Refs #7184.
Browse files Browse the repository at this point in the history
  • Loading branch information
wdzhou committed May 30, 2013
1 parent 049f60c commit 4300991
Showing 1 changed file with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,8 @@ def PyInit(self):

tableprop = ITableWorkspaceProperty("SplittersWorkspace", "", Direction.Input, PropertyMode.Optional)
self.declareProperty(tableprop, "Splitters workspace for split event workspace.")
# self.declareProperty("KeepRemainder", True, "Keeping the remainder events workspace if true.")

""" Disabled Due To #
self.declareProperty("FilterByLogValue", "", "Name of log value to filter by")
self.declareProperty("FilterMinimumValue", 0.0, "Minimum log value for which to keep events.")
self.declareProperty("FilterMaximumValue", 0.0, "Maximum log value for which to keep events.")
self.declareProperty("FilterByTimeMin", 0.,
"Relative time to start filtering by in seconds. Applies only to sample.")
self.declareProperty("FilterByTimeMax", 0.,
"Relative time to stop filtering by in seconds. Applies only to sample.")
"""
infotableprop = ITableWorkspaceProperty("SplitInformationWorkspace", "", Direction.Input, PropertyMode.Optional)
self.declareProperty(infotableprop, "Name of table workspace containing information for splitters.")

return

Expand Down Expand Up @@ -313,6 +304,8 @@ def PyExec(self):
timeFilterWall = (0.0, 0.0)
self.log().information("SplittersWorkspace is None, and thus there is NO time filter wall. ")

self._splitinfotablews = self.getProperty("SplitInformationWorkspace")

# Process data
workspacelist = [] # all data workspaces that will be converted to d-spacing in the end
samwksplist = []
Expand Down Expand Up @@ -736,8 +729,14 @@ def _focusChunks(self, runnumber, extension, filterWall, calib, splitwksp=None,
if dosplit:
# Splitting workspace
basename = str(temp)
api.FilterEvents(InputWorkspace=temp, OutputWorkspaceBaseName=basename,
SplitterWorkspace=splitwksp, GroupWorkspaces=True)
if self._splitinfotablews is None:
api.FilterEvents(InputWorkspace=temp, OutputWorkspaceBaseName=basename,
SplitterWorkspace=splitwksp, GroupWorkspaces=True)
else:
api.FilterEvents(InputWorkspace=temp, OutputWorkspaceBaseName=basename,
SplitterWorkspace=splitwksp, InformationWorkspace = self._splitinfotablews,
GroupWorkspaces=True)
# ENDIF
wsgroup = mtd[basename]
tempwsnamelist = wsgroup.getNames()

Expand Down

0 comments on commit 4300991

Please sign in to comment.