From 0ed9ee0e5d3e78ee0f4e83437c5ac2c201730a7f Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 21 Nov 2016 12:02:45 +0100 Subject: [PATCH] fixing the 32 bit crash and empty plot using zmq --- .../jungfrauDetectorServer/firmware_funcs.c | 23 +++++++++--------- .../jungfrauDetectorServerv2.2.1 | Bin 126888 -> 126892 bytes .../multiSlsDetector/multiSlsDetector.cpp | 23 ++++-------------- .../slsDetector/slsDetector.cpp | 3 +-- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c b/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c index d6e485f48..845972a73 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c @@ -91,7 +91,8 @@ u_int32_t progressMask=0; int phase_shift=0;//DEFAULT_PHASE_SHIFT; int ipPacketSize=DEFAULT_IP_PACKETSIZE; int udpPacketSize=DEFAULT_UDP_PACKETSIZE; -int clockdivider = 40; +int clockdivider_exptime = 40; +int clockdivider_fc = 20; /* #ifndef NEW_PLL_RECONFIG u_int32_t clkDivider[2]={32,16}; @@ -496,7 +497,7 @@ void configurePll(int i) { #endif if (i<2) { - tot= PLL_VCO_FREQ_MHZ/clockdivider; /* check if it always reads clock */ + tot= PLL_VCO_FREQ_MHZ/clockdivider_fc; /* which clock divider?????? Is it called? clean up!! */ l=tot/2; h=l; if (tot>2*l) { @@ -1192,15 +1193,15 @@ int64_t getFrames(){ int64_t setExposureTime(int64_t value){ if (value!=-1){ printf("\nSetting exptime to %lldns\n",(long long int)value); - value*=(1E-3*clockdivider); + value*=(1E-3*clockdivider_exptime); } - int64_t retval = set64BitReg(value,SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG)/(1E-3*clockdivider);//(1E-9*CLK_FREQ); + int64_t retval = set64BitReg(value,SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG)/(1E-3*clockdivider_exptime);//(1E-9*CLK_FREQ); printf("Getting exptime: %lldns\n",(long long int)retval); return retval; } int64_t getExposureTime(){ - return get64BitReg(GET_EXPTIME_LSB_REG, GET_EXPTIME_MSB_REG)/(1E-3*clockdivider);//(1E-9*CLK_FREQ); + return get64BitReg(GET_EXPTIME_LSB_REG, GET_EXPTIME_MSB_REG)/(1E-3*clockdivider_exptime);//(1E-9*CLK_FREQ); } int64_t setGates(int64_t value){ @@ -1219,31 +1220,31 @@ int64_t getGates(){ int64_t setPeriod(int64_t value){ if (value!=-1){ printf("\nSetting period to %lldns\n",(long long int)value); - value*=(1E-3*clockdivider); + value*=(1E-3*clockdivider_fc); } - int64_t retval = set64BitReg(value,SET_PERIOD_LSB_REG, SET_PERIOD_MSB_REG)/(1E-3*clockdivider);//(1E-9*CLK_FREQ); + int64_t retval = set64BitReg(value,SET_PERIOD_LSB_REG, SET_PERIOD_MSB_REG)/(1E-3*clockdivider_fc);//(1E-9*CLK_FREQ); printf("Getting period: %lldns\n",(long long int)retval); return retval; } int64_t getPeriod(){ - return get64BitReg(GET_PERIOD_LSB_REG, GET_PERIOD_MSB_REG)/(1E-3*clockdivider);//(1E-9*CLK_FREQ); + return get64BitReg(GET_PERIOD_LSB_REG, GET_PERIOD_MSB_REG)/(1E-3*clockdivider_fc);//(1E-9*CLK_FREQ); } int64_t setDelay(int64_t value){ if (value!=-1){ printf("\nSetting delay to %lldns\n",(long long int)value); - value*=(1E-3*clockdivider); + value*=(1E-3*clockdivider_fc); } - int64_t retval = set64BitReg(value,SET_DELAY_LSB_REG, SET_DELAY_MSB_REG)/(1E-3*clockdivider);//(1E-9*CLK_FREQ); + int64_t retval = set64BitReg(value,SET_DELAY_LSB_REG, SET_DELAY_MSB_REG)/(1E-3*clockdivider_fc);//(1E-9*CLK_FREQ); printf("Getting delay: %lldns\n",(long long int)retval); return retval; } int64_t getDelay(){ - return get64BitReg(GET_DELAY_LSB_REG, GET_DELAY_MSB_REG)/(1E-3*clockdivider);//(1E-9*CLK_FREQ); + return get64BitReg(GET_DELAY_LSB_REG, GET_DELAY_MSB_REG)/(1E-3*clockdivider_fc);//(1E-9*CLK_FREQ); } int64_t setTrains(int64_t value){ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.1 b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.1 index 8f3ec4cf8a04b8239f46deee534f4ae7e29339e4..6014d803c3ecbba778c7a0f50c6e79238df51163 100755 GIT binary patch delta 13425 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 delta 13415 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 U*(nP&V0Nkl+MCcokyCg655$^w)Bpeg diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 03ae47e9f..d6317aa58 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -2266,6 +2266,7 @@ double* multiSlsDetector::decodeData(int *datain, double *fdata) { } } + return dataout; } @@ -5246,11 +5247,6 @@ void multiSlsDetector::startReceivingDataThread(){ memcpy((char*)(singleframe[ithread]),(char*)zmq_msg_data(&message),singleDatabytes/numReadoutPerDetector); //cprintf(GREEN,"%d copied data %d\n",ithread,singleDatabytes/numReadoutPerDetector); - if(!ithread){ - for(int i=0;i<30;i++) - cprintf(BLUE,"value[%d]:%d\n",i,(short int)singleframe[ithread][i]); - - } //jungfrau masking adcval if(jungfrau){ for(unsigned int i=0;ioffsetY[idet] + slsmaxY)) * maxX * bytesperchannel; //the left half or right half @@ -5361,19 +5358,12 @@ void multiSlsDetector::readFrameFromReceiver(){ else offsetX = thisMultiDetector->offsetX[idet] + halfreadoutoffset; offsetX *= bytesperchannel; - //cprintf(BLUE,"ireadout:%d, offsetx:%d offsety:%d maxx:%d slsmaxX:%d slsmaxY:%d bytesperchannel:%d\n", - // ireadout, offsetX,offsetY,maxX,slsmaxX,slsmaxY,bytesperchannel); - // cprintf(BLUE,"copying bytes:%d\n", (slsmaxX/numReadoutPerDetector)*bytesperchannel); - //interleaving with other detectors //bottom if(((idet+1)%2) == 0){ for(int i=0;i