diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index ef69e3a61..c3a0ad181 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: aab5292e58e0ebf3a425e13254194f780952155a -Revision: 1491 -Branch: 3.0-rc +Repsitory UUID: 7eb486427fab1732def525df6fcfad6e34ee4f74 +Revision: 1539 +Branch: 3.0 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1496 -Last Changed Date: 2017-08-18 16:08:14.000000002 +0200 ./slsDetector/slsDetector.cpp +Last Changed Rev: 1544 +Last Changed Date: 2017-08-24 14:09:36.000000002 +0200 ./slsDetector/slsDetectorUtils.h diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 4329057b4..301f1e34c 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 "aab5292e58e0ebf3a425e13254194f780952155a" -//#define SVNREV 0x1496 +#define SVNREPUUIDLIB "7eb486427fab1732def525df6fcfad6e34ee4f74" +//#define SVNREV 0x1544 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1496 -#define SVNDATELIB 0x20170818 +#define SVNREVLIB 0x1544 +#define SVNDATELIB 0x20170824 // diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index d3c49ff9c..3968c7d8b 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -2473,9 +2473,7 @@ string slsDetectorCommand::cmdDataStream(int narg, char *args[], int action) { if (action==PUT_ACTION) { if (!sscanf(args[1],"%d",&ival)) return string ("cannot scan externalgui mode"); - bool bval=ival>0?true:false; - bool oldval = myDet->getExternalGuiFlag(); - myDet->setExternalGuiFlag(bval); + myDet->setExternalGuiFlag(ival>0?true:false); myDet->enableDataStreamingFromReceiver(ival); }