Indirect energy reduction should use SaveASCII version 1

[Samuel Jackson]

Users have asked if this could be switched back to the format produced using version 1 of the SaveASCII algorithm as this works more nicely with excel and origin.

[Samuel Jackson]

Refs #9979 Swap to use version 1 of the SaveASCII algorithm.

Changeset: 3df26ededa926a81de8667f6d750a870a334a668

[Samuel Jackson]

Refs #9979 Add system test to check output files.

This should help prevent issues like this in the future.

Changeset: 71e0276201c14c38c06d879ca3c1b14bc32c1e1e

[Samuel Jackson]

To Test

• The output from selecting the ascii save output option in indirect convert to energy should use the old format. (compare with the output in Mantid 3.0)

• Check the new system test is passing.

[Harry Jeffery]

What happened to the second commit? It's 404ing on github.

Did you remove the commit?

[Nick Draper]

Harry, commit links to any repo other than the main code repo will do that. This one is to the system tests repo.

Admittedly the To test section should be more clear in stating that you need to Merge both the Main and system tests repo.

[Nick Draper]

Indirect system tests failing on develop for Win7 with the following:

Traceback (most recent call last):

  File "<string>", line 1, in <module>

  File "c:/jenkins-linode/workspace/develop_systemtests_all/label/win7/StressTestFramework\stresstesting.py", line 347, in returnValidationCode

    if self.doValidation():

  File "c:/jenkins-linode/workspace/develop_systemtests_all/label/win7/StressTestFramework\stresstesting.py", line 317, in doValidation

    validation = self.validate()

  File "c:/jenkins-linode/workspace/develop_systemtests_all/label/win7/SystemTests/AnalysisTests\ISISIndirectInelastic.py", line 348, in validate

    self.assert_ascii_file_matches()

  File "c:/jenkins-linode/workspace/develop_systemtests_all/label/win7/SystemTests/AnalysisTests\ISISIndirectInelastic.py", line 366, in assert_ascii_file_matches

    "Output of ASCII format did not match expected result.")

  File "c:/jenkins-linode/workspace/develop_systemtests_all/label/win7/SystemTests/AnalysisTests\ISISIndirectInelastic.py", line 395, in assert_file_format_matches_expected

    self.assertTrue(actual_result == expected_result, msg + " (%s != %s)" % (actual_result, expected_result))

  File "Lib\unittest\case.py", line 405, in assertTrue

AssertionError: Output of ASCII format did not match expected result. (['X , Y0 , E0 , Y1 , E1 , Y2 , E2\r\n', '-2.4925,0,0,0.617579,0.362534,0.270868,0.159006\r\n', '-2.4775,0.375037,0.273017,0,0,0.210547,0.153272\r\n'] != ['X , Y0 , E0 , Y1 , E1 , Y2 , E2\n', '-2.4925,0,0,0.617579,0.362534,0.270868,0.159006\n', '-2.4775,0.375037,0.273017,0,0,0.210547,0.153272\n'])

[Samuel Jackson]

Refs #9979 Trim line end whitespace.

Changeset: fc4c604367bbdde15738713edef0cc8d01b25dde

[Samuel Jackson]

To Test: See above. Sys tests should now be passing for this test on all machines.

[Dan Nixon]

Merge remote-tracking branch 'origin/bugfix/9979_c2e_saveascii_v1'

Full changeset: ​d25788977349d401f7abbdc01c3066c7f94a2a20

[Dan Nixon]

Merge remote-tracking branch 'origin/bugfix/9979_c2e_saveascii_v1'

Full changeset: ​11cd3428520a702a2f5e9141a3bd38b582844ded

[Stuart Campbell]

This ticket has been transferred to github issue ​10821