detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-01 18:30:05 +02:00
Code Issues Actions Packages Releases Activity

got rid of insignificant printouts from debugging

Browse Source
This commit is contained in:
maliakal_d 2019-02-04 16:43:37 +01:00
parent 7481c7f0e6
commit 61e769773b
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1235,10 +1235,10 @@ void multiSlsDetector::setDetectorOffset(dimension d, int off, int pos) {
void multiSlsDetector::updateOffsets() { void multiSlsDetector::updateOffsets() {
//cannot paralllize due to slsdetector calling this via parentdet-> //cannot paralllize due to slsdetector calling this via parentdet->
//#ifdef VERBOSE #ifdef VERBOSE
cout << endl cout << endl
<< "Updating Multi-Detector Offsets" << endl; << "Updating Multi-Detector Offsets" << endl;
//#endif #endif
int offsetX = 0, offsetY = 0, numX = 0, numY = 0, maxX = 0, maxY = 0; int offsetX = 0, offsetY = 0, numX = 0, numY = 0, maxX = 0, maxY = 0;
int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X]; int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X];
int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y]; int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y];
@ -1298,9 +1298,9 @@ void multiSlsDetector::updateOffsets() {
maxY_gp += detectors[idet]->getMaxNumberOfChannelsInclGapPixels(Y); maxY_gp += detectors[idet]->getMaxNumberOfChannelsInclGapPixels(Y);
++thisMultiDetector->numberOfDetector[X]; ++thisMultiDetector->numberOfDetector[X];
++thisMultiDetector->numberOfDetector[Y]; ++thisMultiDetector->numberOfDetector[Y];
//#ifdef VERBOSE #ifdef VERBOSE
cout << "incrementing in both direction" << endl; cout << "incrementing in both direction" << endl;
//#endif #endif
} }
//incrementing in y direction //incrementing in y direction
@ -1318,9 +1318,9 @@ void multiSlsDetector::updateOffsets() {
// increment in y again only in the first column (else you double increment) // increment in y again only in the first column (else you double increment)
if (thisMultiDetector->numberOfDetector[X] == 1) if (thisMultiDetector->numberOfDetector[X] == 1)
++thisMultiDetector->numberOfDetector[Y]; ++thisMultiDetector->numberOfDetector[Y];
//#ifdef VERBOSE #ifdef VERBOSE
cout << "incrementing in y direction" << endl; cout << "incrementing in y direction" << endl;
//#endif #endif
} }
//incrementing in x direction //incrementing in x direction
@ -1348,9 +1348,9 @@ void multiSlsDetector::updateOffsets() {
maxX += detectors[idet]->getMaxNumberOfChannels(X); maxX += detectors[idet]->getMaxNumberOfChannels(X);
maxX_gp += detectors[idet]->getMaxNumberOfChannelsInclGapPixels(X); maxX_gp += detectors[idet]->getMaxNumberOfChannelsInclGapPixels(X);
++thisMultiDetector->numberOfDetector[X]; ++thisMultiDetector->numberOfDetector[X];
//#ifdef VERBOSE #ifdef VERBOSE
cout << "incrementing in x direction" << endl; cout << "incrementing in x direction" << endl;
//#endif #endif
} }
double bytesperchannel = (double)detectors[idet]->getDataBytes() / double bytesperchannel = (double)detectors[idet]->getDataBytes() /
@ -1383,7 +1383,7 @@ void multiSlsDetector::updateOffsets() {
if (maxY_gp > thisMultiDetector->maxNumberOfChannelInclGapPixels[Y]) if (maxY_gp > thisMultiDetector->maxNumberOfChannelInclGapPixels[Y])
thisMultiDetector->maxNumberOfChannelInclGapPixels[Y] = maxY_gp; thisMultiDetector->maxNumberOfChannelInclGapPixels[Y] = maxY_gp;
} }
//#ifdef VERBOSE #ifdef VERBOSE
cout << "Number of Channels in X direction:" << thisMultiDetector->numberOfChannel[X] << endl; cout << "Number of Channels in X direction:" << thisMultiDetector->numberOfChannel[X] << endl;
cout << "Number of Channels in Y direction:" << thisMultiDetector->numberOfChannel[Y] << endl cout << "Number of Channels in Y direction:" << thisMultiDetector->numberOfChannel[Y] << endl
<< endl; << endl;
@ -1392,7 +1392,7 @@ void multiSlsDetector::updateOffsets() {
cout << "Number of Channels in Y direction with Gap Pixels:" << cout << "Number of Channels in Y direction with Gap Pixels:" <<
thisMultiDetector->numberOfChannelInclGapPixels[Y] << endl thisMultiDetector->numberOfChannelInclGapPixels[Y] << endl
<< endl; << endl;
//#endif #endif
} }
@ -5067,7 +5067,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"
@ -5077,7 +5077,7 @@ void multiSlsDetector::readFrameFromReceiver() {
"nPixelsY: %u\n", "nPixelsY: %u\n",
size, multisize, dynamicRange, bytesPerPixel, size, multisize, dynamicRange, bytesPerPixel,
nPixelsX, nPixelsY); nPixelsX, nPixelsY);
//#endif #endif
} }
// each time, parse rest of header // each time, parse rest of header
currentFileName = doc["fname"].GetString(); currentFileName = doc["fname"].GetString();
@ -5086,12 +5086,12 @@ void multiSlsDetector::readFrameFromReceiver() {
currentFileIndex = doc["fileIndex"].GetUint64(); currentFileIndex = doc["fileIndex"].GetUint64();
currentSubFrameIndex = doc["expLength"].GetUint(); currentSubFrameIndex = doc["expLength"].GetUint();
coordY = doc["row"].GetUint(); coordY = doc["row"].GetUint();
coordX = doc["column"].GetUint();cprintf(BLUE, "row:%d, col:%d,ny:%d\n", coordY, coordX, nY); coordX = doc["column"].GetUint();
if (eiger) if (eiger)
coordY = (nY - 1) - coordY; coordY = (nY - 1) - coordY;
//cout << "X:" << doc["row"].GetUint() <<" Y:"<<doc["column"].GetUint(); //cout << "X:" << doc["row"].GetUint() <<" Y:"<<doc["column"].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"
@ -5105,7 +5105,7 @@ void multiSlsDetector::readFrameFromReceiver() {
currentFrameIndex, currentFileIndex, currentSubFrameIndex, currentFrameIndex, currentFileIndex, currentSubFrameIndex,
coordX, coordY, coordX, coordY,
flippedDataX); flippedDataX);
//#endif #endif
} }
// DATA // DATA
@ -5118,14 +5118,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 #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);
//#endif #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) + memcpy(((char*)multiframe) +