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

bugfix: framesl was not conected, exptime default time is 10 us

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-18 16:11:49 +02:00
parent cda7814c21
commit ec4be4f2c0
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.5 → slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6
View File

Binary file not shown.

10
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
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: 9f1b82c18ab0893d65bfadeb646b8ea244614632 Repsitory UUID: c58dfe801770ceb63a9baab0be5b4cd16794b57e
Revision: 88 Revision: 89
Branch: developer Branch: 3.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1443 Last Changed Rev: 1495
Last Changed Date: 2017-07-10 10:40:23.000000002 +0200 ./Makefile Last Changed Date: 2017-08-15 14:14:32.000000002 +0200 ./RegisterDefs.h

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" #define SVNREPUUID "c58dfe801770ceb63a9baab0be5b4cd16794b57e"
//#define SVNREV 0x1443 //#define SVNREV 0x1495
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1443 #define SVNREV 0x1495
#define SVNDATE 0x20170710 #define SVNDATE 0x20170815
// //

2
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -347,7 +347,7 @@ void setupDetector() {
setTimer(FRAME_NUMBER, DEFAULT_NUM_FRAMES); setTimer(FRAME_NUMBER, DEFAULT_NUM_FRAMES);
setTimer(CYCLES_NUMBER, DEFAULT_NUM_CYCLES); setTimer(CYCLES_NUMBER, DEFAULT_NUM_CYCLES);
setTimer(ACQUISITION_TIME, DEFAULT_PERIOD); setTimer(ACQUISITION_TIME, DEFAULT_EXPTIME);
setTimer(FRAME_PERIOD, DEFAULT_PERIOD); setTimer(FRAME_PERIOD, DEFAULT_PERIOD);
setTimer(DELAY_AFTER_TRIGGER, DEFAULT_DELAY); setTimer(DELAY_AFTER_TRIGGER, DEFAULT_DELAY);
/*setSpeed(CLOCK_DIVIDER, HALF_SPEED); depends if all the previous stuff works*/ /*setSpeed(CLOCK_DIVIDER, HALF_SPEED); depends if all the previous stuff works*/

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2626,7 +2626,7 @@ int get_time_left(int file_des) {
case FRAMES_FROM_START: case FRAMES_FROM_START:
case FRAMES_FROM_START_PG: case FRAMES_FROM_START_PG:
#endif #endif
getTimeLeft(ind); retval=getTimeLeft(ind);
break; break;
default: default:
ret = FAIL; ret = FAIL;