Ticket #8392 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

[IBayes] Add sample logs

Reported by: Samuel Jackson Owned by: Samuel Jackson
Priority: major Milestone: Release 3.1
Component: Indirect Inelastic Keywords:
Cc: spencer.howells@… Blocked By:
Blocking: Tester: Peter Parker

Description

Request from Spencer:

Sample logs

  • Quas - changes lines 363-393
  • Quest - add lines 793-810
  • ResNorm - add lines 864-871

File IndirectJumpFit

  • line 27 - change to fit_program
  • Sample logs - add lines 61-65

Attachments

IndirectBayes.py​ (31.7 KB) - added by Samuel Jackson 7 years ago.
Updated version of the script
IndirectJumpFit.py​ (2.5 KB) - added by Samuel Jackson 7 years ago.
Updated version of the script

Change History

Changed 7 years ago by Samuel Jackson

Updated version of the script

Changed 7 years ago by Samuel Jackson

Updated version of the script

comment:1 Changed 7 years ago by Samuel Jackson

  • Summary changed from [IBayes] Updates add sample logs to [IBayes] Add sample logs

comment:2 Changed 7 years ago by Samuel Jackson

  • Status changed from new to inprogress

Refs #8392 Add logs to Bayes workflows.

Changeset: 991d8ab34363bcd86c9f8332d0a0f062744a4bc8

comment:3 Changed 7 years ago by Samuel Jackson

Merge branch 'feature/8392_bayes_add_sample_logs' into develop

Refs #8392

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectBayes.py Code/Mantid/scripts/Inelastic/IndirectJumpFit.py

Changeset: dd5926c250cc59b03d8b4f7a38efad5b2d8527b3

comment:4 Changed 7 years ago by Samuel Jackson

Refs #8392 Missed changing log name in JumpFit.

Changeset: d4b820db17b2c0de06f50d5ceb448a6244d981bb

comment:5 Changed 7 years ago by Samuel Jackson

Refs #8392 Miss variable rename in JumpFit

Changeset: f5184ece2b5dcf060e12e110d7c8efc10d4925b9

comment:6 Changed 7 years ago by Samuel Jackson

  • Milestone changed from Backlog to Release 3.1

comment:7 Changed 7 years ago by Samuel Jackson

Refs #8392 Convert logs in ConvFit to match.

The output from ConvFit is used in JumpFit, so they should be consistent.

Changeset: d0ce400a90affa92fb45fd65bd554ee165abdc0a

comment:8 Changed 7 years ago by Samuel Jackson

Refs #8392 Add backwards compatibility for older files.

Changeset: adc5f2992f9a320d6b7e0d501deb2fd7e9049bec

comment:9 Changed 7 years ago by Samuel Jackson

To Tester:

This ticket uses code that executes Fortran with F2Py, so you'll need to build Mantid in release mode on windows. For input data you can use irs26176_graphite002_red.nxs and irs26173_graphite002_res.nxs from the system tests.

To test check that the sample logs from the input sample are copied across and that the following sample log entries have also been added to the output workspace(s) of the following programs:

ResNorm

  • energy_min - double
  • energy_max - double
  • van_binning - int

Quasi

  • res_file - file name - string
  • fit_program - string
  • background -string
  • elastic_peak - boolean
  • energy_min - double
  • energy_max - double
  • sample_binning - int
  • resolution_binning - int
  • resnom - boolean - depends on if a resnorm file was used
  • resnorm_file - string - only added if the above is true
  • width - boolean - depends on if a width file was used
  • width_file - string - only added if the above is true

Quest

  • res_file - file name - string
  • background -string
  • elastic_peak - boolean
  • energy_min - double
  • energy_max - double
  • sample_binning - int
  • sigma - double
  • beta - double

JumpFit

  • jump_function - string
  • q_min - double
  • q_max - double

comment:10 Changed 7 years ago by Samuel Jackson

Merge remote-tracking branch 'origin/master' into

feature/8392_bayes_add_sample_logs Refs #8392

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectBayes.py

Changeset: faccf51d9024c84a30a9331bf5fdacd82ce24102

comment:11 Changed 7 years ago by Samuel Jackson

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

comment:12 Changed 7 years ago by Peter Parker

  • Status changed from verify to verifying
  • Tester set to Peter Parker

comment:13 Changed 7 years ago by Peter Parker

Passing, though opened #8806 and #8807, as discussed.

comment:14 Changed 7 years ago by Peter Parker

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Unfortunately, we have a merge conflict, which must have been introduced in the last hour or so.

comment:15 Changed 7 years ago by Samuel Jackson

  • Status changed from reopened to inprogress

Merge branch 'master' into feature/8392_bayes_add_sample_logs

Refs #8392

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectJumpFit.py

Changeset: f0b563d50b13548fe61b8cdcf6eab05aa0d9d179

comment:16 Changed 7 years ago by Samuel Jackson

Merge branch 'feature/8392_bayes_add_sample_logs' into develop

Refs #8392

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectJumpFit.py

Changeset: 3a53b15a89d7781c8084c15c05ab416677240142

comment:17 Changed 7 years ago by Samuel Jackson

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

comment:18 Changed 7 years ago by Peter Parker

  • Status changed from verify to verifying

comment:19 Changed 7 years ago by Peter Parker

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/8392_bayes_add_sample_logs'

Full changeset: ​c896b8f181e64837443ecfe5dc25ab07a4296f8a

comment:20 Changed 7 years ago by Peter Parker

Did a quick check again after the merges and it still works fine.

comment:21 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​9237

Note: See TracTickets for help on using tickets.