Ticket #7949 (closed: fixed)
Move PeakRadius properties from PeaksWorkspace to peaks
Reported by: | Vickie Lynch | Owned by: | Vickie Lynch |
---|---|---|---|
Priority: | major | Milestone: | Release 3.0 |
Component: | Framework | Keywords: | |
Cc: | petersonpf@… | Blocked By: | |
Blocking: | Tester: | Owen Arnold |
Description
This ticket will be the first stop toward arbitrary integration shapes for integrated peaks in Q space. Each peak should have a PeakRadius, BackgroundInnerRadius, and BackgroundOuterRadius that is used for plotting in the SliceViewer. Test with AdaptiveQRadius checked in IntegratePeaksMD.
Attachments
Change History
comment:2 Changed 7 years ago by Vickie Lynch
To test: Load(Filename='TOPAZ_6674_event.nxs',OutputWorkspace='TOPAZ_6674_event',FilterByTofMin='2000',FilterByTofMax='16500',LoadMonitors='1',MonitorsAsEvents='1') ConvertToDiffractionMDWorkspace(InputWorkspace='TOPAZ_6674_event',OutputWorkspace='TOPAZ_6674_MD',OutputDimensions='Q (sample frame)',SplitThreshold='50',MaxRecursionDepth='11') FindPeaksMD(InputWorkspace='TOPAZ_6674_MD',PeakDistanceThreshold='0.47099999999999997',MaxPeaks='100',OutputWorkspace='peaks_ws') CentroidPeaksMD(InputWorkspace='TOPAZ_6674_MD',PeaksWorkspace='peaks_ws',OutputWorkspace='peaks_ws') FindUBUsingFFT(PeaksWorkspace='peaks_ws',MinD='4',MaxD='12',Tolerance='0.12') IndexPeaks(PeaksWorkspace='peaks_ws',Tolerance='0.12') SelectCellOfType(PeaksWorkspace='peaks_ws',CellType='Rhombohedral',Centering='R') IntegratePeaksMD(InputWorkspace='TOPAZ_6674_MD',CoordinatesToUse='Q (sample frame)',PeakRadius='0.02',PeaksWorkspace='peaks_ws',OutputWorkspace='peaks_ws_sphere_adaptive',AdaptiveQRadius='1',CylinderLength='0.40000000000000002',PercentBackground='20',ProfilesFile=r'/home/vel/mantid/Code/release/bin/new.profiles')
comment:3 Changed 7 years ago by Vickie Lynch
- Status changed from new to inprogress
Refs #7949 plot radius of peaks for adaptive integration
Changeset: 5148e20596ddc31b27643aa6206cba358dbca0a0
Changed 7 years ago by Vickie Lynch
- Attachment adaptive.png added
Radii of integration are function of magnitude of Q at peak center
comment:4 Changed 7 years ago by Vickie Lynch
- Status changed from inprogress to verify
- Resolution set to fixed
comment:5 Changed 7 years ago by Owen Arnold
- Status changed from verify to verifying
- Tester set to Owen Arnold
comment:6 Changed 7 years ago by Owen Arnold
- Status changed from verifying to reopened
- Resolution fixed deleted
This is a nice addition, and the implementation looks good. I've tested this out with the SliceViewer and it works okay, the only problem is that in saving (SaveNexus) and loading, these log properties are getting lost. I'm pretty sure that that didn't used to happen.
Try saving your IntegratedPeaks file and then load it as a workspace called 'temp' run something like:
run = temp.run() val = run.getLogData('PeakRadius')
The PeakRadius has not been preserved in the save/load cycle, so the overlay turns up in the SliceViewer as position only.
comment:7 Changed 7 years ago by Vickie Lynch
- Cc petersonpf@… added
I saved the integrated peaks with SaveNexus and then used Load. The vector PeakRadius was read in correctly, but the QSample was identical to QLab and the circles were not over the peaks. This also happened in the nightly build without my changes. I also loaded a peaks file with only one PeakRadius. The one value is printed, but the SliceViewer has the error PeakRadius is not the requested type when I add that peaks workspace to the slice.
Load(Filename=r'/home/vel/workspace/adaptive2.nxs',OutputWorkspace='adaptive2') temp = mtdadaptive2? run = temp.run() val = run.getLogData('PeakRadius') print val.value
Fri Oct 4 15:32:22 2013: Script execution started.
[ 0.19916542 0.16823065 0.23040833 0.2877883 0.13485071 0.16476721
0.19323874 0.25402624 0.2532482 0.04168517 0.04836068 0.08951773 0.10535731 0.13437148 0.19376436 0.25330256 0.2105353 0.23965286 0.08110095 0.11155439 0.13316558 0.19262527 0.22307152 0.26636118 0.27339956 0.21422882 0.32280884 0.16236526 0.32503971 0.10972557 0.20119829 0.16894777 0.14136208 0.21977982 0.24813541 0.22876957 0.09449048 0.13788195 0.19714247 0.16546371 0.03371143 0.1293417 0.18883644 0.03992935 0.17102268 0.16145546 0.19231636 0.18625637 0.13420108 0.21681211 0.27143757 0.24270258 0.2135334 0.18639807 0.13442199 0.2167691 0.21340616 0.24317369 0.21359566 0.27044016 0.24137999 0.29380373 0.1515414 0.1773226 0.1756074 0.1997801 0.11672187 0.2100823 0.28283756 0.04017299 0.03642025 0.07282485 0.10869473 0.01763294 0.14743281 0.02441872 0.02624831 0.14506432 0.1522178 0.11063756 0.16185553 0.19308603 0.2721353 0.12409592 0.15769152 0.03641788 0.14252693 0.22793962 0.06208429 0.04545352 0.24815746 0.09159453 0.18330938 0.15390524 0.26149141 0.04684488 0.04123536 0.21762749 0.05543124 0.27497797]
Fri Oct 4 15:32:22 2013: Script execution finished.
comment:8 Changed 7 years ago by Vickie Lynch
- Status changed from reopened to inprogress
Need to be able to load old files with only one value for PeakRadius
comment:9 Changed 7 years ago by Vickie Lynch
Refs #7949 display peaks read from old peaks nexus files
Changeset: 0b230d5855bc7054e4752883e38c0141dd70e88c
comment:10 Changed 7 years ago by Vickie Lynch
- Status changed from inprogress to verify
- Resolution set to fixed
comment:12 Changed 7 years ago by Owen Arnold
This looks great. I cant merge it to master because of network issues at the moment. But it's working exactly as I expect it to, including with the older file format.
comment:13 Changed 7 years ago by Owen Arnold
- Status changed from verifying to closed
Merge remote-tracking branch 'origin/feature/7949_PeakRadius_for_peaks'
Full changeset: 24cbd275b9cb31a29cd10e642356f201f5735638
comment:14 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 8794