Indirect Load ASCII - Implement New Interface

[Peter Parker]

Following on from some of the files added as part of #5172, integrate ForCE functionality into an extra tab for the C2E interface.

Updated ticket instructions from Spencer:

Replace the Python algorithm ForCe with a new interface.

1. Read Facilities.xml and for Facility != ISIS or SNS, get instruments where technique is Spectroscopy and Indirect. Use that list for drop-down menu for Instrument
2. Drop-down menu for File extension with options asc & inx
3. Drop-down menu for Analyser - only 'silicon' at present
4. Drop-down menu for Reflection - only '111' at present
5. Input box with Browse for selected extension & beginning with '<Instrument>_'
6. Option boxes for: Reject Zero & Use Map
7. Options for Verbose, Save & Plot (drop-down menu).

When tested & OK the Py alg ForCE can be removed

[Peter Parker]

Currently there is an issue when running ForCE on Spencer's Win7 machine - with both 32bit and 64bit versions of Mantid.

To test ForCE, save the attached files into Mantid's Default Save Directory and make sure that the same folder is listed as one of Mantid's Data Search Directories. Then run the following in a Python console window:

ForCE(Mode="INX", Instrument="IN10", RunName="P3OT_350K", RejectZero=False, 
   UseMap=False, Verbose=True, Save=True, Plot="Both")

[Peter Parker]

Refs #5422 - Some temporary debug statements ...

... that are to be removed later. These will help diagnose the problem on Spencer's machine.

Changeset: d9f6445122e05f334a3dfccf936df320ae68e7fc

[Peter Parker]

Refs #5422 - Some temporary debug statements ...

... that are to be removed later. These will help diagnose the problem on Spencer's machine.

Changeset: d9f6445122e05f334a3dfccf936df320ae68e7fc

[Peter Parker]

Refs #5422 - One more temp debug statement.

Strings::getFile seems to return nothing, so need to check the file path.

Changeset: 1280ff05cd92117306d71347695e8cce87075e11

[Peter Parker]

Refs #5422 - Some temporary debug statements ...

... that are to be removed later. These will help diagnose the problem on Spencer's machine.

Changeset: d9f6445122e05f334a3dfccf936df320ae68e7fc

[Peter Parker]

Refs #5422 - One more temp debug statement.

Strings::getFile seems to return nothing, so need to check the file path.

Changeset: 1280ff05cd92117306d71347695e8cce87075e11

[Peter Parker]

Refs #5422 - Remove debug statements.

Changeset: 59d323b462f79211e8515f5480eac60104e473f8

[Peter Parker]

Refs #5422 - Remove debug statements.

Changeset: 59d323b462f79211e8515f5480eac60104e473f8

[Peter Parker]

Refs #5422 - One more temp debug statement.

Strings::getFile seems to return nothing, so need to check the file path.

Changeset: 1280ff05cd92117306d71347695e8cce87075e11

[Peter Parker]

Refs #5422 - Remove debug statements.

Changeset: 59d323b462f79211e8515f5480eac60104e473f8

[Peter Parker]

Refs #5422 - Add ILL facility to Facilities.xml.

Along with entries for IN5, IN6, IN10 and IN16.

Changeset: 81dd6d0ec5fd9e6d4cb91215e00694ed4ef3e706

[Peter Parker]

Refs #5422 - Need IDFs for any declared insts in Facilities.xml.

Revert "Refs #5422 - Add ILL facility to Facilities.xml."

This reverts commit 81dd6d0ec5fd9e6d4cb91215e00694ed4ef3e706.

Changeset: 37c1f2390082db96e100ccd8745e5b7d6d4b079e

[Peter Parker]

Refs #5422 - Add ILL facility to Facilities.xml.

Along with entries for IN5, IN6, IN10 and IN16.

Changeset: 81dd6d0ec5fd9e6d4cb91215e00694ed4ef3e706

[Peter Parker]

Refs #5422 - Need IDFs for any declared insts in Facilities.xml.

Revert "Refs #5422 - Add ILL facility to Facilities.xml."

This reverts commit 81dd6d0ec5fd9e6d4cb91215e00694ed4ef3e706.

Changeset: 37c1f2390082db96e100ccd8745e5b7d6d4b079e

[Peter Parker]

Refs #5422 - Reinstate Facilities.xml changes for ILL and add IDFs.

Revert "Refs #5422 - Need IDFs for any declared insts in Facilities.xml."

This reverts commit 37c1f2390082db96e100ccd8745e5b7d6d4b079e.

Changeset: 1649415cb3585b9dc9e15399a67ccdf20edda27a

[Nick Draper]

Moved at the end of release 2.2

[Peter Parker]

Refs #5422 - Reinstate Facilities.xml changes for ILL and add IDFs.

