detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

removing warnings shown from esrf debian

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-04-11 13:39:35 +02:00
parent 6ecca8fcb0
commit 9cf5714a5b
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1810,7 +1810,6 @@ void UDPStandardImplementation::startDataCallback(){
char buf[1000]; char buf[1000];
uint64_t acquisitionIndex = -1; uint64_t acquisitionIndex = -1;
uint64_t frameIndex = -1; uint64_t frameIndex = -1;
uint32_t subframeIndex = -1;
#ifdef DEBUG #ifdef DEBUG
int oldpnum = -1; int oldpnum = -1;
#endif #endif
@ -1834,7 +1833,6 @@ void UDPStandardImplementation::startDataCallback(){
//update frame details //update frame details
frameIndex = fnum; frameIndex = fnum;
acquisitionIndex = fnum - startAcquisitionIndex; acquisitionIndex = fnum - startAcquisitionIndex;
if(dynamicRange == 32) subframeIndex = snum;
int len = sprintf(buf,jsonFmt, int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread], SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/
@ -1954,7 +1952,6 @@ void UDPStandardImplementation::startDataCallback(){
//update frame details //update frame details
frameIndex = fnum; frameIndex = fnum;
acquisitionIndex = fnum - startAcquisitionIndex; acquisitionIndex = fnum - startAcquisitionIndex;
if(dynamicRange == 32) subframeIndex = snum;
int len = sprintf(buf,jsonFmt, int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread], SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/
@ -1992,7 +1989,6 @@ void UDPStandardImplementation::startDataCallback(){
//update frame details //update frame details
frameIndex = fnum; frameIndex = fnum;
acquisitionIndex = fnum - startAcquisitionIndex; acquisitionIndex = fnum - startAcquisitionIndex;
if(dynamicRange == 32) subframeIndex = snum;
int len = sprintf(buf,jsonFmt, int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread], SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/
@ -3305,7 +3301,6 @@ void UDPStandardImplementation::handleDataCompression(int ithread, char* wbuffer
int once = 0; int once = 0;
int xmax = 0, ymax = 0; //max pixels in x and y direction int xmax = 0, ymax = 0; //max pixels in x and y direction
int xmin = 1, ymin = 1; //min pixels in x and y direction int xmin = 1, ymin = 1; //min pixels in x and y direction
double tot, tl, tr, bl, br;
//determining xmax and ymax //determining xmax and ymax
switch(myDetectorType){ switch(myDetectorType){
@ -3351,11 +3346,6 @@ void UDPStandardImplementation::handleDataCompression(int ithread, char* wbuffer
for(int iy = ymin - 1; iy < ymax+1; iy++){ for(int iy = ymin - 1; iy < ymax+1; iy++){
thisEvent=singlePhotonDetectorObject[ithread]->getEventType(buff[0], ix, iy, commonModeSubtractionEnable); thisEvent=singlePhotonDetectorObject[ithread]->getEventType(buff[0], ix, iy, commonModeSubtractionEnable);
if (nf>1000) { if (nf>1000) {
tot=0;
tl=0;
tr=0;
bl=0;
br=0;
if (thisEvent==PHOTON_MAX) { if (thisEvent==PHOTON_MAX) {
receiverData[ithread]->getFrameNumber(buff[0]); receiverData[ithread]->getFrameNumber(buff[0]);
//iFrame=receiverData[ithread]->getFrameNumber(buff); //iFrame=receiverData[ithread]->getFrameNumber(buff);