From a138b5b3650dd1cb86c2b15bdb4cbe9378b32e9e Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 9 Apr 2025 17:52:23 +0200 Subject: [PATCH 1/4] m3 server fix for trimbits and badchannels that are shifted by 1 --- slsDetectorServers/mythen3DetectorServer/mythen3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorServers/mythen3DetectorServer/mythen3.c b/slsDetectorServers/mythen3DetectorServer/mythen3.c index f4dc01871..a03fd736d 100644 --- a/slsDetectorServers/mythen3DetectorServer/mythen3.c +++ b/slsDetectorServers/mythen3DetectorServer/mythen3.c @@ -304,7 +304,7 @@ patternParameters *setChannelRegisterChip(int ichip, char *mask, chanReg |= (0x1 << (3 + icounter)); } } - + chanReg /= 2; // deserialize if (chanReg & CHAN_REG_BAD_CHANNEL_MSK) { LOG(logINFOBLUE, From f8b12201f861327c6ff651c57ba2dcafeddfde29 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 9 Apr 2025 18:21:54 +0200 Subject: [PATCH 2/4] binary in --- .../bin/mythen3DetectorServer_developer | Bin 305788 -> 305788 bytes slsSupportLib/include/sls/versionAPI.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 0ac0007c5d0c7bf4e7e220c11c1e77fbf4094157..bc4c3055261aeeb31032107294784e2efff275e8 100755 GIT binary patch delta 19030 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 diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index f37cd7b42..b9a1d824d 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -5,8 +5,8 @@ #define APIRECEIVER "developer 0x241122" #define APICTB "developer 0x250310" #define APIGOTTHARD2 "developer 0x250310" -#define APIMYTHEN3 "developer 0x250310" #define APIMOENCH "developer 0x250310" #define APIEIGER "developer 0x250310" #define APIXILINXCTB "developer 0x250311" #define APIJUNGFRAU "developer 0x250318" +#define APIMYTHEN3 "developer 0x250409" From 361437428dc7110cfa26f301ae0f7f452b55483e Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 10 Apr 2025 13:11:16 +0200 Subject: [PATCH 3/4] commenting out the example in receiver data call back changing size as it affects users using debugging mode to print out headers --- slsReceiverSoftware/src/MultiReceiverApp.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/slsReceiverSoftware/src/MultiReceiverApp.cpp b/slsReceiverSoftware/src/MultiReceiverApp.cpp index 061c9a441..e66e8a90c 100644 --- a/slsReceiverSoftware/src/MultiReceiverApp.cpp +++ b/slsReceiverSoftware/src/MultiReceiverApp.cpp @@ -146,8 +146,9 @@ void GetData(slsDetectorDefs::sls_receiver_header &header, // header->packetsMask.to_string().c_str(), ((uint8_t)(*((uint8_t *)(dataPointer)))), imageSize); - // if data is modified, eg ROI and size is reduced - imageSize = 26000; + // if data is modified, can affect size + // only reduction in size allowed, not increase + // imageSize = 26000; } /** From 01cc745787e7336693d62430f650d395ebd47ba0 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 11 Apr 2025 10:30:28 +0200 Subject: [PATCH 4/4] update the comment about how to modify data on a data call back from the receiver --- slsReceiverSoftware/src/MultiReceiverApp.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/slsReceiverSoftware/src/MultiReceiverApp.cpp b/slsReceiverSoftware/src/MultiReceiverApp.cpp index e66e8a90c..44284281c 100644 --- a/slsReceiverSoftware/src/MultiReceiverApp.cpp +++ b/slsReceiverSoftware/src/MultiReceiverApp.cpp @@ -146,9 +146,21 @@ void GetData(slsDetectorDefs::sls_receiver_header &header, // header->packetsMask.to_string().c_str(), ((uint8_t)(*((uint8_t *)(dataPointer)))), imageSize); - // if data is modified, can affect size - // only reduction in size allowed, not increase - // imageSize = 26000; + // // example of how to use roi or modify data that is later written to file + // 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; } /**