From cb223210066d9e0e06fd1e80d58f58ebe1f51af6 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 16 Aug 2021 16:59:35 +0200 Subject: [PATCH] fixed for eiger 4 bit --- .../eigerDetectorServer/slsDetectorFunctionList.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 9638745e3..4622e97c5 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -2335,11 +2335,13 @@ void *start_timer(void *arg) { memset(imageData, 0, databytes * 2); { int npixels = NCHAN * NCHIP; - const int pixelsPerPacket = (double)datasize / eiger_dynamicrange; + const int pixelsPerPacket = (double)datasize / bytesPerPixel; int pixelVal = 0; if (dr == 4) { npixels /= 2; - } + } + LOG(logINFOBLUE, + ("pixels:%d pixelsperpacket:%d\n", npixels, pixelsPerPacket)); for (int i = 0; i < npixels; ++i) { if (i > 0 && i % pixelsPerPacket == 0) { ++pixelVal; @@ -2349,7 +2351,10 @@ void *start_timer(void *arg) { *((uint8_t *)(imageData + i)) = eiger_virtual_test_mode ? 0xEE - : (uint8_t)(((2 * pixelVal & 0xF) << 4) | ((2 * pixelVal + 1) & 0xF)); + : (uint8_t)(((2 * pixelVal & 0xF) << 4) | + ((2 * pixelVal) & 0xF)); + //: (uint8_t)(((2 * pixelVal & 0xF) << 4) | ((2 * pixelVal + 1) + //& 0xF)); break; case 8: *((uint8_t *)(imageData + i)) =