From f9bc2eb1269872e8c4cd380d1290304be65e92d6 Mon Sep 17 00:00:00 2001 From: Mazzoleni Alice Francesca Date: Fri, 11 Apr 2025 10:32:31 +0200 Subject: [PATCH] removed Gotthard stuff --- slsReceiverSoftware/src/DataProcessor.cpp | 10 ---------- slsReceiverSoftware/src/GeneralData.h | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 7a69e3f41..1956d3578 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -515,16 +515,6 @@ void DataProcessor::PadMissingPackets(sls_receiver_header header, char *data) { // missing packet switch (generalData->detType) { - // for gotthard, 1st packet: 4 bytes fnum, CACA + CACA, 639*2 bytes - // data - // 2nd packet: 4 bytes fnum, previous 1*2 bytes data + - // 640*2 bytes data !! - case GOTTHARD: - if (pnum == 0u) - memset(data + (pnum * dsize), 0xFF, dsize - 2); - else - memset(data + (pnum * dsize), 0xFF, dsize + 2); - break; case CHIPTESTBOARD: case XILINX_CHIPTESTBOARD: if (pnum == (pperFrame - 1)) diff --git a/slsReceiverSoftware/src/GeneralData.h b/slsReceiverSoftware/src/GeneralData.h index 9f3b43429..6d9a5d626 100644 --- a/slsReceiverSoftware/src/GeneralData.h +++ b/slsReceiverSoftware/src/GeneralData.h @@ -60,8 +60,8 @@ class GeneralData { slsDetectorDefs::frameDiscardPolicy frameDiscardMode{ slsDetectorDefs::NO_DISCARD}; - GeneralData(){}; - virtual ~GeneralData(){}; + GeneralData() {}; + virtual ~GeneralData() {}; // Returns the pixel depth in byte, 4 bits being 0.5 byte float GetPixelDepth() { return float(dynamicRange) / 8; }