detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d Repsitory UUID: 5d22df1c472895035fdb21ec1104e749aaa41167
Revision: 1430 Revision: 1431
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1435 Last Changed Rev: 1436
Last Changed Date: 2017-06-28 18:16:55 +0200 Last Changed Date: 2017-06-29 17:10:10 +0200

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "d4b0bef367ef407a3267619196da01dc1636865d" #define SVNREPUUIDLIB "5d22df1c472895035fdb21ec1104e749aaa41167"
//#define SVNREV 0x1435 //#define SVNREV 0x1436
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1435 #define SVNREVLIB 0x1436
#define SVNDATELIB 0x20170628 #define SVNDATELIB 0x20170629
// //

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

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