Ticket #8693 (closed: fixed)
Required IDF Updates
Reported by: | Owen Arnold | Owned by: | Keith Brown |
---|---|---|---|
Priority: | blocker | Milestone: | Release 3.1 |
Component: | Reflectometry | Keywords: | |
Cc: | Blocked By: | ||
Blocking: | #7377, #8751 | Tester: | Owen Arnold |
Description
This is essential non-gui work that MUST get done in this release.
See email forwarded just now. Feel free to break the following into separate tickets:
- Add MonitorIntegralMin and MonitorIntegralMax to the POLREF parameters.xml file with the values in the attached email.
- As Max suggests, duplicate the parameters from the POLREF IDF across to CRISP if these parameters are currently missing. If you want to know which Parameters I'm talking about. Look at the ones fetched in quick.py and ensure that those ones are there for CRISP.
- For POLREF, INTER, CRISP and SURF create associated parameter xml files and move the instrument parameter values (from quick) into these files. Ensure that you have correctly named these files. See http://www.mantidproject.org/InstrumentParameterFile . These parameter files MUST be named correctly. You should test that loading sample data, for all instruments listed, results in the parameters correctly being attached to the instrument as they used to be. Existing system tests that rely on these parameters should pass.
- Optionally, you could create system tests that ensure that for all of these instruments the parameters are being made available (don't worry about the values as these may change). A good way to do this might be to have an abstract base class and have concrete classes to provide the data for each instrument. See ReflectometryISIS.py system test as a guide.
Change History
comment:2 Changed 7 years ago by Keith Brown
MonitorToCorrect (or similar) needs to be deleted if it exists in IDF or parameter
comment:3 Changed 7 years ago by Keith Brown
- Status changed from new to inprogress
Refs #8693. Updated IDF and paraemeter files
Updated IDF and paraemeter files for ISIS reflectomety instruments
POLREF has had a couple fo parameters added
CRISP has had a parameters file created based off POLREF
INTER and SURF have had new parameter fiels made by moving the files out of thier IDFs
MonitorsToCorrect has been removed from their IDFs and parameter files.
Changeset: 4eb2ff4700c064610fe5235bb6b8cae62b709d0f
comment:4 Changed 7 years ago by Keith Brown
Refs #8693 Written system tests
Written a new system test ISISReflInstrumentIDFTest.py to test that the changes to the IDFs and Parameter files of POLREF, INTER, SURF and CRISP work properly.
Changeset: 16132bae6edfde1b6e0265dc2963c7d6c1de4aa0
comment:5 Changed 7 years ago by Keith Brown
Refs #8693. Removed parameter fetch from quick
MonitorsToCorrect has been removed from the reflectometry IDFs, so i've removed the lookup of this parameter from quick. It didn't actually use it anyway it seems.
Changeset: 80fbf6a3e3857b5380b8845a9d63233a8d89f0a0
comment:6 Changed 7 years ago by Keith Brown
- Status changed from inprogress to verify
- Resolution set to fixed
comment:7 Changed 7 years ago by Keith Brown
Refs #8693. Fixed Instrument selection
It was, as i expected, the way that pyqt attaches signals. i had to specify [str] in the signature.
Changeset: e705d6155cd251734ed00c697dccdbfae46689e3
This was put on the wrong ticket and should have gone on #8721
comment:8 Changed 7 years ago by Russell Taylor
- Status changed from verify to reopened
- Resolution fixed deleted
I think it's changes in this ticket to the POLREF_Parameters.xml that are causing the PolrefExample system test to fail. Probably it's just a case of updating the reference result for that test.
comment:9 Changed 7 years ago by Keith Brown
- Status changed from reopened to inprogress
refs #8693 Properly updated now
The reference result has been updated, didn't work the first time.
Changeset: e458e5dc1b2cd53b54a0db09722646a071c9a42a
comment:10 Changed 7 years ago by Keith Brown
Refs #8693 Change valid dates
Advised by owen to alter dates. They are now in line with the other parameter files as they haddn't been changed
Changeset: 1cf31d42efe0c71b44d140f50ae17e93804733f5
comment:11 Changed 7 years ago by Owen Arnold
I've verified that the system test failures were purely down to the CheckWorkspacesMatch also checking the instrument definition. This was important to check because the IDF changes could also have changed the outputs of the results of the analysis (this would be bad). Fortunately this is not the case and I expect the development system tests to pass tonight if the reference results have been correctly updated.
Maybe the PolrefExample system test should be modified so that the following line appears in the validate method
self.disableChecking.append('Instrument')
This would prevent IDF changes directly from triggering test failures.
comment:12 Changed 7 years ago by Keith Brown
- Status changed from inprogress to verify
- Resolution set to fixed
It's probably a good thing they do. So I'd say not to disable checking.
comment:13 Changed 7 years ago by Keith Brown
- Status changed from verify to reopened
- Resolution fixed deleted
merged master in to make sure other tickets don't break this
comment:14 Changed 7 years ago by Keith Brown
- Status changed from reopened to verify
- Resolution set to fixed
comment:15 Changed 7 years ago by Owen Arnold
- Status changed from verify to closed
Merge remote-tracking branch 'origin/feature/8693_Refl_IDF_Updates'
Full changeset: 3ca63d78d9fd83aa3cd8f051ca7f7a79c8fba035
comment:16 Changed 7 years ago by Owen Arnold
Merge remote-tracking branch 'origin/feature/8693_Refl_IDF_Updates'
Full changeset: 7f2f6fe91eca8dc65cf3538ea5de35b5a0267be5
comment:19 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 9537