detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

added burst_trigger mode for eiger to replace trigger_readout mode

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-07-04 15:44:59 +02:00
parent 7db1136e65
commit d4dd7b5d8c
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorGui/forms/form_tab_measurement.ui
View File

@ -538,6 +538,11 @@ Maximum value is 3. <br>
<string>Gated with Start Trigger</string> <string>Gated with Start Trigger</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Burst Trigger</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@ -862,7 +867,7 @@ Frame period between exposures.
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">

2
slsDetectorGui/include/qTabMeasurement.h
View File

@ -180,7 +180,7 @@ private:
/** detector type */ /** detector type */
slsDetectorDefs::detectorType detType; slsDetectorDefs::detectorType detType;
/** enum for the timing mode */ /** enum for the timing mode */
enum{None, Auto, Trigger_Exp_Series, Trigger_Readout, Gated, Gated_Start, NumTimingModes}; enum{None, Auto, Trigger_Exp_Series, Trigger_Readout, Gated, Gated_Start, Burst_Trigger, NumTimingModes};
/** timer to update the progress*/ /** timer to update the progress*/
QTimer *progressTimer; QTimer *progressTimer;
/** tool tip variables*/ /** tool tip variables*/

2
slsDetectorGui/slsDetectorGui.pro
View File

@ -23,7 +23,7 @@ QMAKE_LIBS = -L$(QTDIR)/lib
DEFINES += VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE CHECKINFERROR DEFINES += VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE CHECKINFERROR
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
CXXFLAGS += -g
QMAKE_CXXFLAGS_WARN_ON = -w QMAKE_CXXFLAGS_WARN_ON = -w

23
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -137,12 +137,14 @@ void qTabMeasurement::SetupTimingMode(){
item[(int)Trigger_Readout]->setEnabled(true); item[(int)Trigger_Readout]->setEnabled(true);
item[(int)Gated]->setEnabled(true); item[(int)Gated]->setEnabled(true);
item[(int)Gated_Start]->setEnabled(true); item[(int)Gated_Start]->setEnabled(true);
item[(int)Burst_Trigger]->setEnabled(false);
break; break;
case slsDetectorDefs::EIGER: case slsDetectorDefs::EIGER:
item[(int)Trigger_Exp_Series]->setEnabled(true); item[(int)Trigger_Exp_Series]->setEnabled(true);
item[(int)Trigger_Readout]->setEnabled(true); item[(int)Trigger_Readout]->setEnabled(false);
item[(int)Gated]->setEnabled(true); item[(int)Gated]->setEnabled(true);
item[(int)Gated_Start]->setEnabled(false); item[(int)Gated_Start]->setEnabled(false);
item[(int)Burst_Trigger]->setEnabled(true);
break; break;
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
case slsDetectorDefs::PROPIX: case slsDetectorDefs::PROPIX:
@ -152,6 +154,7 @@ void qTabMeasurement::SetupTimingMode(){
item[(int)Trigger_Readout]->setEnabled(false); item[(int)Trigger_Readout]->setEnabled(false);
item[(int)Gated]->setEnabled(false); item[(int)Gated]->setEnabled(false);
item[(int)Gated_Start]->setEnabled(false); item[(int)Gated_Start]->setEnabled(false);
item[(int)Burst_Trigger]->setEnabled(false);
break; break;
default: default:
cout << "Unknown detector type." << endl; cout << "Unknown detector type." << endl;
@ -175,7 +178,7 @@ void qTabMeasurement::GetModeFromDetector(bool startup){
slsDetectorDefs::externalCommunicationMode mode = myDet->setExternalCommunicationMode(); slsDetectorDefs::externalCommunicationMode mode = myDet->setExternalCommunicationMode();
//Setting the timing mode in gui //Setting the timing mode in gui
if(model && model->itemFromIndex(model->index(mode,comboTimingMode->modelColumn(), comboTimingMode->rootModelIndex()))->isEnabled()){ if(model && model->itemFromIndex(model->index(mode+1,comboTimingMode->modelColumn(), comboTimingMode->rootModelIndex()))->isEnabled()){
//these are things checked in setuptimingmode //these are things checked in setuptimingmode
@ -229,7 +232,7 @@ void qTabMeasurement::GetModeFromDetector(bool startup){
cout << "The detector(s) " << offline << " is/are not connected. Exiting GUI." << endl; cout << "The detector(s) " << offline << " is/are not connected. Exiting GUI." << endl;
exit(-1); exit(-1);
} }
cout << "Unknown Timing Mode " << mode << " detected from detector" << endl;
qDefs::Message(qDefs::WARNING,"Unknown Timing Mode detected from detector." qDefs::Message(qDefs::WARNING,"Unknown Timing Mode detected from detector."
"\n\nSetting the following defaults:\nTiming Mode \t: None\n" "\n\nSetting the following defaults:\nTiming Mode \t: None\n"
"Number of Frames \t: 1\nNumber of Triggers \t: 1","qTabMeasurement::GetModeFromDetector"); "Number of Frames \t: 1\nNumber of Triggers \t: 1","qTabMeasurement::GetModeFromDetector");
@ -655,9 +658,6 @@ void qTabMeasurement::SetTimingMode(int mode){
success = true; success = true;
break; break;
case Trigger_Readout://#Frames, ExpTime, Period, (Delay) case Trigger_Readout://#Frames, ExpTime, Period, (Delay)
if(detType != slsDetectorDefs::EIGER){
lblDelay->setEnabled(true); spinDelay->setEnabled(true); comboDelayUnit->setEnabled(true);
}
spinNumTriggers->setValue(1); spinNumTriggers->setValue(1);
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true); lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true); lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
@ -685,6 +685,17 @@ void qTabMeasurement::SetTimingMode(int mode){
if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_WITH_START_TRIGGER)==slsDetectorDefs::GATE_WITH_START_TRIGGER) if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_WITH_START_TRIGGER)==slsDetectorDefs::GATE_WITH_START_TRIGGER)
success = true; success = true;
break; break;
case Burst_Trigger://#Frames, ExpTime, Period, (Delay)
spinNumTriggers->setValue(1);
if(detType != slsDetectorDefs::EIGER){
lblDelay->setEnabled(true); spinDelay->setEnabled(true); comboDelayUnit->setEnabled(true);
}
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
lblPeriod->setEnabled(true); spinPeriod->setEnabled(true); comboPeriodUnit->setEnabled(true);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::BURST_TRIGGER)==slsDetectorDefs::BURST_TRIGGER)
success = true;
break;
default: default:
cout << "Timing mode unknown to GUI" << endl; cout << "Timing mode unknown to GUI" << endl;
//This should never happen //This should never happen