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

gotthard and mythen detector merged

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@42 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2011-11-03 14:37:21 +00:00
parent 93af09b71e
commit 6edf6fa614
3 changed files with 106 additions and 2640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -254,14 +254,14 @@ enum dacIndex {
VSH_POT, /**< chiptest board power supply vsh */
VIO_POT, /**< chiptest board power supply va */
HV_POT, /**< chiptest board high voltage */
G_VREF_DS, /**< gotthard */
G_VCASCN_PB, /**< gotthard */
G_VCASCP_PB, /**< gotthard */
G_VOUT_CM, /**< gotthard */
G_VCASC_OUT, /**< gotthard */
G_VIN_CM, /**< gotthard */
G_VREF_COMP, /**< gotthard */
G_IB_TESTC /**< gotthard */
G_VREF_DS, /**< gotthard */
G_VCASCN_PB, /**< gotthard */
G_VCASCP_PB, /**< gotthard */
G_VOUT_CM, /**< gotthard */
G_VCASC_OUT, /**< gotthard */
G_VIN_CM, /**< gotthard */
G_VREF_COMP, /**< gotthard */
G_IB_TESTC /**< gotthard */
};
/**
@ -316,6 +316,9 @@ enum timerIndex {
GATES_NUMBER, /**< number of gates per frame (in gated mode) */
PROBES_NUMBER, /**< number of probe types in pump-probe mode */
CYCLES_NUMBER, /**< number of cycles: total number of acquisitions is number or frames*number of cycles */
ACTUAL_TIME, /**< Actual time of the detector's internal timer */
MEASUREMENT_TIME, /**< Time of the measurement from the detector (fifo) */
PROGRESS /**< fraction of measurement elapsed - only get! */
};
@ -459,11 +462,11 @@ enum {
//Trimming
F_EXECUTE_TRIMMING, /**< execute trimming */
F_EXIT_SERVER, /**< turnoff detector server */
F_EXIT_SERVER, /**< turn off detector server */
F_GET_ACTUAL_TIME, /**< Gets the actual time of the detector's internal timer */
F_GET_MEASUREMENT_TIME /**< Gets the time of the measurement from the detector (fifo) */
F_GET_TEMPERATURE,
F_SET_GOTTHARD,
F_GET_GOTTHARD
/* Always append functions hereafter!!! */