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

making nx and ny available for jctb in call back

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-22 15:08:09 +01:00
parent 8328b30cbd
commit 590fac9e07
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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: 73bad32c4ab2c8cfb2687547f7da6f932b358c1a
Revision: 1604
Repsitory UUID: c79a7cdd6f5f936a90bb31038389b587745a3088
Revision: 1672
Branch: developer
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 1609
Last Changed Date: 2017-11-07 09:50:45.000000002 +0100 ./threadFiles/ThreadPool.o
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1680
Last Changed Date: 2017-11-22 11:36:57.000000002 +0100 ./multiSlsDetector/multiSlsDetector.cpp

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5866,6 +5866,10 @@ void multiSlsDetector::readFrameFromReceiver(){
int maxX = (bytesperchannel >= 1.0) ? thisMultiDetector->numberOfChannelInclGapPixels[X] : thisMultiDetector->numberOfChannel[X];
int maxY = (bytesperchannel >= 1.0) ? thisMultiDetector->numberOfChannelInclGapPixels[Y] : thisMultiDetector->numberOfChannel[Y];
int multidatabytes = (bytesperchannel >= 1.0) ? thisMultiDetector->dataBytesInclGapPixels : thisMultiDetector->dataBytes;
if (myDetType == JUNGFRAUCTB) {
maxY = (int)(thisMultiDetector->timerValue[SAMPLES_JCTB] * 2)/25; // for moench 03
maxX = 400;
}
int dr = bytesperchannel * 8;

10
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 "73bad32c4ab2c8cfb2687547f7da6f932b358c1a"
//#define SVNREV 0x1609
#define SVNREPUUIDLIB "c79a7cdd6f5f936a90bb31038389b587745a3088"
//#define SVNREV 0x1680
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Thattil"
#define SVNREVLIB 0x1609
#define SVNDATELIB 0x20171107
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1680
#define SVNDATELIB 0x20171122
//