detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

got rid of trigger frame and trigger window to merge with other timing modes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@267 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2014-03-26 14:06:59 +00:00
parent ef983c151f
commit bf2d8937f4
3 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/forms/form_tab_measurement.ui
View File

@ -523,11 +523,6 @@ Maximum value is 3. <br>
<string>Trigger Exposure Series</string> <string>Trigger Exposure Series</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Trigger Frame</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Trigger Readout</string> <string>Trigger Readout</string>
@ -543,11 +538,6 @@ Maximum value is 3. &lt;br&gt;
<string>Gated with Start Trigger</string> <string>Gated with Start Trigger</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>External Trigger Window</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

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_Frame, Trigger_Readout, Gated, Gated_Start, Trigger_Window, NumTimingModes}; enum{None, Auto, Trigger_Exp_Series, Trigger_Readout, Gated, Gated_Start, NumTimingModes};
/** timer to update the progress*/ /** timer to update the progress*/
QTimer *progressTimer; QTimer *progressTimer;
/** tool tip variables*/ /** tool tip variables*/

30
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -134,28 +134,22 @@ void qTabMeasurement::SetupTimingMode(){
switch(detType){ switch(detType){
case slsDetectorDefs::MYTHEN: case slsDetectorDefs::MYTHEN:
item[(int)Trigger_Exp_Series]->setEnabled(true); item[(int)Trigger_Exp_Series]->setEnabled(true);
item[(int)Trigger_Frame]->setEnabled(false);
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)Trigger_Window]->setEnabled(false);
break; break;
case slsDetectorDefs::EIGER: case slsDetectorDefs::EIGER:
item[(int)Trigger_Exp_Series]->setEnabled(false);/**not implemented yet*/ item[(int)Trigger_Exp_Series]->setEnabled(false);/**not implemented yet*/
item[(int)Trigger_Frame]->setEnabled(true);
item[(int)Trigger_Readout]->setEnabled(false); item[(int)Trigger_Readout]->setEnabled(false);
item[(int)Gated]->setEnabled(false); item[(int)Gated]->setEnabled(true);
item[(int)Gated_Start]->setEnabled(false); item[(int)Gated_Start]->setEnabled(false);
item[(int)Trigger_Window]->setEnabled(true);
break; break;
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
item[(int)Trigger_Exp_Series]->setEnabled(true); item[(int)Trigger_Exp_Series]->setEnabled(true);
item[(int)Trigger_Frame]->setEnabled(false);
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)Trigger_Window]->setEnabled(false);
break; break;
default: default:
qDefs::Message(qDefs::CRITICAL,"Unknown detector type.","qTabMeasurement::SetupTimingMode"); qDefs::Message(qDefs::CRITICAL,"Unknown detector type.","qTabMeasurement::SetupTimingMode");
@ -645,7 +639,11 @@ void qTabMeasurement::SetTimingMode(int mode){
success = true; success = true;
break; break;
case Trigger_Exp_Series://#Frames, #Triggers, ExpTime, Period, Delay case Trigger_Exp_Series://#Frames, #Triggers, ExpTime, Period, Delay
if(detType == slsDetectorDefs::EIGER)//more than 1 frame per trigger yet to be implemented
spinNumFrames->setValue(1);
else{
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);
lblPeriod->setEnabled(true); spinPeriod->setEnabled(true); comboPeriodUnit->setEnabled(true); lblPeriod->setEnabled(true); spinPeriod->setEnabled(true); comboPeriodUnit->setEnabled(true);
lblNumTriggers->setEnabled(true); spinNumTriggers->setEnabled(true); lblNumTriggers->setEnabled(true); spinNumTriggers->setEnabled(true);
@ -653,13 +651,6 @@ void qTabMeasurement::SetTimingMode(int mode){
if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_EXPOSURE)==slsDetectorDefs::TRIGGER_EXPOSURE) if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_EXPOSURE)==slsDetectorDefs::TRIGGER_EXPOSURE)
success = true; success = true;
break; break;
case Trigger_Frame://ExpTime, #Frames
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
lblNumTriggers->setEnabled(false); spinNumTriggers->setEnabled(false);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_FRAME)==slsDetectorDefs::TRIGGER_FRAME)
success = true;
break;
case Trigger_Readout://#Frames, ExpTime, Period, Delay case Trigger_Readout://#Frames, ExpTime, Period, Delay
spinNumTriggers->setValue(1); spinNumTriggers->setValue(1);
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true); lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
@ -671,8 +662,12 @@ void qTabMeasurement::SetTimingMode(int mode){
break; break;
case Gated://#Frames, #Gates case Gated://#Frames, #Gates
spinNumTriggers->setValue(1); spinNumTriggers->setValue(1);
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true); if(detType == slsDetectorDefs::EIGER)//more than 1 frame per trigger yet to be implemented
spinNumGates->setValue(1);
else{
lblNumGates->setEnabled(true); spinNumGates->setEnabled(true); lblNumGates->setEnabled(true); spinNumGates->setEnabled(true);
}
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_FIX_NUMBER)==slsDetectorDefs::GATE_FIX_NUMBER) if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_FIX_NUMBER)==slsDetectorDefs::GATE_FIX_NUMBER)
success = true; success = true;
break; break;
@ -685,11 +680,6 @@ 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 Trigger_Window://#Frames
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_WINDOW)==slsDetectorDefs::TRIGGER_WINDOW)
success = true;
break;
default: default:
//This should never happen //This should never happen
qDefs::Message(qDefs::CRITICAL,"Timing mode unknown to GUI","qTabMeasurement::SetTimingMode"); qDefs::Message(qDefs::CRITICAL,"Timing mode unknown to GUI","qTabMeasurement::SetTimingMode");