diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 2a00b4ab0..a0e5f2ab8 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer differ diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 4e09334df..5764f4414 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -36,7 +36,7 @@ int timingMode = AUTO_TIMING; enum detectorSettings thisSettings; int sChan, sChip, sMod, sDac, sAdc; -int nModBoard; +int nModBoard = 1; extern int dataBytes; @@ -248,7 +248,7 @@ int getADC(enum detDacIndex ind, int imod){ int setModule(sls_detector_module myMod){ #ifdef VERBOSE - printf("Setting module\n"); + printf("Setting module with settings %d\n",myMod.reg); #endif //int nchip = myMod.nchip; @@ -265,8 +265,12 @@ int setModule(sls_detector_module myMod){ } int getModule(sls_detector_module *myMod){ + int i; + for(i=0;indac;i++) + myMod->dacs[i]= dacvalues[i]; + //template getModulebyNumber() from mcb_funcs.c - return FAIL; + return OK; } int getThresholdEnergy(int imod){ diff --git a/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h index 22ced92ae..944f9f1e0 100644 --- a/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x616 +//#define SVNREV 0x621 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x616 -#define SVNDATE 0x20130619 +#define SVNREV 0x621 +#define SVNDATE 0x20130620 //