Ticket #6344 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

Enable Tube Calibration Scripts to handle tubes not running parallel to Y-axis

Reported by: Karl Palmen Owned by: Karl Palmen
Priority: major Milestone: Release 2.5
Component: Mantid Keywords: calibration
Cc: anders.markvardsen@… Blocked By:
Blocking: Tester: Anders Markvardsen

Description

The tube calibration scripts in Mantid/scripts/Calibration only work for tubes that run parallel to the Y-axis. Enable calibration to work with tubes of arbitrary orientation.

Once done, calibration should work on the MAPS instrument. Ticket #6343 may also need to be completed before MAPS calibration can be done.

Change History

comment:1 Changed 8 years ago by Karl Palmen

  • Owner set to Karl Palmen
  • Status changed from new to assigned

comment:2 Changed 8 years ago by Karl Palmen

  • Status changed from assigned to accepted

comment:3 Changed 8 years ago by Karl Palmen

  • Milestone changed from Release 2.4 to Release 2.5

comment:4 Changed 8 years ago by Karl Palmen

Fix a bug in testmode re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: e39d22e8fd670303128286b51a95aa25c7b59139

comment:5 Changed 8 years ago by Karl Palmen

Put LinearBackGround into slit/bar fitting re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: 5c6e86ee00fd43b3b532635f6b655359932a3bbf

comment:6 Changed 8 years ago by Karl Palmen

Tidy up tube_calib.py code re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f6331f62004d88b6dcee2f1d66dcb3f371fa5208

comment:7 Changed 8 years ago by Karl Palmen

Reject peaks very short of expected height re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: c8ac6dfe5c9404565c16c957eac7399ccf82158d

comment:8 Changed 8 years ago by Karl Palmen

Take account of tube center re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: 653f2490a2439cfc72d063f75b6770c27426f570

comment:9 Changed 8 years ago by Karl Palmen

Unit test that detects the failure of ApplyCalibration is now in branch tube_calibration_1 .

comment:10 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:11 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:12 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: cb5fed5528ff778849537efbdf182c602e444907

comment:13 Changed 8 years ago by Karl Palmen

Merge branch 'tube_calibration_1' into develop re #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: a00da7c053253ff5a9f050caa4ef8b667f16fc13

comment:14 Changed 8 years ago by Karl Palmen

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

To test, run the new python scripts for MAPS added to .../scripts/Examples . Check that the run OK. Have a look at the instrument and check the calibration has occurred in the relevent parts of the instrument and such parts are in proper place.

comment:15 Changed 8 years ago by Karl Palmen

Revert "Merge branch 'tube_calibration_1' into develop re #6344"

This reverts commit a00da7c053253ff5a9f050caa4ef8b667f16fc13, reversing changes made to 804e126ebd86403441793ec00a49c6a51b8912cc.

Changeset: a374e1d520cf75b5616476dccb60ef17636136e9

comment:16 Changed 8 years ago by Karl Palmen

  • Status changed from verify to reopened
  • Resolution fixed deleted

Merge to development branch had to be reverted, because it was causing persistant problems with some builds.

comment:17 Changed 8 years ago by Karl Palmen

  • Status changed from reopened to accepted

comment:18 Changed 8 years ago by Karl Palmen

Revert "Revert "Merge branch 'tube_calibration_1' into develop re #6344""

This reverts commit a374e1d520cf75b5616476dccb60ef17636136e9.

Conflicts:

Code/Mantid/Framework/Algorithms/test/ApplyCalibrationTest.h

Changeset: ad4f4bcc890553eeb627989f8f176f500727d37d

comment:19 Changed 8 years ago by Karl Palmen

I assigned the following commit to the wrong ticket. It belongs here:

Merge branch 'tube_calibration_1' into develop. Refs #6635

Conflicts:

Code/Mantid/Framework/Algorithms/test/ApplyCalibrationTest.h

