detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-22 20:20:43 +01:00
Code Issues Actions Packages Releases Activity

ensuring set detector type is the first call

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-07-03 13:32:10 +02:00
parent b05e9c194a
commit da4ffb235c
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -1674,7 +1674,7 @@ int slsDetector::setDetectorType(detectorType const type){
//receiver
if((retType != GENERIC) && (thisDetector->receiverOnlineFlag==ONLINE_FLAG)) {
if((retType != GENERIC) && (thisDetector->receiverOnlineFlag==ONLINE_FLAG) && (arg != GENERIC)) {
retval = FAIL;
if(thisDetector->receiverOnlineFlag==ONLINE_FLAG){
#ifdef VERBOSE
@@ -6032,8 +6032,6 @@ string slsDetector::setReceiver(string receiverIP){
setUDPConnection();
if(thisDetector->myDetectorType == EIGER)
enableTenGigabitEthernet(thisDetector->tenGigaEnable);
//datastreamenable
//fifodepth
}
}