Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tango-ds
DeviceClasses
Acquisition
2D
AGIPD
Commits
0c2eab09
Commit
0c2eab09
authored
Aug 09, 2016
by
Yuelong Yu
Browse files
calculation routine of ltcc temperature has been changed. The previous one was wrong
parent
edd4d2f5
Changes
25
Hide whitespace changes
Inline
Side-by-side
agipdmc/AGIPDMC.cpp
View file @
0c2eab09
...
...
@@ -209,7 +209,7 @@ void AGIPDMC::init_device()
/*----- PROTECTED REGION ID(AGIPDMC::init_device) ENABLED START -----*/
// Initialize device
Tango
::
DevString
strDefaultTemperature
=
"
-9999;-9999;-9999
"
;
Tango
::
DevString
strDefaultTemperature
=
"
X;X;X;X
"
;
*
attr_Temperature1_read
=
strDefaultTemperature
;
*
attr_Temperature2_read
=
strDefaultTemperature
;
...
...
agipdmc/AGIPDMC.h
View file @
0c2eab09
...
...
@@ -77,6 +77,7 @@ class AGIPDMC : public TANGO_BASE_CLASS
/*----- PROTECTED REGION END -----*/
// AGIPDMC::Data Members
// Device property data members
public:
// TTTGWDeviceName:
string
tTTGWDeviceName
;
// NumberOfModules:
...
...
agipdmc/AGIPDMC.xmi
View file @
0c2eab09
...
...
@@ -37,7 +37,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature1"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature1"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature2"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -45,7 +45,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature2"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature2"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature3"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -53,7 +53,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature3"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature3"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature4"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -61,7 +61,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature4"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature4"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature5"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -69,7 +69,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature5"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature5"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature6"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -77,7 +77,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature6"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature6"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature7"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -85,7 +85,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature7"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature7"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature8"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -93,7 +93,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature8"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature8"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature9"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -101,7 +101,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature9"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature9"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature10"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -109,7 +109,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature10"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature10"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature11"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -117,7 +117,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature11"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature11"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature12"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -125,7 +125,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature12"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature12"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature13"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -133,7 +133,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature13"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature13"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature14"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -141,7 +141,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature14"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature14"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature15"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -149,7 +149,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature15"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature15"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"Temperature16"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:StringType"
/>
...
...
@@ -157,7 +157,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
"Temperature16"
unit=
"
K
el
vin
"
standardUnit=
"
K
el
vin
"
displayUnit=
"
K
el
vin
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
"Temperature16"
unit=
"
C
el
sius
"
standardUnit=
"
C
el
sius
"
displayUnit=
"
C
el
sius
"
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
</attributes>
<attributes
name=
"RawMatrix"
attType=
"Spectrum"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
"6000"
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
<dataType
xsi:type=
"pogoDsl:ShortType"
/>
...
...
agipdmc/AGIPDMCClass.cpp
View file @
0c2eab09
...
...
@@ -465,9 +465,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature1_prop
;
// description not set for Temperature1
temperature1_prop
.
set_label
(
"Temperature1"
);
temperature1_prop
.
set_unit
(
"
K
el
vin
"
);
temperature1_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature1_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature1_prop
.
set_unit
(
"
C
el
sius
"
);
temperature1_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature1_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature1
// max_value not set for Temperature1
// min_value not set for Temperature1
...
...
@@ -489,9 +489,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature2_prop
;
// description not set for Temperature2
temperature2_prop
.
set_label
(
"Temperature2"
);
temperature2_prop
.
set_unit
(
"
K
el
vin
"
);
temperature2_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature2_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature2_prop
.
set_unit
(
"
C
el
sius
"
);
temperature2_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature2_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature2
// max_value not set for Temperature2
// min_value not set for Temperature2
...
...
@@ -513,9 +513,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature3_prop
;
// description not set for Temperature3
temperature3_prop
.
set_label
(
"Temperature3"
);
temperature3_prop
.
set_unit
(
"
K
el
vin
"
);
temperature3_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature3_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature3_prop
.
set_unit
(
"
C
el
sius
"
);
temperature3_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature3_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature3
// max_value not set for Temperature3
// min_value not set for Temperature3
...
...
@@ -537,9 +537,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature4_prop
;
// description not set for Temperature4
temperature4_prop
.
set_label
(
"Temperature4"
);
temperature4_prop
.
set_unit
(
"
K
el
vin
"
);
temperature4_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature4_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature4_prop
.
set_unit
(
"
C
el
sius
"
);
temperature4_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature4_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature4
// max_value not set for Temperature4
// min_value not set for Temperature4
...
...
@@ -561,9 +561,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature5_prop
;
// description not set for Temperature5
temperature5_prop
.
set_label
(
"Temperature5"
);
temperature5_prop
.
set_unit
(
"
K
el
vin
"
);
temperature5_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature5_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature5_prop
.
set_unit
(
"
C
el
sius
"
);
temperature5_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature5_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature5
// max_value not set for Temperature5
// min_value not set for Temperature5
...
...
@@ -585,9 +585,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature6_prop
;
// description not set for Temperature6
temperature6_prop
.
set_label
(
"Temperature6"
);
temperature6_prop
.
set_unit
(
"
K
el
vin
"
);
temperature6_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature6_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature6_prop
.
set_unit
(
"
C
el
sius
"
);
temperature6_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature6_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature6
// max_value not set for Temperature6
// min_value not set for Temperature6
...
...
@@ -609,9 +609,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature7_prop
;
// description not set for Temperature7
temperature7_prop
.
set_label
(
"Temperature7"
);
temperature7_prop
.
set_unit
(
"
K
el
vin
"
);
temperature7_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature7_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature7_prop
.
set_unit
(
"
C
el
sius
"
);
temperature7_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature7_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature7
// max_value not set for Temperature7
// min_value not set for Temperature7
...
...
@@ -633,9 +633,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature8_prop
;
// description not set for Temperature8
temperature8_prop
.
set_label
(
"Temperature8"
);
temperature8_prop
.
set_unit
(
"
K
el
vin
"
);
temperature8_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature8_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature8_prop
.
set_unit
(
"
C
el
sius
"
);
temperature8_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature8_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature8
// max_value not set for Temperature8
// min_value not set for Temperature8
...
...
@@ -657,9 +657,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature9_prop
;
// description not set for Temperature9
temperature9_prop
.
set_label
(
"Temperature9"
);
temperature9_prop
.
set_unit
(
"
K
el
vin
"
);
temperature9_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature9_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature9_prop
.
set_unit
(
"
C
el
sius
"
);
temperature9_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature9_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature9
// max_value not set for Temperature9
// min_value not set for Temperature9
...
...
@@ -681,9 +681,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature10_prop
;
// description not set for Temperature10
temperature10_prop
.
set_label
(
"Temperature10"
);
temperature10_prop
.
set_unit
(
"
K
el
vin
"
);
temperature10_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature10_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature10_prop
.
set_unit
(
"
C
el
sius
"
);
temperature10_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature10_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature10
// max_value not set for Temperature10
// min_value not set for Temperature10
...
...
@@ -705,9 +705,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature11_prop
;
// description not set for Temperature11
temperature11_prop
.
set_label
(
"Temperature11"
);
temperature11_prop
.
set_unit
(
"
K
el
vin
"
);
temperature11_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature11_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature11_prop
.
set_unit
(
"
C
el
sius
"
);
temperature11_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature11_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature11
// max_value not set for Temperature11
// min_value not set for Temperature11
...
...
@@ -729,9 +729,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature12_prop
;
// description not set for Temperature12
temperature12_prop
.
set_label
(
"Temperature12"
);
temperature12_prop
.
set_unit
(
"
K
el
vin
"
);
temperature12_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature12_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature12_prop
.
set_unit
(
"
C
el
sius
"
);
temperature12_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature12_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature12
// max_value not set for Temperature12
// min_value not set for Temperature12
...
...
@@ -753,9 +753,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature13_prop
;
// description not set for Temperature13
temperature13_prop
.
set_label
(
"Temperature13"
);
temperature13_prop
.
set_unit
(
"
K
el
vin
"
);
temperature13_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature13_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature13_prop
.
set_unit
(
"
C
el
sius
"
);
temperature13_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature13_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature13
// max_value not set for Temperature13
// min_value not set for Temperature13
...
...
@@ -777,9 +777,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature14_prop
;
// description not set for Temperature14
temperature14_prop
.
set_label
(
"Temperature14"
);
temperature14_prop
.
set_unit
(
"
K
el
vin
"
);
temperature14_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature14_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature14_prop
.
set_unit
(
"
C
el
sius
"
);
temperature14_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature14_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature14
// max_value not set for Temperature14
// min_value not set for Temperature14
...
...
@@ -801,9 +801,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature15_prop
;
// description not set for Temperature15
temperature15_prop
.
set_label
(
"Temperature15"
);
temperature15_prop
.
set_unit
(
"
K
el
vin
"
);
temperature15_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature15_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature15_prop
.
set_unit
(
"
C
el
sius
"
);
temperature15_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature15_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature15
// max_value not set for Temperature15
// min_value not set for Temperature15
...
...
@@ -825,9 +825,9 @@ void AGIPDMCClass::attribute_factory(vector<Tango::Attr *> &att_list)
Tango
::
UserDefaultAttrProp
temperature16_prop
;
// description not set for Temperature16
temperature16_prop
.
set_label
(
"Temperature16"
);
temperature16_prop
.
set_unit
(
"
K
el
vin
"
);
temperature16_prop
.
set_standard_unit
(
"
K
el
vin
"
);
temperature16_prop
.
set_display_unit
(
"
K
el
vin
"
);
temperature16_prop
.
set_unit
(
"
C
el
sius
"
);
temperature16_prop
.
set_standard_unit
(
"
C
el
sius
"
);
temperature16_prop
.
set_display_unit
(
"
C
el
sius
"
);
// format not set for Temperature16
// max_value not set for Temperature16
// min_value not set for Temperature16
...
...
agipdmc/MicroController.cpp
View file @
0c2eab09
...
...
@@ -39,7 +39,7 @@ namespace AGIPDMC_ns
for
(
auto
nIdx
:
LTCC_INDEX_TABLE
)
{
short
shADCValue
=
m_vshMatrix
[
nIdx
/
2
];
shADCValue
=
(((
shADCValue
&
0xff00
)
>>
8
)
|
((
shADCValue
&
0xff
)
<<
8
))
&
0xfff
;
//
shADCValue = (((shADCValue & 0xff00) >> 8)| ((shADCValue & 0xff) << 8)) & 0xfff;
double
dTemp
=
CalculateLTCCTemperature
(
shADCValue
);
m_vstTemperatures
[
i
].
dLTCCTemperature
=
dTemp
;
i
++
;
...
...
@@ -81,11 +81,14 @@ namespace AGIPDMC_ns
{
try
{
return
GetPt100Temperature
(
dADU
);
if
(
dADU
!=
0
)
return
GetPt100Temperature
(
dADU
);
else
return
UNKNOWN_VALUE
;
}
catch
(
exception
&
e
)
{
cout
<<
"CalculateTemperature
s
:"
<<
e
.
what
()
<<
endl
;
cout
<<
"Calculate
LTCC
Temperature:"
<<
e
.
what
()
<<
endl
;
return
nan
(
""
);
}
}
...
...
@@ -111,15 +114,16 @@ namespace AGIPDMC_ns
//temperature sensor(near voltage regulator ADC "U_plus_I")
short
shEntry2
=
m_vshMatrix
[
nIdxBegin
+
nOffSet
+
(
i
+
1
)
];
shEntry2
=
(((
shEntry2
&
0xff00
)
&
0xf
)
|
((
shEntry2
&
0xff
)
<<
8
))
&
0xfff
;
dResult
=
CalculateTemperatures
(
NormalizeResistor
(
shEntry1
,
shEntry2
));
if
(
isnan
(
dResult
))
dResult
=
UNKNOWN_VALUE
;
else
dResult
-=
273.15
;
//to celsius
}
else
//vector out of range
dResult
=
UNKNOWN_VALUE
;
vdTmp
.
push_back
(
dResult
);
}
...
...
@@ -133,20 +137,20 @@ namespace AGIPDMC_ns
long
ADC_Value
=
0
;
double
const
A
=
3.9083E-3
;
double
const
B
=
-
5.775E-7
;
double
const
R0
=
100
0
;
double
const
R0
=
100
;
double
const
ADC_Res
=
4096.0
;
double
const
ADC_Ref
=
1.25
;
double
const
ADC_Const_Current
=
0.0005185
;
//0.00051
75
double
const
ADC_Ref
=
2048
;
double
const
ADC_Const_Current
=
1.0
75
;
double
T
=
0
;
// Temperatur bei 0°C
double
voltage
;
double
r
=
10
0
;
double
r
=
0
;
/* Read ADC-Values */
ADC_Value
=
dADU
;
/* Calculate Voltage according to ADC-Value */
voltage
=
ADC_Ref
*
ADC_Value
/
ADC_Res
;
voltage
=
ADC_Ref
*
ADC_Value
/
ADC_Res
-
2
;
/* Calculate pt1000 resistance*/
r
=
voltage
/
ADC_Const_Current
;
...
...
agipdmc/MicroController.h
View file @
0c2eab09
...
...
@@ -93,7 +93,7 @@ namespace AGIPDMC_ns
/**
* @brief calcuate temperature
* @param normalized resistor value
* @return temperature in
K
el
vin
or nan if exception is caught
* @return temperature in
C
el
sius
or nan if exception is caught
*/
double
CalculateTemperatures
(
double
dRnorm
);
...
...
agipdmc/UpdateDataThread.cpp
View file @
0c2eab09
...
...
@@ -76,7 +76,7 @@ namespace AGIPDMC_ns
}
char
*
UpdateDataThread
::
TemperatureToString
(
int
nIdx
)
Tango
::
DevString
UpdateDataThread
::
TemperatureToString
(
int
nIdx
)
{
if
(
nIdx
<
m_vstTemperature
.
size
())
...
...
@@ -102,13 +102,12 @@ namespace AGIPDMC_ns
strMsg
+=
"X;"
;
else
strMsg
+=
to_string
(
m_vstTemperature
[
nIdx
].
dLTCCTemperature
)
+
string
(
";"
);
return
const_cast
<
char
*>
(
strMsg
.
c_str
());
return
CORBA
::
string_dup
(
strMsg
.
c_str
());
}
else
{
return
const_cast
<
char
*>
(
string
(
"X;X;X;X"
).
c_str
());
{
return
CORBA
::
string_dup
(
string
(
"X;X;X;X"
).
c_str
());
}
}
void
UpdateDataThread
::
UpdateTemperatures
(
vector
<
short
>&
vshData
)
...
...
agipdmc/UpdateDataThread.h
View file @
0c2eab09
...
...
@@ -22,7 +22,7 @@ namespace AGIPDMC_ns
private:
void
ReadOutSpectrum
(
string
);
void
UpdateTemperatures
(
vector
<
short
>&
vshData
);
char
*
TemperatureToString
(
int
nIdx
);
Tango
::
DevString
TemperatureToString
(
int
nIdx
);
/// member variables
...
...
agipdmc/doc_html/AttrTemperature1.html
View file @
0c2eab09
...
...
@@ -66,15 +66,15 @@
</tr>
<tr>
<td>
unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
standard unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
display unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
format
</td>
...
...
agipdmc/doc_html/AttrTemperature10.html
View file @
0c2eab09
...
...
@@ -66,15 +66,15 @@
</tr>
<tr>
<td>
unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
standard unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
display unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
format
</td>
...
...
agipdmc/doc_html/AttrTemperature11.html
View file @
0c2eab09
...
...
@@ -66,15 +66,15 @@
</tr>
<tr>
<td>
unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
standard unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
display unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
format
</td>
...
...
agipdmc/doc_html/AttrTemperature12.html
View file @
0c2eab09
...
...
@@ -66,15 +66,15 @@
</tr>
<tr>
<td>
unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
standard unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
display unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
format
</td>
...
...
agipdmc/doc_html/AttrTemperature13.html
View file @
0c2eab09
...
...
@@ -66,15 +66,15 @@
</tr>
<tr>
<td>
unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
standard unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
display unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
format
</td>
...
...
agipdmc/doc_html/AttrTemperature14.html
View file @
0c2eab09
...
...
@@ -66,15 +66,15 @@
</tr>
<tr>
<td>
unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>
<td>
standard unit
</td>
<td>
K
el
vin
</td>
<td>
C
el
sius
</td>
</tr>
<tr>