From da4ffb235cdb23255bc5216ea1c36dffd9972bf3 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 3 Jul 2017 13:32:10 +0200 Subject: [PATCH] ensuring set detector type is the first call --- slsDetectorSoftware/gitInfo.txt | 8 ++++---- slsDetectorSoftware/slsDetector/gitInfoLib.h | 8 ++++---- slsDetectorSoftware/slsDetector/slsDetector.cpp | 4 +--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 3ba4cd1bd..b7206f074 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d -Revision: 1430 +Repsitory UUID: 5d22df1c472895035fdb21ec1104e749aaa41167 +Revision: 1431 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1435 -Last Changed Date: 2017-06-28 18:16:55 +0200 +Last Changed Rev: 1436 +Last Changed Date: 2017-06-29 17:10:10 +0200 diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 8fa9ea217..1afda5824 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUIDLIB "d4b0bef367ef407a3267619196da01dc1636865d" -//#define SVNREV 0x1435 +#define SVNREPUUIDLIB "5d22df1c472895035fdb21ec1104e749aaa41167" +//#define SVNREV 0x1436 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1435 -#define SVNDATELIB 0x20170628 +#define SVNREVLIB 0x1436 +#define SVNDATELIB 0x20170629 // diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 8fceec06d..9390d6650 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -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 } }