Revert "Refs #5422 - Need IDFs for any declared insts in Facilities.xml."

This reverts commit 37c1f2390082db96e100ccd8745e5b7d6d4b079e.

Changeset: 1649415cb3585b9dc9e15399a67ccdf20edda27a

[Peter Parker]

Update:

This is an ongoing ticket. The ForCE algorithm is currently bundled along with Mantid in the Workflow->MIDAS category so that it may be tested by users before being implemented as a tab.

To proceed we need more feedback from Spencer (and the users), as well as clarification about what the final tab should look like and what functionality should be on offer.

[Nick Draper]

Moved to milestone 2.4

[Nick Draper]

Moved at the code freeze for release 2.4

[Nick Draper]

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

[Nick Draper]

Moved to backlog at the code freeze for R2.6

[Samuel Jackson]

Refs #5422 Added UI and py routines for Indirect Foreign.

Changeset: b2e5a799c384460fe058debb05a152de6b7fd8d2

[Samuel Jackson]

Refs #5422 Added base classes for Indirect Foreign.

Changeset: b1126fe2460da1fd8d4a887b7c04d27e1c81b600

[Samuel Jackson]

Refs #5422 Added concrete tabs for Indirect Foreign.

Changeset: 13ac6eb7f4032677b154ac6c9cfebcc0d8abec75

[Samuel Jackson]

Merge branch 'feature/5422_indirect_foreign' into develop

Refs #5422

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt

Changeset: a2b9e6114d59985dc48cd6086478ae4223b9309c

[Samuel Jackson]

Refs #5422 Updated GUI files extensions.

Changeset: 3e2e096f5baca53e56bb5a04ce0f7f298431c926

[Samuel Jackson]

Refs #5422 Adding and updating IPFs for Indirect Foreign.

Changeset: 067412af179a18c9040b89ebb0c601f1c4e8c1d8

[Samuel Jackson]

Refs #5422 Correcting Syntax.

Changeset: ca8ead5a80398ba6f21c31c82f748cae88f8b5b4

[Samuel Jackson]

Refs #5422 Re-added ILL instruments to Mantid.

Changeset: ab1ba37b7479c10310b45c3aba49ed8b02c40f83

[Samuel Jackson]

Refs #5422 Adding definition file for IN13.

Changeset: 5197612f0d20f8790bb5f57d022d17dcc4b849be

[Samuel Jackson]

Refs #5422 Update ForCE to use load analysers and reflections.

Changeset: 46eae78f21fc466d474b1a6be36190fdc1837c27

[Samuel Jackson]

Refs #5422 Update location of help page.

Changeset: 84f411836b5e053016339a60b58d32e36f893a5b

[Samuel Jackson]

Refs #5422 Finished up ForCE implementation.

Changeset: 9135d3cecefcedecba81cca8ff63564d1ed48d74

[Samuel Jackson]

Refs #5422 Implemented MolDyn and updated ForCE.

Changeset: ffb8debe002e6e9421f2bb9949e32284eca38df9

[Samuel Jackson]

Refs #5422 Updating scripts to support run numbers.

Changeset: 6b18adaeaa790968e220f367a04ea0fc7f5dde78

[Samuel Jackson]

Refs #5422 Updating system tests for indirect force.

Changeset: 36a6f8d4f2d3e87f8d7852318d141746be0e9149

[Samuel Jackson]

Refs #5422 remove parameter map checking in system test.

Changeset: ee6647a6697bec44d21573b00e1128e14e41b453

[Samuel Jackson]

Refs #5422 Remove fortran dependency code.

Changeset: dc7e58024e8b2bf3d067e6f3db58d63bab7be765

[Martyn Gigg]

Change IN16 parameters date attribute to valid-from

The schema only uses valid-from and doesn't understand date. Refs #5422

Changeset: 634d0090d3b0e91218375dcc8758e7b4792d8457

[Martyn Gigg]

A warning here: The two new algorithms MolDynAscii & MolDynLoad are written using the old Python API and will not work when merged to master.

This needs to be fixed.

[Samuel Jackson]

Refs #5422 Updated to load IN13 files.

Changeset: f1a7389c09c29d7f00aa51047a724b3fe5a50157

[Samuel Jackson]

Refs #5422 remove wrapper algorithms from source.

Changeset: 5f54c676b44279a04ccc5395b0aef07c5ff80153

[Samuel Jackson]

Refs #5422 Changed name of interface, tabs and code.

Note that ForCE is now IndirectNeutron. MolDyn is now IndirectMolDyn IndirectForeign is now IndirectLoadAscii

Changeset: d35b62f50f04b0e28b4428f2f8866d04b092be5b

[Samuel Jackson]

Refs #5422 Remove ISIS instruments from being listed.

Changeset: 750b4d767bbe3d21224965557e7396db117c945d

