diff --git a/slsDetectorSoftware/commonFiles/communication_funcs.c b/slsDetectorSoftware/commonFiles/communication_funcs.c index 4f494aaeb..1fa060b9d 100755 --- a/slsDetectorSoftware/commonFiles/communication_funcs.c +++ b/slsDetectorSoftware/commonFiles/communication_funcs.c @@ -341,10 +341,25 @@ int sendModule(sls_detector_module *myMod) { int nAdcs=myMod->nadc; int nDacs=myMod->ndac; ts+= sendDataOnly(myMod,sizeof(sls_detector_module)); +#ifdef VERBOSE + printf("module %d of size %d sent\n",myMod->module, ts); +#endif ts+= sendDataOnly(myMod->dacs,sizeof(float)*nDacs); +#ifdef VERBOSE + printf("dacs %d of size %d sent\n",myMod->module, ts); +#endif ts+= sendDataOnly(myMod->adcs,sizeof(float)*nAdcs); +#ifdef VERBOSE + printf("adcs %d of size %d sent\n",myMod->module, ts); +#endif ts+=sendDataOnly(myMod->chipregs,sizeof(int)*nChips); +#ifdef VERBOSE + printf("chips %d of size %d sent\n",myMod->module, ts); +#endif ts+=sendDataOnly(myMod->chanregs,sizeof(int)*nChans); +#ifdef VERBOSE + printf("chans %d of size %d sent - %d\n",myMod->module, ts, myMod->nchan); +#endif #ifdef VERBOSE printf("module %d of size %d sent register %x\n",myMod->module, ts, myMod->reg); #endif diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index ce40f56b5..5f6ba08bd 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -2,6 +2,11 @@ #define SLS_DETECTOR_DEFS_H #include + + +typedef float float32_t; +typedef int int32_t; + /** \file sls_detector_defs.h This file contains all the basic definitions common to the slsDetector class @@ -106,12 +111,13 @@ typedef struct { Type of the detector */ enum detectorType { - GET_DETECTOR_TYPE, /**< the detector will return its type */ + GET_DETECTOR_TYPE=-1, /**< the detector will return its type */ GENERIC, /**< generic sls detector */ MYTHEN, /**< mythen */ PILATUS, /**< pilatus */ EIGER, /**< eiger */ GOTTHARD, /**< gotthard */ + PICASSO, /**< mythen */ AGIPD /**< agipd */ }; @@ -153,7 +159,7 @@ enum dimension { enum { OK, /**< function succeeded */ FAIL, /**< function failed */ - FINISHED /**< function failed */ + FINISHED /**< acquisition finished */ }; /** @@ -168,7 +174,7 @@ enum { use of the external signals */ enum externalSignalFlag { - GET_EXTERNAL_SIGNAL_FLAG, /**