...
 
Commits (4)
...@@ -37,8 +37,11 @@ const int32 MpdaCommon::LISTMODE_MODE = 1; ...@@ -37,8 +37,11 @@ const int32 MpdaCommon::LISTMODE_MODE = 1;
*/ */
MpdaCommon::MpdaCommon(const std::string& name) : RegisterCommon(name) { MpdaCommon::MpdaCommon(const std::string& name) : RegisterCommon(name) {
// nbGGs use for initGG (all GG in MPDA )
// but nbGGsUseAcqMode use for WriteParam (need to exclude all DMS gg)
nbGGs.init(this, SAVE, "nbGGs"); nbGGs.init(this, SAVE, "nbGGs");
nbGGsUseAcqMode.init(this, NOSAVE, "nbGGs"); nbGGsUseAcqMode.init(this, NOSAVE, "nbGGsUseAcqMode");
portType.init(this, NOSAVE, "portType"); portType.init(this, NOSAVE, "portType");
ggaddress.init(this, NOSAVE | HEX, "ggaddress"); ggaddress.init(this, NOSAVE | HEX, "ggaddress");
......
...@@ -167,7 +167,8 @@ void MpdaController::init() { ...@@ -167,7 +167,8 @@ void MpdaController::init() {
vector<ControllerPtr<GGController>>::iterator iter2 = m_GGs.begin(); vector<ControllerPtr<GGController>>::iterator iter2 = m_GGs.begin();
iter2 = m_GGs.begin(); iter2 = m_GGs.begin();
while (iter2!= m_GGs.end()) { while (iter2!= m_GGs.end()) {
if ( (*iter2)->portType() != 0 ){
if ( (*iter2)->cardType() != 23 ){// cardType = lstdpp128::DMS;
localnbGGsUseAcqMode++; localnbGGsUseAcqMode++;
} }
++iter2; ++iter2;
...@@ -181,7 +182,7 @@ void MpdaController::init() { ...@@ -181,7 +182,7 @@ void MpdaController::init() {
cout << " This is correct if your configuration include a DMS" << endl; cout << " This is correct if your configuration include a DMS" << endl;
cout << " DMS is not a GG for acquisition " << endl; cout << " DMS is not a GG for acquisition " << endl;
cout << " nGGs " << nGGs() << endl; cout << " nGGs " << nGGs() << endl;
cout << " nGGs for Acq " << mpdaDriver->nbGGsUseAcqMode() << endl; cout << " nGGs for Acq " << mpdaDriver->nbGGsUseAcqMode() << endl;
cout << "===================================" << endl; cout << "===================================" << endl;
} }
......
...@@ -425,7 +425,7 @@ void PolarizationController::start() { ...@@ -425,7 +425,7 @@ void PolarizationController::start() {
startPhase (stateValue() , consign1 , consign2 ); startPhase (stateValue() , consign1 , consign2 );
commandProgression = 50; commandProgression = 50;
usleep(1000); //wait for 1 msec usleep(delay()*1000); //wait for 1 msec
consign1 = down1Value.setpoint(); consign1 = down1Value.setpoint();
consign2 = down2Value.setpoint(); consign2 = down2Value.setpoint();
......
...@@ -4,11 +4,11 @@ polarization.wantedValuePrefix=Wanted polarization ...@@ -4,11 +4,11 @@ polarization.wantedValuePrefix=Wanted polarization
polarization.upValuePrefix=Polarization + state polarization.upValuePrefix=Polarization + state
polarization.downValuePrefix=Polarization - state polarization.downValuePrefix=Polarization - state
polarization.pulsedPrefix=Pulsed polarization.pulsedPrefix=Pulsed
polarization.delayPrefix=Delay polarization.delayPrefix=Pulse Duration
polarization.voltSuffix=V polarization.voltSuffix=V
polarization.ampsSuffix=A polarization.ampsSuffix=A
polarization.delaySuffix=s polarization.delaySuffix=ms
polarization.pulsedCheckedValue=true polarization.pulsedCheckedValue=true
polarization.pulsedUncheckedValue=false polarization.pulsedUncheckedValue=false
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<newLine/> <newLine/>
<text role="lsswavelength1" property="angle_factor" prefix="lsswavelength.angle_factorPrefix"/> <text role="lsswavelength1" property="angle_factor" prefix="lsswavelength.angle_factorPrefix"/>
<newLine/> <newLine/>
<label role="lsswavelength1" property="sel_tt_angle" prefix="lsswavelength.sel_tt_anglePrefix"/> <text role="lsswavelength1" property="sel_tt_angle" prefix="lsswavelength.sel_tt_anglePrefix"/>
</group> </group>
<newLine/> <newLine/>
<group title="lsswavelength1.resolutionTitle"> <group title="lsswavelength1.resolutionTitle">
......
...@@ -275,12 +275,12 @@ private: ...@@ -275,12 +275,12 @@ private:
ControllerPtr<selector::SelectorController> selectorDriver; ControllerPtr<selector::SelectorController> selectorDriver;
ControllerPtr<d33::D33ChopperCommand> chopperCommand;// ControllerPtr<d33::D33ChopperCommand> chopperCommand;//
ControllerPtr<acquisition::TofAcquisitionController> tofParam;// ControllerPtr<acquisition::TofAcquisitionController> tofParam;//
ControllerPtr<acquisition::TofAcquisitionController> tofParam2;// //ControllerPtr<acquisition::TofAcquisitionController> tofParam2;//
ControllerPtr<stateaxis::StateAxisController> m_Att; ControllerPtr<stateaxis::StateAxisController> m_Att;
//ControllerPtr<acquisition::MpdaController> m_Mpda3; //! Link //ControllerPtr<acquisition::MpdaController> m_Mpda3; //! Link
DriverPtr<acquisition::MpdaCommon> m_Mpda1; // DriverPtr<acquisition::MpdaCommon> m_Mpda1;
DriverPtr<acquisition::MpdaCommon> m_Mpda2; // DriverPtr<acquisition::MpdaCommon> m_Mpda2;
/** /**
......
...@@ -188,7 +188,7 @@ void RealFugHCPDriver::start() { ...@@ -188,7 +188,7 @@ void RealFugHCPDriver::start() {
} else { } else {
positive(); positive();
} }
writeCurrent(fabs(owner()->currentLimit())); // writeCurrent(fabs(owner()->currentLimit()));
writeVoltage(fabs(owner()->voltage.setpoint())); writeVoltage(fabs(owner()->voltage.setpoint()));
} }
......
...@@ -127,7 +127,7 @@ void RealD33AstriumChopperComputerDriver::setDir(DeviceDriver* aDeviceDriver) { ...@@ -127,7 +127,7 @@ void RealD33AstriumChopperComputerDriver::setDir(DeviceDriver* aDeviceDriver) {
w_dir = trim(any_cast<std::string>(aDeviceDriver->getValue(D33ASTRIUMCHOPPER_WANTED_DIRECTION_DEVICE_CONTAINER))); w_dir = trim(any_cast<std::string>(aDeviceDriver->getValue(D33ASTRIUMCHOPPER_WANTED_DIRECTION_DEVICE_CONTAINER)));
buf_conf <<D33ASTRIUMCHOPPER_DIR_COMMAND<< channel<<": "<<w_dir<<D33ASTRIUMCHOPPER_ENDL; buf_conf <<D33ASTRIUMCHOPPER_DIR_COMMAND<< channel<<": "<<w_dir<<D33ASTRIUMCHOPPER_ENDL;
// cout<< "send setDir "<< D33ASTRIUMCHOPPER_DIR_COMMAND<< channel<<D33ASTRIUMCHOPPER_SEPARATOR<<w_dir<< endl; cout<< "send setDir "<< D33ASTRIUMCHOPPER_DIR_COMMAND<< channel<<D33ASTRIUMCHOPPER_SEPARATOR<<w_dir<< endl;
m_owner->write(buf_conf.str()); m_owner->write(buf_conf.str());
string buf_poubelle; string buf_poubelle;
...@@ -151,12 +151,12 @@ void RealD33AstriumChopperComputerDriver::setGear(DeviceDriver* aDeviceDriver) { ...@@ -151,12 +151,12 @@ void RealD33AstriumChopperComputerDriver::setGear(DeviceDriver* aDeviceDriver) {
int32 w_gear = any_cast<int32>(aDeviceDriver->getValue(D33ASTRIUMCHOPPER_WANTED_GEAR_DEVICE_CONTAINER)); int32 w_gear = any_cast<int32>(aDeviceDriver->getValue(D33ASTRIUMCHOPPER_WANTED_GEAR_DEVICE_CONTAINER));
uint32 channel = aDeviceDriver->getChannel(); uint32 channel = aDeviceDriver->getChannel();
buf_conf <<D33ASTRIUMCHOPPER_GEAR_COMMAND<< channel<<": "<<w_gear <<D33ASTRIUMCHOPPER_ENDL; buf_conf <<D33ASTRIUMCHOPPER_GEAR_COMMAND<< channel<<": "<<w_gear <<D33ASTRIUMCHOPPER_ENDL;
// cout<< "send setGear "<< D33ASTRIUMCHOPPER_GEAR_COMMAND<< channel<<":"<<w_gear<< endl; cout<< "send setGear "<< D33ASTRIUMCHOPPER_GEAR_COMMAND<< channel<<":"<<w_gear<< endl;
m_owner->write(buf_conf.str()); m_owner->write(buf_conf.str());
string buf_poubelle; string buf_poubelle;
m_owner->read(buf_poubelle, D33ASTRIUMCHOPPER_ENDL); // just for clear the second string m_owner->read(buf_poubelle, D33ASTRIUMCHOPPER_ENDL); // just for clear the second string
// cout<< "return setGear "<<buf_poubelle<< endl; cout<< "return setGear "<<buf_poubelle<< endl;
sleep(1); sleep(1);
} }
......