Merge branch 'V3.1_182' of...

Merge branch 'V3.1_182' of https://code.ill.fr/instrument-control/nomad-special-modules into V3.1_182

src/controllers/cadarache/DualCount.cpp

@@ -40,22 +40,21 @@ DualCount::DualCount(const std::string& name) :
  */
 void DualCount::postConfiguration() {
 	Count::postConfiguration();
-	m_KineticGate.copy(gate);
 
 	m_KineticAcquisitionControllers.resize(nDetectors());
-//	for (int32 i = 0; i < nDetectors(); ++i) {
-	m_KineticAcquisitionControllers[0].copy(acquisitionControllers[0]);
-//	}
-	registerUpdater(m_KineticGate->time, &DualCount::updateActualTime, this);
-	registerUpdater(m_KineticGate->timeSetPoint, &DualCount::updateTimeSetPoint, this);
-	registerUpdater(m_KineticGate->nbRepaint, &DualCount::updateNbRepaint, this);
+	for (int32 i = 0; i < nDetectors(); ++i) {
+		m_KineticAcquisitionControllers[0].copy(acquisitionControllers[0]);
+	}
+	registerUpdater(m_KineticAcquisitionControllers[0]->time, &DualCount::updateActualTime, this);
+	registerUpdater(m_KineticAcquisitionControllers[0]->timeSetPoint, &DualCount::updateTimeSetPoint, this);
+	registerUpdater(m_KineticAcquisitionControllers[0]->nbRepaint, &DualCount::updateNbRepaint, this);
 }
 
 /*
  * preStart
  */
 void DualCount::preStart() {
-	m_KineticGate->slicesFile = slicesFile();
+	m_KineticAcquisitionControllers[0]->slicesFile = slicesFile();
 	m_KineticAcquisitionControllers[0]->nbRepaint.setpoint = localReps();
 
 }
@@ -71,9 +70,9 @@ void DualCount::gateStart() {
 	time100.setpoint = m_TimeSetPointSecond * 100;
 	time1000.setpoint = m_TimeSetPointSecond * 1000;
 	preset = m_TimeSetPointSecond * 1000.;
-	m_KineticGate->startCountingParallel(false);
+	m_KineticAcquisitionControllers[0]->startCountingParallel(false);
 	// wait kinetic ready
-	while(m_KineticGate->gateStatus() != acquisition::GateCommon::WAITFORSTART_STATUS) {
+	while(m_KineticAcquisitionControllers[0]->gateStatus() != acquisition::GateCommon::WAITFORSTART_STATUS) {
 		boost::this_thread::yield();
 	}
 	m_DPPTimeGate->startCountingCommand();
@@ -93,7 +92,7 @@ void DualCount::gateSynchro() {
  */
 void DualCount::pause() {
 	log(Level::s_Info) << "pause" << endlog;
-	m_KineticGate->pauseParallel(false);
+	m_KineticAcquisitionControllers[0]->pauseParallel(false);
 	m_DPPTimeGate->pauseParallel(false);
 }
 
@@ -101,7 +100,7 @@ void DualCount::pause() {
  * resume
  */
 void DualCount::resume() {
-	m_KineticGate->resumeParallel(false);
+	m_KineticAcquisitionControllers[0]->resumeParallel(false);
 	m_DPPTimeGate->resumeParallel(false);
 	log(Level::s_Info) << "continu" << endlog;
 }
@@ -112,7 +111,7 @@ void DualCount::resume() {
 void DualCount::stop() {
 
 	m_DPPTimeGate->stopParallel(false);
-	m_KineticGate->stopParallel(false);
+	m_KineticAcquisitionControllers[0]->stopParallel(false);
 
 	log(Level::s_Info) << "stopped" << endlog;
 

src/controllers/npp/CAENQdcController.cpp

@@ -98,14 +98,14 @@ void CAENQdcController::postConfiguration() {
 	registerRefresher(channelActive_5, &CAENQdcController::refreshActivateChannelProperty, this, 5);
 	registerRefresher(channelActive_6, &CAENQdcController::refreshActivateChannelProperty, this, 6);
 	registerRefresher(channelActive_7, &CAENQdcController::refreshActivateChannelProperty, this, 7);
-	registerRefresher(triggerThreshold_0, &CAENQdcController::refreshTriggerThresholdProperty, this, 0);
-	registerRefresher(triggerThreshold_1, &CAENQdcController::refreshTriggerThresholdProperty, this, 1);
-	registerRefresher(triggerThreshold_2, &CAENQdcController::refreshTriggerThresholdProperty, this, 2);
-	registerRefresher(triggerThreshold_3, &CAENQdcController::refreshTriggerThresholdProperty, this, 3);
-	registerRefresher(triggerThreshold_4, &CAENQdcController::refreshTriggerThresholdProperty, this, 4);
-	registerRefresher(triggerThreshold_5, &CAENQdcController::refreshTriggerThresholdProperty, this, 5);
-	registerRefresher(triggerThreshold_6, &CAENQdcController::refreshTriggerThresholdProperty, this, 6);
-	registerRefresher(triggerThreshold_7, &CAENQdcController::refreshTriggerThresholdProperty, this, 7);
+	registerRefresher(triggerThreshold_0, &CAENQdcController::refreshTriggerThresholdProperty, this);
+	registerRefresher(triggerThreshold_1, &CAENQdcController::refreshTriggerThresholdProperty, this);
+	registerRefresher(triggerThreshold_2, &CAENQdcController::refreshTriggerThresholdProperty, this);
+	registerRefresher(triggerThreshold_3, &CAENQdcController::refreshTriggerThresholdProperty, this);
+	registerRefresher(triggerThreshold_4, &CAENQdcController::refreshTriggerThresholdProperty, this);
+	registerRefresher(triggerThreshold_5, &CAENQdcController::refreshTriggerThresholdProperty, this);
+	registerRefresher(triggerThreshold_6, &CAENQdcController::refreshTriggerThresholdProperty, this);
+	registerRefresher(triggerThreshold_7, &CAENQdcController::refreshTriggerThresholdProperty, this);
 
 	updateBoardProperties();
 }