diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index a17ec27d5..304d57e84 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -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 diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index dc2a8740b..9acabb11f 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -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; diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 2228cbcfa..c6fab4f68 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -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 //