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

Merge branch 'developer' into dev/issue_dont_reorder_digital_data

Browse Source
This commit is contained in:
maliakal_d 2025-04-11 14:30:11 +02:00 committed by GitHub
commit 9625a8058c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/mythen3DetectorServer/mythen3.c
View File

@ -304,7 +304,7 @@ patternParameters *setChannelRegisterChip(int ichip, char *mask,
chanReg |= (0x1 << (3 + icounter)); chanReg |= (0x1 << (3 + icounter));
} }
} }
chanReg /= 2;
// deserialize // deserialize
if (chanReg & CHAN_REG_BAD_CHANNEL_MSK) { if (chanReg & CHAN_REG_BAD_CHANNEL_MSK) {
LOG(logINFOBLUE, LOG(logINFOBLUE,

17
slsReceiverSoftware/src/MultiReceiverApp.cpp
View File

@ -146,8 +146,21 @@ void GetData(slsDetectorDefs::sls_receiver_header &header,
// header->packetsMask.to_string().c_str(), // header->packetsMask.to_string().c_str(),
((uint8_t)(*((uint8_t *)(dataPointer)))), imageSize); ((uint8_t)(*((uint8_t *)(dataPointer)))), imageSize);
// if data is modified, eg ROI and size is reduced // // example of how to use roi or modify data that is later written to file
imageSize = 26000; // slsDetectorDefs::ROI roi{0, 10, 0, 20};
// int width = roi.xmax - roi.xmin;
// int height = roi.ymax - roi.ymin;
// uint8_t *destPtr = (uint8_t *)dataPointer;
// for (int irow = roi.ymin; irow < roi.ymax; ++irow) {
// memcpy(destPtr,
// ((uint8_t *)(dataPointer + irow * callbackHeader.shape.x +
// roi.xmin)),
// width);
// destPtr += width;
// }
// memcpy((uint8_t*)dataPointer, (uint8_t*)dataPointer
// // setting roi for eg. changes size
// imageSize = width * height;
} }
/** /**

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -5,8 +5,8 @@
#define APIRECEIVER "developer 0x241122" #define APIRECEIVER "developer 0x241122"
#define APICTB "developer 0x250310" #define APICTB "developer 0x250310"
#define APIGOTTHARD2 "developer 0x250310" #define APIGOTTHARD2 "developer 0x250310"
#define APIMYTHEN3 "developer 0x250310"
#define APIMOENCH "developer 0x250310" #define APIMOENCH "developer 0x250310"
#define APIEIGER "developer 0x250310" #define APIEIGER "developer 0x250310"
#define APIXILINXCTB "developer 0x250311" #define APIXILINXCTB "developer 0x250311"
#define APIJUNGFRAU "developer 0x250318" #define APIJUNGFRAU "developer 0x250318"
#define APIMYTHEN3 "developer 0x250409"