Development

fix resonance strength, clarify and fix ResetResonanceStrength command

src/E2Quadrupole.cpp

@@ -617,7 +617,7 @@ void E2Quadrupole::write_ResonanceStrength(Tango::WAttribute &attr)
 	Tango::DeviceAttribute watt("Current", curr_out[0]);
 	current_dev->write_attribute(watt);
 	wValResStrength = w_val;
-	//*attr_ResonanceStrength_read = w_val;
+	*attr_ResonanceStrength_read = w_val;
 	set_strength[0] = newStrength;
 	strengthAtt->set_write_value(set_strength[0]);
 	/*----- PROTECTED REGION END -----*/	//	E2Quadrupole::write_ResonanceStrength
@@ -793,7 +793,7 @@ void E2Quadrupole::reset()
 //--------------------------------------------------------
 /**
  *	Command ResetResonanceStrength related method
- *	Description: Reset ResonanceStrength to 0
+ *	Description: Transfer ResonanceStranght to CorrectionStrength and set ResonanceStrength to 0. Strngth is not modified
  *
  */
 //--------------------------------------------------------
@@ -806,24 +806,14 @@ void E2Quadrupole::reset_resonance_strength()
 	//	Add your own code
 
 	/* clang-format off */
-	//force to 0 resonance strength
+	//transfer resonance strngth to correction strength and force to 0 resonance strength
 	omni_mutex_lock guardio(iomutex);
-	/*
-	Tango::DevDouble newStrength;
-	newStrength = wValCorrStrength;
-	std::vector<double> req_strength;
-	std::vector<double> curr_out;
-	req_strength.push_back(newStrength);
-	quadrupole->compute_currents(magnet_rigidity, req_strength, curr_out);
-	Tango::DeviceAttribute watt("Current", curr_out[0]);
-	current_dev->write_attribute(watt);
-	*/
 	wValCorrStrength +=  wValResStrength;
 	wValResStrength = 0.0;
-	//set_strength[0] = newStrength;
-	//strengthAtt->set_write_value(set_strength[0]);
 	correctionAtt->set_write_value(wValCorrStrength);
+	*attr_CorrectionStrength_read = wValCorrStrength;
 	resonanceAtt->set_write_value(0.0);
+	*attr_ResonanceStrength_read = 0.0;
 	/*----- PROTECTED REGION END -----*/	//	E2Quadrupole::reset_resonance_strength
 }
 //--------------------------------------------------------