Commit 4cca1aa5 authored by legoc's avatar legoc
Browse files

Corrected call to toDouble in VEXPController

parent eb728306
......@@ -275,8 +275,8 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
// calca1, calca2, calcStatus are calculated.
incidentBeam->calculate(tas::Beam::K_MODE);
calca1 = incidentBeam->calca1();
calca2 = incidentBeam->calca2();
calca1 = toDouble(incidentBeam->calca1());
calca2 = toDouble(incidentBeam->calca2());
cout << "calc A1 " << calca1() << endl;
cout << "calc A2 " << calca2() << endl;
......@@ -301,15 +301,8 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
// calca1, calca2, calcStatus are calculated.
scatteredBeam->calculate(tas::Beam::K_MODE);
calca5 = scatteredBeam->calca5();
calca6 = scatteredBeam->calca6();
cout << "calc A1 " << calca1() << endl;
cout << "calc A2 " << calca2() << endl;
cout << "calc A3 " << calca3() << endl;
cout << "calc A4 " << calca4() << endl;
cout << "calc A5 " << calca5() << endl;
cout << "calc A6 " << calca6() << endl << endl;
calca5 = toDouble(scatteredBeam->calca5());
calca6 = toDouble(scatteredBeam->calca6());
// Manage the status.
if (scatteredBeam->calcStatus.isError()) {
......@@ -332,15 +325,15 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
// Calculate by fixing Ki.
scattering->calculate(tas::Beam::K_MODE, 1);
calca3 = scattering->calca3();
calca4 = scattering->calca4();
calca3 = toDouble(scattering->calca3());
calca4 = toDouble(scattering->calca4());
cout << "calc A1 " << calca1() << endl;
cout << "calc A2 " << calca2() << endl;
cout << "calc A3 " << calca3() << endl;
cout << "calc A4 " << calca4() << endl;
cout << "calc A5 " << calca5() << endl;
cout << "calc A6 " << calca6() << endl << endl;
// cout << "calc A1 " << calca1() << endl;
// cout << "calc A2 " << calca2() << endl;
// cout << "calc A3 " << calca3() << endl;
// cout << "calc A4 " << calca4() << endl;
// cout << "calc A5 " << calca5() << endl;
// cout << "calc A6 " << calca6() << endl << endl;
// Manage the status.
if (scattering->calcStatus.isError()) {
......
Markdown is supported
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