Context Navigation

← Previous Ticket
Next Ticket →

Ticket #7505 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Check SINQ contributed code on all platforms

Reported by:	Martyn Gigg	Owned by:	Stuart Campbell
Priority:	critical	Milestone:	Release 3.0
Component:	Framework	Keywords:	Maintenance
Cc:	nick.draper@…	Blocked By:
Blocking:		Tester:	Nick Draper

Description

We have had a pull request from the PSI with some contributed code. This is a ticket mainly to bring the code into a branch and build/test it on all platforms and make any necessary modifications.

Change History

comment:1 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:2 Changed 7 years ago by Martyn Gigg

Milestone changed from Backlog to Release 3.0

comment:3 Changed 7 years ago by Martyn Gigg

Keywords Maintenance added

comment:4 Changed 7 years ago by Nick Draper

Owner changed from Martyn Gigg to Stuart Campbell

I understand that you are looking at this.

Please consider this as very important for this release. ANSTO are interested in using the flexi nexus reader.

comment:5 Changed 7 years ago by Nick Draper

Priority changed from major to critical

comment:6 Changed 7 years ago by Stuart Campbell

Status changed from new to inprogress

comment:7 Changed 7 years ago by Stuart Campbell

Merge branch 'feature/7505_sinq_code_check' into develop

refs #7505

Changeset: 141187c01f5870d85017067c8e3809cc50722561

comment:8 Changed 7 years ago by Stuart Campbell

Don't build SINQ package. refs #7505

Changeset: c902cdae8c86c7c0e6950c2403e247d8671bae35

comment:9 Changed 7 years ago by Stuart Campbell

Merge branch 'feature/7505_sinq_code_check' into develop

refs #7505

Changeset: a3058d8f70996777533caa5cd7b0d79df4beeaba

comment:10 Changed 7 years ago by Martyn Gigg

Fixes for SINQ code compilation on MSVC.

Refs #7505

Changeset: ebf8d0ac3a8838a6100de3bdaa47695ad1222a0c

comment:11 Changed 7 years ago by Martyn Gigg

Fix MSVC export declarations in SINQ library.

This allows the tests to compile. Refs #7505

Changeset: 6170579c37817d744e8896e55240ce860ad8dc3a

comment:12 Changed 7 years ago by Martyn Gigg

Increase version number of Python LoadSINQ algorithm to 2

There is currently a bug with the FileLoaderRegistry when a Python algorithm has the same name & version as a C++ algorithm that is defined as a loader. The Python alg silently overwrites the C++ one and crashes the file loader search. For now call this version 2 to avoid this. Refs #7505

Changeset: 1e083d9e3a7cb061c3ef0d28e3aa36624eeb6293

comment:13 Changed 7 years ago by Martyn Gigg

Fix ifstream constructor calls for OS X

They require const char * filenames & not std::string. Refs #7505

Changeset: a6938142118002b6ca96f833421de6b33f07adea

comment:14 Changed 7 years ago by Martyn Gigg

Corrections for POLDI idfs & parameter files to conform with schema

Refs #7505

Changeset: 6f2fd026322f62f4d7f2680ece1a1216789333e9

comment:15 Changed 7 years ago by Martyn Gigg

Warnings cull from SINQ code.

All related to conversions to/from size_t etc. I have simply made explicit with static_casts what was happening implicitly so that the original behaviour is preserved. Refs #7505

Changeset: 16e2040cb5087eebcbc535b809905cc32582cbb4

comment:16 Changed 7 years ago by Martyn Gigg

Fix a bug in LoadFlexiNexus picked up by MSVC in debug

vector::reserve only pre-allocates memory, it doesn't expand the size of the vector meaning subscripting is technically not valid. Release builds will allow it as the memory is there so the underlying array can still be addressed. Refs #7505

Changeset: 4e5d8ca174a98e8f61a719785885d5fee50b8cbe

comment:17 Changed 7 years ago by Martyn Gigg

Cull more warnings from SINQ library.

Refs #7505

Changeset: 99140c28e8a8eed7e0f40bbd0822080b983350a9

comment:18 Changed 7 years ago by Martyn Gigg

Cull a few more warnings from SINQ tests.

Refs #7505

Changeset: 10cf528f20a3f2369a465a62a82d2d0f724c01f7

comment:19 Changed 7 years ago by Nick Draper

Owner changed from Stuart Campbell to Martyn Gigg

comment:20 Changed 7 years ago by Martyn Gigg

Standardize properties on LoadSINQ,LoadSINQFile & LoadFlexiNexus.

Changes to the output workspace properties to work in the more standard way that Mantid works with them. Refs #7505

Changeset: 2349f1201cdf2abf2ea4f98768e649a77ebe07fd

comment:21 Changed 7 years ago by Martyn Gigg

Rename C++ LoadSINQ to LoadSINQFocus as it only loads FOCUS data.

Deprecated in favour of new LoadSINQ Refs #7505

Changeset: 9381fc8dc3c7edd6cce39a2086a9c4889c289dbe

comment:22 Changed 7 years ago by Martyn Gigg

Rename Nexus dictionaries to remove mantid prefix.

Now that they are within mantid the prefix seems redundant. Refs #7505

Changeset: 6599e1b914ce5521cad41af311e3b0127c83f2cb

comment:23 Changed 7 years ago by Martyn Gigg

Replace error logging with information level logging.

Refs #7505

Changeset: 235b8b3eb71c14d5dabe8eeb4a69bf8f49769864

comment:24 Changed 7 years ago by Martyn Gigg

Merge branch 'feature/7505_sinq_code_check' into develop

Conflicts:

Code/Mantid/Framework/DataHandling/CMakeLists.txt

Refs #7505

Changeset: 2219ae41ed9a514929aff3b92c50fac7e7dce412

comment:25 Changed 7 years ago by Martyn Gigg

Put LoadSINQFocus back into loader search list.

Refs #7505

Changeset: 4d3ca1ad7b3a721f3af5a1e9128b8d2e4a19bd62

comment:26 Changed 7 years ago by Martyn Gigg

Status changed from inprogress to verify
Resolution set to fixed

Branch: feature/7505_sinq_code_check

Tester:

Modifications were required in order for the code to compile under MSVC. This was largely due to missing DLL export declarations. There was also a out of vector range error in LoadFlexiNexus that the MSVC debug build picked up on.

Many warnings were culled due to mismatches when comparing int & size_t. The warnings were culled using static_casts so that the code will behave equivalent to before. #8268 has been opened in order to ask the PSI contributors to make some maintenance changes.

The properties on the Python algorithms were also improved to use the more correct WorkspaceProperties rather than just strings.

We have also deprecated and renamed our LoadSINQ to LoadSINQFocus as the new LoadSINQ loads more than just the FOCUS instrument.

The systemtests should still be passing.