mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 12:57:13 +02:00
got rid of trigger frame and trigger window to merge with other timing modes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@809 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
@ -283,11 +283,9 @@ enum externalCommunicationMode{
|
||||
GET_EXTERNAL_COMMUNICATION_MODE=-1,/**<return flag for communication mode */
|
||||
AUTO_TIMING, /**< internal timing */
|
||||
TRIGGER_EXPOSURE, /**< trigger mode i.e. exposure is triggered */
|
||||
TRIGGER_FRAME, /**< each trigger triggers one frame at a time */
|
||||
TRIGGER_READOUT, /**< stop trigger mode i.e. readout is triggered by external signal */
|
||||
GATE_FIX_NUMBER, /**< gated and reads out after a fixed number of gates */
|
||||
GATE_WITH_START_TRIGGER, /**< gated with start trigger */
|
||||
TRIGGER_WINDOW /**< exposure time coincides with the external signal */
|
||||
GATE_WITH_START_TRIGGER /**< gated with start trigger */
|
||||
};
|
||||
/**
|
||||
detector IDs/versions
|
||||
|
@ -644,11 +644,9 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
|
||||
switch(f) { \
|
||||
case AUTO_TIMING: return string( "auto"); \
|
||||
case TRIGGER_EXPOSURE: return string("trigger"); \
|
||||
case TRIGGER_FRAME: return string("trigger_frame"); \
|
||||
case TRIGGER_READOUT: return string("ro_trigger"); \
|
||||
case GATE_FIX_NUMBER: return string("gating"); \
|
||||
case GATE_WITH_START_TRIGGER: return string("triggered_gating"); \
|
||||
case TRIGGER_WINDOW: return string("trigger_window"); \
|
||||
default: return string( "unknown"); \
|
||||
} };
|
||||
|
||||
@ -663,11 +661,9 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
|
||||
static externalCommunicationMode externalCommunicationType(string sval){\
|
||||
if (sval=="auto") return AUTO_TIMING;\
|
||||
if (sval=="trigger") return TRIGGER_EXPOSURE; \
|
||||
if (sval=="trigger_frame") return TRIGGER_FRAME; \
|
||||
if (sval=="ro_trigger") return TRIGGER_READOUT;\
|
||||
if (sval=="gating") return GATE_FIX_NUMBER;\
|
||||
if (sval=="triggered_gating") return GATE_WITH_START_TRIGGER;\
|
||||
if (sval=="trigger_window") return TRIGGER_WINDOW; \
|
||||
return GET_EXTERNAL_COMMUNICATION_MODE; \
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user