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

changed all the dacs and adc types from double to dacs_int to an ifdef defined in sls det defs

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@223 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-08-15 17:12:20 +00:00
parent 5407fdcf6e
commit 3e8f1e22e9
9 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -17,6 +17,15 @@ typedef int int32_t;
typedef char mystring[MAX_STR_LENGTH];
typedef double mysteps[MAX_SCAN_STEPS];
#ifdef DACS_INT
typedef int dacs_t;
//typedef uint32_t dacs_t;
//#elif DACS_INT_CSERVER
//typedef u_int32_t dacs_t;
#else
typedef float dacs_t;
#endif
/**
\file sls_detector_defs.h
This file contains all the basic definitions common to the slsDetector class
@ -102,8 +111,8 @@ typedef struct {
int nadc; /**< is the number of adcs on the module */
int reg; /**< is the module register (e.g. dynamic range?)
\see moduleRegisterBit */
double *dacs; /**< is the pointer to the array of the dac values (in V) */
double *adcs; /**< is the pointer to the array of the adc values (in V) FLAT_FIELD_CORRECTION*/
dacs_t *dacs; /**< is the pointer to the array of the dac values (in V) */
dacs_t *adcs; /**< is the pointer to the array of the adc values (in V) FLAT_FIELD_CORRECTION*/
int *chipregs; /**< is the pointer to the array of the chip registers
\see ::chipRegisterBit */
int *chanregs; /**< is the pointer to the array of the channel registers