From 3da8bca46223a8ee3cfc150c9acf961e0f42b216 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 31 Oct 2017 12:39:36 +0100 Subject: [PATCH] allowing receiver to know of gap pixels enable even in 4 bit mode, but not doing anything useful --- slsReceiverSoftware/include/GeneralData.h | 2 ++ slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/slsReceiverSoftware/include/GeneralData.h b/slsReceiverSoftware/include/GeneralData.h index a9f646e83..207b15f66 100644 --- a/slsReceiverSoftware/include/GeneralData.h +++ b/slsReceiverSoftware/include/GeneralData.h @@ -545,6 +545,8 @@ class EigerData : public GeneralData { * @param dr dynamic range */ void SetGapPixelsEnable(bool b, int dr) { + if (dr == 4) + b = 0; switch((int)b) { case 1: nPixelsX = (256 * 2) + 3; diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index a7103b260..c27d141b1 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -2461,10 +2461,7 @@ int slsReceiverTCPIPInterface::enable_gap_pixels() { else if (receiverBase->getStatus() != IDLE) receiverNotIdle(); else { - if (receiverBase->getDynamicRange() == 4) - FILE_LOG(logERROR) << "Warning: Cannot set gap pixels at receiver level for 4 bit mode" << endl; - else - receiverBase->setGapPixelsEnable(enable); + receiverBase->setGapPixelsEnable(enable); } } //get