Changeset: bc6cfe5625a70d5f10ca4be6987b0aa70a84a44f

comment:20 Changed 8 years ago by Karl Palmen

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

comment:21 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: 4d7badd3d71ada98dc4ef09485a992d53fec4a4d

comment:22 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: 510fd8679e482b8a619431cf9cbcac6920b4aa76

comment:23 Changed 8 years ago by Anders Markvardsen

  • Status changed from verify to verifying
  • Tester set to Anders Markvardsen

comment:24 Changed 8 years ago by Anders Markvardsen

  • Status changed from verifying to closed

Ran TubeCalibDemoMaps_D2.py successfully, and does a good job at straighten the lines for the D2 bank.

Small comment a comment in the script the script of ticket you may specify that MAPS14919.nxs is available from
isis\inst$\NDXMAPS\Instrument\data\cycle_09_5.

Also I received the following message in the MantidPlot Scripting Console window:

Traceback (most recent call last):

File "<string>", line 71, in _ScopeInspector_GetFunctionAttributes

NameError: global name '_get_function_spec' is not defined

comment:25 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:26 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: cb5fed5528ff778849537efbdf182c602e444907

comment:27 Changed 8 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/tube_calibration_1' Refs #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Changeset: 82724543ce91eb281824c5947cd5c955007a5d52

comment:28 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:29 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: cb5fed5528ff778849537efbdf182c602e444907

comment:30 Changed 8 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/tube_calibration_1' Refs #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Changeset: 82724543ce91eb281824c5947cd5c955007a5d52

comment:31 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:32 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: cb5fed5528ff778849537efbdf182c602e444907

comment:33 Changed 8 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/tube_calibration_1' Refs #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Changeset: 82724543ce91eb281824c5947cd5c955007a5d52

comment:34 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: 02317ff1f85216c44d2605dcd49973a92c3e1d5f

comment:35 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: c68792d7aabc625d64a1ef763302bfb9255369ed

comment:36 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:37 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: cb5fed5528ff778849537efbdf182c602e444907

comment:38 Changed 8 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/tube_calibration_1' Refs #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Changeset: 82724543ce91eb281824c5947cd5c955007a5d52

comment:39 Changed 8 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:40 Changed 8 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: cb5fed5528ff778849537efbdf182c602e444907

comment:41 Changed 8 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/tube_calibration_1' Refs #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Changeset: 82724543ce91eb281824c5947cd5c955007a5d52

comment:42 Changed 7 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: f39efb527fa44f5b34fc2c175e1ba5f442e18502

comment:43 Changed 7 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: cb5fed5528ff778849537efbdf182c602e444907

comment:44 Changed 7 years ago by Anders Markvardsen

Merge remote-tracking branch 'origin/tube_calibration_1' Refs #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Changeset: 82724543ce91eb281824c5947cd5c955007a5d52

comment:45 Changed 7 years ago by Karl Palmen

Merge branch 'tube_calibration_1' into develop re #6344

Conflicts:

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: a00da7c053253ff5a9f050caa4ef8b667f16fc13

comment:46 Changed 7 years ago by Karl Palmen

Revert "Merge branch 'tube_calibration_1' into develop re #6344"

This reverts commit a00da7c053253ff5a9f050caa4ef8b667f16fc13, reversing changes made to 804e126ebd86403441793ec00a49c6a51b8912cc.

Changeset: a374e1d520cf75b5616476dccb60ef17636136e9

comment:47 Changed 7 years ago by Karl Palmen

Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: 4d7badd3d71ada98dc4ef09485a992d53fec4a4d

comment:48 Changed 7 years ago by Karl Palmen

Add examples scripts for MAPS re #6344

Signed-off-by: Karl Palmen <karl.palmen@…>

Changeset: 510fd8679e482b8a619431cf9cbcac6920b4aa76

comment:49 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​7190

Note: See TracTickets for help on using tickets.