Ticket #1944 (closed: fixed)

Opened 10 years ago

Last modified 5 years ago

Geometry: neutronic (vs. physical) position for components

Reported by: Janik Zikovsky Owned by: Russell Taylor
Priority: major Milestone: Release 2.0
Component: Mantid Keywords:
Cc: 2zr@…, scu@… Blocked By:
Blocking: Tester: Andrei Savici

Description (last modified by Russell Taylor) (diff)

Add the ability to specify both the neutronic and actual position of components. The "neutronic" position will be used by all algorithms, the actual position is just for use in the instrument view.

Will need new tags in the XML instrument definition file.

This will be done by having two separate instrument trees created when LoadInstrument spots the extra tags in the IDF. The 'neutronic' instrument will be attached to the workspace, the other will be available via a toggle button in the instrument view.

Change History

comment:1 Changed 10 years ago by Janik Zikovsky

  • Milestone changed from Iteration 26 to Iteration 27

comment:2 Changed 10 years ago by Janik Zikovsky

  • Milestone changed from Iteration 27 to Iteration 28

comment:3 Changed 9 years ago by Janik Zikovsky

  • Milestone changed from Iteration 28 to Iteration 29

comment:4 Changed 9 years ago by Janik Zikovsky

  • Milestone changed from Iteration 29 to Iteration 30

Moved my tickets that won't get finished by iteration 29

comment:5 Changed 9 years ago by Russell Taylor

  • Owner changed from Janik Zikovsky to Russell Taylor
  • Status changed from new to accepted
  • Description modified (diff)

I'm going to take this one...

comment:6 Changed 9 years ago by Russell Taylor

In [14218]:

Some minor tidy-ups. Re #1944.

comment:7 Changed 9 years ago by Russell Taylor

In [14232]:

Minor refactoring of LoadInstrument. Re #1944.

comment:8 Changed 9 years ago by Russell Taylor

In [14250]:

Small LoadInstrument refactors. Re #1944.

comment:9 Changed 9 years ago by Russell Taylor

In [14252]:

Tidy up. Re #1944.

comment:10 Changed 9 years ago by Russell Taylor

In [14278]:

Add a copy constructor to Instrument. Oh, and go on a const-correctness hunt that led this commit to touch slightly more than just the one class. Re #1944.

comment:11 Changed 9 years ago by Russell Taylor

In [14279]:

Didn't mean for that test to go in yet. Re #1944.

comment:12 Changed 9 years ago by Russell Taylor

In [14282]:

Try to get system tests passing. This includes temporary renaming of a method on Instrument. Re #1944.

comment:13 Changed 9 years ago by Russell Taylor

In [14285]:

Completely remove pointless methods. Didn't notice any warnings when I commented them out earlier anyway. Re #1944

comment:14 Changed 9 years ago by Russell Taylor

In [14300]:

Remove unnecessary IDetector method. Re #1944.

comment:15 Changed 9 years ago by Russell Taylor

In [14312]:

Test for Instrument copy constructor. Re #1944.

comment:16 Changed 9 years ago by Russell Taylor

In [14314]:

Fix InstrumentTest. Re #1944.

comment:17 Changed 9 years ago by Russell Taylor

In [14356]:

Add enforcement that the source and sample components are named. Re #1944.

comment:18 Changed 9 years ago by Russell Taylor

In [14371]:

Checkpoint LoadInstrument changes. Includes a bit more refactoring to remove duplicated code. Re #1944.

comment:19 Changed 9 years ago by Russell Taylor

In [14380]:

Remove unneeded methods. Re #1944.

comment:20 Changed 9 years ago by Russell Taylor

In [14396]:

Add ability for LoadInstrument to produce 2 instruments - one containing physical and the other 'neutronic' positions. Re #1944.

comment:21 Changed 9 years ago by Russell Taylor

In [14429]:

Add tests for new methods. Re #1944.

comment:22 Changed 9 years ago by Mathieu Doucet

In [14452]:

Fixing warnings Re #1944

comment:23 Changed 9 years ago by Russell Taylor

In [14478]:

Rationalise InstrumentWidget, in particular limiting the number of places that the workspace and the instrument are held to 1 for each. Re #1944.

comment:24 Changed 9 years ago by Russell Taylor

In [14518]:

Add pointer to physical instrument as a member (not used in vast majority of cases) of Instrument. Show this 'physical instrument' in the instrument view, if it exists. Re #1944.
P.S. This again lead to a const change which accounts for most of the changes.

comment:25 Changed 9 years ago by Martyn Gigg

In [14524]:

Fix for Qxy which in turn fixes the 2D Sans system tests. When the output workspace was changed to copy from the input it copied over the masking within the map as well. The masking can't be a direct copy from the input as it's essentially a rebin. Added a function on the parameter map to be able to clear named parameters so that now Qxy clears the masking on the outputworkspace when it creates it. Refs #1944

comment:26 Changed 9 years ago by Martyn Gigg

In [14525]:

Refs #1944. Whoops. Lesson for me, don't checkin code that you haven't compiled, even if it seems simple!

comment:27 Changed 9 years ago by Russell Taylor

In [14580]:

Add a monitor + comments to the test. Re #1944.

comment:28 Changed 9 years ago by Russell Taylor

In [14637]:

Continue obsession with const: ExperimentInfo(MatrixWorkspace)::getInstrument now returns a const instrument. Re #1944.

comment:29 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:30 Changed 9 years ago by Russell Taylor

In [14952]:

Allow for 'neutronic' detectors to have a different shape to their 'physical' counterpart. Re #1944.

comment:31 Changed 9 years ago by Russell Taylor

In [14975]:

Test for new ObjComponent method. Re #1944.

comment:32 Changed 9 years ago by Russell Taylor

Instructions for the changes required to the IDF have been added at http://www.mantidproject.org/Indirect_Instrument_Definition_Options

comment:33 Changed 9 years ago by Russell Taylor

  • Blocked By 3884 added

comment:34 Changed 9 years ago by Russell Taylor

  • Status changed from accepted to verify
  • Resolution set to fixed
  • Blocked By 3884 removed

To test: Load IDFs_for_UNIT_TESTING/INDIRECT_Definition.xml and compare its representation in the Instrument Window compared to all other places (e.g. from the detector table, python, algorithms). They will be different!

comment:35 Changed 9 years ago by Andrei Savici

  • Status changed from verify to verifying
  • Tester set to Andrei Savici

comment:36 Changed 9 years ago by Andrei Savici

  • Status changed from verifying to closed

Detector table data is different than the one shown in instrument view. It is NOT clear which things are displayed. This MUST be made clear, in documentation and in captions (instrument view - show "xyz neutronic" or "xyz physical". Same for Detector table ("R-physical", or "theta-neutronic")

comment:37 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 2791

Note: See TracTickets for help on using tickets.