Merge Changes from Rob and Richard (LARMOR and SANS2D)

[Peter Parker]

This ticket is to merge in Rob Dalgliesh's and Richard Heenan's changes which are to support LARMOR and introduce a new User File command for SANS2D, respectively. They are very keen to get these in as soon as possible.

System tests to cover the LARMOR functionality are to follow in a separate ticket.

[Peter Parker]

Apply Rob's changes, which are to support LARMOR.

The files have moved on from the version of the code used by Rob, so this required some work to bring in the changes. System tests are passing so I think we're okay here.

Refs #11360.

Changeset: 8a9dc716692505cbe9b5916732be65027845bc9b

[Peter Parker]

Refs #11360 - Changes from Richard. Some System Tests breaking.

Changeset: 854c8f724a6d93d417188da5d8da093ab0407eb5

[Peter Parker]

Refs #11360 - Fix for tests that use SetDetectorOffets.

The new params just needed defaults.

Changeset: 18463aa49387678deac5db32ab50b2ca7ab2ab3e

[Peter Parker]

Refs #11360 - Only tilt if angle is not 0.0.

It looks like RotateInstrumentComponent does actually rotate even if the angle is 0.0. Just dont call it in this case.

Should fix remaining system tests.

Changeset: ad1090689aa27151ce07eb2ac3ccfe1d0e922a06

[Peter Parker]

Refs #11360 - Remove data files commited by accident.

Changeset: d3a9e2e2f5bd4733625b8d95c3227e097ff91c49

[anonymous]

This is being verified as ​pull request #393.

[anonymous]

Jenkins, retest this please.

Win7 build failed with the following:

` 19:36:54 ApplicationWindow-[Notice] Script execution finished. 19:36:54 MantidUI-[Notice] MantidPlot is shutting down... 19:36:56 C:\Jenkins\workspace\pull_requests\label\win7-build\build 19:36:56 Removing package 'C:\Jenkins\workspace\pull_requests\label\win7-build\build\mantid-3.3.20150315.1903-win64.exe' 19:36:56 Traceback (most recent call last): 19:36:56 File "C:\Jenkins\workspace\pull_requests\label\win7-build\Code\Mantid\Testing\SystemTests\scripts\mantidinstaller.py", line 274, in <module> 19:36:56 installer.uninstall() 19:36:56 File "C:\Jenkins\workspace\pull_requests\label\win7-build\Code\Mantid\Testing\SystemTests\scripts\mantidinstaller.py", line 136, in uninstall 19:36:56 self.do_uninstall() 19:36:56 File "C:\Jenkins\workspace\pull_requests\label\win7-build\Code\Mantid\Testing\SystemTests\scripts\mantidinstaller.py", line 165, in do_uninstall 19:36:56 run('start "Uninstaller" /wait ' + uninstall_path + ' /S') 19:36:56 File "C:\Jenkins\workspace\pull_requests\label\win7-build\Code\Mantid\Testing\SystemTests\scripts\mantidinstaller.py", line 87, in run 19:36:56 raise Exception('Returned with code '+str(p.returncode)+'\n'+out) 19:36:56 Exception: Returned with code 1 19:36:56 Access is denied. `

Which looks very much like an intermittent problem with the builder rather than an issue with the changes made as part of this ticket.

[anonymous]

Jenkins, retest this please

[anonymous]

Jenkins, retest this please

[Peter Parker]

Refs #11360 - Coerce Sophos into playing nice.

Sophos is complaining about unistall.exe again for some reason. It's possible that it's quite flaky about changes to XML files, and the only XML file that we changed in this branch was the LARMOR param file.

Making a trivial change to a comment to try and motivate a different result.

Changeset: 3a681a144456cd1a17b2e8daecb8b5fc97d7b1fe

[Peter Parker]

Refs #11360 - Another change to nudge Sophos.

Changeset: dc54fed42e95f40f12dee2458247ee4149acefab

[anonymous]

Jenkins, retest this please.

[Peter Parker]

Refs #11360 - Revert changes intended to nudge Sophos.

These changes didn't have the desired effect.

For now, making sure that the Win7 build happens on the machine with on-access virus scanning turned off, so at least we have something to give to Richard and Rob.

Changeset: 240ab514e6f7307d65565455564ee9b2350d7694

[anonymous]

This failed again, but now because of RHEL 6 being flaky!. Pushed a revert of the last two commits to set off yet another build.

[Anders-Markvardsen]

Merge pull request #393 from mantidproject/11360_merge_robs_larmor_changes

Merge Changes From Rob and Richard for ISIS SANS

Full changeset: ​f3f480a2569c7a4a34e896b18e2bbe564ee08196

[Stuart Campbell]

This ticket has been transferred to github issue ​12199