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

removed changing number of samples by setting dynamic range

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-21 16:36:33 +02:00
parent 6eb5167c70
commit 2b3d2bb4d7
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c
View File

@ -2309,8 +2309,6 @@ u_int32_t* decode_data(int *datain)
int setDynamicRange(int dr) { int setDynamicRange(int dr) {
if (dr%16==0 && dr>0) { if (dr%16==0 && dr>0) {
dynamicRange=16; dynamicRange=16;
nSamples=dr/16;
bus_w(NSAMPLES_REG,nSamples);
} }
getDynamicRange(); getDynamicRange();
allocateRAM(); allocateRAM();

8
slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer
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: a45cc31a576153e251cfe904b3b459c7a2a9abdb Repsitory UUID: 2ed351b29db70212973e15b26f604a0a7fef6fcc
Revision: 9 Revision: 14
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1553 Last Changed Rev: 1582
Last Changed Date: 2017-09-07 11:20:19.000000002 +0200 ./server_funcs.c Last Changed Date: 2017-09-21 16:35:15.000000002 +0200 ./firmware_funcs.c

8
slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.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 "a45cc31a576153e251cfe904b3b459c7a2a9abdb" #define SVNREPUUID "2ed351b29db70212973e15b26f604a0a7fef6fcc"
//#define SVNREV 0x1553 //#define SVNREV 0x1582
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1553 #define SVNREV 0x1582
#define SVNDATE 0x20170907 #define SVNDATE 0x20170921
// //

BIN
slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest
View File

Binary file not shown.