From e312098e56b9d187fb1bfdde43ad779d7294400f Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 25 Oct 2016 14:52:25 +0200 Subject: [PATCH] check for why gui doesnt show all data --- .../eigerDetectorServer/FebControl.c | 10 ++++++++-- .../bin/eigerDetectorServerv2.2.0.14.0 | Bin 277523 -> 277523 bytes .../multiSlsDetector/multiSlsDetector.cpp | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/FebControl.c b/slsDetectorSoftware/eigerDetectorServer/FebControl.c index cabbb5296..a5dd9ae83 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebControl.c +++ b/slsDetectorSoftware/eigerDetectorServer/FebControl.c @@ -1679,7 +1679,10 @@ int Feb_Control_PrintCorrectedValues(){ int Feb_Control_GetLeftFPGATemp(){ unsigned int temperature=0; - Feb_Interface_ReadRegister(Module_GetTopLeftAddress (&modules[1]),FEB_REG_STATUS, &temperature); + if(Module_TopAddressIsValid(&modules[1])) + Feb_Interface_ReadRegister(Module_GetTopLeftAddress (&modules[1]),FEB_REG_STATUS, &temperature); + else + Feb_Interface_ReadRegister(Module_GetBottomLeftAddress (&modules[1]),FEB_REG_STATUS, &temperature); temperature = temperature >> 16; //division done in client to send int over network return (int)temperature; @@ -1687,7 +1690,10 @@ int Feb_Control_GetLeftFPGATemp(){ int Feb_Control_GetRightFPGATemp(){ unsigned int temperature=0; - Feb_Interface_ReadRegister(Module_GetTopRightAddress (&modules[1]),FEB_REG_STATUS, &temperature); + if(Module_TopAddressIsValid(&modules[1])) + Feb_Interface_ReadRegister(Module_GetTopRightAddress (&modules[1]),FEB_REG_STATUS, &temperature); + else + Feb_Interface_ReadRegister(Module_GetBottomRightAddress (&modules[1]),FEB_REG_STATUS, &temperature); temperature = temperature >> 16; //division done in client to send int over network return (int)temperature; diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.14.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.14.0 index 6a1c6c66bedce52ec1275fed8985efff1449b57b..75724eb5ec55469ca8e777cd42de7773e5e33bda 100755 GIT binary patch delta 15962 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 J$@Eyy{{rer^;`e| diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 76cf9850d..d8e5ce663 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5178,7 +5178,7 @@ void multiSlsDetector::startReceivingDataThread(){ } else{ //actual data - //cprintf(BLUE,"%d actual dataaa\n",ithread); + cprintf(BLUE,"%d actual dataaa\n",ithread); memcpy((char*)(singleframe[ithread]),(char*)zmq_msg_data(&message),singleDatabytes/numReadoutPerDetector);