Commit 3ad6b1d8 authored by yannick legoc's avatar yannick legoc
Browse files

Added A3P to VEXPController

parent 41e41f3a
......@@ -63,6 +63,7 @@ VEXPController::VEXPController(const string& name) :
a1.init(this, NOSAVE, "a1");
a2.init(this, NOSAVE, "a2");
a3.init(this, NOSAVE, "a3");
a3p.init(this, NOSAVE, "a3p");
a4.init(this, NOSAVE, "a4");
a5.init(this, NOSAVE, "a5");
a6.init(this, NOSAVE, "a6");
......@@ -72,6 +73,7 @@ VEXPController::VEXPController(const string& name) :
calca1.init(this, NOSAVE, "calca1");
calca2.init(this, NOSAVE, "calca2");
calca3.init(this, NOSAVE, "calca3");
calca3p.init(this, NOSAVE, "calca3p");
calca4.init(this, NOSAVE, "calca4");
calca5.init(this, NOSAVE, "calca5");
calca6.init(this, NOSAVE, "calca6");
......@@ -89,6 +91,7 @@ VEXPController::VEXPController(const string& name) :
a1Controller.init(this, "A1");
a2Controller.init(this, "A2");
a3Controller.init(this, "A3");
a3pController.init(this, "A3P");
a4Controller.init(this, "A4");
a5Controller.init(this, "A5");
a6Controller.init(this, "A6");
......@@ -189,6 +192,7 @@ void VEXPController::updateProperties() {
a1.update(a1Controller->position());
a2.update(a2Controller->position());
a3.update(a3Controller->position());
a3p.update(a3pController->position());
a4.update(a4Controller->position());
a5.update(a5Controller->position());
a6.update(a6Controller->position());
......@@ -225,6 +229,7 @@ void VEXPController::postConfiguration() {
registerPropertyCopierByUpdate(a1Controller->position, a1);
registerPropertyCopierByUpdate(a2Controller->position, a2);
registerPropertyCopierByUpdate(a3Controller->position, a3);
registerPropertyCopierByUpdate(a3pController->position, a3p);
registerPropertyCopierByUpdate(a4Controller->position, a4);
registerPropertyCopierByUpdate(a5Controller->position, a5);
registerPropertyCopierByUpdate(a6Controller->position, a6);
......@@ -237,6 +242,7 @@ void VEXPController::postConfiguration() {
registerRefresher(calca1, &VEXPController::refreshFloat64PropertyToMoveModel, this, a1Controller->position);
registerRefresher(calca2, &VEXPController::refreshFloat64PropertyToMoveModel, this, a2Controller->position);
registerRefresher(calca3, &VEXPController::refreshFloat64PropertyToMoveModel, this, a3Controller->position);
registerRefresher(calca3p, &VEXPController::refreshFloat64PropertyToMoveModel, this, a3pController->position);
registerRefresher(calca4, &VEXPController::refreshFloat64PropertyToMoveModel, this, a4Controller->position);
registerRefresher(calca5, &VEXPController::refreshFloat64PropertyToMoveModel, this, a5Controller->position);
registerRefresher(calca6, &VEXPController::refreshFloat64PropertyToMoveModel, this, a6Controller->position);
......@@ -258,12 +264,13 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
calca1 = toDouble(incidentBeam->calca1());
calca2 = toDouble(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;
// cout << "calc A1 " << calca1() << endl;
// cout << "calc A2 " << calca2() << endl;
// cout << "calc A3 " << calca3() << endl;
// cout << "calc A3P " << calca3p() << endl;
// cout << "calc A4 " << calca4() << endl;
// cout << "calc A5 " << calca5() << endl;
// cout << "calc A6 " << calca6() << endl << endl;
// Manage the status.
if (incidentBeam->calcStatus.isError()) {
......@@ -306,6 +313,7 @@ void VEXPController::calculate(float64 ki, float64 kf, float64 qh, float64 qk, f
scattering->calculate(tas::Beam::K_MODE, 1);
calca3 = toDouble(scattering->calca3());
calca3p = toDouble(scattering->calca3p());
calca4 = toDouble(scattering->calca4());
// cout << "calc A1 " << calca1() << endl;
......
......@@ -83,6 +83,7 @@ public:
Property<float64> a1;
Property<float64> a2;
Property<float64> a3;
Property<float64> a3p;
Property<float64> a4;
Property<float64> a5;
Property<float64> a6;
......@@ -93,6 +94,7 @@ public:
Property<float64> calca1;
Property<float64> calca2;
Property<float64> calca3;
Property<float64> calca3p;
Property<float64> calca4;
Property<float64> calca5;
Property<float64> calca6;
......@@ -110,6 +112,7 @@ public:
ControllerPtr<axis::AxisController> a1Controller;
ControllerPtr<axis::AxisController> a2Controller;
ControllerPtr<axis::AxisController> a3Controller;
ControllerPtr<axis::AxisController> a3pController;
ControllerPtr<axis::AxisController> a4Controller;
ControllerPtr<axis::AxisController> a5Controller;
ControllerPtr<axis::AxisController> a6Controller;
......
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