Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve order of loading idfs for nxs files #815

Merged
merged 15 commits into from Jun 15, 2015
Merged

Improve order of loading idfs for nxs files #815

merged 15 commits into from Jun 15, 2015

Conversation

NickDraper
Copy link
Contributor

Fixes #12656

To Test

This is a core change and needs to pass a review by a member of the TSC

to be completed

@NickDraper
Merge branch 'feature/11569_IDF_use_checksum_in_name_mangling' into f…
03143a4 
…eature/11818_Improve_order_of_loading_IDFs_for_nxs_files
@NickDraper
First implementation of changes
da16824 
 1. IDS mangling used for checksum is now inst name + sha1 of xml
 1.1. sha1 is computed after converitng to linux line endings and trim
 1. VTP file names changes to be same filename as IDS mangling
 1. VTP save directory moved to appdata/mantidproject/instrument/geometryCache
 1. VTP file saving simplified as files based on a checksum cannot be out of date
 1. unit tests updated to account for this
 1. unused methods removed from IDFObject
 1. InstrumentDefinitionParser changed to initialise during constructor
 1. XML parsing changed to lazy load rather than during initialisation.

Still to do:
 1. cache SHA1 checksum if needed
 1. Change the filename reported for nexus files
 1. Manually test
 1. Stop saving the filename to nexus files
 1. update documentation

re #11818
@NickDraper
Further steps as defined below
0e064a7 
 1. Change the filename reported for nexus files if xml contained within
 1. Stop saving the filename to nexus processed files
 1. removed some unused includes

Still to do:
 1. cache SHA1 checksum if needed
 1. Manually test
 1. update documentation
 1. investigate this error:

ctest -C Debug -J 4 -R LoadEventNexusTest -V

 548: LoadParameterFile-[Error] Bad path syntax: C:\Mantid\Code\Mantid\instrument
\C:\Users\rrc79113\AppData\Roaming\mantidproject\mantid\instrument\HYSPECA_Param
eters.xml. Unable to parse File: in C:/Mantid/Code/Mantid/instrument//C:\Users\r
rc79113\AppData\Roaming\mantidproject\mantid\instrument\HYSPECA_Parameters.xml
548: LoadIDFFromNexus-[Notice] Instrument parameter file: C:\Users\rrc79113\AppD
ata\Roaming\mantidproject\mantid\instrument\HYSPECA_Parameters.xml not found or
un-parsable. Instrument parameter file: C:/Mantid/Code/Mantid/instrument/HYSPECA
_Parameters.xml has been loaded

re #11818
@NickDraper
fixed the following unit test failures
5ac567b 
        712 - AlgorithmsTest_CreateDummyCalFileTest (Failed)
        1181 - MDAlgorithmsTest_LoadMDTest (Timeout)
        1195 - MDAlgorithmsTest_MergeMDFilesTest (Failed)

re #11818
@NickDraper
Error 4: from above the instrument parameter loading is fixed
455e782 
re #11818
@NickDraper
Merge branch 'master' of github.com:mantidproject/mantid into feature…
995e5e0 
…/11818_Improve_order_of_loading_IDFs_for_nxs_files
@NickDraper NickDraper added In Progress Maintenance Unassigned issues to be addressed in the next maintenance period. Framework Issues and pull requests related to components in the Framework Extra Attention Testers and Gate keepers should pay extra attention as this affects core aspects. labels May 29, 2015
@NickDraper NickDraper added this to the Release 3.5 milestone May 29, 2015
@NickDraper NickDraper changed the title Improve order of loading id fs for nxs files Improve order of loading idfs for nxs files May 29, 2015
@NickDraper NickDraper mentioned this pull request Jun 3, 2015
Closed
1 task
@martyngigg martyngigg self-assigned this Jun 12, 2015
@martyngigg
Fix documentation tests.
de3a200 
Refs #12656
@martyngigg
Fix bug when loading parameter_map from NeXus
bfc3a41 
The instrument_source attribute was removed and so the code hit an
error when trying to load the parameter map. As the instrument_source
is no longer used anywhere there is no point in trying to load it from
older files.
Refs #12656
@martyngigg
Merge branch 'master' into feature/11818_Improve_order_of_loading_IDF…
872f070 
…s_for_nxs_files
@martyngigg
Close group before leaving method
a623c53 
Preserves the expected path within the Nexus file
Refs #12656
martyngigg added a commit that referenced this pull request Jun 15, 2015
@martyngigg
Merge pull request #815 from mantidproject/feature/11818_Improve_orde…
cc19d80 
…r_of_loading_IDFs_for_nxs_files

Improve order of loading idfs for nxs files
@martyngigg martyngigg merged commit cc19d80 into master Jun 15, 2015
@martyngigg martyngigg deleted the feature/11818_Improve_order_of_loading_IDFs_for_nxs_files branch June 15, 2015 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@martyngigg martyngigg

Labels
Extra Attention Testers and Gate keepers should pay extra attention as this affects core aspects. Framework Issues and pull requests related to components in the Framework Maintenance Unassigned issues to be addressed in the next maintenance period.
Projects
None yet
Milestone
Release 3.5
Development

Successfully merging this pull request may close these issues.

Change the order that instrument files are loaded in preferece for nexus files
2 participants
@NickDraper @martyngigg