diff --git a/slsDetectorSoftware/commonFiles/communication_funcs.c b/slsDetectorSoftware/commonFiles/communication_funcs.c index 0c13acd4c..40005b44e 100755 --- a/slsDetectorSoftware/commonFiles/communication_funcs.c +++ b/slsDetectorSoftware/commonFiles/communication_funcs.c @@ -535,7 +535,7 @@ int receiveModule(int file_des, sls_detector_module* myMod) { ts+=receiveData(file_des,myMod->chanregs,sizeof(myMod->nchan),INT32); ts+=receiveData(file_des,&(myMod->gain), sizeof(myMod->gain),OTHER); ts+=receiveData(file_des,&(myMod->offset), sizeof(myMod->offset),OTHER); - +printf(RED,"ts:%d\n",ts); myMod->dacs=dacptr; myMod->adcs=adcptr; myMod->chipregs=chipptr; diff --git a/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c b/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c index 85a32eb21..ba6e284d2 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c @@ -1138,7 +1138,11 @@ u_int32_t testRAM(void) { } int getNModBoard() { +#ifdef JUNGFRAU_DHANYA + return 1; +#else return 32;//nModX; +#endif } int setNMod(int n) { @@ -2316,7 +2320,6 @@ u_int32_t* decode_data(int *datain) int setDynamicRange(int dr) { - if (dr%16==0 && dr>0) { dynamicRange=16; nSamples=dr/16; diff --git a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest index 8dd49e730..a9de9d697 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest and b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerTest differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/mcb_funcs.c b/slsDetectorSoftware/jungfrauDetectorServer/mcb_funcs.c index 656787a7b..d0e2a9812 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/mcb_funcs.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/mcb_funcs.c @@ -103,14 +103,12 @@ int initDetector() { /* dynamicRange=getDynamicRange(); //always 16 not required commented out nModX=setNMod(-1);*/ - //dataBytes=nModX*NCHIP*NCHAN*4; // dynamicRange=32; // initChip(0, 0,ALLMOD); //nModX=n; // allocateRAM(); - return OK; } @@ -899,7 +897,7 @@ int setSettings(int i, int imod) { /* Initialization*/ -int initChannelbyNumber(sls_detector_channel myChan) { +int initChannelbyNumber(sls_detector_channel myChan) {printf("in init channel by number\n"); int reg=myChan.reg; int ft=reg & TRIM_DR; int cae=(reg>>(NTRIMBITS))&1; @@ -1535,8 +1533,8 @@ int initMCBregisters(int cm, int imod){ int initModulebyNumber(sls_detector_module myMod) { - printf("\ninside initmoduleynumber..\n"); - + printf("\ninside initmoduleynumberrrr..\n"); + printf("000\n"); int nchip,nchan;//int ichip, nchip, ichan, nchan; int im, modmi,modma; // int ft, cae, ae, coe, ocoe, counts, chanreg; @@ -1545,7 +1543,7 @@ int initModulebyNumber(sls_detector_module myMod) { // int ow; /* int v[NDAC];*/ int retval =-1, idac; - +printf("111\n"); nchip=myMod.nchip; nchan=(myMod.nchan)/nchip; @@ -1567,13 +1565,11 @@ int initModulebyNumber(sls_detector_module myMod) { modma=sMod+1; } - + printf("222\n"); /* for (idac=0; idac=0) @@ -1595,8 +1594,8 @@ int set_module(int file_des) { free(myAdc); // setDynamicRange(dr); always 16 commented out +printf("freed\n"); - return ret; }