Bugs when loading the instrument from inside a nexus file

[Russell Taylor]

A couple of problems have been observed following #8108:

• Owing to commit 029f69253d3a4b53495badb0b629183068f5ee66 (specifically the deletion of line 969 in ExperimentInfo.cpp), the vtp file is being regenerated every time.

• When the instrument is within the nexus file, but a definition also exists (e.g. SEQUOIA, but not HYSPECA) then an LoadIDFFromNexus is failing because an attempt is being made to store an instrument with an empty name in the Instrument Data Service (which is not allowed).

[Russell Taylor]

The second point above is specifically a big problem for SEQUOIA because its IDF is missing a last-modified field. For others (e.g. HYSPEC), the name in the IDS is just the last modified date (with not indication of the instrument).

[Russell Taylor]

Re #8220. If the filename member is not empty, expand to full path.

The filename is used inside InstrumentDefinitionParser to locate the geometry cache (vtp) file.

Changeset: 022313d1809806117dae62d425d4b37292570bf2

[Russell Taylor]

Re #8220. Use the instrument name for the 'mangled name' if no IDF.

Previously, this would always return empty for the filename as no file is being used in these circumstances.

Changeset: 7cbba1266afa114b2e70d1b2f81a00c5ff079d24

[Russell Taylor]

The problems are solved - check by loading a processed nexus file and inspecting the log (turn up the level) to see that the instrument cache has been found and loaded. Check you can load the HYSA files in the repository as well.

[Gesner Passos]

I'm afraid I'm not able to reproduce the problem before applying the patch proposed in this ticket. I mean, I loaded the files that have the instrument defined inside them, and they used that inside, with no clear problem, I was able to spot. Hence, I will not be able to verify it works. It may be necessary to use the SEQUOIA file to really see the problem. Or, I will need further explanation on how to spot the problem.

I'm returning the ticket to the pool.

[Samuel Jackson]

Merge remote-tracking branch 'origin/bugfix/8220_instrument_caching_bug'

Full changeset: ​e5a3dec2f34ff56254132a4b8c6db126945c8592

[Samuel Jackson]

I checked that the original issue has been resolved and that the HYSA files in the system tests repo could be loaded. The vtp file is now being found when loading OSIRIS and ISIS nexus files.

[Stuart Campbell]

This ticket has been transferred to github issue ​9065