Skip to content
Snippets Groups Projects
Commit 4003eaef authored by Claudio Scafuri's avatar Claudio Scafuri :speech_balloon:
Browse files

intermiediate - not working yet

parent 6561dcd2
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
TODO
+ 2
− 1
View file @ 4003eaef
fix units
\ No newline at end of file
fix units
exception handling reading/writng attributes
\ No newline at end of file
src/E2Sextupole.cpp
+ 317
− 186
View file @ 4003eaef
This diff is collapsed.
src/E2Sextupole.h
+ 59
− 27
View file @ 4003eaef
......@@ -81,12 +81,30 @@ class E2Sextupole : public TANGO_BASE_CLASS
/*----- PROTECTED REGION ID(E2Sextupole::Data Members) ENABLED START -----*/
/* clang-format on */
// Add your own data members
//Flags and switches
bool pure_sext; //true if the magnet is connected as a pure sextupole, emmebdded corrector coils are not powered - no need to create proxies
bool ceh_cev; //true if the magnet is connected as a sextupole, with ambedd emmebdded corrector coils - no skew quadrupole
bool sext_with_skew; //true if the emebdded correcotr coils are permanently cable as skew quadupole and vertica correcotors; no bba switch
bool bba_ready; // true if the sextupole ebedded correctors are powered and the horizontal corrector can be reconnected as skew quadrupole via the bba switch
// these flags are set by inspecting the EmbeddedConfiguration, which can assume only the values: "pure_sext", "ceh_cev", "bba_ready", "sext_with skew".
// all calibrations are loaded indipendently of the configuration (prepare for integral model 3x3)
//
// pure_sext: no reading, setting of ceh, cev, sq, bba switch, ceh, cev, sq, always set to 0 field, only main power supply
// ceh_cev: reading and setting of ceh end cev, no bba switch, sq alway set to 0, use all power supplies
// sext_with_skew: reading and setting of SQ and cev, no bba switch, ceh always 0,use all power supplies
// bba_ready: reading and setting of ceh and cev, end bba_switch, depending on bba switch, use pscev for cev or SQ, the other is 0, use all power supplies
MagnetModel::PureSextupole* sextupole; //magnet model
MagnetModel::Corrector* ceh; //magnet model for embedded horizontal corrector
MagnetModel::Corrector* cev; //magnet model for embedded vertical corrector
MagnetModel::Quadrupole* skewquadrupole; // magnet model for embedded skew quadrupole
double magnet_rigidity;
double magnet_rigidity_inv;
Tango::DeviceProxy* bba_switch_dev;
Tango::DeviceProxy *main_current_dev;
Tango::DeviceProxy *ceh_current_dev;
Tango::DeviceProxy *cev_current_dev;
......@@ -156,43 +174,57 @@ public:
// Device property data members
public:
// CurrentDevice: power supply tango device name
std::string currentDevice;
// Model: corrector model (part number)
std::string model;
// SerialNumber: serial number of the magnet
std::string serialNumber;
// MagnetName: Name of magnet
std::string magnetName;
// CalibrationFileName: name of calibration table file name
std::string calibrationFileName;
// CalibrationPath: path of calibration and parameter files
std::string calibrationPath;
// BBASwitchable: true if the magnet embbeded skew quadrupole cna be activated for beama based alignement operations.
Tango::DevBoolean bBASwitchable;
// SkewQuad: True if the magnet is cabled with embbedd skew quadrupole QS . In this configuration the emmbedd horizontal corrector CEH is not available.
Tango::DevBoolean skewQuad;
// CEHName: Magnet name of embbedded horizontal corrector.
std::string cEHName;
// CEVName: Magnet name of embbedded vertical corrector.
std::string cEVName;
// BbaSwitchAttribute: Attribute name of the speciific ba switch
// The BBA switches are part of Elettra 2.0 MPS (Interlock) system
std::string bbaSwitchAttribute;
// BbaSwitchDeviceName: Tango device name exporting the interface to the BBA switches.
// Part of Elettra 2.0 MPS (Interlock) system
std::string bbaSwitchDeviceName;
// CEHCalibrationFileName: name of calibration table file name for horizontal embedded corrector - to be review3d when real calibrtaion tablles wil be available
std::string cEHCalibrationFileName;
// CEHDeviceName: Name of tango device implementing the interface of the embedded horizontal corrector.
std::string cEHDeviceName;
// CEHName: Magnet name of embbedded horizontal corrector.
std::string cEHName;
// CEVCalibrationFileName: name of calibration table file name for vertical embedded corrector - to be reviewed when real calibration tables wil be available
std::string cEVCalibrationFileName;
// CEVDeviceName: Name of tango device implementing the interface of the embedded vertical corrector.
std::string cEVDeviceName;
// CEVName: Magnet name of embbedded vertical corrector.
std::string cEVName;
// CalibrationFileName: name of calibration table file name
std::string calibrationFileName;
// CalibrationPath: path of calibration and parameter files
std::string calibrationPath;
// CurrentDevice: power supply tango device name
std::string currentDevice;
// EmbeddedConfiguration: String descibing the configuration fo the embedded coils. Only three values are valid:
//
// pure_sext
// ceh_cev
// sext_with_skew
// bba_ready
//
//
// Depending on the EbenddedConfiguration the appropriate numebr of proxies for power supplies and calibration models is built.
std::string embeddedConfiguration;
// MagnetName: Name of magnet
std::string magnetName;
// Model: corrector model (part number)
std::string model;
// ParameterFileName: name of auxiliary parametr file name
// (EBSmagnet compatibility)
std::string parameterFileName;
// PsCehDeviceName: Name of the tango device of powering the embbedded horizontal corrector / embedded skew quadrupole.
std::string psCehDeviceName;
// PsCevDeviceName: Name of the tango device of powering the embbedded vertical corrector.
std::string psCevDeviceName;
// ParameterFileName: name of auxiliary parametr file name
// (EBSmagnet compatibility)
std::string parameterFileName;
// CEHCalibrationFileName: name of calibration table file name for horizontal embedded corrector - to be review3d when real calibrtaion tablles wil be available
std::string cEHCalibrationFileName;
// SQCalibrationFileName: name of calibration table file name for embedded skeq quadrupole - to be reviewed when real calibration tables will be available
std::string sQCalibrationFileName;
// CEVCalibrationFileName: name of calibration table file name for vertical embedded corrector - to be reviewed when real calibration tables wil be available
std::string cEVCalibrationFileName;
// SerialNumber: serial number of the magnet
std::string serialNumber;
// SkewQuad: True if the magnet is cabled with embbedd skew quadrupole QS . In this configuration the emmbedd horizontal corrector CEH is not available.
Tango::DevBoolean skewQuad;
bool mandatoryNotDefined;
......
src/E2Sextupole.xmi
+ 31
− 20
View file @ 4003eaef
......@@ -11,6 +11,10 @@
<keyWords>calibartion</keyWords>
</identification>
</description>
<classProperties name="BbaSwitchDeviceName" description="Tango device name exporting the interface to the BBA switches.&#xA;Part of Elettra 2.0 MPS (Interlock) system">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</classProperties>
<classProperties name="BeamEnergy" description="default electron beam energy, in GeV.&#xA;Use to initialize all magnet istances BeamEnergy attribute.">
<type xsi:type="pogoDsl:DoubleType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
......@@ -20,61 +24,59 @@
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</classProperties>
<deviceProperties name="CurrentDevice" description="power supply tango device name">
<deviceProperties name="BbaSwitchAttribute" description="Attribute name of the speciific ba switch&#xA;The BBA switches are part of Elettra 2.0 MPS (Interlock) system">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="Model" description="corrector model (part number)">
<deviceProperties name="BbaSwitchDeviceName" description="Tango device name exporting the interface to the BBA switches.&#xA;Part of Elettra 2.0 MPS (Interlock) system">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="SerialNumber" description="serial number of the magnet">
<deviceProperties name="CEHCalibrationFileName" mandatory="true" description="name of calibration table file name for horizontal embedded corrector - to be review3d when real calibrtaion tablles wil be available">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="MagnetName" description="Name of magnet">
<deviceProperties name="CEHDeviceName" description="Name of tango device implementing the interface of the embedded horizontal corrector.">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="CalibrationFileName" mandatory="true" description="name of calibration table file name">
<deviceProperties name="CEHName" description="Magnet name of embbedded horizontal corrector.">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="CalibrationPath" description="path of calibration and parameter files">
<deviceProperties name="CEVCalibrationFileName" mandatory="true" description="name of calibration table file name for vertical embedded corrector - to be reviewed when real calibration tables wil be available">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="BBASwitchable" description="true if the magnet embbeded skew quadrupole cna be activated for beama based alignement operations.">
<type xsi:type="pogoDsl:BooleanType"/>
<deviceProperties name="CEVDeviceName" description="Name of tango device implementing the interface of the embedded vertical corrector.">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<DefaultPropValue>False</DefaultPropValue>
</deviceProperties>
<deviceProperties name="SkewQuad" description="True if the magnet is cabled with embbedd skew quadrupole QS . In this configuration the emmbedd horizontal corrector CEH is not available.">
<type xsi:type="pogoDsl:BooleanType"/>
<deviceProperties name="CEVName" description="Magnet name of embbedded vertical corrector.">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<DefaultPropValue>False</DefaultPropValue>
</deviceProperties>
<deviceProperties name="CEHName" description="Magnet name of embbedded horizontal corrector.">
<deviceProperties name="CalibrationFileName" mandatory="true" description="name of calibration table file name">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="CEVName" description="Magnet name of embbedded vertical corrector.">
<deviceProperties name="CalibrationPath" description="path of calibration and parameter files">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="CEHDeviceName" description="Name of tango device implementing the interface of the embedded horizontal corrector.">
<deviceProperties name="CurrentDevice" description="power supply tango device name">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="CEVDeviceName" description="Name of tango device implementing the interface of the embedded vertical corrector.">
<deviceProperties name="EmbeddedConfiguration" mandatory="true" description="String descibing the configuration fo the embedded coils. Only three values are valid:&#xA;&#xA;pure_sext&#xA;ceh_cev&#xA;sext_with_skew&#xA;bba_ready&#xA;&#xA;&#xA;Depending on the EbenddedConfiguration the appropriate numebr of proxies for power supplies and calibration models is built.">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="PsCehDeviceName" description="Name of the tango device of powering the embbedded horizontal corrector / embedded skew quadrupole.">
<deviceProperties name="MagnetName" description="Name of magnet">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="PsCevDeviceName" description="Name of the tango device of powering the embbedded vertical corrector.">
<deviceProperties name="Model" description="corrector model (part number)">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
......@@ -82,7 +84,11 @@
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="CEHCalibrationFileName" mandatory="true" description="name of calibration table file name for horizontal embedded corrector - to be review3d when real calibrtaion tablles wil be available">
<deviceProperties name="PsCehDeviceName" description="Name of the tango device of powering the embbedded horizontal corrector / embedded skew quadrupole.">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="PsCevDeviceName" description="Name of the tango device of powering the embbedded vertical corrector.">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
......@@ -90,10 +96,15 @@
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="CEVCalibrationFileName" mandatory="true" description="name of calibration table file name for vertical embedded corrector - to be reviewed when real calibration tables wil be available">
<deviceProperties name="SerialNumber" description="serial number of the magnet">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</deviceProperties>
<deviceProperties name="SkewQuad" description="True if the magnet is cabled with embbedd skew quadrupole QS . In this configuration the emmbedd horizontal corrector CEH is not available.">
<type xsi:type="pogoDsl:BooleanType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<DefaultPropValue>False</DefaultPropValue>
</deviceProperties>
<commands name="State" description="This command gets the device state (stored in its device_state data member) and returns it to the caller." execMethod="dev_state" displayLevel="OPERATOR" polledPeriod="0">
<argin description="none">
<type xsi:type="pogoDsl:VoidType"/>
......
src/E2SextupoleClass.cpp
+ 87
− 36
View file @ 4003eaef
......@@ -275,6 +275,7 @@ void E2SextupoleClass::get_class_property()
/* clang-format off */
/*----- PROTECTED REGION END -----*/ // E2SextupoleClass::get_class_property_before
// Read class properties from database.
cl_prop.push_back(Tango::DbDatum("BbaSwitchDeviceName"));
cl_prop.push_back(Tango::DbDatum("BeamEnergy"));
cl_prop.push_back(Tango::DbDatum("CalibrationPath"));
......@@ -284,6 +285,18 @@ void E2SextupoleClass::get_class_property()
Tango::DbDatum def_prop;
int i = -1;
// Try to extract BbaSwitchDeviceName value
if (cl_prop[++i].is_empty()==false) cl_prop[i] >> bbaSwitchDeviceName;
else
{
// Check default value for BbaSwitchDeviceName
def_prop = get_default_class_property(cl_prop[i].name);
if (def_prop.is_empty()==false)
{
def_prop >> bbaSwitchDeviceName;
cl_prop[i] << bbaSwitchDeviceName;
}
}
// Try to extract BeamEnergy value
if (cl_prop[++i].is_empty()==false) cl_prop[i] >> beamEnergy;
else
......@@ -333,6 +346,19 @@ void E2SextupoleClass::set_default_property()
std::vector<std::string> vect_data;
// Set Default Class Properties
prop_name = "BbaSwitchDeviceName";
prop_desc = "Tango device name exporting the interface to the BBA switches.\nPart of Elettra 2.0 MPS (Interlock) system";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
{
Tango::DbDatum data(prop_name);
data << vect_data ;
cl_def_prop.push_back(data);
add_wiz_class_prop(prop_name, prop_desc, prop_def);
}
else
add_wiz_class_prop(prop_name, prop_desc);
prop_name = "BeamEnergy";
prop_desc = "default electron beam energy, in GeV.\nUse to initialize all magnet istances BeamEnergy attribute.";
prop_def = "2.4";
......@@ -362,8 +388,8 @@ void E2SextupoleClass::set_default_property()
add_wiz_class_prop(prop_name, prop_desc);
// Set Default device Properties
prop_name = "CurrentDevice";
prop_desc = "power supply tango device name";
prop_name = "BbaSwitchAttribute";
prop_desc = "Attribute name of the speciific ba switch\nThe BBA switches are part of Elettra 2.0 MPS (Interlock) system";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -375,8 +401,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "Model";
prop_desc = "corrector model (part number)";
prop_name = "BbaSwitchDeviceName";
prop_desc = "Tango device name exporting the interface to the BBA switches.\nPart of Elettra 2.0 MPS (Interlock) system";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -388,8 +414,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "SerialNumber";
prop_desc = "serial number of the magnet";
prop_name = "CEHCalibrationFileName";
prop_desc = "name of calibration table file name for horizontal embedded corrector - to be review3d when real calibrtaion tablles wil be available";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -401,8 +427,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "MagnetName";
prop_desc = "Name of magnet";
prop_name = "CEHDeviceName";
prop_desc = "Name of tango device implementing the interface of the embedded horizontal corrector.";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -414,8 +440,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CalibrationFileName";
prop_desc = "name of calibration table file name";
prop_name = "CEHName";
prop_desc = "Magnet name of embbedded horizontal corrector.";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -427,8 +453,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CalibrationPath";
prop_desc = "path of calibration and parameter files";
prop_name = "CEVCalibrationFileName";
prop_desc = "name of calibration table file name for vertical embedded corrector - to be reviewed when real calibration tables wil be available";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -440,11 +466,10 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "BBASwitchable";
prop_desc = "true if the magnet embbeded skew quadrupole cna be activated for beama based alignement operations.";
prop_def = "False";
prop_name = "CEVDeviceName";
prop_desc = "Name of tango device implementing the interface of the embedded vertical corrector.";
prop_def = "";
vect_data.clear();
vect_data.push_back("False");
if (prop_def.length()>0)
{
Tango::DbDatum data(prop_name);
......@@ -454,11 +479,10 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "SkewQuad";
prop_desc = "True if the magnet is cabled with embbedd skew quadrupole QS . In this configuration the emmbedd horizontal corrector CEH is not available.";
prop_def = "False";
prop_name = "CEVName";
prop_desc = "Magnet name of embbedded vertical corrector.";
prop_def = "";
vect_data.clear();
vect_data.push_back("False");
if (prop_def.length()>0)
{
Tango::DbDatum data(prop_name);
......@@ -468,8 +492,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CEHName";
prop_desc = "Magnet name of embbedded horizontal corrector.";
prop_name = "CalibrationFileName";
prop_desc = "name of calibration table file name";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -481,8 +505,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CEVName";
prop_desc = "Magnet name of embbedded vertical corrector.";
prop_name = "CalibrationPath";
prop_desc = "path of calibration and parameter files";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -494,8 +518,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CEHDeviceName";
prop_desc = "Name of tango device implementing the interface of the embedded horizontal corrector.";
prop_name = "CurrentDevice";
prop_desc = "power supply tango device name";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -507,8 +531,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CEVDeviceName";
prop_desc = "Name of tango device implementing the interface of the embedded vertical corrector.";
prop_name = "EmbeddedConfiguration";
prop_desc = "String descibing the configuration fo the embedded coils. Only three values are valid:\n\npure_sext\nceh_cev\nsext_with_skew\nbba_ready\n\n\nDepending on the EbenddedConfiguration the appropriate numebr of proxies for power supplies and calibration models is built.";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -520,8 +544,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "PsCehDeviceName";
prop_desc = "Name of the tango device of powering the embbedded horizontal corrector / embedded skew quadrupole.";
prop_name = "MagnetName";
prop_desc = "Name of magnet";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -533,8 +557,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "PsCevDeviceName";
prop_desc = "Name of the tango device of powering the embbedded vertical corrector.";
prop_name = "Model";
prop_desc = "corrector model (part number)";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -559,8 +583,21 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CEHCalibrationFileName";
prop_desc = "name of calibration table file name for horizontal embedded corrector - to be review3d when real calibrtaion tablles wil be available";
prop_name = "PsCehDeviceName";
prop_desc = "Name of the tango device of powering the embbedded horizontal corrector / embedded skew quadrupole.";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
{
Tango::DbDatum data(prop_name);
data << vect_data ;
dev_def_prop.push_back(data);
add_wiz_dev_prop(prop_name, prop_desc, prop_def);
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "PsCevDeviceName";
prop_desc = "Name of the tango device of powering the embbedded vertical corrector.";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -585,8 +622,8 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "CEVCalibrationFileName";
prop_desc = "name of calibration table file name for vertical embedded corrector - to be reviewed when real calibration tables wil be available";
prop_name = "SerialNumber";
prop_desc = "serial number of the magnet";
prop_def = "";
vect_data.clear();
if (prop_def.length()>0)
......@@ -598,6 +635,20 @@ void E2SextupoleClass::set_default_property()
}
else
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "SkewQuad";
prop_desc = "True if the magnet is cabled with embbedd skew quadrupole QS . In this configuration the emmbedd horizontal corrector CEH is not available.";
prop_def = "False";
vect_data.clear();
vect_data.push_back("False");
if (prop_def.length()>0)
{
Tango::DbDatum data(prop_name);
data << vect_data ;
dev_def_prop.push_back(data);
add_wiz_dev_prop(prop_name, prop_desc, prop_def);
}
else
add_wiz_dev_prop(prop_name, prop_desc);
}
//--------------------------------------------------------
......
src/E2SextupoleClass.h
+ 3
− 0
View file @ 4003eaef
......@@ -449,6 +449,9 @@ class E2SextupoleClass : public Tango::DeviceClass
public:
// Class properties data members
// BbaSwitchDeviceName: Tango device name exporting the interface to the BBA switches.
// Part of Elettra 2.0 MPS (Interlock) system
std::string bbaSwitchDeviceName;
// BeamEnergy: default electron beam energy, in GeV.
// Use to initialize all magnet istances BeamEnergy attribute.
Tango::DevDouble beamEnergy;
......
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