Ticket #6192 (closed: fixed)
Spectrum Axis get or cache numbers from ispectrum
Reported by: | Nick Draper | Owned by: | Russell Taylor |
---|---|---|---|
Priority: | blocker | Milestone: | Release 2.5 |
Component: | Mantid | Keywords: | |
Cc: | Blocked By: | ||
Blocking: | Tester: | Martyn Gigg |
Description
Change History
comment:3 Changed 8 years ago by Russell Taylor
Re #6192. Remove SpectraAxis::populateOneToOne method.
Nothing was using it on the C++ side. It was exposed to python, but as far as I can tell nothing was using it there either.
Changeset: 88420c59d0490efc5d5b7659f92f75298243e537
comment:4 Changed 8 years ago by Russell Taylor
Re #6192. Remove non-const-ref Axis::spectraNo method.
Changeset: 9ba533a8f40fda2afed500adf34a92c1fc0d22b0
comment:5 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ef8f243ef9e1abc11b0c8ce01bc46edf78c91902
comment:6 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 377bfe88cbedc3d0921181345ab53a193695b2d8
comment:7 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ae92922b13b2c175b5fe59d339fed4c2db80e2dc
comment:8 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 503080bf8f3c1252cca24ae9b68d36dcf0c573a7
comment:9 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis. The remaining uses of Axis::setValue in this package are where the axis is (or could be) a NumericAxis.
Changeset: 1188cc79cc7ec786f269fce1e5f782e0156dc52c
comment:10 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Changeset: ec6b29d9b90a911c057a3de706979e4ae752a4b7
comment:11 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis.
Changeset: f77c635e9aca795692f7f708a07fc62cf20300cf
comment:12 Changed 8 years ago by Russell Taylor
- Status changed from accepted to verify
- Resolution set to fixed
The branch name is feature/6192_remove_spectrum_no_duplication
Testing: Not easy to test other than by code inspection. The crucial commit to this ticket ([129ee2f4]) appears not to have made it into trac. Observe that the SpectraAxis class no longer holds an vector of values, but instead just a pointer to the workspace to which it belongs. As always, observe also that all tests are passing after these changes.
N.B. To inspect all the changes in this ticket, run the command git log origin/feature/6192_remove_spectrum_no_duplication --not origin/master before merging the branch.
comment:13 Changed 8 years ago by Russell Taylor
- Status changed from verify to reopened
- Resolution fixed deleted
Turns out that commit [6f4d834e] (which also failed to make it into trac) in the case where the spectra-detector mapping is not 1-1 (specifically LET). This was picked up when a system test failed.
comment:15 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: 81061ed2e63505954e56231ce569a001da7bc056
comment:16 Changed 8 years ago by Russell Taylor
- Status changed from accepted to verify
- Resolution set to fixed
Should be good now. Testing instructions in comment:12 still stand.
comment:17 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: 81061ed2e63505954e56231ce569a001da7bc056
comment:18 Changed 8 years ago by Russell Taylor
Re #6192. Remove python createSpectraAxis methods (in API v1 & v2).
This is in preparation for changes to the SpectraAxis class, which will make it impossible to create an axis of this type without a parent workspace. The removed methods are unused anyway.
Changeset: 8b05cfd196d22770fd93c73fc91743c130b0cc37
comment:19 Changed 8 years ago by Russell Taylor
Re #6192. Eliminate spectrum no. duplication between Axis & ISpectrum
Achieved by having the SpectraAxis class hold a pointer to it's owning workspace and going through that back to the spectrum number held by the ISpectrum when necessary. Other code and tests need to be fixed after these changes.
Changeset: 129ee2f403177b34acbed46bb84fd47c495b1b3a
comment:20 Changed 8 years ago by Russell Taylor
Re #6192. Fix code & tests for changes in SpectraAxis class.
Changeset: 6f4d834e36bbe283b43711f3f95d9002e38e479f
comment:21 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ef8f243ef9e1abc11b0c8ce01bc46edf78c91902
comment:22 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 377bfe88cbedc3d0921181345ab53a193695b2d8
comment:23 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ae92922b13b2c175b5fe59d339fed4c2db80e2dc
comment:24 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 503080bf8f3c1252cca24ae9b68d36dcf0c573a7
comment:25 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis. The remaining uses of Axis::setValue in this package are where the axis is (or could be) a NumericAxis.
Changeset: 1188cc79cc7ec786f269fce1e5f782e0156dc52c
comment:26 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Changeset: ec6b29d9b90a911c057a3de706979e4ae752a4b7
comment:27 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis.
Changeset: f77c635e9aca795692f7f708a07fc62cf20300cf
comment:28 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: 81061ed2e63505954e56231ce569a001da7bc056
comment:29 Changed 8 years ago by Russell Taylor
Merge branch 'feature/6192_remove_spectrum_no_duplication' into develop
Re #6192. Conflicts:
Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
Changeset: f9b9888c72d31875bb5dc4c7f7be52a50c2b7f73
comment:30 Changed 8 years ago by Martyn Gigg
- Status changed from verify to verifying
- Tester set to Martyn Gigg
comment:32 Changed 8 years ago by Martyn Gigg
Merge remote-tracking branch 'origin/feature/6192_remove_spectrum_no_duplication' Refs #6192
Conflicts:
Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
Changeset: c07b1725a99e791cee85c7c6e5ff75636dbf66de
comment:33 Changed 8 years ago by Russell Taylor
Re #6192. Remove python createSpectraAxis methods (in API v1 & v2).
This is in preparation for changes to the SpectraAxis class, which will make it impossible to create an axis of this type without a parent workspace. The removed methods are unused anyway.
Changeset: 8b05cfd196d22770fd93c73fc91743c130b0cc37
comment:34 Changed 8 years ago by Russell Taylor
Re #6192. Eliminate spectrum no. duplication between Axis & ISpectrum
Achieved by having the SpectraAxis class hold a pointer to it's owning workspace and going through that back to the spectrum number held by the ISpectrum when necessary. Other code and tests need to be fixed after these changes.
Changeset: 129ee2f403177b34acbed46bb84fd47c495b1b3a
comment:35 Changed 8 years ago by Russell Taylor
Re #6192. Fix code & tests for changes in SpectraAxis class.
Changeset: 6f4d834e36bbe283b43711f3f95d9002e38e479f
comment:36 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ef8f243ef9e1abc11b0c8ce01bc46edf78c91902
comment:37 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 377bfe88cbedc3d0921181345ab53a193695b2d8
comment:38 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ae92922b13b2c175b5fe59d339fed4c2db80e2dc
comment:39 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 503080bf8f3c1252cca24ae9b68d36dcf0c573a7
comment:40 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis. The remaining uses of Axis::setValue in this package are where the axis is (or could be) a NumericAxis.
Changeset: 1188cc79cc7ec786f269fce1e5f782e0156dc52c
comment:41 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Changeset: ec6b29d9b90a911c057a3de706979e4ae752a4b7
comment:42 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis.
Changeset: f77c635e9aca795692f7f708a07fc62cf20300cf
comment:43 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: 81061ed2e63505954e56231ce569a001da7bc056
comment:44 Changed 8 years ago by Martyn Gigg
Merge remote-tracking branch 'origin/feature/6192_remove_spectrum_no_duplication' Refs #6192
Conflicts:
Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
Changeset: c07b1725a99e791cee85c7c6e5ff75636dbf66de
comment:45 Changed 8 years ago by Russell Taylor
Re #6192. Remove python createSpectraAxis methods (in API v1 & v2).
This is in preparation for changes to the SpectraAxis class, which will make it impossible to create an axis of this type without a parent workspace. The removed methods are unused anyway.
Changeset: 8b05cfd196d22770fd93c73fc91743c130b0cc37
comment:46 Changed 8 years ago by Russell Taylor
Re #6192. Eliminate spectrum no. duplication between Axis & ISpectrum
Achieved by having the SpectraAxis class hold a pointer to it's owning workspace and going through that back to the spectrum number held by the ISpectrum when necessary. Other code and tests need to be fixed after these changes.
Changeset: 129ee2f403177b34acbed46bb84fd47c495b1b3a
comment:47 Changed 8 years ago by Russell Taylor
Re #6192. Fix code & tests for changes in SpectraAxis class.
Changeset: 6f4d834e36bbe283b43711f3f95d9002e38e479f
comment:48 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ef8f243ef9e1abc11b0c8ce01bc46edf78c91902
comment:49 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 377bfe88cbedc3d0921181345ab53a193695b2d8
comment:50 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ae92922b13b2c175b5fe59d339fed4c2db80e2dc
comment:51 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 503080bf8f3c1252cca24ae9b68d36dcf0c573a7
comment:52 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis. The remaining uses of Axis::setValue in this package are where the axis is (or could be) a NumericAxis.
Changeset: 1188cc79cc7ec786f269fce1e5f782e0156dc52c
comment:53 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Changeset: ec6b29d9b90a911c057a3de706979e4ae752a4b7
comment:54 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis.
Changeset: f77c635e9aca795692f7f708a07fc62cf20300cf
comment:55 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: 81061ed2e63505954e56231ce569a001da7bc056
comment:56 Changed 8 years ago by Martyn Gigg
Merge remote-tracking branch 'origin/feature/6192_remove_spectrum_no_duplication' Refs #6192
Conflicts:
Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
Changeset: c07b1725a99e791cee85c7c6e5ff75636dbf66de
comment:57 Changed 8 years ago by Russell Taylor
Re #6192. Remove python createSpectraAxis methods (in API v1 & v2).
This is in preparation for changes to the SpectraAxis class, which will make it impossible to create an axis of this type without a parent workspace. The removed methods are unused anyway.
Changeset: f5179ff44026ef00a8024d2011b61be251b5b6ff
comment:58 Changed 8 years ago by Russell Taylor
Re #6192. Eliminate spectrum no. duplication between Axis & ISpectrum
Achieved by having the SpectraAxis class hold a pointer to it's owning workspace and going through that back to the spectrum number held by the ISpectrum when necessary. Other code and tests need to be fixed after these changes.
Changeset: f8d52f05c14770eb32c777964a934d23930773bc
comment:59 Changed 8 years ago by Russell Taylor
Re #6192. Fix code & tests for changes in SpectraAxis class.
Changeset: 1db996e5e2084b288e60e2f9b8f2195045be16b9
comment:60 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: 2bf823dace86c4e245f87fe36ebdaa93bc24c420
comment:61 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 3d29697d949db41259dc3a23241cedc244033c1c
comment:62 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: c417c5cf8e773b27c488eef00e3863822d74d6db
comment:63 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 78cd6b95546199e015e8caf0f3f9a1b1a73cadf4
comment:64 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis. The remaining uses of Axis::setValue in this package are where the axis is (or could be) a NumericAxis.
Changeset: 5cf7c38decda1ef062b4d6697b2f10edeb849d7b
comment:65 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Changeset: 53f2c5367cd9df460ff6dde5a7c1d0bf659c53e5
comment:66 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis.
Changeset: 2e4b3c28f1f199d8add77a5d0911c42587cdfe3a
comment:67 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: b3dabb24ba087731f2ee2bd974ca6c56e7da11ea
comment:68 Changed 8 years ago by Russell Taylor
Re #6192. Remove python createSpectraAxis methods (in API v1 & v2).
This is in preparation for changes to the SpectraAxis class, which will make it impossible to create an axis of this type without a parent workspace. The removed methods are unused anyway.
Changeset: 8b05cfd196d22770fd93c73fc91743c130b0cc37
comment:69 Changed 8 years ago by Russell Taylor
Re #6192. Eliminate spectrum no. duplication between Axis & ISpectrum
Achieved by having the SpectraAxis class hold a pointer to it's owning workspace and going through that back to the spectrum number held by the ISpectrum when necessary. Other code and tests need to be fixed after these changes.
Changeset: 129ee2f403177b34acbed46bb84fd47c495b1b3a
comment:70 Changed 8 years ago by Russell Taylor
Re #6192. Fix code & tests for changes in SpectraAxis class.
Changeset: 6f4d834e36bbe283b43711f3f95d9002e38e479f
comment:71 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ef8f243ef9e1abc11b0c8ce01bc46edf78c91902
comment:72 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 377bfe88cbedc3d0921181345ab53a193695b2d8
comment:73 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ae92922b13b2c175b5fe59d339fed4c2db80e2dc
comment:74 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 503080bf8f3c1252cca24ae9b68d36dcf0c573a7
comment:75 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis. The remaining uses of Axis::setValue in this package are where the axis is (or could be) a NumericAxis.
Changeset: 1188cc79cc7ec786f269fce1e5f782e0156dc52c
comment:76 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Changeset: ec6b29d9b90a911c057a3de706979e4ae752a4b7
comment:77 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis.
Changeset: f77c635e9aca795692f7f708a07fc62cf20300cf
comment:78 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: 81061ed2e63505954e56231ce569a001da7bc056
comment:79 Changed 8 years ago by Martyn Gigg
Merge remote-tracking branch 'origin/feature/6192_remove_spectrum_no_duplication' Refs #6192
Conflicts:
Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
Changeset: c07b1725a99e791cee85c7c6e5ff75636dbf66de
comment:80 Changed 8 years ago by Russell Taylor
Re #6192. Remove python createSpectraAxis methods (in API v1 & v2).
This is in preparation for changes to the SpectraAxis class, which will make it impossible to create an axis of this type without a parent workspace. The removed methods are unused anyway.
Changeset: 8b05cfd196d22770fd93c73fc91743c130b0cc37
comment:81 Changed 8 years ago by Russell Taylor
Re #6192. Eliminate spectrum no. duplication between Axis & ISpectrum
Achieved by having the SpectraAxis class hold a pointer to it's owning workspace and going through that back to the spectrum number held by the ISpectrum when necessary. Other code and tests need to be fixed after these changes.
Changeset: 129ee2f403177b34acbed46bb84fd47c495b1b3a
comment:82 Changed 8 years ago by Russell Taylor
Re #6192. Fix code & tests for changes in SpectraAxis class.
Changeset: 6f4d834e36bbe283b43711f3f95d9002e38e479f
comment:83 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ef8f243ef9e1abc11b0c8ce01bc46edf78c91902
comment:84 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 377bfe88cbedc3d0921181345ab53a193695b2d8
comment:85 Changed 8 years ago by Russell Taylor
Re #6192. Fix formatting/indentation only. No code changes.
Changeset: ae92922b13b2c175b5fe59d339fed4c2db80e2dc
comment:86 Changed 8 years ago by Russell Taylor
Re #6192. Remove redundant setting of spectrum number.
The workspace factory will have already done it in these circumstances.
Changeset: 503080bf8f3c1252cca24ae9b68d36dcf0c573a7
comment:87 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis. The remaining uses of Axis::setValue in this package are where the axis is (or could be) a NumericAxis.
Changeset: 1188cc79cc7ec786f269fce1e5f782e0156dc52c
comment:88 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Changeset: ec6b29d9b90a911c057a3de706979e4ae752a4b7
comment:89 Changed 8 years ago by Russell Taylor
Re #6192. Prefer setting spectrum number via ISpectrum class.
Rather than going via the axis.
Changeset: f77c635e9aca795692f7f708a07fc62cf20300cf
comment:90 Changed 8 years ago by Russell Taylor
Re #6192. Fix for non 1-1 spectra-detector mapping in padSpectra.
Code taken from the former SpectraAxis 'constructor from a SpectraDetectorMap'. This correctly handles ISIS instruments where multiple detectors contribute to a spectrum. This code will hopefully only be temporary pending the elimination of the SpectraDetectorMap (in #6191).
Changeset: 81061ed2e63505954e56231ce569a001da7bc056
comment:91 Changed 8 years ago by Martyn Gigg
Merge remote-tracking branch 'origin/feature/6192_remove_spectrum_no_duplication' Refs #6192
Conflicts:
Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
Changeset: c07b1725a99e791cee85c7c6e5ff75636dbf66de
comment:92 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 7038