MASKFILE Command Not Working in Batch Mode

[Peter Parker]

Andrew Jackson has spotted that the MASKFILE command is not working correctly in Batch Mode -- the mask gets applied to the first reduction, but then is ignored in all further reductions.

The MASKFILE command uses a new way of storing settings, and I think the problem is that they are not copied across with the other settings when a fresh reducer is created.

[Peter Parker]

Refs #9484 - Move the reduction settings stuff to its own file.

Changeset: 08008e0d47a6805dedc2c6ffb31db2eedd65a19d

[Peter Parker]

Refs #9484 - Add some features to our settings object.

Changeset: 9227c964908cff0fe3fa37681bd17a885f92f05f

[Peter Parker]

Refs #9484 - Carry settings across for each iteration in Batch mode.

Changeset: 6d6445f56eded079d7a40454f48dce34620e2ca9

[Peter Parker]

Refs #9484 - Add system test to cover settings in Batch mode.

Changeset: 8fa7395a052c9f82efea0a75ecf8d1bec960c37a

[Peter Parker]

Refs #9484 - Can't use context manager assert in older Python.

Changeset: d2843b4d9b931eb4ed69e49959131483c3fb1aaf

[Peter Parker]

Refs #9484 - Do not load CSV or mask files in LoadLotsOfFiles test.

Changeset: c52257dd80b060d482d507b323f784c87088c425

[Peter Parker]

Remember to merge the system tests repo as well as the main repo.

To test:

The new system test covers the problem described in the ticket, so maybe a code review is all that is needed here. If you like, you can run the following script, which uses some of the new files added to the system test repo, and shows that the history for the first workspace produced by the batch is the same as the second workspace:

from ISISCommandInterface import *
from SANSBatchMode import *

SANS2D()
Set1D()
Detector("rear-detector")
# This contains two MASKFILE commands, each resulting in a seperate call to MaskDetectors.
MaskFile('MaskSANS2DReductionGUI_MaskFiles.txt')
Gravity(True)

# This does 3 seperate reductions of the same data, but saving the result of each to a different workspace.
csv_file = FileFinder.getFullPath('SANS2D_mask_batch.csv')
BatchReduce(csv_file, 'nxs', plotresults=False)

# Get a hold of each of the three results, and make sure they all have the same size
# history (i.e. check that MaskDetectors was called for all iterations.)  This failed
# before the changes made to this ticket.
it_1 = mtd["iteration_1"]
it_2 = mtd["iteration_2"]
assert it_1.getHistory().size() == it_2.getHistory().size()

[Anders Markvardsen]

Merge remote-tracking branch 'origin/bugfix/9484_maskfile_command_not_working_in_batch_mode'

Full changeset: ​0d39935384f0c374a79bb16bd2e32608ae4c7ce8

[Anders Markvardsen]

Merge remote-tracking branch 'origin/bugfix/9484_mask_file_command_not_working_in_batch_mode'

Full changeset: ​d3682a69ce105d7208b92f026a507d9a6675977c

[Anders Markvardsen]

Script returns same size history of 38

[Stuart Campbell]

This ticket has been transferred to github issue ​10327