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.

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

Improve order of loading idfs for nxs files #815

Merged

Commits on May 20, 2015

  1. Merge branch 'feature/11569_IDF_use_checksum_in_name_mangling' into f…

    …eature/11818_Improve_order_of_loading_IDFs_for_nxs_files
    NickDraper committed May 20, 2015
    Configuration menu
    Copy the full SHA
    03143a4 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2015

  1. First implementation of changes

     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 committed May 27, 2015
    Configuration menu
    Copy the full SHA
    da16824 View commit details
    Browse the repository at this point in the history
  2. Further steps as defined below

     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 committed May 27, 2015
    Configuration menu
    Copy the full SHA
    0e064a7 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. fixed the following unit test failures

            712 - AlgorithmsTest_CreateDummyCalFileTest (Failed)
            1181 - MDAlgorithmsTest_LoadMDTest (Timeout)
            1195 - MDAlgorithmsTest_MergeMDFilesTest (Failed)
    
    re #11818
    NickDraper committed May 28, 2015
    Configuration menu
    Copy the full SHA
    5ac567b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    455e782 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2015

  1. Merge branch 'master' of github.com:mantidproject/mantid into feature…

    …/11818_Improve_order_of_loading_IDFs_for_nxs_files
    NickDraper committed May 29, 2015
    Configuration menu
    Copy the full SHA
    995e5e0 View commit details
    Browse the repository at this point in the history
  2. re #11818 for doxygen warning

    NickDraper committed May 29, 2015
    Configuration menu
    Copy the full SHA
    b34f136 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2015

  1. re #11818 update documentation

    NickDraper committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    c4aded7 View commit details
    Browse the repository at this point in the history
  2. re #11818 update documentation

    NickDraper committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    c817b1b View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2015

  1. Configuration menu
    Copy the full SHA
    14b5183 View commit details
    Browse the repository at this point in the history
  2. Fix documentation tests.

    Refs #12656
    martyngigg committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    de3a200 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. Fix bug when loading parameter_map from NeXus

    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 committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    bfc3a41 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    872f070 View commit details
    Browse the repository at this point in the history
  3. Close group before leaving method

    Preserves the expected path within the Nexus file
    Refs #12656
    martyngigg committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    a623c53 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b96b52d View commit details
    Browse the repository at this point in the history