Commit 8b142965 authored by legoc's avatar legoc
Browse files

Output in VEXPController

parent f4bf2779
......@@ -128,6 +128,8 @@ void VEXPController::updateBMatrix() {
void VEXPController::refreshCalcParameters(const std::string& value) {
cout << "refreshCalcParameters " << value << endl;
// Parse the values.
rapidjson::Document document;
document.Parse(value.c_str());
......@@ -144,6 +146,8 @@ void VEXPController::refreshCalcParameters(const std::string& value) {
void VEXPController::refreshCalcTrigger(int32 value) {
cout << "refreshCalcTrigger " << value << endl;
rapidjson::Document document;
rapidjson::StringBuffer s;
......@@ -168,7 +172,7 @@ void VEXPController::refreshCalcTrigger(int32 value) {
writer.EndObject();
//cout << "JSON parameters = " << s.GetString() << endl;
cout << "JSON parameters = " << s.GetString() << endl;
//calculate(calcki(), calckf(), calcqh(), calcqk(), calcql());
refreshCalcParameters(s.GetString());
......@@ -289,6 +293,13 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
calca1 = incidentBeam->calca1();
calca2 = incidentBeam->calca2();
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 (incidentBeam->calcStatus.isError()) {
calculationStatus.setError();
......@@ -308,6 +319,13 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
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;
// Manage the status.
if (scatteredBeam->calcStatus.isError()) {
calculationStatus.setError();
......@@ -332,6 +350,13 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
calca3 = scattering->calca3();
calca4 = 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;
// Manage the status.
if (scattering->calcStatus.isError()) {
calculationStatus.setError();
......
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