[Samuel Jackson]

Refs #5422 Added system test for IndirectForce IN13.

Changeset: fec69d679d70a5354cb7459c5da48b917d4472bb

[Samuel Jackson]

Refs #5422 Added system test for MolDyn.

Changeset: cf98b57eccf935e8cb300b9dc485855abd4539e3

[Samuel Jackson]

Refs #5422 Updated files to follow more consistent naming.

Changeset: 4b5fc8f25ca7ac80efb0945ef610543306e16c93

[Samuel Jackson]

Merge branch 'feature/5422_indirect_foreign' into develop

Refs #5422 Fixed conflicts in CMakeLists

Conflicts:

Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt

Changeset: bf304d81a632f5bf8bf59e79615e5879bbd0ad63

[Samuel Jackson]

Refs #5422 Missed changing an import

Changeset: 02e84619632e64d1e2e2c09fd0cea64c4922d268

[Samuel Jackson]

Refs #5422 Changed import name.

Changeset: 9cc6392629cbb79ced89177fc9511de8597a1c67

[Samuel Jackson]

Refs #5422 Add notification to change default user directory.

Changeset: e9fb4bededb30615fead6dd338806b5cc00a4cc2

[Samuel Jackson]

Refs #5422 Update header files to follow convention.

Changeset: d9f463115d0c8b200c43adc80ec67ed5cb3b774e

[Samuel Jackson]

Refs #5422 adding news files to banned list.

Changeset: 55d813846eb2c490c81b16223eba8874e1d18475

[Russell Taylor]

Re #5422. Another file to skip trying to load.

Changeset: cb79c37d11e452b75a2fc2ddef41f90d57a422eb

[Samuel Jackson]

To Tester

A new interface has been created for the indirect data analysis team called Indirect Load ASCII. You can find it in the interfaces menu. The interface consists of two tabs one for loading .asc and .inx files and one for .dat and .cdl files.

I've written some (very) basic instructions on how to use the interface on the wiki at: http://www.mantidproject.org/Indirect:Indirect_Load_ASCII

You can find some files to use for testing in the data folder in the system tests repo.

Generally just check that the interface works and that nothing obvious breaks.

Note: both the system tests and main branch need merging for this ticket.

[Samuel Jackson]

Refs #5422 Missed changing wiki URL.

Changeset: f11f648a18245d2c4222a91d00a129988c994554

[Peter Parker]

Couple of issues:

• As discussed, using [System Tests]/Data/IN10_P3OT_350K.inx in the Neutron tab with Reject Zero ticked causes the error "TypeError: 'float' object has no attribute '__getitem__'" to occur in line 368 in Code/Mantid/scripts/Inelastic\IndirectNeutron.py.

• Veeeery minor, only mentioning it because we're reopening the ticket, but validation for the "Function Names" field of MolDyn is maybe a little off:
  • "Fqt-total,a,Sqw-total" gives an error of "SystemExit: ERROR *** Failed to parse function stringa". This is fine but a space between "string" and "a" would be nice.
  • "Fqt-total,Sqw-totalss" gives an error of "IndexError: list index out of range" which is not as helpful/clear as the previous error.
  • "Fqt-total, Sqw-total" also gives an error "IndexError: list index out of range". We could easily trim the individual function names to stop this.

Otherwise, nice. Automatic detection of instrument works, result plotting and saving works, and the input files are correctly filtered by extension. System tests pass fine, too.

I'm also a fan of splitting up the tabs into their own classes/files. I wish more interfaces in Mantid were laid out like that.

[Samuel Jackson]

Refs #5422 Corrected python script to work with inx files.

Also changed the extension output from when using inx.

Changeset: 375486cc5fbccd1640c7def04677ea08eb42f259

[Samuel Jackson]

Refs #5422 Added better function string parsing.

Changeset: ef22608c6dd2be83d547e5a9b2fc7d892ceed74a

[Samuel Jackson]

Refs #5422 Fix window resize quirk.

Changeset: 95b545fd45dca43a048c9d66777194d0368848b0

[Samuel Jackson]

Tester: As above, but check that the additional issues listed have been resolved too.

[Samuel Jackson]

Merge branch 'feature/5422_indirect_foreign' of github.com:mantidproject/mantid into feature/5422_indirect_foreign

Full changeset: ​982313fa074547c26ca88900901b10335a049b05

[Martyn Gigg]

Merge remote-tracking branch 'origin/feature/5422_indirect_foreign'

Full changeset: ​765d12a111a5a9c2d7fb0afd56c1913657d90186

[Martyn Gigg]

Merge remote-tracking branch 'origin/feature/5422_indirect_foreign'

Full changeset: ​29c37cf847929008c66b447c427a9bad6ffd8ec1

[Stuart Campbell]

This ticket has been transferred to github issue ​6268