diff --git a/Code/Mantid/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp b/Code/Mantid/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp
index 67a0fe6666a3ceea9155e90284e9a8ce88293037..a4a2ce7c88104bc15781a6e585bd0a4de1aae3c8 100644
--- a/Code/Mantid/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp
+++ b/Code/Mantid/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp
@@ -106,32 +106,12 @@ void FindUBUsingIndexedPeaks::exec() {
OrientedLattice o_lattice;
o_lattice.setUB(UB);
- double calc_a = o_lattice.a();
- double calc_b = o_lattice.b();
- double calc_c = o_lattice.c();
- double calc_alpha = o_lattice.alpha();
- double calc_beta = o_lattice.beta();
- double calc_gamma = o_lattice.gamma();
- // Show the modified lattice parameters
- sprintf(
- logInfo,
- std::string("Lattice Parameters: %8.3f %8.3f %8.3f %8.3f %8.3f %8.3f")
- .c_str(),
- calc_a, calc_b, calc_c, calc_alpha, calc_beta, calc_gamma);
- g_log.notice(std::string(logInfo));
- g_log.notice() << std::fixed << std::setprecision(3) << std::setw(9);
-
- g_log.notice() << "Parameter Errors :" << std::fixed
- << std::setprecision(3) << std::setw(9) << sigabc[0]
- << std::fixed << std::setprecision(3) << std::setw(9)
- << sigabc[1] << std::fixed << std::setprecision(3)
- << std::setw(9) << sigabc[2] << std::fixed
- << std::setprecision(3) << std::setw(9) << sigabc[3]
- << std::fixed << std::setprecision(3) << std::setw(9)
- << sigabc[4] << std::fixed << std::setprecision(3)
- << std::setw(9) << sigabc[5] << std::endl;
+
o_lattice.setError(sigabc[0], sigabc[1], sigabc[2], sigabc[3], sigabc[4],
sigabc[5]);
+
+ // Show the modified lattice parameters
+ g_log.notice() << o_lattice << "\n";
ws->mutableSample().setOrientedLattice(&o_lattice);
}
}
diff --git a/Code/Mantid/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp b/Code/Mantid/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp
index d17030d75d7f066510ed06e64d9a1e7e108bab45..3f8b587e729b3d30d176a3d0de808ab2bbae5e6b 100644
--- a/Code/Mantid/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp
+++ b/Code/Mantid/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp
@@ -139,25 +139,10 @@ void FindUBUsingLatticeParameters::exec() {
double calc_beta = o_lattice.beta();
double calc_gamma = o_lattice.gamma();
// Show the modified lattice parameters
- sprintf(
- logInfo,
- std::string("Lattice Parameters: %8.3f %8.3f %8.3f %8.3f %8.3f %8.3f")
- .c_str(),
- calc_a, calc_b, calc_c, calc_alpha, calc_beta, calc_gamma);
- g_log.notice(std::string(logInfo));
+ g_log.notice() << o_lattice << "\n";
- g_log.notice() << "Parameter Errors :" << std::fixed
- << std::setprecision(3) << std::setw(9) << sigabc[0]
- << std::fixed << std::setprecision(3) << std::setw(9)
- << sigabc[1] << std::fixed << std::setprecision(3)
- << std::setw(9) << sigabc[2] << std::fixed
- << std::setprecision(3) << std::setw(9) << sigabc[3]
- << std::fixed << std::setprecision(3) << std::setw(9)
- << sigabc[4] << std::fixed << std::setprecision(3)
- << std::setw(9) << sigabc[5] << std::endl;
-
- sprintf(logInfo, std::string("Lattice Parameters (Refined - Input): %8.3f "
- "%8.3f %8.3f %8.3f %8.3f %8.3f").c_str(),
+ sprintf(logInfo, std::string("Lattice Parameters (Refined - Input): %11.6f "
+ "%11.6f %11.6f %11.6f %11.6f %11.6f").c_str(),
calc_a - a, calc_b - b, calc_c - c, calc_alpha - alpha,
calc_beta - beta, calc_gamma - gamma);
g_log.notice(std::string(logInfo));
diff --git a/Code/Mantid/Framework/Crystal/src/FindUBUsingMinMaxD.cpp b/Code/Mantid/Framework/Crystal/src/FindUBUsingMinMaxD.cpp
index 9c3fdecb41fd5f3b446930d8f9b7b8a3cc1229c3..b008fe742f9166dc69725f1588fb6e5f64687e86 100644
--- a/Code/Mantid/Framework/Crystal/src/FindUBUsingMinMaxD.cpp
+++ b/Code/Mantid/Framework/Crystal/src/FindUBUsingMinMaxD.cpp
@@ -135,29 +135,9 @@ void FindUBUsingMinMaxD::exec() {
o_lattice.setError(sigabc[0], sigabc[1], sigabc[2], sigabc[3], sigabc[4],
sigabc[5]);
- double calc_a = o_lattice.a();
- double calc_b = o_lattice.b();
- double calc_c = o_lattice.c();
- double calc_alpha = o_lattice.alpha();
- double calc_beta = o_lattice.beta();
- double calc_gamma = o_lattice.gamma();
// Show the modified lattice parameters
- sprintf(
- logInfo,
- std::string("Lattice Parameters: %8.3f %8.3f %8.3f %8.3f %8.3f %8.3f")
- .c_str(),
- calc_a, calc_b, calc_c, calc_alpha, calc_beta, calc_gamma);
- g_log.notice(std::string(logInfo));
+ g_log.notice() << o_lattice << "\n";
- g_log.notice() << "Parameter Errors :" << std::fixed
- << std::setprecision(3) << std::setw(9) << sigabc[0]
- << std::fixed << std::setprecision(3) << std::setw(9)
- << sigabc[1] << std::fixed << std::setprecision(3)
- << std::setw(9) << sigabc[2] << std::fixed
- << std::setprecision(3) << std::setw(9) << sigabc[3]
- << std::fixed << std::setprecision(3) << std::setw(9)
- << sigabc[4] << std::fixed << std::setprecision(3)
- << std::setw(9) << sigabc[5] << std::endl;
ws->mutableSample().setOrientedLattice(&o_lattice);
}
}
diff --git a/Code/Mantid/Framework/Geometry/src/Crystal/UnitCell.cpp b/Code/Mantid/Framework/Geometry/src/Crystal/UnitCell.cpp
index d94cd9ad9a21fc92ac9c298c5d2c706fd284160e..ed6f2b9b3fa66514c4b9c56dc3841864ddb760a1 100644
--- a/Code/Mantid/Framework/Geometry/src/Crystal/UnitCell.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Crystal/UnitCell.cpp
@@ -569,26 +569,26 @@ void UnitCell::recalculateFromGstar(const DblMatrix &NewGstar) {
std::ostream &operator<<(std::ostream &out, const UnitCell &unitCell) {
// always show the lattice constants
- out << "Lattice Parameters:" << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.a() << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.b() << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.c() << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.alpha() << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.beta() << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.gamma();
+ out << "Lattice Parameters:" << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.a() << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.b() << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.c() << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.alpha() << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.beta() << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.gamma();
// write out the uncertainty if there is a positive one somewhere
if ((unitCell.errora() > 0) || (unitCell.errorb() > 0) ||
(unitCell.errorc() > 0) || (unitCell.erroralpha() > 0) ||
(unitCell.errorbeta() > 0) || (unitCell.errorgamma() > 0))
- out << "\nParameter Errors :" << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.errora() << std::fixed
- << std::setprecision(3) << std::setw(9) << unitCell.errorb()
- << std::fixed << std::setprecision(3) << std::setw(9)
- << unitCell.errorc() << std::fixed << std::setprecision(3)
- << std::setw(9) << unitCell.erroralpha() << std::fixed
- << std::setprecision(3) << std::setw(9) << unitCell.errorbeta()
- << std::fixed << std::setprecision(3) << std::setw(9)
+ out << "\nParameter Errors :" << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.errora() << std::fixed
+ << std::setprecision(6) << std::setw(12) << unitCell.errorb()
+ << std::fixed << std::setprecision(6) << std::setw(12)
+ << unitCell.errorc() << std::fixed << std::setprecision(6)
+ << std::setw(12) << unitCell.erroralpha() << std::fixed
+ << std::setprecision(6) << std::setw(12) << unitCell.errorbeta()
+ << std::fixed << std::setprecision(6) << std::setw(12)
<< unitCell.errorgamma();
return out;