Ticket #2159 (closed: fixed)

Opened 10 years ago

Last modified 5 years ago

SANS: Allow front and rear data to merged STAGE 1

Reported by: Nick Draper Owned by: Anders Markvardsen
Priority: critical Milestone: Release 2.2
Component: Mantid Keywords:
Cc: Richard.heenan@…, stephen.king@… Blocked By:
Blocking: Tester: Martyn Gigg

Description (last modified by Anders Markvardsen) (diff)

From meeting last week Richard/Steve agreed the following user commands should be used to control when data from front and rear detectors:

SYNTAX:

DET/RESCALE r (DEFAULT TO 1.0)

DET/SHIFT s (DEFAULT TO 0.0)

DET/RESCALE/FIT [fromQ toQ]

DET/SHIFT/FIT [Q1 Q2]

Qualifiers:

/RESCALE Scale multiplied to the front data

/SHIFT Constant background subtracted from front data

/RESCALE/FIT Fit RESCALE so front and back data match

/SHIFT/FIT Fit SHIFT so front and back data match

Parameters:

r Value of RESCALE parameter

s Value of SHIFT parameter

Q1 Q2 To optionally specify the Q range to do the fit over. Note if not specified will use the full overlapping front and rear data Q range. If both /RESCALE/FIT and /SHIFT/FIT specify a Q range the latter specified in the user file will be used

In this ticket add code to allow the following additional options in the Analysis Details tab -> Detector bank combobox:

merged rear, front rear, front, merged

The merging and front reduced data are affected by the Front detector Rescale and Shift user input values. In a later tickets these will be allowed to be fitted

Change History

comment:1 Changed 10 years ago by Nick Draper

  • Milestone changed from Iteration 27 to Iteration 28

Bulk move of tickets at the end of iteration 27

comment:2 Changed 9 years ago by Nick Draper

  • Milestone changed from Iteration 28 to Iteration 29

Bulk move of tickets at the end of iteration 28

comment:3 Changed 9 years ago by Nick Draper

  • Milestone changed from Iteration 29 to Iteration 30

"New" tickets moved at the code freeze of iteration 29

comment:4 Changed 9 years ago by Steve Williams

  • Status changed from new to assigned
  • Owner changed from Steve Williams to Anders Markvardsen

comment:5 Changed 9 years ago by Nick Draper

  • Milestone changed from Iteration 30 to Iteration 31

Bulk move of tickets to iteration 31 at the iteration 30 code freeze

comment:6 Changed 9 years ago by Nick Draper

  • Milestone changed from Iteration 32 to Iteration 33

Moved to iteration 33 at iteration 32 code freeze

comment:7 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.1 to Release 2.2

Moved at end of release 2.1

comment:8 Changed 8 years ago by Anders Markvardsen

  • Cc steve.king@… added
  • Status changed from assigned to accepted
  • Priority changed from minor to critical
  • Description modified (diff)
  • Summary changed from SANS: Implement DET/BOTH and DET/MERGE to SANS: Allow front and rear data to merged STAGE 1

comment:9 Changed 8 years ago by Anders Markvardsen

  • Cc stephen.king@… added; steve.king@… removed

comment:10 Changed 8 years ago by Anders Markvardsen

  • Description modified (diff)

comment:11 Changed 8 years ago by Anders Markvardsen

Some code for front and rear merged. re #2159

Changeset: 85b62bd0786f8d383a9ab3fa4d1ee17d9638d752

comment:12 Changed 8 years ago by Anders Markvardsen

Code towards merging sans bank data. re #2159

Changeset: 4219ba5f475ecddb46253ffb6ece7c6c3dcf6370

comment:13 Changed 8 years ago by Anders Markvardsen

Some code for front and rear merged. re #2159

Changeset: 85b62bd0786f8d383a9ab3fa4d1ee17d9638d752

comment:14 Changed 8 years ago by Anders Markvardsen

Code towards merging sans bank data. re #2159

Changeset: 4219ba5f475ecddb46253ffb6ece7c6c3dcf6370

comment:15 Changed 8 years ago by Anders Markvardsen

Some code for front and rear merged. re #2159

Changeset: 85b62bd0786f8d383a9ab3fa4d1ee17d9638d752

comment:16 Changed 8 years ago by Anders Markvardsen

Code towards merging sans bank data. re #2159

Changeset: 4219ba5f475ecddb46253ffb6ece7c6c3dcf6370

comment:17 Changed 8 years ago by Anders Markvardsen

More toward merging bank data in isis sans. re #2159

Changeset: 417c36c2fa05ba8c9ddcb04464b18f7a840b7dad

comment:18 Changed 8 years ago by Anders Markvardsen

