Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cs
ds
bpmid
Commits
e0fd25d6
Commit
e0fd25d6
authored
Aug 30, 2021
by
Claudio Scafuri
💬
Browse files
removed redundant attr. XP_S12, Y_S12, YP_s12
parent
0dd6112d
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/BPMID.cpp
View file @
e0fd25d6
...
...
@@ -73,7 +73,6 @@
// XP_S1 | Tango::DevDouble Scalar
// XP_S10 | Tango::DevDouble Scalar
// XP_S11 | Tango::DevDouble Scalar
// XP_S12 | Tango::DevDouble Scalar
// XP_S2 | Tango::DevDouble Scalar
// XP_S3 | Tango::DevDouble Scalar
// XP_S4 | Tango::DevDouble Scalar
...
...
@@ -111,7 +110,6 @@
// YP_S1 | Tango::DevDouble Scalar
// YP_S10 | Tango::DevDouble Scalar
// YP_S11 | Tango::DevDouble Scalar
// YP_S12 | Tango::DevDouble Scalar
// YP_S2 | Tango::DevDouble Scalar
// YP_S3 | Tango::DevDouble Scalar
// YP_S4 | Tango::DevDouble Scalar
...
...
@@ -130,7 +128,6 @@
// Y_S1 | Tango::DevDouble Scalar
// Y_S10 | Tango::DevDouble Scalar
// Y_S11 | Tango::DevDouble Scalar
// Y_S12 | Tango::DevDouble Scalar
// Y_S2 | Tango::DevDouble Scalar
// Y_S3 | Tango::DevDouble Scalar
// Y_S4 | Tango::DevDouble Scalar
...
...
@@ -225,7 +222,6 @@ void BPMID::delete_device()
delete
[]
attr_XP_S1_read
;
delete
[]
attr_XP_S10_read
;
delete
[]
attr_XP_S11_read
;
delete
[]
attr_XP_S12_read
;
delete
[]
attr_XP_S2_read
;
delete
[]
attr_XP_S3_read
;
delete
[]
attr_XP_S4_read
;
...
...
@@ -263,7 +259,6 @@ void BPMID::delete_device()
delete
[]
attr_YP_S1_read
;
delete
[]
attr_YP_S10_read
;
delete
[]
attr_YP_S11_read
;
delete
[]
attr_YP_S12_read
;
delete
[]
attr_YP_S2_read
;
delete
[]
attr_YP_S3_read
;
delete
[]
attr_YP_S4_read
;
...
...
@@ -282,7 +277,6 @@ void BPMID::delete_device()
delete
[]
attr_Y_S1_read
;
delete
[]
attr_Y_S10_read
;
delete
[]
attr_Y_S11_read
;
delete
[]
attr_Y_S12_read
;
delete
[]
attr_Y_S2_read
;
delete
[]
attr_Y_S3_read
;
delete
[]
attr_Y_S4_read
;
...
...
@@ -327,7 +321,6 @@ void BPMID::init_device()
attr_XP_S1_read
=
new
Tango
::
DevDouble
[
1
];
attr_XP_S10_read
=
new
Tango
::
DevDouble
[
1
];
attr_XP_S11_read
=
new
Tango
::
DevDouble
[
1
];
attr_XP_S12_read
=
new
Tango
::
DevDouble
[
1
];
attr_XP_S2_read
=
new
Tango
::
DevDouble
[
1
];
attr_XP_S3_read
=
new
Tango
::
DevDouble
[
1
];
attr_XP_S4_read
=
new
Tango
::
DevDouble
[
1
];
...
...
@@ -365,7 +358,6 @@ void BPMID::init_device()
attr_YP_S1_read
=
new
Tango
::
DevDouble
[
1
];
attr_YP_S10_read
=
new
Tango
::
DevDouble
[
1
];
attr_YP_S11_read
=
new
Tango
::
DevDouble
[
1
];
attr_YP_S12_read
=
new
Tango
::
DevDouble
[
1
];
attr_YP_S2_read
=
new
Tango
::
DevDouble
[
1
];
attr_YP_S3_read
=
new
Tango
::
DevDouble
[
1
];
attr_YP_S4_read
=
new
Tango
::
DevDouble
[
1
];
...
...
@@ -384,7 +376,6 @@ void BPMID::init_device()
attr_Y_S1_read
=
new
Tango
::
DevDouble
[
1
];
attr_Y_S10_read
=
new
Tango
::
DevDouble
[
1
];
attr_Y_S11_read
=
new
Tango
::
DevDouble
[
1
];
attr_Y_S12_read
=
new
Tango
::
DevDouble
[
1
];
attr_Y_S2_read
=
new
Tango
::
DevDouble
[
1
];
attr_Y_S3_read
=
new
Tango
::
DevDouble
[
1
];
attr_Y_S4_read
=
new
Tango
::
DevDouble
[
1
];
...
...
@@ -450,7 +441,6 @@ void BPMID::init_device()
attr_XP_S9_read
=&
(
local_data
.
x_p
[
8
]);
attr_XP_S10_read
=&
(
local_data
.
x_p
[
9
]);
attr_XP_S11_read
=&
(
local_data
.
x_p
[
10
]);
// attr_XP_S12_read=&(local_data.x_p[11]);
attr_YP_S1_read
=&
(
local_data
.
y_p
[
0
]);
attr_YP_S2_read
=&
(
local_data
.
y_p
[
1
]);
...
...
@@ -463,7 +453,6 @@ void BPMID::init_device()
attr_YP_S9_read
=&
(
local_data
.
y_p
[
8
]);
attr_YP_S10_read
=&
(
local_data
.
y_p
[
9
]);
attr_YP_S11_read
=&
(
local_data
.
y_p
[
10
]);
// attr_YP_S12_read=&y_p[11];
// bending sources
attr_X_B6_read
=&
(
local_data
.
xb
[
5
]);
...
...
@@ -895,24 +884,6 @@ void BPMID::read_XP_S11(Tango::Attribute &attr)
/*----- PROTECTED REGION END -----*/
// BPMID::read_XP_S11
}
//--------------------------------------------------------
/**
* Read attribute XP_S12 related method
* Description:
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
void
BPMID
::
read_XP_S12
(
Tango
::
Attribute
&
attr
)
{
DEBUG_STREAM
<<
"BPMID::read_XP_S12(Tango::Attribute &attr) entering... "
<<
endl
;
/*----- PROTECTED REGION ID(BPMID::read_XP_S12) ENABLED START -----*/
// Set the attribute value
attr
.
set_value
(
attr_XP_S12_read
);
/*----- PROTECTED REGION END -----*/
// BPMID::read_XP_S12
}
//--------------------------------------------------------
/**
* Read attribute XP_S2 related method
* Description:
...
...
@@ -1762,24 +1733,6 @@ void BPMID::read_YP_S11(Tango::Attribute &attr)
/*----- PROTECTED REGION END -----*/
// BPMID::read_YP_S11
}
//--------------------------------------------------------
/**
* Read attribute YP_S12 related method
* Description:
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
void
BPMID
::
read_YP_S12
(
Tango
::
Attribute
&
attr
)
{
DEBUG_STREAM
<<
"BPMID::read_YP_S12(Tango::Attribute &attr) entering... "
<<
endl
;
/*----- PROTECTED REGION ID(BPMID::read_YP_S12) ENABLED START -----*/
// Set the attribute value
attr
.
set_value
(
attr_YP_S12_read
);
/*----- PROTECTED REGION END -----*/
// BPMID::read_YP_S12
}
//--------------------------------------------------------
/**
* Read attribute YP_S2 related method
* Description:
...
...
@@ -2194,24 +2147,6 @@ void BPMID::read_Y_S11(Tango::Attribute &attr)
/*----- PROTECTED REGION END -----*/
// BPMID::read_Y_S11
}
//--------------------------------------------------------
/**
* Read attribute Y_S12 related method
* Description:
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
//--------------------------------------------------------
void
BPMID
::
read_Y_S12
(
Tango
::
Attribute
&
attr
)
{
DEBUG_STREAM
<<
"BPMID::read_Y_S12(Tango::Attribute &attr) entering... "
<<
endl
;
/*----- PROTECTED REGION ID(BPMID::read_Y_S12) ENABLED START -----*/
// Set the attribute value
attr
.
set_value
(
attr_Y_S12_read
);
/*----- PROTECTED REGION END -----*/
// BPMID::read_Y_S12
}
//--------------------------------------------------------
/**
* Read attribute Y_S2 related method
* Description:
...
...
src/BPMID.h
View file @
e0fd25d6
...
...
@@ -94,7 +94,6 @@ public:
Tango
::
DevDouble
*
attr_XP_S1_read
;
Tango
::
DevDouble
*
attr_XP_S10_read
;
Tango
::
DevDouble
*
attr_XP_S11_read
;
Tango
::
DevDouble
*
attr_XP_S12_read
;
Tango
::
DevDouble
*
attr_XP_S2_read
;
Tango
::
DevDouble
*
attr_XP_S3_read
;
Tango
::
DevDouble
*
attr_XP_S4_read
;
...
...
@@ -132,7 +131,6 @@ public:
Tango
::
DevDouble
*
attr_YP_S1_read
;
Tango
::
DevDouble
*
attr_YP_S10_read
;
Tango
::
DevDouble
*
attr_YP_S11_read
;
Tango
::
DevDouble
*
attr_YP_S12_read
;
Tango
::
DevDouble
*
attr_YP_S2_read
;
Tango
::
DevDouble
*
attr_YP_S3_read
;
Tango
::
DevDouble
*
attr_YP_S4_read
;
...
...
@@ -151,7 +149,6 @@ public:
Tango
::
DevDouble
*
attr_Y_S1_read
;
Tango
::
DevDouble
*
attr_Y_S10_read
;
Tango
::
DevDouble
*
attr_Y_S11_read
;
Tango
::
DevDouble
*
attr_Y_S12_read
;
Tango
::
DevDouble
*
attr_Y_S2_read
;
Tango
::
DevDouble
*
attr_Y_S3_read
;
Tango
::
DevDouble
*
attr_Y_S4_read
;
...
...
@@ -311,15 +308,6 @@ public:
*/
virtual
void
read_XP_S11
(
Tango
::
Attribute
&
attr
);
virtual
bool
is_XP_S11_allowed
(
Tango
::
AttReqType
type
);
/**
* Attribute XP_S12 related methods
* Description:
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
virtual
void
read_XP_S12
(
Tango
::
Attribute
&
attr
);
virtual
bool
is_XP_S12_allowed
(
Tango
::
AttReqType
type
);
/**
* Attribute XP_S2 related methods
* Description:
...
...
@@ -653,15 +641,6 @@ public:
*/
virtual
void
read_YP_S11
(
Tango
::
Attribute
&
attr
);
virtual
bool
is_YP_S11_allowed
(
Tango
::
AttReqType
type
);
/**
* Attribute YP_S12 related methods
* Description:
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
virtual
void
read_YP_S12
(
Tango
::
Attribute
&
attr
);
virtual
bool
is_YP_S12_allowed
(
Tango
::
AttReqType
type
);
/**
* Attribute YP_S2 related methods
* Description:
...
...
@@ -824,15 +803,6 @@ public:
*/
virtual
void
read_Y_S11
(
Tango
::
Attribute
&
attr
);
virtual
bool
is_Y_S11_allowed
(
Tango
::
AttReqType
type
);
/**
* Attribute Y_S12 related methods
* Description:
*
* Data type: Tango::DevDouble
* Attr type: Scalar
*/
virtual
void
read_Y_S12
(
Tango
::
Attribute
&
attr
);
virtual
bool
is_Y_S12_allowed
(
Tango
::
AttReqType
type
);
/**
* Attribute Y_S2 related methods
* Description:
...
...
src/BPMID.xmi
View file @
e0fd25d6
...
...
@@ -114,14 +114,6 @@
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"millirad"
standardUnit=
"1"
displayUnit=
"mr"
format=
"%6.3f"
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"XP_S12"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:DoubleType"
/>
<changeEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"millirad"
standardUnit=
"1"
displayUnit=
"mr"
format=
"%6.3f"
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"XP_S2"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:DoubleType"
/>
<changeEvent
fire=
"false"
libCheckCriteria=
"false"
/>
...
...
@@ -418,14 +410,6 @@
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"millirad"
standardUnit=
"1"
displayUnit=
"mr"
format=
"%6.3f"
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"YP_S12"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:DoubleType"
/>
<changeEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"millirad"
standardUnit=
"1"
displayUnit=
"mr"
format=
"%6.3f"
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"YP_S2"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:DoubleType"
/>
<changeEvent
fire=
"false"
libCheckCriteria=
"false"
/>
...
...
@@ -570,14 +554,6 @@
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"mm"
standardUnit=
"1"
displayUnit=
"mm"
format=
"%6.3f"
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Y_S12"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:DoubleType"
/>
<changeEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"mm"
standardUnit=
"1"
displayUnit=
"mm"
format=
"%6.3f"
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Y_S2"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:DoubleType"
/>
<changeEvent
fire=
"false"
libCheckCriteria=
"false"
/>
...
...
src/BPMIDClass.cpp
View file @
e0fd25d6
...
...
@@ -599,30 +599,6 @@ void BPMIDClass::attribute_factory(vector<Tango::Attr *> &att_list)
// Not Memorized
att_list
.
push_back
(
xp_s11
);
// Attribute : XP_S12
XP_S12Attrib
*
xp_s12
=
new
XP_S12Attrib
();
Tango
::
UserDefaultAttrProp
xp_s12_prop
;
// description not set for XP_S12
// label not set for XP_S12
xp_s12_prop
.
set_unit
(
"millirad"
);
xp_s12_prop
.
set_standard_unit
(
"1"
);
xp_s12_prop
.
set_display_unit
(
"mr"
);
xp_s12_prop
.
set_format
(
"%6.3f"
);
// max_value not set for XP_S12
// min_value not set for XP_S12
// max_alarm not set for XP_S12
// min_alarm not set for XP_S12
// max_warning not set for XP_S12
// min_warning not set for XP_S12
// delta_t not set for XP_S12
// delta_val not set for XP_S12
xp_s12
->
set_default_properties
(
xp_s12_prop
);
// Not Polled
xp_s12
->
set_disp_level
(
Tango
::
OPERATOR
);
// Not Memorized
att_list
.
push_back
(
xp_s12
);
// Attribute : XP_S2
XP_S2Attrib
*
xp_s2
=
new
XP_S2Attrib
();
Tango
::
UserDefaultAttrProp
xp_s2_prop
;
...
...
@@ -1511,30 +1487,6 @@ void BPMIDClass::attribute_factory(vector<Tango::Attr *> &att_list)
// Not Memorized
att_list
.
push_back
(
yp_s11
);
// Attribute : YP_S12
YP_S12Attrib
*
yp_s12
=
new
YP_S12Attrib
();
Tango
::
UserDefaultAttrProp
yp_s12_prop
;
// description not set for YP_S12
// label not set for YP_S12
yp_s12_prop
.
set_unit
(
"millirad"
);
yp_s12_prop
.
set_standard_unit
(
"1"
);
yp_s12_prop
.
set_display_unit
(
"mr"
);
yp_s12_prop
.
set_format
(
"%6.3f"
);
// max_value not set for YP_S12
// min_value not set for YP_S12
// max_alarm not set for YP_S12
// min_alarm not set for YP_S12
// max_warning not set for YP_S12
// min_warning not set for YP_S12
// delta_t not set for YP_S12
// delta_val not set for YP_S12
yp_s12
->
set_default_properties
(
yp_s12_prop
);
// Not Polled
yp_s12
->
set_disp_level
(
Tango
::
OPERATOR
);
// Not Memorized
att_list
.
push_back
(
yp_s12
);
// Attribute : YP_S2
YP_S2Attrib
*
yp_s2
=
new
YP_S2Attrib
();
Tango
::
UserDefaultAttrProp
yp_s2_prop
;
...
...
@@ -1967,30 +1919,6 @@ void BPMIDClass::attribute_factory(vector<Tango::Attr *> &att_list)
// Not Memorized
att_list
.
push_back
(
y_s11
);
// Attribute : Y_S12
Y_S12Attrib
*
y_s12
=
new
Y_S12Attrib
();
Tango
::
UserDefaultAttrProp
y_s12_prop
;
// description not set for Y_S12
// label not set for Y_S12
y_s12_prop
.
set_unit
(
"mm"
);
y_s12_prop
.
set_standard_unit
(
"1"
);
y_s12_prop
.
set_display_unit
(
"mm"
);
y_s12_prop
.
set_format
(
"%6.3f"
);
// max_value not set for Y_S12
// min_value not set for Y_S12
// max_alarm not set for Y_S12
// min_alarm not set for Y_S12
// max_warning not set for Y_S12
// min_warning not set for Y_S12
// delta_t not set for Y_S12
// delta_val not set for Y_S12
y_s12
->
set_default_properties
(
y_s12_prop
);
// Not Polled
y_s12
->
set_disp_level
(
Tango
::
OPERATOR
);
// Not Memorized
att_list
.
push_back
(
y_s12
);
// Attribute : Y_S2
Y_S2Attrib
*
y_s2
=
new
Y_S2Attrib
();
Tango
::
UserDefaultAttrProp
y_s2_prop
;
...
...
src/BPMIDClass.h
View file @
e0fd25d6
...
...
@@ -170,19 +170,6 @@ public:
{
return
(
static_cast
<
BPMID
*>
(
dev
))
->
is_XP_S11_allowed
(
ty
);}
};
// Attribute XP_S12 class definition
class
XP_S12Attrib
:
public
Tango
::
Attr
{
public:
XP_S12Attrib
()
:
Attr
(
"XP_S12"
,
Tango
::
DEV_DOUBLE
,
Tango
::
READ
)
{};
~
XP_S12Attrib
()
{};
virtual
void
read
(
Tango
::
DeviceImpl
*
dev
,
Tango
::
Attribute
&
att
)
{(
static_cast
<
BPMID
*>
(
dev
))
->
read_XP_S12
(
att
);}
virtual
bool
is_allowed
(
Tango
::
DeviceImpl
*
dev
,
Tango
::
AttReqType
ty
)
{
return
(
static_cast
<
BPMID
*>
(
dev
))
->
is_XP_S12_allowed
(
ty
);}
};
// Attribute XP_S2 class definition
class
XP_S2Attrib
:
public
Tango
::
Attr
{
...
...
@@ -664,19 +651,6 @@ public:
{
return
(
static_cast
<
BPMID
*>
(
dev
))
->
is_YP_S11_allowed
(
ty
);}
};
// Attribute YP_S12 class definition
class
YP_S12Attrib
:
public
Tango
::
Attr
{
public:
YP_S12Attrib
()
:
Attr
(
"YP_S12"
,
Tango
::
DEV_DOUBLE
,
Tango
::
READ
)
{};
~
YP_S12Attrib
()
{};
virtual
void
read
(
Tango
::
DeviceImpl
*
dev
,
Tango
::
Attribute
&
att
)
{(
static_cast
<
BPMID
*>
(
dev
))
->
read_YP_S12
(
att
);}
virtual
bool
is_allowed
(
Tango
::
DeviceImpl
*
dev
,
Tango
::
AttReqType
ty
)
{
return
(
static_cast
<
BPMID
*>
(
dev
))
->
is_YP_S12_allowed
(
ty
);}
};
// Attribute YP_S2 class definition
class
YP_S2Attrib
:
public
Tango
::
Attr
{
...
...
@@ -911,19 +885,6 @@ public:
{
return
(
static_cast
<
BPMID
*>
(
dev
))
->
is_Y_S11_allowed
(
ty
);}
};
// Attribute Y_S12 class definition
class
Y_S12Attrib
:
public
Tango
::
Attr
{
public:
Y_S12Attrib
()
:
Attr
(
"Y_S12"
,
Tango
::
DEV_DOUBLE
,
Tango
::
READ
)
{};
~
Y_S12Attrib
()
{};
virtual
void
read
(
Tango
::
DeviceImpl
*
dev
,
Tango
::
Attribute
&
att
)
{(
static_cast
<
BPMID
*>
(
dev
))
->
read_Y_S12
(
att
);}
virtual
bool
is_allowed
(
Tango
::
DeviceImpl
*
dev
,
Tango
::
AttReqType
ty
)
{
return
(
static_cast
<
BPMID
*>
(
dev
))
->
is_Y_S12_allowed
(
ty
);}
};
// Attribute Y_S2 class definition
class
Y_S2Attrib
:
public
Tango
::
Attr
{
...
...
src/BPMIDStateMachine.cpp
View file @
e0fd25d6
...
...
@@ -193,22 +193,6 @@ bool BPMID::is_XP_S11_allowed(TANGO_UNUSED(Tango::AttReqType type))
return
true
;
}
//--------------------------------------------------------
/**
* Method : BPMID::is_XP_S12_allowed()
* Description : Execution allowed for XP_S12 attribute
*/
//--------------------------------------------------------
bool
BPMID
::
is_XP_S12_allowed
(
TANGO_UNUSED
(
Tango
::
AttReqType
type
))
{
// Not any excluded states for XP_S12 attribute in read access.
/*----- PROTECTED REGION ID(BPMID::XP_S12StateAllowed_READ) ENABLED START -----*/
/*----- PROTECTED REGION END -----*/
// BPMID::XP_S12StateAllowed_READ
return
true
;
}
//--------------------------------------------------------
/**
* Method : BPMID::is_XP_S2_allowed()
...
...
@@ -801,22 +785,6 @@ bool BPMID::is_YP_S11_allowed(TANGO_UNUSED(Tango::AttReqType type))
return
true
;
}
//--------------------------------------------------------
/**
* Method : BPMID::is_YP_S12_allowed()
* Description : Execution allowed for YP_S12 attribute
*/
//--------------------------------------------------------
bool
BPMID
::
is_YP_S12_allowed
(
TANGO_UNUSED
(
Tango
::
AttReqType
type
))
{
// Not any excluded states for YP_S12 attribute in read access.
/*----- PROTECTED REGION ID(BPMID::YP_S12StateAllowed_READ) ENABLED START -----*/
/*----- PROTECTED REGION END -----*/
// BPMID::YP_S12StateAllowed_READ
return
true
;
}
//--------------------------------------------------------
/**
* Method : BPMID::is_YP_S2_allowed()
...
...
@@ -1105,22 +1073,6 @@ bool BPMID::is_Y_S11_allowed(TANGO_UNUSED(Tango::AttReqType type))
return
true
;
}
//--------------------------------------------------------
/**
* Method : BPMID::is_Y_S12_allowed()
* Description : Execution allowed for Y_S12 attribute
*/
//--------------------------------------------------------
bool
BPMID
::
is_Y_S12_allowed
(
TANGO_UNUSED
(
Tango
::
AttReqType
type
))
{
// Not any excluded states for Y_S12 attribute in read access.
/*----- PROTECTED REGION ID(BPMID::Y_S12StateAllowed_READ) ENABLED START -----*/
/*----- PROTECTED REGION END -----*/
// BPMID::Y_S12StateAllowed_READ
return
true
;
}
//--------------------------------------------------------
/**
* Method : BPMID::is_Y_S2_allowed()
...
...
test/comp.py
View file @
e0fd25d6
...
...
@@ -24,9 +24,9 @@ for a in attrlist2:
sorted_att1
=
{
k
:
att1
[
k
]
for
k
in
sorted
(
att1
)}
sorted_att2
=
{
k
:
att2
[
k
]
for
k
in
sorted
(
att2
)}
print
(
sorted_att1
.
keys
())
print
(
sorted_att2
.
keys
())
#
for attr in
attrlist2
:
#
a1 = bpm1.read_attribute(attr).value
#
a2 = bpm2.read_attribute(attr).value
#
print(attr,a1,a2)
#
print(sorted_att1.keys())
#
print(sorted_att2.keys())
for
attr
in
sorted_att1
:
a1
=
bpm1
.
read_attribute
(
attr
).
value
a2
=
bpm2
.
read_attribute
(
attr
).
value
print
(
attr
,
a1
,
a2
)
test/dump2
0 → 100644
View file @
e0fd25d6
79 79
HorAngle [ 9.65087528e-02 -1.21457182e-01 -3.37830252e-02 3.02158142e-03
1.29130198e-02 2.71985137e-04 4.93087659e-02 1.24103236e-01
9.98498560e-01 2.14606133e-03 5.20939492e-03] [ 9.65112944e-02 -1.21455359e-01 -3.38171596e-02 3.01063931e-03
1.29587771e-02 2.98673932e-04 4.93336542e-02 1.24157892e-01
9.98449002e-01 2.15505624e-03 5.18717746e-03]
HorPos [ 0.01924167 -0.11033135 -0.03664178 -0.03822477 -0.04759041 -0.01768701
0.03386284 -0.01572364 1.97963708 -0.00609704 -0.00779083] [ 0.01917848 -0.11023256 -0.03664117 -0.03833077 -0.04763178 -0.01792868
0.03383769 -0.01570938 1.97960567 -0.00604832 -0.00783128]
State ALARM ALARM
Status BPMID: working
Warning : Value too high for XP_B6
Alarm : Value too high for XP_B7
Warning : Value too high for S11 Horizontal beam angle
Warning : Value too high for XP_S3
Alarm : Value too high for S5 Horizontal beam angle
Alarm : Value too low for XP_S7
Alarm : Value too low for X_B6
Alarm : Value too low for X_B7
Warning : Value too high for X_S1
Warning : Value too low for X_S10
Warning : Value too low for X_S11
Alarm : Value too high for X_S12
Alarm : Value too low for X_S3
Alarm : Value too low for X_S4
Alarm : Value too low for X_S5
Alarm : Value too low for X_S6
Alarm : Value too high for X_S7
Warning : Value too low for X_S8
Alarm : Value too low for X_S9
Alarm : Value too high for X_SS1
Warning : Value too low for YP_B7
Warning : Value too low for YP_B9
Warning : Value too low for YP_S5
Alarm : Value too low for YP_SS1
Warning : Value too high for Y_B6
Warning : Value too low for Y_B7
Warning : Value too low for Y_B8
Alarm : Value too high for Y_S1
Alarm : Value too low for Y_S10
Alarm : Value too high for Y_S11
Alarm : Value too high for Y_S3
Alarm : Value too high for Y_S4
Alarm : Value too high for Y_S5
Alarm : Value too high for Y_S6
Alarm : Value too high for Y_S8
Alarm : Value too high for Y_SS1 BPMID: working
VerAngle [-0.00437282 0.01140675 -0.06316323 0.00107271 -0.04663529 -0.07499365
-0.01755967 0.00032916 -0.04953546 -0.00224535 -0.00061648] [-0.00440225 0.01140681 -0.06312691 0.00103096 -0.04665197 -0.07500731
-0.01754793 0.00038372 -0.04949575 -0.00227045 -0.00060453]
VerPos [ 0.01603291 -0.01418633 0.05291704 0.01513477 0.05480101 0.01076952
0.00218216 0.01121808 -0.00149828 -0.01267768 0.02048446] [ 0.01605346 -0.01419152 0.0530233 0.01499105 0.05476489 0.01075262
0.00216792 0.01124255 -0.00146015 -0.012672 0.02047511]
XP_B10 -0.09137841114692097 -0.09161440861250408
XP_B11 0.00154459279550993 0.00287489872699243
XP_B6 0.015926533984396512 0.015922852537026824
XP_B7 0.05434849589032477 0.05399350195771766
XP_B8 0.009279174106953156 0.010520846442004952
XP_B9 -0.04851836429052048 -0.04846581115830079
XP_S1 0.09650875281832966 0.09652861025693654
XP_S10 0.0021460613319191357 0.002140572870177715
XP_S11 0.005209394915242999 0.005197806228466745
XP_S2 -0.12145718232347846 -0.1214733741560107
XP_S3 -0.03378302515377116 -0.03381136272583456
XP_S4 0.003021581420352082 0.0030309319487381026
XP_S5 0.012913019787878899 0.012898116761553058
XP_S6 0.0002719851371147941 0.00025483587016003617
XP_S7 0.049308765877533134 0.04937202120732759
XP_S8 0.12410323607176627 0.12419968577733076
XP_S9 0.9984985596626477 0.998482245974825
XP_SS1 -0.035893338119467266 -0.03592517062369856
X_B10 -0.001766700579490521 -0.0016218744057812388
X_B11 -0.0061398441788332045 -0.007605000960527246
X_B6 -0.028454416543174703 -0.028307627146441718
X_B7 -0.027263960104470426 -0.02722457623213857
X_B8 -0.00849196491083806 -0.00900405728550623
X_B9 -0.12277367273610029 -0.12280927727814855
X_S1 0.01924167491035092 0.019219449828430095
X_S10 -0.006097042785587464 -0.006092371271553082
X_S11 -0.007790827943668404 -0.007881456806049372
X_S12 0.0925121158361435 0.09244945645332336
X_S2 -0.11033135171438396 -0.11030137802864252
X_S3 -0.036641780309044206 -0.036620881430469834
X_S4 -0.03822476570863768 -0.03831762974519765
X_S5 -0.04759040931700524 -0.04767237129150685
X_S6 -0.017687008624814135 -0.017876491790555164
X_S7 0.033862838930305436 0.03390387672823342
X_S8 -0.01572364425072792 -0.015870867723322964
X_S9 1.9796370820559548 1.9794861630953826
X_SS1 -0.09963619433983793 -0.09969354618632828
YP_B10 0.2369652672495217 0.23615473576360088
YP_B11 -0.07182615706412294 -0.07155253225309847
YP_B6 0.0428538615474499 0.04287450166134685
YP_B7 -0.10076504834001045 -0.10078162374121996
YP_B8 -0.0011795268976332184 -0.0012830693365985582
YP_B9 0.23914909575248527 0.23976274888222807
YP_S1 -0.00437282076434764 -0.004366725512998215
YP_S10 -0.0022453476982992604 -0.002233433235135085
YP_S11 -0.0006164824559938831 -0.000637063565813667
YP_S2 0.011406751259098201 0.01141985940673719
YP_S3 -0.06316323430175332 -0.06317232122481778
YP_S4 0.0010727143211229084 0.0010631101347860217
YP_S5 -0.0466352887186717 -0.0466356891003393
YP_S6 -0.07499365014666212 -0.07499332188343155
YP_S7 -0.017559672498368845 -0.01756161223564051
YP_S8 0.0003291560486925818 0.00037651548023057146
YP_S9 -0.049535455631032344 -0.049553619529790705
YP_SS1 -0.2578859976077372 -0.25899320653080016
Y_B10 -0.30983058646764805 -0.3104576178318746
Y_B11 -0.007831935635115191 -0.00599664906548555
Y_B6 0.017884758054066252 0.017942477302423536
Y_B7 -0.01952008276928128 -0.019508011964951354
Y_B8 -0.016142925336875925 -0.014615808812686978
Y_B9 0.41913404738549875 0.41854562815681173
Y_S1 0.01603290678906743 0.016036803442719436
Y_S10 -0.012677681259639337 -0.012683529965407917
Y_S11 0.02048446451727217 0.02041380321089101
Y_S2 -0.014186334651970053 -0.014177043777965663
Y_S3 0.052917040110060765 0.05298583877129277
Y_S4 0.015134769662813817 0.015146616085962922
Y_S5 0.05480101321070227 0.054767865577626536
Y_S6 0.010769522066688048 0.010846501465415463
Y_S7 0.0021821609882413315 0.0021719983963070667
Y_S8 0.011218080272382294 0.011264780511563812
Y_S9 -0.0014982825236918573 -0.0013937955814007376