Ticket #9204 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Allow "MaskFile" Commands in SANS ISIS User Files

Reported by: Peter Parker Owned by: Peter Parker
Priority: critical Milestone: Release 3.2
Component: SANS Keywords:
Cc: anders.markvardsen@… Blocked By: #9205
Blocking: #8847 Tester: Anders Markvardsen

Description

As part of #8847, allow users to specify a mask file to use in the ISIS SANS reduction via a new User File Command.

This will hopefully be quite simple to do -- I think the solution for #9097 is similar to what is needed here.

Attachments

MaskSANS2DReductionGUI_MaskFiles.txt (1.4 KB) - added by Peter Parker 6 years ago.
linked_circles_mask.xml (3.1 KB) - added by Peter Parker 6 years ago.
target_circles_mask.xml (3.9 KB) - added by Peter Parker 6 years ago.

Change History

comment:1 Changed 7 years ago by Martyn Gigg

  • Status changed from new to assigned

comment:2 Changed 7 years ago by Peter Parker

No reason why we can't allow multiple files while we're at it.

comment:3 Changed 6 years ago by Peter Parker

  • Blocked By 9205 added

comment:4 Changed 6 years ago by Peter Parker

  • Status changed from assigned to inprogress

Refs #9204 - Allow the MASKFILE command in User Files.

Also show paths in Masking tab of interface.

Now is as good a time as any to slowly introduce the use of a PropertyManager to share settings between ReductionSteps and between the C++ and Python layers of Mantid. See code for further info.

Changeset: 826c9f61e08903fd5d353f9d35f2da8d51812f35

comment:5 Changed 6 years ago by Peter Parker

Refs #9204 - Fix RHEL6 system test.

New settings object clashed with old settings method.

Changeset: d13dddd947718da1b6aa2b4662ae60a5c51a4616

comment:6 Changed 6 years ago by Peter Parker

Refs #9204 - Make sure new settings object is cleared ...

... whenever the singleton is reset.

Also, slight change so that we only ever load the instrument once on interface startup.

Changeset: 26cf78aba778e4b2bd6eafaff6666850b3be57fb

comment:7 Changed 6 years ago by Peter Parker

Refs #9204 - Workaround for bug in MaskDetectors ...

... so that things are no longer "flipped".

Changeset: 917cca00b2014e988d166dee605d8efa118f6cdc

comment:8 Changed 6 years ago by Peter Parker

Refs #9204 - Explicitly raise "user file loaded" flag after startup.

Changeset: 21c9291177667679860ee1b5a306c38640099516

comment:9 Changed 6 years ago by Peter Parker

Merge branch 'master' into feature/9204_allow_maskfile_commands_in_sans_isis_user_files

Conflicts:

Code/Mantid/scripts/SANS/isis_reduction_steps.py

Refs #9204.

Changeset: fa2c5546243c55ce0e2d0ee70782f28f9588e6d3

comment:10 Changed 6 years ago by Peter Parker

  • Status changed from inprogress to verify
  • Cc anders.markvardsen@… added
  • Resolution set to fixed

To Test:

  • Download the attached user file and the two mask files into a directory managed by Mantid.
  • Make sure the Data/SANS2D folder of the System Tests repo is also a managed directory.
  • Open up the ISIS SANS interface, load the mask file, then load SANS2D00022048.
  • Clicking on "Display Mask" in the Masking tab should then show you the result of applying the two mask files; i.e. some concentric circles around the beam, as well as some linked circles.
  • Make sure the reduction process still works by clicking "1D Reduce". No errors or warnings should be reported.
  • To make sure the mask files settings aren't kept around by the reducer after a new user file has been loaded, load "MaskSANS2DReductionGUI.txt" from the system tests folder, and reload SANS2D00022048. Clicking "Display Mask" should be similar to what you saw previously, but without the circles from the mask files.

@Anders:

I want to slowly introduce PropertyManagers as a way to pass round settings in the reducer, and between the C++/Python layers. There's a large comment in isis_reducer.py that explains the relevant changes in this ticket and the motivation for them. Let me know if you want to discuss further.

Changed 6 years ago by Peter Parker

Changed 6 years ago by Peter Parker

Changed 6 years ago by Peter Parker

comment:11 Changed 6 years ago by Anders Markvardsen

  • Status changed from verify to verifying
  • Tester set to Anders Markvardsen

comment:12 Changed 6 years ago by Anders Markvardsen

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/9204_allow_maskfile_commands_in_sans_isis_user_files'

Full changeset: c961399d0a41f9d4cf3f4d269df073de1c4b561e

comment:13 Changed 6 years ago by Anders Markvardsen

Got rings in first ex and no rings in step 4.

One small commend: how you updated wiki http://www.mantidproject.org/SANS_User_File_Commands#MASK

comment:14 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 10047

Note: See TracTickets for help on using tickets.