From fe11a9b2202b9e1631f185d5325f33a84477f5bd Mon Sep 17 00:00:00 2001
From: Claudio Scafuri <claudio.scafuri@elettra.eu>
Date: Fri, 7 Feb 2025 14:14:50 +0100
Subject: [PATCH] first cleanup of attribute naming
---
src/E2Sextupole.cpp | 220 ++++++++++++++--------------
src/E2Sextupole.h | 60 ++++----
src/E2Sextupole.xmi | 12 +-
src/E2SextupoleClass.cpp | 250 ++++++++++++++++----------------
src/E2SextupoleClass.h | 84 +++++------
src/E2SextupoleStateMachine.cpp | 108 +++++++-------
6 files changed, 367 insertions(+), 367 deletions(-)
diff --git a/src/E2Sextupole.cpp b/src/E2Sextupole.cpp
index abe48ff..f6f4d0c 100644
--- a/src/E2Sextupole.cpp
+++ b/src/E2Sextupole.cpp
@@ -66,26 +66,26 @@
//================================================================
// Attributes managed are:
//================================================================
-// Strength | Tango::DevDouble Scalar
-// CorrectionStrength | Tango::DevDouble Scalar
-// ResonanceStrength | Tango::DevDouble Scalar
-// Current | Tango::DevDouble Scalar
-// BeamEnergy | Tango::DevDouble Scalar
-// DesignStrength | Tango::DevDouble Scalar
-// bbaEnable | Tango::DevBoolean Scalar
-// ChStrength | Tango::DevDouble Scalar
-// ChCorrectionStrength | Tango::DevDouble Scalar
-// ChResonanceStrength | Tango::DevDouble Scalar
-// CvStrength | Tango::DevDouble Scalar
-// CvCorrectionStrength | Tango::DevDouble Scalar
-// CvResonanceStrength | Tango::DevDouble Scalar
-// SQStrength | Tango::DevDouble Scalar
-// SQCorrectionStrength | Tango::DevDouble Scalar
-// SQResonanceStrength | Tango::DevDouble Scalar
-// CeHCurrent | Tango::DevDouble Scalar
-// CeVCurrent | Tango::DevDouble Scalar
-// PolynomA | Tango::DevDouble Spectrum ( max = 3)
-// PolynomB | Tango::DevDouble Spectrum ( max = 3)
+// Strength | Tango::DevDouble Scalar
+// CorrectionStrength | Tango::DevDouble Scalar
+// ResonanceStrength | Tango::DevDouble Scalar
+// Current | Tango::DevDouble Scalar
+// BeamEnergy | Tango::DevDouble Scalar
+// DesignStrength | Tango::DevDouble Scalar
+// bbaEnable | Tango::DevBoolean Scalar
+// CehStrength | Tango::DevDouble Scalar
+// CehCorrectionStrength | Tango::DevDouble Scalar
+// CehResonanceStrength | Tango::DevDouble Scalar
+// CevStrength | Tango::DevDouble Scalar
+// CevCorrectionStrength | Tango::DevDouble Scalar
+// CevResonanceStrength | Tango::DevDouble Scalar
+// SQStrength | Tango::DevDouble Scalar
+// SQCorrectionStrength | Tango::DevDouble Scalar
+// SQResonanceStrength | Tango::DevDouble Scalar
+// CeHCurrent | Tango::DevDouble Scalar
+// CeVCurrent | Tango::DevDouble Scalar
+// PolynomA | Tango::DevDouble Spectrum ( max = 3)
+// PolynomB | Tango::DevDouble Spectrum ( max = 3)
//================================================================
namespace E2Sextupole_ns
@@ -165,7 +165,7 @@ void E2Sextupole::delete_device()
if (cev)
delete cev;
- // ceh current and ch model and skew quad model
+ // ceh/v current and ceh/v model and skew quad model
if (ceh_state_event_id)
ceh_current_dev->unsubscribe_event(ceh_state_event_id);
if (ceh_current_set_event_id)
@@ -206,12 +206,12 @@ void E2Sextupole::delete_device()
delete[] attr_BeamEnergy_read;
delete[] attr_DesignStrength_read;
delete[] attr_bbaEnable_read;
- delete[] attr_ChStrength_read;
- delete[] attr_ChCorrectionStrength_read;
- delete[] attr_ChResonanceStrength_read;
- delete[] attr_CvStrength_read;
- delete[] attr_CvCorrectionStrength_read;
- delete[] attr_CvResonanceStrength_read;
+ delete[] attr_CehStrength_read;
+ delete[] attr_CehCorrectionStrength_read;
+ delete[] attr_CehResonanceStrength_read;
+ delete[] attr_CevStrength_read;
+ delete[] attr_CevCorrectionStrength_read;
+ delete[] attr_CevResonanceStrength_read;
delete[] attr_SQStrength_read;
delete[] attr_SQCorrectionStrength_read;
delete[] attr_SQResonanceStrength_read;
@@ -251,12 +251,12 @@ void E2Sextupole::init_device()
attr_BeamEnergy_read = new Tango::DevDouble[1];
attr_DesignStrength_read = new Tango::DevDouble[1];
attr_bbaEnable_read = new Tango::DevBoolean[1];
- attr_ChStrength_read = new Tango::DevDouble[1];
- attr_ChCorrectionStrength_read = new Tango::DevDouble[1];
- attr_ChResonanceStrength_read = new Tango::DevDouble[1];
- attr_CvStrength_read = new Tango::DevDouble[1];
- attr_CvCorrectionStrength_read = new Tango::DevDouble[1];
- attr_CvResonanceStrength_read = new Tango::DevDouble[1];
+ attr_CehStrength_read = new Tango::DevDouble[1];
+ attr_CehCorrectionStrength_read = new Tango::DevDouble[1];
+ attr_CehResonanceStrength_read = new Tango::DevDouble[1];
+ attr_CevStrength_read = new Tango::DevDouble[1];
+ attr_CevCorrectionStrength_read = new Tango::DevDouble[1];
+ attr_CevResonanceStrength_read = new Tango::DevDouble[1];
attr_SQStrength_read = new Tango::DevDouble[1];
attr_SQCorrectionStrength_read = new Tango::DevDouble[1];
attr_SQResonanceStrength_read = new Tango::DevDouble[1];
@@ -401,14 +401,14 @@ void E2Sextupole::init_device()
mainResonanceAtt = &get_device_attr()->get_w_attr_by_name("ResonanceStrength");
mainCursetAtt = &(get_device_attr()->get_w_attr_by_name("Current"));
- cehStrengthAtt = &get_device_attr()->get_w_attr_by_name("ChStrength");
- cehCorrectionAtt = &get_device_attr()->get_w_attr_by_name("ChCorrectionStrength");
- cehResonanceAtt = &get_device_attr()->get_w_attr_by_name("ChResonanceStrength");
+ cehStrengthAtt = &get_device_attr()->get_w_attr_by_name("CehStrength");
+ cehCorrectionAtt = &get_device_attr()->get_w_attr_by_name("CehCorrectionStrength");
+ cehResonanceAtt = &get_device_attr()->get_w_attr_by_name("CehResonanceStrength");
cehCursetAtt = &(get_device_attr()->get_w_attr_by_name("CeHCurrent"));
- cevStrengthAtt = &get_device_attr()->get_w_attr_by_name("CvStrength");
- cevCorrectionAtt = &get_device_attr()->get_w_attr_by_name("CvCorrectionStrength");
- cevResonanceAtt = &get_device_attr()->get_w_attr_by_name("CvResonanceStrength");
+ cevStrengthAtt = &get_device_attr()->get_w_attr_by_name("CevStrength");
+ cevCorrectionAtt = &get_device_attr()->get_w_attr_by_name("CevCorrectionStrength");
+ cevResonanceAtt = &get_device_attr()->get_w_attr_by_name("CevResonanceStrength");
cevCursetAtt = &(get_device_attr()->get_w_attr_by_name("CeVCurrent"));
@@ -1114,39 +1114,39 @@ void E2Sextupole::write_bbaEnable(Tango::WAttribute &attr)
}
//--------------------------------------------------------
/**
- * Read attribute ChStrength related method
+ * Read attribute CehStrength related method
* Description: embbeded corrector horizontal kick
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::read_ChStrength(Tango::Attribute &attr)
+void E2Sextupole::read_CehStrength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::read_ChStrength(Tango::Attribute &attr) entering... " << std::endl;
- /*----- PROTECTED REGION ID(E2Sextupole::read_ChStrength) ENABLED START -----*/
+ DEBUG_STREAM << "E2Sextupole::read_CehStrength(Tango::Attribute &attr) entering... " << std::endl;
+ /*----- PROTECTED REGION ID(E2Sextupole::read_CehStrength) ENABLED START -----*/
/* clang-format on */
// Set the attribute value
- attr.set_value(attr_ChStrength_read);
+ attr.set_value(attr_CehStrength_read);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_ChStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CehStrength
}
//--------------------------------------------------------
/**
- * Write attribute ChStrength related method
+ * Write attribute CehStrength related method
* Description: embbeded corrector horizontal kick
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::write_ChStrength(Tango::WAttribute &attr)
+void E2Sextupole::write_CehStrength(Tango::WAttribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::write_ChStrength(Tango::WAttribute &attr) entering... " << std::endl;
+ DEBUG_STREAM << "E2Sextupole::write_CehStrength(Tango::WAttribute &attr) entering... " << std::endl;
// Retrieve write value
Tango::DevDouble w_val;
attr.get_write_value(w_val);
- /*----- PROTECTED REGION ID(E2Sextupole::write_ChStrength) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(E2Sextupole::write_CehStrength) ENABLED START -----*/
/* clang-format on */
// Add your own code
omni_mutex_lock guardio(iomutex);
@@ -1159,49 +1159,49 @@ void E2Sextupole::write_ChStrength(Tango::WAttribute &attr)
ceh_set_strength[0] = w_val;
wValCehCorrStrength = w_val - wValCehResStrength;
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_ChStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CehStrength
}
//--------------------------------------------------------
/**
- * Read attribute ChCorrectionStrength related method
+ * Read attribute CehCorrectionStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::read_ChCorrectionStrength(Tango::Attribute &attr)
+void E2Sextupole::read_CehCorrectionStrength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::read_ChCorrectionStrength(Tango::Attribute &attr) entering... " << std::endl;
- /*----- PROTECTED REGION ID(E2Sextupole::read_ChCorrectionStrength) ENABLED START -----*/
+ DEBUG_STREAM << "E2Sextupole::read_CehCorrectionStrength(Tango::Attribute &attr) entering... " << std::endl;
+ /*----- PROTECTED REGION ID(E2Sextupole::read_CehCorrectionStrength) ENABLED START -----*/
/* clang-format on */
// Set the attribute value
- attr.set_value(attr_ChCorrectionStrength_read);
+ attr.set_value(attr_CehCorrectionStrength_read);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_ChCorrectionStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CehCorrectionStrength
}
//--------------------------------------------------------
/**
- * Write attribute ChCorrectionStrength related method
+ * Write attribute CehCorrectionStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::write_ChCorrectionStrength(Tango::WAttribute &attr)
+void E2Sextupole::write_CehCorrectionStrength(Tango::WAttribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::write_ChCorrectionStrength(Tango::WAttribute &attr) entering... " << std::endl;
+ DEBUG_STREAM << "E2Sextupole::write_CehCorrectionStrength(Tango::WAttribute &attr) entering... " << std::endl;
// Retrieve write value
Tango::DevDouble w_val;
attr.get_write_value(w_val);
- /*----- PROTECTED REGION ID(E2Sextupole::write_ChCorrectionStrength) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(E2Sextupole::write_CehCorrectionStrength) ENABLED START -----*/
/* clang-format on */
// Add your own code
omni_mutex_lock guardio(iomutex);
Tango::DevDouble newStrength;
//resonanceAtt->get_write_value(_resStrength);
- newStrength = w_val + wValCehResStrength + *attr_ChCorrectionStrength_read;
+ newStrength = w_val + wValCehResStrength + *attr_CehCorrectionStrength_read;
std::vector<double> req_strength;
std::vector<double> curr_out;
req_strength.push_back(newStrength);
@@ -1212,48 +1212,48 @@ void E2Sextupole::write_ChCorrectionStrength(Tango::WAttribute &attr)
ceh_set_strength[0] = newStrength;
cehStrengthAtt->set_write_value(ceh_set_strength[0]);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_ChCorrectionStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CehCorrectionStrength
}
//--------------------------------------------------------
/**
- * Read attribute ChResonanceStrength related method
+ * Read attribute CehResonanceStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::read_ChResonanceStrength(Tango::Attribute &attr)
+void E2Sextupole::read_CehResonanceStrength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::read_ChResonanceStrength(Tango::Attribute &attr) entering... " << std::endl;
- /*----- PROTECTED REGION ID(E2Sextupole::read_ChResonanceStrength) ENABLED START -----*/
+ DEBUG_STREAM << "E2Sextupole::read_CehResonanceStrength(Tango::Attribute &attr) entering... " << std::endl;
+ /*----- PROTECTED REGION ID(E2Sextupole::read_CehResonanceStrength) ENABLED START -----*/
/* clang-format on */
// Set the attribute value
- attr.set_value(attr_ChResonanceStrength_read);
+ attr.set_value(attr_CehResonanceStrength_read);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_ChResonanceStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CehResonanceStrength
}
//--------------------------------------------------------
/**
- * Write attribute ChResonanceStrength related method
+ * Write attribute CehResonanceStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::write_ChResonanceStrength(Tango::WAttribute &attr)
+void E2Sextupole::write_CehResonanceStrength(Tango::WAttribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::write_ChResonanceStrength(Tango::WAttribute &attr) entering... " << std::endl;
+ DEBUG_STREAM << "E2Sextupole::write_CehResonanceStrength(Tango::WAttribute &attr) entering... " << std::endl;
// Retrieve write value
Tango::DevDouble w_val;
attr.get_write_value(w_val);
- /*----- PROTECTED REGION ID(E2Sextupole::write_ChResonanceStrength) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(E2Sextupole::write_CehResonanceStrength) ENABLED START -----*/
/* clang-format on */
// Add your own code
omni_mutex_lock guardio(iomutex);
Tango::DevDouble newStrength;
- newStrength = w_val + wValCehCorrStrength + *attr_ChCorrectionStrength_read;
+ newStrength = w_val + wValCehCorrStrength + *attr_CehCorrectionStrength_read;
std::vector<double> req_strength;
std::vector<double> curr_out;
req_strength.push_back(newStrength);
@@ -1261,131 +1261,131 @@ void E2Sextupole::write_ChResonanceStrength(Tango::WAttribute &attr)
Tango::DeviceAttribute watt("Current", curr_out[0]);
ceh_current_dev->write_attribute(watt);
wValCehResStrength = w_val;
- *attr_ChResonanceStrength_read = w_val;
+ *attr_CehResonanceStrength_read = w_val;
ceh_set_strength[0] = newStrength;
cehStrengthAtt->set_write_value(ceh_set_strength[0]);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_ChResonanceStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CehResonanceStrength
}
//--------------------------------------------------------
/**
- * Read attribute CvStrength related method
+ * Read attribute CevStrength related method
* Description: embbeded corrector vertical kick
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::read_CvStrength(Tango::Attribute &attr)
+void E2Sextupole::read_CevStrength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::read_CvStrength(Tango::Attribute &attr) entering... " << std::endl;
- /*----- PROTECTED REGION ID(E2Sextupole::read_CvStrength) ENABLED START -----*/
+ DEBUG_STREAM << "E2Sextupole::read_CevStrength(Tango::Attribute &attr) entering... " << std::endl;
+ /*----- PROTECTED REGION ID(E2Sextupole::read_CevStrength) ENABLED START -----*/
/* clang-format on */
// Set the attribute value
- attr.set_value(attr_CvStrength_read);
+ attr.set_value(attr_CevStrength_read);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CvStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CevStrength
}
//--------------------------------------------------------
/**
- * Write attribute CvStrength related method
+ * Write attribute CevStrength related method
* Description: embbeded corrector vertical kick
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::write_CvStrength(Tango::WAttribute &attr)
+void E2Sextupole::write_CevStrength(Tango::WAttribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::write_CvStrength(Tango::WAttribute &attr) entering... " << std::endl;
+ DEBUG_STREAM << "E2Sextupole::write_CevStrength(Tango::WAttribute &attr) entering... " << std::endl;
// Retrieve write value
Tango::DevDouble w_val;
attr.get_write_value(w_val);
- /*----- PROTECTED REGION ID(E2Sextupole::write_CvStrength) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(E2Sextupole::write_CevStrength) ENABLED START -----*/
/* clang-format on */
// Add your own code
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CvStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CevStrength
}
//--------------------------------------------------------
/**
- * Read attribute CvCorrectionStrength related method
+ * Read attribute CevCorrectionStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::read_CvCorrectionStrength(Tango::Attribute &attr)
+void E2Sextupole::read_CevCorrectionStrength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::read_CvCorrectionStrength(Tango::Attribute &attr) entering... " << std::endl;
- /*----- PROTECTED REGION ID(E2Sextupole::read_CvCorrectionStrength) ENABLED START -----*/
+ DEBUG_STREAM << "E2Sextupole::read_CevCorrectionStrength(Tango::Attribute &attr) entering... " << std::endl;
+ /*----- PROTECTED REGION ID(E2Sextupole::read_CevCorrectionStrength) ENABLED START -----*/
/* clang-format on */
// Set the attribute value
- attr.set_value(attr_CvCorrectionStrength_read);
+ attr.set_value(attr_CevCorrectionStrength_read);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CvCorrectionStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CevCorrectionStrength
}
//--------------------------------------------------------
/**
- * Write attribute CvCorrectionStrength related method
+ * Write attribute CevCorrectionStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::write_CvCorrectionStrength(Tango::WAttribute &attr)
+void E2Sextupole::write_CevCorrectionStrength(Tango::WAttribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::write_CvCorrectionStrength(Tango::WAttribute &attr) entering... " << std::endl;
+ DEBUG_STREAM << "E2Sextupole::write_CevCorrectionStrength(Tango::WAttribute &attr) entering... " << std::endl;
// Retrieve write value
Tango::DevDouble w_val;
attr.get_write_value(w_val);
- /*----- PROTECTED REGION ID(E2Sextupole::write_CvCorrectionStrength) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(E2Sextupole::write_CevCorrectionStrength) ENABLED START -----*/
/* clang-format on */
// Add your own code
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CvCorrectionStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CevCorrectionStrength
}
//--------------------------------------------------------
/**
- * Read attribute CvResonanceStrength related method
+ * Read attribute CevResonanceStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::read_CvResonanceStrength(Tango::Attribute &attr)
+void E2Sextupole::read_CevResonanceStrength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::read_CvResonanceStrength(Tango::Attribute &attr) entering... " << std::endl;
- /*----- PROTECTED REGION ID(E2Sextupole::read_CvResonanceStrength) ENABLED START -----*/
+ DEBUG_STREAM << "E2Sextupole::read_CevResonanceStrength(Tango::Attribute &attr) entering... " << std::endl;
+ /*----- PROTECTED REGION ID(E2Sextupole::read_CevResonanceStrength) ENABLED START -----*/
/* clang-format on */
// Set the attribute value
- attr.set_value(attr_CvResonanceStrength_read);
+ attr.set_value(attr_CevResonanceStrength_read);
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CvResonanceStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::read_CevResonanceStrength
}
//--------------------------------------------------------
/**
- * Write attribute CvResonanceStrength related method
+ * Write attribute CevResonanceStrength related method
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
-void E2Sextupole::write_CvResonanceStrength(Tango::WAttribute &attr)
+void E2Sextupole::write_CevResonanceStrength(Tango::WAttribute &attr)
{
- DEBUG_STREAM << "E2Sextupole::write_CvResonanceStrength(Tango::WAttribute &attr) entering... " << std::endl;
+ DEBUG_STREAM << "E2Sextupole::write_CevResonanceStrength(Tango::WAttribute &attr) entering... " << std::endl;
// Retrieve write value
Tango::DevDouble w_val;
attr.get_write_value(w_val);
- /*----- PROTECTED REGION ID(E2Sextupole::write_CvResonanceStrength) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(E2Sextupole::write_CevResonanceStrength) ENABLED START -----*/
/* clang-format on */
// Add your own code
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CvResonanceStrength
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::write_CevResonanceStrength
}
//--------------------------------------------------------
/**
@@ -1797,7 +1797,7 @@ void E2Sextupole::init_strengths(void) // initialize strengths from power supply
ceh_set_current[0] = _current[0];
cehStrengthAtt->set_write_value(_strength[0]);
- *attr_ChStrength_read = _strength[0];
+ *attr_CehStrength_read = _strength[0];
ceh_set_strength[0] = _strength[0];
Tango::DevDouble corr = _strength[0];
mainCorrectionAtt->set_write_value(corr);
@@ -1805,7 +1805,7 @@ void E2Sextupole::init_strengths(void) // initialize strengths from power supply
wValMainCorrStrength = corr;
cehResonanceAtt->set_write_value(0.0); // start with resonance strength always at 0!
- *attr_ChResonanceStrength_read = 0.0;
+ *attr_CehResonanceStrength_read = 0.0;
wValCehCorrStrength = 0.0;
} catch (Tango::DevFailed &e) {
Tango::Except::print_exception(e);
diff --git a/src/E2Sextupole.h b/src/E2Sextupole.h
index d07e0f1..0b631e8 100644
--- a/src/E2Sextupole.h
+++ b/src/E2Sextupole.h
@@ -199,12 +199,12 @@ public:
Tango::DevDouble *attr_BeamEnergy_read;
Tango::DevDouble *attr_DesignStrength_read;
Tango::DevBoolean *attr_bbaEnable_read;
- Tango::DevDouble *attr_ChStrength_read;
- Tango::DevDouble *attr_ChCorrectionStrength_read;
- Tango::DevDouble *attr_ChResonanceStrength_read;
- Tango::DevDouble *attr_CvStrength_read;
- Tango::DevDouble *attr_CvCorrectionStrength_read;
- Tango::DevDouble *attr_CvResonanceStrength_read;
+ Tango::DevDouble *attr_CehStrength_read;
+ Tango::DevDouble *attr_CehCorrectionStrength_read;
+ Tango::DevDouble *attr_CehResonanceStrength_read;
+ Tango::DevDouble *attr_CevStrength_read;
+ Tango::DevDouble *attr_CevCorrectionStrength_read;
+ Tango::DevDouble *attr_CevResonanceStrength_read;
Tango::DevDouble *attr_SQStrength_read;
Tango::DevDouble *attr_SQCorrectionStrength_read;
Tango::DevDouble *attr_SQResonanceStrength_read;
@@ -357,65 +357,65 @@ public:
virtual void write_bbaEnable(Tango::WAttribute &attr);
virtual bool is_bbaEnable_allowed(Tango::AttReqType type);
/**
- * Attribute ChStrength related methods
+ * Attribute CehStrength related methods
* Description: embbeded corrector horizontal kick
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
- virtual void read_ChStrength(Tango::Attribute &attr);
- virtual void write_ChStrength(Tango::WAttribute &attr);
- virtual bool is_ChStrength_allowed(Tango::AttReqType type);
+ virtual void read_CehStrength(Tango::Attribute &attr);
+ virtual void write_CehStrength(Tango::WAttribute &attr);
+ virtual bool is_CehStrength_allowed(Tango::AttReqType type);
/**
- * Attribute ChCorrectionStrength related methods
+ * Attribute CehCorrectionStrength related methods
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
- virtual void read_ChCorrectionStrength(Tango::Attribute &attr);
- virtual void write_ChCorrectionStrength(Tango::WAttribute &attr);
- virtual bool is_ChCorrectionStrength_allowed(Tango::AttReqType type);
+ virtual void read_CehCorrectionStrength(Tango::Attribute &attr);
+ virtual void write_CehCorrectionStrength(Tango::WAttribute &attr);
+ virtual bool is_CehCorrectionStrength_allowed(Tango::AttReqType type);
/**
- * Attribute ChResonanceStrength related methods
+ * Attribute CehResonanceStrength related methods
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
- virtual void read_ChResonanceStrength(Tango::Attribute &attr);
- virtual void write_ChResonanceStrength(Tango::WAttribute &attr);
- virtual bool is_ChResonanceStrength_allowed(Tango::AttReqType type);
+ virtual void read_CehResonanceStrength(Tango::Attribute &attr);
+ virtual void write_CehResonanceStrength(Tango::WAttribute &attr);
+ virtual bool is_CehResonanceStrength_allowed(Tango::AttReqType type);
/**
- * Attribute CvStrength related methods
+ * Attribute CevStrength related methods
* Description: embbeded corrector vertical kick
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
- virtual void read_CvStrength(Tango::Attribute &attr);
- virtual void write_CvStrength(Tango::WAttribute &attr);
- virtual bool is_CvStrength_allowed(Tango::AttReqType type);
+ virtual void read_CevStrength(Tango::Attribute &attr);
+ virtual void write_CevStrength(Tango::WAttribute &attr);
+ virtual bool is_CevStrength_allowed(Tango::AttReqType type);
/**
- * Attribute CvCorrectionStrength related methods
+ * Attribute CevCorrectionStrength related methods
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
- virtual void read_CvCorrectionStrength(Tango::Attribute &attr);
- virtual void write_CvCorrectionStrength(Tango::WAttribute &attr);
- virtual bool is_CvCorrectionStrength_allowed(Tango::AttReqType type);
+ virtual void read_CevCorrectionStrength(Tango::Attribute &attr);
+ virtual void write_CevCorrectionStrength(Tango::WAttribute &attr);
+ virtual bool is_CevCorrectionStrength_allowed(Tango::AttReqType type);
/**
- * Attribute CvResonanceStrength related methods
+ * Attribute CevResonanceStrength related methods
*
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
- virtual void read_CvResonanceStrength(Tango::Attribute &attr);
- virtual void write_CvResonanceStrength(Tango::WAttribute &attr);
- virtual bool is_CvResonanceStrength_allowed(Tango::AttReqType type);
+ virtual void read_CevResonanceStrength(Tango::Attribute &attr);
+ virtual void write_CevResonanceStrength(Tango::WAttribute &attr);
+ virtual bool is_CevResonanceStrength_allowed(Tango::AttReqType type);
/**
* Attribute SQStrength related methods
* Description: embbeded skew quadrupole strength
diff --git a/src/E2Sextupole.xmi b/src/E2Sextupole.xmi
index 328e791..7827ea3 100644
--- a/src/E2Sextupole.xmi
+++ b/src/E2Sextupole.xmi
@@ -198,7 +198,7 @@
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="Read / and set the rele that modfy the sestupole cabling. If true the skew quadrupole QS is enabled, If fals the embedded horizontal corrector CEH is enabled.
If the magnet is permanetly cabled with the embedded skew quadrupole, the aiitrbute is always true nd is not writable." label="bba enabled" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
- <attributes name="ChStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+ <attributes name="CehStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:DoubleType"/>
<changeEvent fire="false" libCheckCriteria="false"/>
<archiveEvent fire="false" libCheckCriteria="false"/>
@@ -206,7 +206,7 @@
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="embbeded corrector horizontal kick" label="horizontal kick" unit="rad" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
- <attributes name="ChCorrectionStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+ <attributes name="CehCorrectionStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:DoubleType"/>
<changeEvent fire="false" libCheckCriteria="false"/>
<archiveEvent fire="false" libCheckCriteria="false"/>
@@ -214,7 +214,7 @@
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="" label="horizontal emebedded corrector correction strength" unit="rad" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
- <attributes name="ChResonanceStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+ <attributes name="CehResonanceStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:DoubleType"/>
<changeEvent fire="false" libCheckCriteria="false"/>
<archiveEvent fire="false" libCheckCriteria="false"/>
@@ -222,7 +222,7 @@
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="" label="embedded horizontal corrector resonance strength" unit="rad" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
- <attributes name="CvStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+ <attributes name="CevStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:DoubleType"/>
<changeEvent fire="false" libCheckCriteria="false"/>
<archiveEvent fire="false" libCheckCriteria="false"/>
@@ -230,7 +230,7 @@
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="embbeded corrector vertical kick" label="vertical kick" unit="rad" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
- <attributes name="CvCorrectionStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+ <attributes name="CevCorrectionStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:DoubleType"/>
<changeEvent fire="false" libCheckCriteria="false"/>
<archiveEvent fire="false" libCheckCriteria="false"/>
@@ -238,7 +238,7 @@
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="" label="vertical emebedded corrector correction strength" unit="rad" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
- <attributes name="CvResonanceStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+ <attributes name="CevResonanceStrength" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:DoubleType"/>
<changeEvent fire="false" libCheckCriteria="false"/>
<archiveEvent fire="false" libCheckCriteria="false"/>
diff --git a/src/E2SextupoleClass.cpp b/src/E2SextupoleClass.cpp
index 318189d..2ab1d05 100644
--- a/src/E2SextupoleClass.cpp
+++ b/src/E2SextupoleClass.cpp
@@ -869,143 +869,143 @@ void E2SextupoleClass::attribute_factory(std::vector<Tango::Attr *> &att_list)
// Not Memorized
att_list.push_back(bbaenable);
- // Attribute : ChStrength
- ChStrengthAttrib *chstrength = new ChStrengthAttrib();
- Tango::UserDefaultAttrProp chstrength_prop;
- chstrength_prop.set_description("embbeded corrector horizontal kick");
- chstrength_prop.set_label("horizontal kick");
- chstrength_prop.set_unit("rad");
- // standard_unit not set for ChStrength
- // display_unit not set for ChStrength
- // format not set for ChStrength
- // max_value not set for ChStrength
- // min_value not set for ChStrength
- // max_alarm not set for ChStrength
- // min_alarm not set for ChStrength
- // max_warning not set for ChStrength
- // min_warning not set for ChStrength
- // delta_t not set for ChStrength
- // delta_val not set for ChStrength
- chstrength->set_default_properties(chstrength_prop);
+ // Attribute : CehStrength
+ CehStrengthAttrib *cehstrength = new CehStrengthAttrib();
+ Tango::UserDefaultAttrProp cehstrength_prop;
+ cehstrength_prop.set_description("embbeded corrector horizontal kick");
+ cehstrength_prop.set_label("horizontal kick");
+ cehstrength_prop.set_unit("rad");
+ // standard_unit not set for CehStrength
+ // display_unit not set for CehStrength
+ // format not set for CehStrength
+ // max_value not set for CehStrength
+ // min_value not set for CehStrength
+ // max_alarm not set for CehStrength
+ // min_alarm not set for CehStrength
+ // max_warning not set for CehStrength
+ // min_warning not set for CehStrength
+ // delta_t not set for CehStrength
+ // delta_val not set for CehStrength
+ cehstrength->set_default_properties(cehstrength_prop);
// Not Polled
- chstrength->set_disp_level(Tango::EXPERT);
+ cehstrength->set_disp_level(Tango::EXPERT);
// Not Memorized
- att_list.push_back(chstrength);
-
- // Attribute : ChCorrectionStrength
- ChCorrectionStrengthAttrib *chcorrectionstrength = new ChCorrectionStrengthAttrib();
- Tango::UserDefaultAttrProp chcorrectionstrength_prop;
- // description not set for ChCorrectionStrength
- chcorrectionstrength_prop.set_label("horizontal emebedded corrector correction strength");
- chcorrectionstrength_prop.set_unit("rad");
- // standard_unit not set for ChCorrectionStrength
- // display_unit not set for ChCorrectionStrength
- // format not set for ChCorrectionStrength
- // max_value not set for ChCorrectionStrength
- // min_value not set for ChCorrectionStrength
- // max_alarm not set for ChCorrectionStrength
- // min_alarm not set for ChCorrectionStrength
- // max_warning not set for ChCorrectionStrength
- // min_warning not set for ChCorrectionStrength
- // delta_t not set for ChCorrectionStrength
- // delta_val not set for ChCorrectionStrength
- chcorrectionstrength->set_default_properties(chcorrectionstrength_prop);
+ att_list.push_back(cehstrength);
+
+ // Attribute : CehCorrectionStrength
+ CehCorrectionStrengthAttrib *cehcorrectionstrength = new CehCorrectionStrengthAttrib();
+ Tango::UserDefaultAttrProp cehcorrectionstrength_prop;
+ // description not set for CehCorrectionStrength
+ cehcorrectionstrength_prop.set_label("horizontal emebedded corrector correction strength");
+ cehcorrectionstrength_prop.set_unit("rad");
+ // standard_unit not set for CehCorrectionStrength
+ // display_unit not set for CehCorrectionStrength
+ // format not set for CehCorrectionStrength
+ // max_value not set for CehCorrectionStrength
+ // min_value not set for CehCorrectionStrength
+ // max_alarm not set for CehCorrectionStrength
+ // min_alarm not set for CehCorrectionStrength
+ // max_warning not set for CehCorrectionStrength
+ // min_warning not set for CehCorrectionStrength
+ // delta_t not set for CehCorrectionStrength
+ // delta_val not set for CehCorrectionStrength
+ cehcorrectionstrength->set_default_properties(cehcorrectionstrength_prop);
// Not Polled
- chcorrectionstrength->set_disp_level(Tango::EXPERT);
+ cehcorrectionstrength->set_disp_level(Tango::EXPERT);
// Not Memorized
- att_list.push_back(chcorrectionstrength);
-
- // Attribute : ChResonanceStrength
- ChResonanceStrengthAttrib *chresonancestrength = new ChResonanceStrengthAttrib();
- Tango::UserDefaultAttrProp chresonancestrength_prop;
- // description not set for ChResonanceStrength
- chresonancestrength_prop.set_label("embedded horizontal corrector resonance strength");
- chresonancestrength_prop.set_unit("rad");
- // standard_unit not set for ChResonanceStrength
- // display_unit not set for ChResonanceStrength
- // format not set for ChResonanceStrength
- // max_value not set for ChResonanceStrength
- // min_value not set for ChResonanceStrength
- // max_alarm not set for ChResonanceStrength
- // min_alarm not set for ChResonanceStrength
- // max_warning not set for ChResonanceStrength
- // min_warning not set for ChResonanceStrength
- // delta_t not set for ChResonanceStrength
- // delta_val not set for ChResonanceStrength
- chresonancestrength->set_default_properties(chresonancestrength_prop);
+ att_list.push_back(cehcorrectionstrength);
+
+ // Attribute : CehResonanceStrength
+ CehResonanceStrengthAttrib *cehresonancestrength = new CehResonanceStrengthAttrib();
+ Tango::UserDefaultAttrProp cehresonancestrength_prop;
+ // description not set for CehResonanceStrength
+ cehresonancestrength_prop.set_label("embedded horizontal corrector resonance strength");
+ cehresonancestrength_prop.set_unit("rad");
+ // standard_unit not set for CehResonanceStrength
+ // display_unit not set for CehResonanceStrength
+ // format not set for CehResonanceStrength
+ // max_value not set for CehResonanceStrength
+ // min_value not set for CehResonanceStrength
+ // max_alarm not set for CehResonanceStrength
+ // min_alarm not set for CehResonanceStrength
+ // max_warning not set for CehResonanceStrength
+ // min_warning not set for CehResonanceStrength
+ // delta_t not set for CehResonanceStrength
+ // delta_val not set for CehResonanceStrength
+ cehresonancestrength->set_default_properties(cehresonancestrength_prop);
// Not Polled
- chresonancestrength->set_disp_level(Tango::EXPERT);
+ cehresonancestrength->set_disp_level(Tango::EXPERT);
// Not Memorized
- att_list.push_back(chresonancestrength);
-
- // Attribute : CvStrength
- CvStrengthAttrib *cvstrength = new CvStrengthAttrib();
- Tango::UserDefaultAttrProp cvstrength_prop;
- cvstrength_prop.set_description("embbeded corrector vertical kick");
- cvstrength_prop.set_label("vertical kick");
- cvstrength_prop.set_unit("rad");
- // standard_unit not set for CvStrength
- // display_unit not set for CvStrength
- // format not set for CvStrength
- // max_value not set for CvStrength
- // min_value not set for CvStrength
- // max_alarm not set for CvStrength
- // min_alarm not set for CvStrength
- // max_warning not set for CvStrength
- // min_warning not set for CvStrength
- // delta_t not set for CvStrength
- // delta_val not set for CvStrength
- cvstrength->set_default_properties(cvstrength_prop);
+ att_list.push_back(cehresonancestrength);
+
+ // Attribute : CevStrength
+ CevStrengthAttrib *cevstrength = new CevStrengthAttrib();
+ Tango::UserDefaultAttrProp cevstrength_prop;
+ cevstrength_prop.set_description("embbeded corrector vertical kick");
+ cevstrength_prop.set_label("vertical kick");
+ cevstrength_prop.set_unit("rad");
+ // standard_unit not set for CevStrength
+ // display_unit not set for CevStrength
+ // format not set for CevStrength
+ // max_value not set for CevStrength
+ // min_value not set for CevStrength
+ // max_alarm not set for CevStrength
+ // min_alarm not set for CevStrength
+ // max_warning not set for CevStrength
+ // min_warning not set for CevStrength
+ // delta_t not set for CevStrength
+ // delta_val not set for CevStrength
+ cevstrength->set_default_properties(cevstrength_prop);
// Not Polled
- cvstrength->set_disp_level(Tango::EXPERT);
+ cevstrength->set_disp_level(Tango::EXPERT);
// Not Memorized
- att_list.push_back(cvstrength);
-
- // Attribute : CvCorrectionStrength
- CvCorrectionStrengthAttrib *cvcorrectionstrength = new CvCorrectionStrengthAttrib();
- Tango::UserDefaultAttrProp cvcorrectionstrength_prop;
- // description not set for CvCorrectionStrength
- cvcorrectionstrength_prop.set_label("vertical emebedded corrector correction strength");
- cvcorrectionstrength_prop.set_unit("rad");
- // standard_unit not set for CvCorrectionStrength
- // display_unit not set for CvCorrectionStrength
- // format not set for CvCorrectionStrength
- // max_value not set for CvCorrectionStrength
- // min_value not set for CvCorrectionStrength
- // max_alarm not set for CvCorrectionStrength
- // min_alarm not set for CvCorrectionStrength
- // max_warning not set for CvCorrectionStrength
- // min_warning not set for CvCorrectionStrength
- // delta_t not set for CvCorrectionStrength
- // delta_val not set for CvCorrectionStrength
- cvcorrectionstrength->set_default_properties(cvcorrectionstrength_prop);
+ att_list.push_back(cevstrength);
+
+ // Attribute : CevCorrectionStrength
+ CevCorrectionStrengthAttrib *cevcorrectionstrength = new CevCorrectionStrengthAttrib();
+ Tango::UserDefaultAttrProp cevcorrectionstrength_prop;
+ // description not set for CevCorrectionStrength
+ cevcorrectionstrength_prop.set_label("vertical emebedded corrector correction strength");
+ cevcorrectionstrength_prop.set_unit("rad");
+ // standard_unit not set for CevCorrectionStrength
+ // display_unit not set for CevCorrectionStrength
+ // format not set for CevCorrectionStrength
+ // max_value not set for CevCorrectionStrength
+ // min_value not set for CevCorrectionStrength
+ // max_alarm not set for CevCorrectionStrength
+ // min_alarm not set for CevCorrectionStrength
+ // max_warning not set for CevCorrectionStrength
+ // min_warning not set for CevCorrectionStrength
+ // delta_t not set for CevCorrectionStrength
+ // delta_val not set for CevCorrectionStrength
+ cevcorrectionstrength->set_default_properties(cevcorrectionstrength_prop);
// Not Polled
- cvcorrectionstrength->set_disp_level(Tango::EXPERT);
+ cevcorrectionstrength->set_disp_level(Tango::EXPERT);
// Not Memorized
- att_list.push_back(cvcorrectionstrength);
-
- // Attribute : CvResonanceStrength
- CvResonanceStrengthAttrib *cvresonancestrength = new CvResonanceStrengthAttrib();
- Tango::UserDefaultAttrProp cvresonancestrength_prop;
- // description not set for CvResonanceStrength
- cvresonancestrength_prop.set_label("embedded vertical corrector resonance strength");
- cvresonancestrength_prop.set_unit("rad");
- // standard_unit not set for CvResonanceStrength
- // display_unit not set for CvResonanceStrength
- // format not set for CvResonanceStrength
- // max_value not set for CvResonanceStrength
- // min_value not set for CvResonanceStrength
- // max_alarm not set for CvResonanceStrength
- // min_alarm not set for CvResonanceStrength
- // max_warning not set for CvResonanceStrength
- // min_warning not set for CvResonanceStrength
- // delta_t not set for CvResonanceStrength
- // delta_val not set for CvResonanceStrength
- cvresonancestrength->set_default_properties(cvresonancestrength_prop);
+ att_list.push_back(cevcorrectionstrength);
+
+ // Attribute : CevResonanceStrength
+ CevResonanceStrengthAttrib *cevresonancestrength = new CevResonanceStrengthAttrib();
+ Tango::UserDefaultAttrProp cevresonancestrength_prop;
+ // description not set for CevResonanceStrength
+ cevresonancestrength_prop.set_label("embedded vertical corrector resonance strength");
+ cevresonancestrength_prop.set_unit("rad");
+ // standard_unit not set for CevResonanceStrength
+ // display_unit not set for CevResonanceStrength
+ // format not set for CevResonanceStrength
+ // max_value not set for CevResonanceStrength
+ // min_value not set for CevResonanceStrength
+ // max_alarm not set for CevResonanceStrength
+ // min_alarm not set for CevResonanceStrength
+ // max_warning not set for CevResonanceStrength
+ // min_warning not set for CevResonanceStrength
+ // delta_t not set for CevResonanceStrength
+ // delta_val not set for CevResonanceStrength
+ cevresonancestrength->set_default_properties(cevresonancestrength_prop);
// Not Polled
- cvresonancestrength->set_disp_level(Tango::EXPERT);
+ cevresonancestrength->set_disp_level(Tango::EXPERT);
// Not Memorized
- att_list.push_back(cvresonancestrength);
+ att_list.push_back(cevresonancestrength);
// Attribute : SQStrength
SQStrengthAttrib *sqstrength = new SQStrengthAttrib();
diff --git a/src/E2SextupoleClass.h b/src/E2SextupoleClass.h
index 1e67ec9..371695c 100644
--- a/src/E2SextupoleClass.h
+++ b/src/E2SextupoleClass.h
@@ -162,94 +162,94 @@ public:
{return (static_cast<E2Sextupole *>(dev))->is_bbaEnable_allowed(ty);}
};
-// Attribute ChStrength class definition
-class ChStrengthAttrib: public Tango::Attr
+// Attribute CehStrength class definition
+class CehStrengthAttrib: public Tango::Attr
{
public:
- ChStrengthAttrib():Attr("ChStrength",
+ CehStrengthAttrib():Attr("CehStrength",
Tango::DEV_DOUBLE, Tango::READ_WRITE) {}
- ~ChStrengthAttrib() {}
+ ~CehStrengthAttrib() {}
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<E2Sextupole *>(dev))->read_ChStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->read_CehStrength(att);}
virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att)
- {(static_cast<E2Sextupole *>(dev))->write_ChStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->write_CehStrength(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<E2Sextupole *>(dev))->is_ChStrength_allowed(ty);}
+ {return (static_cast<E2Sextupole *>(dev))->is_CehStrength_allowed(ty);}
};
-// Attribute ChCorrectionStrength class definition
-class ChCorrectionStrengthAttrib: public Tango::Attr
+// Attribute CehCorrectionStrength class definition
+class CehCorrectionStrengthAttrib: public Tango::Attr
{
public:
- ChCorrectionStrengthAttrib():Attr("ChCorrectionStrength",
+ CehCorrectionStrengthAttrib():Attr("CehCorrectionStrength",
Tango::DEV_DOUBLE, Tango::READ_WRITE) {}
- ~ChCorrectionStrengthAttrib() {}
+ ~CehCorrectionStrengthAttrib() {}
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<E2Sextupole *>(dev))->read_ChCorrectionStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->read_CehCorrectionStrength(att);}
virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att)
- {(static_cast<E2Sextupole *>(dev))->write_ChCorrectionStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->write_CehCorrectionStrength(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<E2Sextupole *>(dev))->is_ChCorrectionStrength_allowed(ty);}
+ {return (static_cast<E2Sextupole *>(dev))->is_CehCorrectionStrength_allowed(ty);}
};
-// Attribute ChResonanceStrength class definition
-class ChResonanceStrengthAttrib: public Tango::Attr
+// Attribute CehResonanceStrength class definition
+class CehResonanceStrengthAttrib: public Tango::Attr
{
public:
- ChResonanceStrengthAttrib():Attr("ChResonanceStrength",
+ CehResonanceStrengthAttrib():Attr("CehResonanceStrength",
Tango::DEV_DOUBLE, Tango::READ_WRITE) {}
- ~ChResonanceStrengthAttrib() {}
+ ~CehResonanceStrengthAttrib() {}
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<E2Sextupole *>(dev))->read_ChResonanceStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->read_CehResonanceStrength(att);}
virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att)
- {(static_cast<E2Sextupole *>(dev))->write_ChResonanceStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->write_CehResonanceStrength(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<E2Sextupole *>(dev))->is_ChResonanceStrength_allowed(ty);}
+ {return (static_cast<E2Sextupole *>(dev))->is_CehResonanceStrength_allowed(ty);}
};
-// Attribute CvStrength class definition
-class CvStrengthAttrib: public Tango::Attr
+// Attribute CevStrength class definition
+class CevStrengthAttrib: public Tango::Attr
{
public:
- CvStrengthAttrib():Attr("CvStrength",
+ CevStrengthAttrib():Attr("CevStrength",
Tango::DEV_DOUBLE, Tango::READ_WRITE) {}
- ~CvStrengthAttrib() {}
+ ~CevStrengthAttrib() {}
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<E2Sextupole *>(dev))->read_CvStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->read_CevStrength(att);}
virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att)
- {(static_cast<E2Sextupole *>(dev))->write_CvStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->write_CevStrength(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<E2Sextupole *>(dev))->is_CvStrength_allowed(ty);}
+ {return (static_cast<E2Sextupole *>(dev))->is_CevStrength_allowed(ty);}
};
-// Attribute CvCorrectionStrength class definition
-class CvCorrectionStrengthAttrib: public Tango::Attr
+// Attribute CevCorrectionStrength class definition
+class CevCorrectionStrengthAttrib: public Tango::Attr
{
public:
- CvCorrectionStrengthAttrib():Attr("CvCorrectionStrength",
+ CevCorrectionStrengthAttrib():Attr("CevCorrectionStrength",
Tango::DEV_DOUBLE, Tango::READ_WRITE) {}
- ~CvCorrectionStrengthAttrib() {}
+ ~CevCorrectionStrengthAttrib() {}
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<E2Sextupole *>(dev))->read_CvCorrectionStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->read_CevCorrectionStrength(att);}
virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att)
- {(static_cast<E2Sextupole *>(dev))->write_CvCorrectionStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->write_CevCorrectionStrength(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<E2Sextupole *>(dev))->is_CvCorrectionStrength_allowed(ty);}
+ {return (static_cast<E2Sextupole *>(dev))->is_CevCorrectionStrength_allowed(ty);}
};
-// Attribute CvResonanceStrength class definition
-class CvResonanceStrengthAttrib: public Tango::Attr
+// Attribute CevResonanceStrength class definition
+class CevResonanceStrengthAttrib: public Tango::Attr
{
public:
- CvResonanceStrengthAttrib():Attr("CvResonanceStrength",
+ CevResonanceStrengthAttrib():Attr("CevResonanceStrength",
Tango::DEV_DOUBLE, Tango::READ_WRITE) {}
- ~CvResonanceStrengthAttrib() {}
+ ~CevResonanceStrengthAttrib() {}
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<E2Sextupole *>(dev))->read_CvResonanceStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->read_CevResonanceStrength(att);}
virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att)
- {(static_cast<E2Sextupole *>(dev))->write_CvResonanceStrength(att);}
+ {(static_cast<E2Sextupole *>(dev))->write_CevResonanceStrength(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<E2Sextupole *>(dev))->is_CvResonanceStrength_allowed(ty);}
+ {return (static_cast<E2Sextupole *>(dev))->is_CevResonanceStrength_allowed(ty);}
};
// Attribute SQStrength class definition
diff --git a/src/E2SextupoleStateMachine.cpp b/src/E2SextupoleStateMachine.cpp
index 4f1169b..50b332d 100644
--- a/src/E2SextupoleStateMachine.cpp
+++ b/src/E2SextupoleStateMachine.cpp
@@ -220,133 +220,133 @@ bool E2Sextupole::is_bbaEnable_allowed(TANGO_UNUSED(Tango::AttReqType type))
//--------------------------------------------------------
/**
- * Method : E2Sextupole::is_ChStrength_allowed()
- * Description: Execution allowed for ChStrength attribute
+ * Method : E2Sextupole::is_CehStrength_allowed()
+ * Description: Execution allowed for CehStrength attribute
*/
//--------------------------------------------------------
-bool E2Sextupole::is_ChStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool E2Sextupole::is_CehStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
- // Not any excluded states for ChStrength attribute in Write access.
- /*----- PROTECTED REGION ID(E2Sextupole::ChStrengthStateAllowed_WRITE) ENABLED START -----*/
+ // Not any excluded states for CehStrength attribute in Write access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CehStrengthStateAllowed_WRITE) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::ChStrengthStateAllowed_WRITE
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CehStrengthStateAllowed_WRITE
- // Not any excluded states for ChStrength attribute in read access.
- /*----- PROTECTED REGION ID(E2Sextupole::ChStrengthStateAllowed_READ) ENABLED START -----*/
+ // Not any excluded states for CehStrength attribute in read access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CehStrengthStateAllowed_READ) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::ChStrengthStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CehStrengthStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : E2Sextupole::is_ChCorrectionStrength_allowed()
- * Description: Execution allowed for ChCorrectionStrength attribute
+ * Method : E2Sextupole::is_CehCorrectionStrength_allowed()
+ * Description: Execution allowed for CehCorrectionStrength attribute
*/
//--------------------------------------------------------
-bool E2Sextupole::is_ChCorrectionStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool E2Sextupole::is_CehCorrectionStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
- // Not any excluded states for ChCorrectionStrength attribute in Write access.
- /*----- PROTECTED REGION ID(E2Sextupole::ChCorrectionStrengthStateAllowed_WRITE) ENABLED START -----*/
+ // Not any excluded states for CehCorrectionStrength attribute in Write access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CehCorrectionStrengthStateAllowed_WRITE) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::ChCorrectionStrengthStateAllowed_WRITE
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CehCorrectionStrengthStateAllowed_WRITE
- // Not any excluded states for ChCorrectionStrength attribute in read access.
- /*----- PROTECTED REGION ID(E2Sextupole::ChCorrectionStrengthStateAllowed_READ) ENABLED START -----*/
+ // Not any excluded states for CehCorrectionStrength attribute in read access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CehCorrectionStrengthStateAllowed_READ) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::ChCorrectionStrengthStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CehCorrectionStrengthStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : E2Sextupole::is_ChResonanceStrength_allowed()
- * Description: Execution allowed for ChResonanceStrength attribute
+ * Method : E2Sextupole::is_CehResonanceStrength_allowed()
+ * Description: Execution allowed for CehResonanceStrength attribute
*/
//--------------------------------------------------------
-bool E2Sextupole::is_ChResonanceStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool E2Sextupole::is_CehResonanceStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
- // Not any excluded states for ChResonanceStrength attribute in Write access.
- /*----- PROTECTED REGION ID(E2Sextupole::ChResonanceStrengthStateAllowed_WRITE) ENABLED START -----*/
+ // Not any excluded states for CehResonanceStrength attribute in Write access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CehResonanceStrengthStateAllowed_WRITE) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::ChResonanceStrengthStateAllowed_WRITE
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CehResonanceStrengthStateAllowed_WRITE
- // Not any excluded states for ChResonanceStrength attribute in read access.
- /*----- PROTECTED REGION ID(E2Sextupole::ChResonanceStrengthStateAllowed_READ) ENABLED START -----*/
+ // Not any excluded states for CehResonanceStrength attribute in read access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CehResonanceStrengthStateAllowed_READ) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::ChResonanceStrengthStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CehResonanceStrengthStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : E2Sextupole::is_CvStrength_allowed()
- * Description: Execution allowed for CvStrength attribute
+ * Method : E2Sextupole::is_CevStrength_allowed()
+ * Description: Execution allowed for CevStrength attribute
*/
//--------------------------------------------------------
-bool E2Sextupole::is_CvStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool E2Sextupole::is_CevStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
- // Not any excluded states for CvStrength attribute in Write access.
- /*----- PROTECTED REGION ID(E2Sextupole::CvStrengthStateAllowed_WRITE) ENABLED START -----*/
+ // Not any excluded states for CevStrength attribute in Write access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CevStrengthStateAllowed_WRITE) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::CvStrengthStateAllowed_WRITE
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CevStrengthStateAllowed_WRITE
- // Not any excluded states for CvStrength attribute in read access.
- /*----- PROTECTED REGION ID(E2Sextupole::CvStrengthStateAllowed_READ) ENABLED START -----*/
+ // Not any excluded states for CevStrength attribute in read access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CevStrengthStateAllowed_READ) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::CvStrengthStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CevStrengthStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : E2Sextupole::is_CvCorrectionStrength_allowed()
- * Description: Execution allowed for CvCorrectionStrength attribute
+ * Method : E2Sextupole::is_CevCorrectionStrength_allowed()
+ * Description: Execution allowed for CevCorrectionStrength attribute
*/
//--------------------------------------------------------
-bool E2Sextupole::is_CvCorrectionStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool E2Sextupole::is_CevCorrectionStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
- // Not any excluded states for CvCorrectionStrength attribute in Write access.
- /*----- PROTECTED REGION ID(E2Sextupole::CvCorrectionStrengthStateAllowed_WRITE) ENABLED START -----*/
+ // Not any excluded states for CevCorrectionStrength attribute in Write access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CevCorrectionStrengthStateAllowed_WRITE) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::CvCorrectionStrengthStateAllowed_WRITE
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CevCorrectionStrengthStateAllowed_WRITE
- // Not any excluded states for CvCorrectionStrength attribute in read access.
- /*----- PROTECTED REGION ID(E2Sextupole::CvCorrectionStrengthStateAllowed_READ) ENABLED START -----*/
+ // Not any excluded states for CevCorrectionStrength attribute in read access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CevCorrectionStrengthStateAllowed_READ) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::CvCorrectionStrengthStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CevCorrectionStrengthStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : E2Sextupole::is_CvResonanceStrength_allowed()
- * Description: Execution allowed for CvResonanceStrength attribute
+ * Method : E2Sextupole::is_CevResonanceStrength_allowed()
+ * Description: Execution allowed for CevResonanceStrength attribute
*/
//--------------------------------------------------------
-bool E2Sextupole::is_CvResonanceStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool E2Sextupole::is_CevResonanceStrength_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
- // Not any excluded states for CvResonanceStrength attribute in Write access.
- /*----- PROTECTED REGION ID(E2Sextupole::CvResonanceStrengthStateAllowed_WRITE) ENABLED START -----*/
+ // Not any excluded states for CevResonanceStrength attribute in Write access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CevResonanceStrengthStateAllowed_WRITE) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::CvResonanceStrengthStateAllowed_WRITE
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CevResonanceStrengthStateAllowed_WRITE
- // Not any excluded states for CvResonanceStrength attribute in read access.
- /*----- PROTECTED REGION ID(E2Sextupole::CvResonanceStrengthStateAllowed_READ) ENABLED START -----*/
+ // Not any excluded states for CevResonanceStrength attribute in read access.
+ /*----- PROTECTED REGION ID(E2Sextupole::CevResonanceStrengthStateAllowed_READ) ENABLED START -----*/
/* clang-format on */
/* clang-format off */
- /*----- PROTECTED REGION END -----*/ // E2Sextupole::CvResonanceStrengthStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // E2Sextupole::CevResonanceStrengthStateAllowed_READ
return true;
}
--
GitLab