detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

check for why gui doesnt show all data

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-25 14:52:25 +02:00
parent 18c6e8208a
commit e312098e56
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -1679,7 +1679,10 @@ int Feb_Control_PrintCorrectedValues(){
int Feb_Control_GetLeftFPGATemp(){ int Feb_Control_GetLeftFPGATemp(){
unsigned int temperature=0; 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; temperature = temperature >> 16;
//division done in client to send int over network //division done in client to send int over network
return (int)temperature; return (int)temperature;
@ -1687,7 +1690,10 @@ int Feb_Control_GetLeftFPGATemp(){
int Feb_Control_GetRightFPGATemp(){ int Feb_Control_GetRightFPGATemp(){
unsigned int temperature=0; 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; temperature = temperature >> 16;
//division done in client to send int over network //division done in client to send int over network
return (int)temperature; return (int)temperature;

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.14.0
View File

Binary file not shown.

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5178,7 +5178,7 @@ void multiSlsDetector::startReceivingDataThread(){
} }
else{ else{
//actual data //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); memcpy((char*)(singleframe[ithread]),(char*)zmq_msg_data(&message),singleDatabytes/numReadoutPerDetector);