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

gappixels also work with new zmq handler

Browse Source
This commit is contained in:
maliakal_d 2018-04-09 11:19:31 +02:00
parent 3831896a78
commit ccdc7d22e9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -6114,7 +6114,7 @@ void multiSlsDetector::readFrameFromReceiver(){
nPixelsX = doc["shape"][0].GetUint(); nPixelsX = doc["shape"][0].GetUint();
nPixelsY = doc["shape"][1].GetUint(); nPixelsY = doc["shape"][1].GetUint();
//#ifdef VERBOSE #ifdef VERBOSE
cprintf(BLUE,"(Debug) One Time Header Info:\n" cprintf(BLUE,"(Debug) One Time Header Info:\n"
"size: %u\n" "size: %u\n"
"multisize: %u\n" "multisize: %u\n"
@ -6123,7 +6123,7 @@ void multiSlsDetector::readFrameFromReceiver(){
"nPixelsX: %u\n" "nPixelsX: %u\n"
"nPixelsY: %u\n", "nPixelsY: %u\n",
size, multisize, dynamicRange, bytesPerPixel, nPixelsX, nPixelsY); size, multisize, dynamicRange, bytesPerPixel, nPixelsX, nPixelsY);
//#endif #endif
} }
// each time, parse rest of header // each time, parse rest of header
currentFileName = doc["fname"].GetString(); currentFileName = doc["fname"].GetString();
@ -6137,7 +6137,7 @@ void multiSlsDetector::readFrameFromReceiver(){
coordY = (nY - 1) - coordY; coordY = (nY - 1) - coordY;
//cout << "X:" << doc["xCoord"].GetUint() <<" Y:"<<doc["yCoord"].GetUint(); //cout << "X:" << doc["xCoord"].GetUint() <<" Y:"<<doc["yCoord"].GetUint();
flippedDataX = doc["flippedDataX"].GetUint(); flippedDataX = doc["flippedDataX"].GetUint();
//#ifdef VERBOSE #ifdef VERBOSE
cprintf(BLUE,"(Debug) Header Info:\n" cprintf(BLUE,"(Debug) Header Info:\n"
"currentFileName: %s\n" "currentFileName: %s\n"
"currentAcquisitionIndex: %lu\n" "currentAcquisitionIndex: %lu\n"
@ -6149,7 +6149,7 @@ void multiSlsDetector::readFrameFromReceiver(){
"flippedDataX: %u\n", "flippedDataX: %u\n",
currentFileName.c_str(), currentAcquisitionIndex, currentFrameIndex, currentFileName.c_str(), currentAcquisitionIndex, currentFrameIndex,
currentFileIndex, currentSubFrameIndex, coordX, coordY, flippedDataX); currentFileIndex, currentSubFrameIndex, coordX, coordY, flippedDataX);
//#endif #endif
zmqSocket[isocket]->CloseHeaderMessage(); zmqSocket[isocket]->CloseHeaderMessage();
} }
@ -6164,13 +6164,14 @@ void multiSlsDetector::readFrameFromReceiver(){
uint32_t yoffset = coordY * nPixelsY; uint32_t yoffset = coordY * nPixelsY;
uint32_t singledetrowoffset = nPixelsX * bytesPerPixel; uint32_t singledetrowoffset = nPixelsX * bytesPerPixel;
uint32_t rowoffset = nX * singledetrowoffset; uint32_t rowoffset = nX * singledetrowoffset;
#ifdef VERBOSE
cprintf(BLUE,"(Debug) Multi Image Info:\n" cprintf(BLUE,"(Debug) Multi Image Info:\n"
"xoffset: %u\n" "xoffset: %u\n"
"yoffset: %u\n" "yoffset: %u\n"
"singledetrowoffset: %u\n" "singledetrowoffset: %u\n"
"rowoffset: %u\n", "rowoffset: %u\n",
xoffset, yoffset, singledetrowoffset, rowoffset); xoffset, yoffset, singledetrowoffset, rowoffset);
flippedDataX = 0; #endif
if (eiger && flippedDataX) { if (eiger && flippedDataX) {
for (uint32_t i = 0; i < nPixelsY; ++i) { for (uint32_t i = 0; i < nPixelsY; ++i) {
memcpy( ((char*)multiframe) + ((yoffset + (nPixelsY - 1 - i) ) * rowoffset) + xoffset, memcpy( ((char*)multiframe) + ((yoffset + (nPixelsY - 1 - i) ) * rowoffset) + xoffset,