Ticket #5007 (closed: fixed)

Opened 9 years ago

Last modified 5 years ago

[C2E] EnTran / Calib - Add Intensity Scale Factor Option

Reported by: Peter Parker Owned by: Samuel Jackson
Priority: major Milestone: Release 3.0
Component: Indirect Inelastic Keywords: C2E
Cc: Blocked By:
Blocking: Tester: Gesner Passos

Description (last modified by Samuel Jackson) (diff)

For the Energy Transfer tab and possibly the Calibration tab, add an option for an "Intensity Scale Factor" which would scale the intensity to make it in absolute units.

This is done elsewhere in Direct Geom.

Change History

comment:1 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:2 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.2 to Release 2.3

Moved at the end of release 2.2

comment:3 Changed 8 years ago by Peter Parker

  • Keywords C2E added

comment:4 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.3 to Release 2.4

Moved to milestone 2.4

comment:5 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.4 to Release 2.5

Moved at the code freeze for release 2.4

comment:6 Changed 7 years ago by Nick Draper

  • Milestone changed from Release 2.5 to Release 2.6

Moved to r2.6 at the end of r2.5

comment:7 Changed 7 years ago by Nick Draper

  • Component changed from Mantid to Framework

comment:8 Changed 7 years ago by Nick Draper

  • Milestone changed from Release 2.6 to Backlog

Moved to backlog at the code freeze for R2.6

comment:9 Changed 7 years ago by Samuel Jackson

  • Owner changed from Peter Parker to Samuel Jackson
  • Description modified (diff)

comment:10 Changed 7 years ago by Samuel Jackson

  • Status changed from new to inprogress

comment:11 Changed 7 years ago by Samuel Jackson

Adding new checkbox and input box to C2E interface.

No functionality implemented yet.

Refs #5007

Changeset: 46fbce67f54c6c85b09fcc3c3177d99325f910b1

comment:12 Changed 7 years ago by Samuel Jackson

  • Component changed from Framework to Indirect Inelastic

comment:13 Changed 7 years ago by Samuel Jackson

Adding validation of scale multiplier input.

Refs #5007

Changeset: 19df4a9ab56fa04201c39f1278e159aab983e05b

comment:14 Changed 7 years ago by Samuel Jackson

Added scaling option functionality to calibration tab.

Refs #5007

Changeset: 1dd6d0e0ba2dac5693406ab865b13a6410fe14bc

comment:15 Changed 7 years ago by Samuel Jackson

Included scaling and normalisation step.

Scaling option now effects both Calibration and Resolution.

Refs #5007

Changeset: 5cd0065e6970fe04f7db6ab8540cceaa8436d26b

comment:16 Changed 7 years ago by Russell Taylor

I had to undo the merge of the last commit above into the develop branch - it was breaking the following system tests:

  • SystemTests.ISISIndirectInelastic.IRISCalibration
  • SystemTests.ISISIndirectInelastic.IRISResolution
  • SystemTests.ISISIndirectInelastic.OSIRISCalibration
  • SystemTests.ISISIndirectInelastic.OSIRISResolution

comment:17 Changed 7 years ago by Samuel Jackson

Fixed issues with system tests.

Refs #5007

Changeset: 42f6d5f2dcc219de3a9bf0f79b428be37507282b

comment:18 Changed 7 years ago by Samuel Jackson

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

To Test:

The calibration tab of the C2E interface has a new intensity scale factor option. This should scale the output of both the calibration and resolution files generated when running calibration.

First run the calibration with the scale factor option unchecked. Then try checking and setting the scale to be something other than 1. Check that if you change the scale and then uncheck the box and recalibrate the scale defaults back to 1. Ensure that both the res and calib file output are correctly scaled for each of these tests.

comment:19 Changed 7 years ago by Nick Draper

  • Milestone changed from Backlog to Release 3.0

comment:20 Changed 7 years ago by Martyn Gigg

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

comment:21 Changed 7 years ago by Martyn Gigg

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Functionally this works as expected for both the resolution & calibration workspaces.

There is a minor code cleanup that I would like made. On line 353 of Inelastic/inelastic_indirect_reduction_steps.py there is a print statement (print peakMin, peakMax) that look like they were added for debugging. Please could they be removed. If they are required to be shown I would suggest logging using a more verbose statement rather than straight printing.

comment:22 Changed 7 years ago by Samuel Jackson

  • Status changed from reopened to inprogress

Removed debugging statement

Refs #5007

Changeset: 8d1c97180803450fc13940f974365abab6ed2012

comment:23 Changed 7 years ago by Samuel Jackson

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

comment:24 Changed 7 years ago by Jay Rainey

  • Status changed from verify to verifying
  • Tester changed from Martyn Gigg to Jay Rainey

comment:25 Changed 7 years ago by Jay Rainey

  • Tester changed from Jay Rainey to Martyn Gigg

comment:26 Changed 7 years ago by Gesner Passos

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

comment:27 Changed 7 years ago by Gesner Passos

  • Status changed from verify to verifying
  • Tester set to Gesner Passos

comment:28 Changed 7 years ago by Gesner Passos

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/5007_c2e_calib_scale_option'

comment:29 Changed 7 years ago by Gesner Passos

Functionality working and debugging print removed.

passed.

comment:30 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​5853

Note: See TracTickets for help on using tickets.