Commit 3edd1d48 authored by Danny Hindson's avatar Danny Hindson Committed by Zhang, Chen
Browse files

Merge master and fix merge conflict in diffraction rel notes

parent 8a3c9690
......@@ -278,7 +278,8 @@ void EditInstrumentGeometry::exec() {
if (haveTZeros)
storTZEROs[workspaceindex] = tzeros[i];
g_log.debug() << "workspace index = " << workspaceindex << " is for Spectrum " << specids[i] << '\n';
g_log.debug() << "workspace index = " << workspaceindex
<< " is for Spectrum " << specids[i] << '\n';
}
// Generate a new instrument
......
This diff is collapsed.
......@@ -209,6 +209,10 @@ protected:
// Add a 'quick conversion' for a unit pair
void addConversion(std::string to, const double &factor, const double &power = 1.0) const;
virtual void
validateExtraParams(int emode,
std::map<UnitConversionParameters, double> &params);
virtual void
validateExtraParams(int emode,
std::map<UnitConversionParameters, double> &params);
......
......@@ -35,6 +35,18 @@ double UnitConversion::run(const std::string &src, const std::string &dest, cons
emode, params);
}
double UnitConversion::run(const std::string &src, const std::string &dest,
const double srcValue, const double l1,
const double l2, const double theta,
const DeltaEMode::Type emode,
const ExtraParametersMap &params) {
Unit_sptr srcUnit = UnitFactory::Instance().create(src);
Unit_sptr destUnit = UnitFactory::Instance().create(dest);
ExtraParametersMap params{{UnitConversionParameters::efixed, efixed}};
return UnitConversion::run(*srcUnit, *destUnit, srcValue, l1, l2, theta,
emode, params);
}
double UnitConversion::run(const std::string &src, const std::string &dest,
const double srcValue, const double l1,
const double l2, const double theta,
......
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