detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

changes to the eiger and jungfrau server regarding getnumberofchans etc a typo bug resulting in could not allocate

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-27 17:46:32 +02:00
parent 5dd2f273fc
commit ca358e4d17
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.2 → slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.3
View File

Binary file not shown.

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/jungfrauDetectorServer
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 49f4f7295411e3dbcf00fd93ca821eb95e13771c
Revision: 80
Repsitory UUID: d0aea299e999e12df143e036c0cf9c644125d45d
Revision: 82
Branch: developer
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1411
Last Changed Date: 2017-06-14 11:40:35 +0200
Last Changed Rev: 1423
Last Changed Date: 2017-06-27 10:22:55 +0200

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/jungfrauDetectorServer"
//#define SVNREPPATH ""
#define SVNREPUUID "49f4f7295411e3dbcf00fd93ca821eb95e13771c"
//#define SVNREV 0x1411
#define SVNREPUUID "d0aea299e999e12df143e036c0cf9c644125d45d"
//#define SVNREV 0x1423
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1411
#define SVNDATE 0x20170614
#define SVNREV 0x1423
#define SVNDATE 0x20170627
//

4
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1303,8 +1303,8 @@ int calculateDataBytes(){
return DATA_BYTES;
}
int getTotalNumberOfChannels(){return ((int)getNumberOfChannelsPerModule() * (int)getTotalNumberOfModules);}
int getTotalNumberOfChips(){return ((int)getNumberOfChipsPerModule * (int)getTotalNumberOfModules);}
int getTotalNumberOfChannels(){return ((int)getNumberOfChannelsPerModule() * (int)getTotalNumberOfModules());}
int getTotalNumberOfChips(){return ((int)getNumberOfChipsPerModule() * (int)getTotalNumberOfModules());}
int getTotalNumberOfModules(){return NMOD;}
int getNumberOfChannelsPerModule(){return ((int)getNumberOfChannelsPerChip() * (int)getTotalNumberOfChips());}
int getNumberOfChipsPerModule(){return NCHIP;}