Skip to content

Commit

Permalink
Updated due to previous change to C++. Refs #7948.
Browse files Browse the repository at this point in the history
  • Loading branch information
wdzhou committed Oct 2, 2013
1 parent 4082f93 commit 796c101
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ ChopperConfiguration::ChopperConfiguration(const int freq, const std::string& ba
fit = createChildAlgorithm("FixGSASInstrumentFile", -1, -1, true);
fit->initialize();
fit->setProperty("InputFilename", m_gsasFileName);
fit->setProperty("OutputFilename", m_gsasFileName);
fit->execute();
}
catch (Exception::NotFoundError &)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,9 @@ class SaveGSASInstrumentFileTest : public CxxTest::TestSuite
// dmax changes from tabulated value (2.06) to converted-value (2.05263)
// and thus cause the change of tabulated value in .prm file

TS_ASSERT_EQUALS(veclines[0], "INS 1 ICONS 22748.017 0.000 0.000 0.000 0 0.000");
// TS_ASSERT_EQUALS(veclines[1], "INS 1PAB3 2 0.11303 3.91095 0.70362 0.24580");
TS_ASSERT_EQUALS(veclines[1], "INS 1PAB3 2 0.11295 3.90798 0.70397 0.24584");

// TS_ASSERT_EQUALS(veclines[2], "INS 1PAB589 2.11693 51.99258 0.02653 0.02259");
TS_ASSERT_EQUALS(veclines[2], "INS 1PAB589 2.10936 51.75754 0.02659 0.02265");
TS_ASSERT_EQUALS(veclines[0], "INS 1 ICONS 22748.017 0.000 0.000 0.000 0 0.000 ");
TS_ASSERT_EQUALS(veclines[1], "INS 1PAB3 2 0.11295 3.90798 0.70397 0.24584 ");;
TS_ASSERT_EQUALS(veclines[2], "INS 1PAB589 2.10936 51.75754 0.02659 0.02265 ");

// Clean
AnalysisDataService::Instance().remove("PG3ProfileTable");
Expand Down

0 comments on commit 796c101

Please sign in to comment.