Commit 04e3ea3b authored by Mathieu Tillet's avatar Mathieu Tillet
Browse files

Change parameter name

From 2ThetaOffset to TwoThetaOffset, because the former is not valid.
parent 54ed2187
......@@ -113,7 +113,7 @@ void LoadILLDiffraction::init() {
"Select the type of data, with or without calibration "
"already applied. If Auto then the calibrated data is "
"loaded if available, otherwise the raw data is loaded.");
declareProperty("2ThetaOffset", 0.0, "2 theta offset for D1B data.");
declareProperty("TwoThetaOffset", 0.0, "2 theta offset for D1B data.");
declareProperty(
std::make_unique<PropertyWithValue<bool>>("AlignTubes", true,
Direction::Input),
......@@ -206,11 +206,11 @@ void LoadILLDiffraction::loadDataScan() {
// read the starting two theta
double twoThetaValue;
if (m_instName == "D1B") {
if (getPointerToProperty("2ThetaOffset")->isDefault()) {
g_log.warning("A 2theta offset angle is necessary for D1B data.");
if (getPointerToProperty("TwoThetaOffset")->isDefault()) {
g_log.notice("A 2theta offset angle is necessary for D1B data.");
twoThetaValue = 0;
} else {
twoThetaValue = getProperty("2ThetaOffset");
twoThetaValue = getProperty("TwoThetaOffset");
}
} else {
std::string twoThetaPath = "instrument/2theta/value";
......
......@@ -504,7 +504,7 @@ public:
alg.setChild(true);
alg.initialize();
TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("Filename", "473432.nxs"))
TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("2ThetaOffset", "0.0"))
TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("TwoThetaOffset", "0.0"))
TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace", "__"))
TS_ASSERT_THROWS_NOTHING(alg.execute())
TS_ASSERT(alg.isExecuted())
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment