Commit f412687e authored by Locatelli's avatar Locatelli

Ladi changes

parent 2009af6e
......@@ -35,7 +35,7 @@ void CountProperties::init(const std::string& name) {
currentTotalReps.init(this, NOSAVE | SPY, "currenttotalrepetition", "ActualRepet");
currentLocalReps.init(this, NOSAVE | SPY, "currentlocalrepetition", "ActualRepaint");
saveData.init(this, SAVE, "savedata");
statusMessage.init(this, NOSAVE, "status_message");
statusMessage.init(this, NOSAVE | SPY, "status_message");
logStyle.init(this, SAVE, "log_style");
logTitle.init(this, NOSAVE, "log_title");
logValues.init(this, NOSAVE, "log_values");
......
......@@ -452,16 +452,16 @@ void LadiController::updateEraseTime() {
void LadiController::updateLadiDriverStatus() {
int32 status = m_LadiDriver->status();
ladiStatus.update(status);
if (status & ladicontrol::SAFETY_RACK_OK_STATUS) {
// Abort
safetyState.update(1);
}
if (!(status & ladicontrol::SAFETY_RACK_OK_STATUS)) {
// Abort
safetyState.update(0);
}
if (isStarted() == true) {
cout << "updateLadiDriverStatus : status 0x" << hex << status << dec << endl;
if (status & ladicontrol::SAFETY_RACK_OK_STATUS) {
// Abort
safetyState.update(1);
}
if (!(status & ladicontrol::SAFETY_RACK_OK_STATUS)) {
// Abort
safetyState.update(0);
}
if (status & ladicontrol::DRUM_MOVED_ABORT_ACQ_STATUS) {
// Abort
log(Level::s_Error) << "Drum moved during exposition" << endlog;
......
......@@ -4,7 +4,7 @@ ladi_controller.second=s
ladi_controller.volt=V
ladi_controller.mmeter=mm
ladi_controller.degree=~degree
ladi_controller.watt=w
ladi_controller.mwatt=mW
ladi_controller.degreeC=~degreeC
ladi_controller.drumAcquisitionSpeedPrefix=Drum acquisition Speed
......@@ -23,6 +23,8 @@ ladi_controller.enableAveragePrefix=Enable average
ladi_controller.enableAverageCheckedValue=true
ladi_controller.enableAverageUncheckedValue=false
ladi_controller.detector_high_voltagePrefix=High voltage PMT
ladi_controller.drumPositionPrefix=Drum position
ladi_controller.drumSpeedPrefix=Drum speed
ladi_controller.drumDacCommandPrefix=Drum DAC command
......@@ -140,3 +142,6 @@ ladi_controller.waitForStartImage=WARNING_STATUS
ladi_controller.wantedTimePrefix=Time
ladi_controller.runPrefix=Run
ladi_controller.actualTimePrefix=Now
ladi_controller.safetyNotOK=Safety Rack Not OK
ladi_controller.safetyOK=Safety Rack OK
\ No newline at end of file
......@@ -72,6 +72,10 @@
<specific_values values="h,m,s"/>
</property>
<property name="detector_high_voltage" type="float64" max_length="6">
<decimal_format nb_decimal_places="1"/>
</property>
<property name="ladi_status" type="int32">
</property>
......
......@@ -4,7 +4,7 @@
<property_switcher role="ladi_controller1" property="status" switcher_key="acquisitionStatusSwitcher" />
<property_switcher role="ladi_controller1" property="ladi_message" switcher_key="ladi_messageSwitcher" />
<property_switcher role="ladi_controller1" property="ladi_message" switcher_key="ladi_messageSwitcher" />
<property_switcher role="ladi_controller1" property="safetyState" switcher_key="safetyStateSwitcher" />
<composite isVertical="true" grabHorizontal="true">
<composite>
......@@ -30,6 +30,8 @@
<label role="ladi_controller1" property="drumPosition" prefix="ladi_controller.drumPositionPrefix" suffix="ladi_controller.degree" font_size="10"/>
<label role="ladi_controller1" property="drumSpeed" prefix="ladi_controller.drumSpeedPrefix" suffix="ladi_controller.rpm" font_size="10"/>
<label role="ladi_controller1" property="headPosition" prefix="ladi_controller.headPositionPrefix" suffix="ladi_controller.mmeter" font_size="10"/>
<label role="ladi_controller1" property="adcPhotodiode" prefix="ladi_controller.adcPhotodiodePrefix" suffix="ladi_controller.mwatt" font_size="10"/>
<label role="ladi_controller1" property="adcTemperature" prefix="ladi_controller.adcTemperaturePrefix" suffix="ladi_controller.degreeC" font_size="10"/>
<switchable_composite switcher_key="ladi_messageSwitcher" switch_values="Counting">
<switchable_composite switcher_key="acquisitionStatusSwitcher" switch_values="0,1,2,4,16,32" >
<label role="ladi_controller1" property="status_message" font_size="10"/>
......@@ -42,5 +44,14 @@
<label role="ladi_controller1" property="readingDataProgression" prefix="ladi_controller.readingDataProgressionPrefix" suffix="ladi_controller.progressionSuffix" spaceBefore="false" font_size="10"/>
</switchable_composite>
</composite>
<newLine />
<composite isVertical="true">
<switchable_composite switcher_key="safetyStateSwitcher" switch_values="0">
<simple_label prefix="ladi_controller.safetyNotOK" font_size="10" font_style="ALARM"/>
</switchable_composite>
<switchable_composite switcher_key="safetyStateSwitcher" switch_values="1">
<simple_label prefix="ladi_controller.safetyOK" font_size="10" font_style="BOLD"/>
</switchable_composite>
</composite>
</plugin>
......@@ -44,6 +44,8 @@
<check role="ladi_controller1" property="enableAverage" prefix="ladi_controller.enableAveragePrefix" checkBoxValues="ladi_controller.enableAverage"/>
<newLine/>
<text role="ladi_controller1" property="detector_high_voltage" prefix="ladi_controller.detector_high_voltagePrefix" suffix="ladi_controller.volt"/>
</switchable_composite>
......@@ -80,7 +82,7 @@
<label role="ladi_controller1" property="nbWordsInDDR"/>
<simple_label prefix="ladi_controller.adcPhotodiodePrefix"/>
<label role="ladi_controller1" property="adcPhotodiode" suffix="ladi_controller.watt"/>
<label role="ladi_controller1" property="adcPhotodiode" suffix="ladi_controller.mwatt"/>
<simple_label prefix="ladi_controller.adcTemperaturePrefix"/>
<label role="ladi_controller1" property="adcTemperature" suffix="ladi_controller.degreeC"/>
......
......@@ -8,6 +8,7 @@ LadiControl.volt=V
LadiControl.mmeter=mm
LadiControl.degree=~degree
LadiControl.dac=dac
LadiControl.mwatt=mW
LadiControl.drumCenterExpositionPrefix=Drum center exposition
LadiControl.drumZeroMotionPrefix=Drum zero motion
......
......@@ -25,7 +25,7 @@
<newLine/>
<text role="LadiControl1" property="nbClkPulse" prefix="LadiControl.nbClkPulsePrefix"/>
<newLine/>
<text role="LadiControl1" property="dacLaserSetpoint" prefix="LadiControl.dacLaserSetpointPrefix" suffix="LadiControl.volt"/>
<text role="LadiControl1" property="dacLaserSetpoint" prefix="LadiControl.dacLaserSetpointPrefix" suffix="LadiControl.mwatt"/>
<newLine/>
<text role="LadiControl1" property="timerAdcPhotodiode" prefix="LadiControl.timerAdcPhotodiodePrefix" suffix="LadiControl.usecond"/>
<newLine/>
......
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