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

getting dr from rxr fixed

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-06-30 17:21:45 +02:00
parent 3600fb6304
commit 88e96d45e7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -563,10 +563,11 @@ int UDPStandardImplementation::getDynamicRange() const{
int32_t UDPStandardImplementation::setDynamicRange(int32_t dr){ FILE_LOG(logDEBUG) << __AT__ << " called"; int32_t UDPStandardImplementation::setDynamicRange(int32_t dr){ FILE_LOG(logDEBUG) << __AT__ << " called";
cout << "Setting Dynamic Range" << endl;
int olddr = dynamicRange; int olddr = dynamicRange;
if(dr >= 0){ if(dr >= 0){
cout << "Setting Dynamic Range to " << dr << endl;
dynamicRange = dr; dynamicRange = dr;
if(myDetectorType == EIGER){ if(myDetectorType == EIGER){
@ -615,7 +616,8 @@ int32_t UDPStandardImplementation::setDynamicRange(int32_t dr){ FILE_LOG(logDEB
} }
} }
} }else cout << "Getting Dynamic Range " << endl;
return getDynamicRange(); return getDynamicRange();
} }

8
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -1996,7 +1996,7 @@ int slsReceiverTCPIPInterface::set_dynamic_range() {
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP); sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL; ret=FAIL;
} }
else if(myDetectorType == EIGER){ else if ((dr>0) && (myDetectorType == EIGER)){
switch(dr){ switch(dr){
case 4: case 4:
case 8: case 8:
@ -2004,6 +2004,7 @@ int slsReceiverTCPIPInterface::set_dynamic_range() {
case 32:break; case 32:break;
default: default:
sprintf(mess,"This dynamic range does not exist for eiger: %d\n",dr); sprintf(mess,"This dynamic range does not exist for eiger: %d\n",dr);
cprintf(RED,"%s", mess);
ret=FAIL; ret=FAIL;
break; break;
} }
@ -2013,8 +2014,9 @@ int slsReceiverTCPIPInterface::set_dynamic_range() {
strcpy(mess,"Receiver not set up\n"); strcpy(mess,"Receiver not set up\n");
ret=FAIL; ret=FAIL;
}else{ }else{
retval=receiverBase->setDynamicRange(dr); if(dr > 0) receiverBase->setDynamicRange(dr);
dynamicrange = dr; retval = receiverBase->getDynamicRange();
dynamicrange = retval;
if(myDetectorType == EIGER){ if(myDetectorType == EIGER){
if(!tenGigaEnable) if(!tenGigaEnable)
packetsPerFrame = EIGER_ONE_GIGA_CONSTANT * dynamicrange * EIGER_MAX_PORTS; packetsPerFrame = EIGER_ONE_GIGA_CONSTANT * dynamicrange * EIGER_MAX_PORTS;