Commit 5468d36d authored by Jean-Luc Pons's avatar Jean-Luc Pons

Fixed for offset

parent b6d7655a
......@@ -473,7 +473,7 @@ void LiberaSparkSRBPM::init_device()
attr_SA_Enable_read[0] = false;
attr_SA_Avg_Enable_read[0] = true;
attr_SA_Avg_Length_read[0] = 20;
attr_SA_Stat_Length_read[0] = 0;
attr_SA_Stat_Length_read[0] = 1;
attr_SA_History_BufSize_read[0] = 1800;
attr_SA_Incoherency_Ref_read[0] = 0;
saThread = NULL;
......
......@@ -62,7 +62,7 @@
<archiveEvent fire="false" libCheckCriteria="false"/>
<dataReadyEvent fire="false" libCheckCriteria="true"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="" label="" unit="SA sample" standardUnit="" displayUnit="" format="%3d" maxValue="100" minValue="0" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
<properties description="" label="" unit="SA sample" standardUnit="" displayUnit="" format="%3d" maxValue="100" minValue="1" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
<attributes name="SA_Va" attType="Scalar" rwType="READ" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:DoubleType"/>
......@@ -367,7 +367,7 @@
<archiveEvent fire="false" libCheckCriteria="false"/>
<dataReadyEvent fire="false" libCheckCriteria="true"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="" label="" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
<properties description="" label="" unit="" standardUnit="" displayUnit="" format="%6d" maxValue="" minValue="10" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
<attributes name="TBT_Enable" attType="Scalar" rwType="READ_WRITE" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" memorized="true" memorizedAtInit="true" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:BooleanType"/>
......@@ -415,7 +415,7 @@
<archiveEvent fire="false" libCheckCriteria="false"/>
<dataReadyEvent fire="false" libCheckCriteria="true"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<properties description="" label="" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
<properties description="" label="" unit="" standardUnit="" displayUnit="" format="%6d" maxValue="" minValue="10" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
</attributes>
<attributes name="ADC_Enable" attType="Scalar" rwType="READ_WRITE" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" memorized="true" memorizedAtInit="true" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:BooleanType"/>
......
......@@ -431,7 +431,7 @@ void LiberaSparkSRBPMClass::attribute_factory(vector<Tango::Attr *> &att_list)
// display_unit not set for SA_Stat_Length
sa_stat_length_prop.set_format("%3d");
sa_stat_length_prop.set_max_value("100");
sa_stat_length_prop.set_min_value("0");
sa_stat_length_prop.set_min_value("1");
// max_alarm not set for SA_Stat_Length
// min_alarm not set for SA_Stat_Length
// max_warning not set for SA_Stat_Length
......@@ -1356,9 +1356,9 @@ void LiberaSparkSRBPMClass::attribute_factory(vector<Tango::Attr *> &att_list)
// unit not set for TBT_BufSize
// standard_unit not set for TBT_BufSize
// display_unit not set for TBT_BufSize
// format not set for TBT_BufSize
tbt_bufsize_prop.set_format("%6d");
// max_value not set for TBT_BufSize
// min_value not set for TBT_BufSize
tbt_bufsize_prop.set_min_value("10");
// max_alarm not set for TBT_BufSize
// min_alarm not set for TBT_BufSize
// max_warning not set for TBT_BufSize
......@@ -1505,9 +1505,9 @@ void LiberaSparkSRBPMClass::attribute_factory(vector<Tango::Attr *> &att_list)
// unit not set for ADC_BufSize
// standard_unit not set for ADC_BufSize
// display_unit not set for ADC_BufSize
// format not set for ADC_BufSize
adc_bufsize_prop.set_format("%6d");
// max_value not set for ADC_BufSize
// min_value not set for ADC_BufSize
adc_bufsize_prop.set_min_value("10");
// max_alarm not set for ADC_BufSize
// min_alarm not set for ADC_BufSize
// max_warning not set for ADC_BufSize
......
......@@ -164,9 +164,9 @@ void PosCalculation::ComputePosition(BP &p) {
case DOS_CALC: {
// Pos in m
p.x = (KX * (((a + d) - (b + c)) / p.sum) - OX)*1e-9;
p.z = (KZ * (((a + b) - (c + d)) / p.sum) - OZ)*1e-9;
p.q = (KX * (((a + c) - (b + d)) / p.sum) - OQ)*1e-9;
p.x = (KX * (((a + d) - (b + c)) / p.sum) + OX)*1e-9;
p.z = (KZ * (((a + b) - (c + d)) / p.sum) + OZ)*1e-9;
p.q = (KX * (((a + c) - (b + d)) / p.sum) + OQ)*1e-9;
}
break;
......@@ -219,7 +219,7 @@ void PosCalculation::ComputePosition(BP &p) {
p.z = (sum + OZ)*1e-9;
// TODO polynomial for Q
p.q = (KX * (((p.va + p.vc) - (p.vb + p.vd)) / p.sum) - OQ)*1e-9;
p.q = (KX * (((p.va + p.vc) - (p.vb + p.vd)) / p.sum) + OQ)*1e-9;
}
break;
......
Markdown is supported
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