More toward merging bank data in isis sans. re #2159

Changeset: 417c36c2fa05ba8c9ddcb04464b18f7a840b7dad

comment:19 Changed 8 years ago by Anders Markvardsen

More toward merging bank data in isis sans. re #2159

Changeset: 417c36c2fa05ba8c9ddcb04464b18f7a840b7dad

comment:20 Changed 8 years ago by Anders Markvardsen

More toward merging bank data in isis sans. re #2159

Changeset: 417c36c2fa05ba8c9ddcb04464b18f7a840b7dad

comment:21 Changed 8 years ago by Anders Markvardsen

Extend Q1D2 to optionally output parts of cross section. Re #2159

Needed for merging detector information from different detectors banks

Changeset: 8dff6843ec99e9bd2be4b776c22d8ef1bf3006a4

comment:22 Changed 8 years ago by Anders Markvardsen

Allow optional OutputParts for Qxy also. re #2159

Changeset: 55eb57a751162f18a4a9a2f30ef94a81354a1b2a

comment:23 Changed 8 years ago by Anders Markvardsen

Can now merge sans data. re #2159

Although for now for fixed values of shift and rescale

Changeset: e6ea32828185882ce7355cb325beee2c53ee9411

comment:24 Changed 8 years ago by Anders Markvardsen

Some adjustment for merging. re #2159

Richard asked for shift/rescale to apply when select 'front' and for the merged data to cover the entire range included where no overlap

Changeset: c948a2feed819fa6feccd5e2e43dcfd8f738b3a5

comment:25 Changed 8 years ago by Anders Markvardsen

deleted debug line. re #2159

Changeset: e0af7dbe30320d540367138bdb548eb7017236cf

comment:26 Changed 8 years ago by Anders Markvardsen

  • Status changed from accepted to verify
  • Resolution set to fixed
  • Description modified (diff)

comment:27 Changed 8 years ago by Martyn Gigg

  • Status changed from verify to verifying
  • Tester set to Martyn Gigg

comment:28 Changed 8 years ago by Martyn Gigg

Had a play with the extra options and after understanding that the merge is not a straight sum, the outputs look reasonable. Doing sum divisions from scaled/shifted vs scaled/unshifted seems to yield the expected answers.

comment:29 Changed 8 years ago by Martyn Gigg

  • Status changed from verifying to closed

comment:30 Changed 8 years ago by Anders Markvardsen

  • Status changed from closed to reopened
  • Resolution fixed deleted

To accommodate a last minute request from Richard. Change dropdown list from

'rear', 'front', 'merged', 'rear, front', 'rear, front, merged'

to

'rear', 'front', 'both', 'merged'

where now “merged” generates 3 workspaces, front, rear and merged in order to encourage user to actually check the overlap

comment:31 Changed 8 years ago by Anders Markvardsen

  • Status changed from reopened to assigned

comment:32 Changed 8 years ago by Anders Markvardsen

  • Status changed from assigned to accepted

comment:33 Changed 8 years ago by Anders Markvardsen

Change number of 'merge' options. re #2159

From 5 to 4

Changeset: ae9b08b15455cee657253b5a498d8c108ccc2836

comment:34 Changed 8 years ago by Anders Markvardsen

  • Status changed from accepted to verify
  • Resolution set to fixed

comment:35 Changed 8 years ago by Martyn Gigg

  • Status changed from verify to verifying

comment:36 Changed 8 years ago by Martyn Gigg

  • Status changed from verifying to closed

Verified that merge options are now correct and still work as expected.

comment:37 Changed 8 years ago by Anders Markvardsen

Change number of 'merge' options. re #2159

From 5 to 4

Changeset: ae9b08b15455cee657253b5a498d8c108ccc2836

comment:38 Changed 8 years ago by Anders Markvardsen

Can now merge sans data. re #2159

Although for now for fixed values of shift and rescale

Changeset: e6ea32828185882ce7355cb325beee2c53ee9411

comment:39 Changed 8 years ago by Anders Markvardsen

Some adjustment for merging. re #2159

Richard asked for shift/rescale to apply when select 'front' and for the merged data to cover the entire range included where no overlap

Changeset: c948a2feed819fa6feccd5e2e43dcfd8f738b3a5

comment:40 Changed 8 years ago by Anders Markvardsen

deleted debug line. re #2159

Changeset: e0af7dbe30320d540367138bdb548eb7017236cf

comment:41 Changed 8 years ago by Anders Markvardsen

Change number of 'merge' options. re #2159

From 5 to 4

Changeset: ae9b08b15455cee657253b5a498d8c108ccc2836

comment:42 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 3006

Note: See TracTickets for help on using tickets.