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

Merge branch '3.0-rc' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-04 14:21:31 +02:00
commit d2d2959237
3 changed files with 9 additions and 9 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
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: cf21b6d9cf4da3c251942505fee950639971aaa1
Revision: 1447
Repsitory UUID: bf23037ef4056190013997e7d46aad76b6eb2fa6
Revision: 1449
Branch: 3.0-rc
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1452
Last Changed Date: 2017-07-28 10:59:15.000000002 +0200 ./slsDetector/slsDetectorUtils.o
Last Changed Rev: 1454
Last Changed Date: 2017-08-04 14:08:44.000000002 +0200 ./slsDetector/slsDetectorCommand.cpp

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "cf21b6d9cf4da3c251942505fee950639971aaa1"
//#define SVNREV 0x1452
#define SVNREPUUIDLIB "bf23037ef4056190013997e7d46aad76b6eb2fa6"
//#define SVNREV 0x1454
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1452
#define SVNDATELIB 0x20170728
#define SVNREVLIB 0x1454
#define SVNDATELIB 0x20170804
//

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4343,7 +4343,7 @@ string slsDetectorCommand::cmdTimer(int narg, char *args[], int action) {
myDet->setReceiverOnline(ONLINE_FLAG);
ret=myDet->setTimer(index,t);
if (index==ACQUISITION_TIME || index==SUBFRAME_ACQUISITION_TIME || index==FRAME_PERIOD || index==DELAY_AFTER_TRIGGER)
if ((ret!=-1) && (index==ACQUISITION_TIME || index==SUBFRAME_ACQUISITION_TIME || index==FRAME_PERIOD || index==DELAY_AFTER_TRIGGER))
rval=(double)ret*1E-9;
else rval=ret;