From 876977392bf8ea9946ce56b61a6f7cf1006e587a Mon Sep 17 00:00:00 2001 From: Julian Heymes Date: Mon, 24 Oct 2022 12:08:42 +0200 Subject: [PATCH] Modified moench04CtbZmq10GbData.h for analog digital mode --- .../dataStructures/moench04CtbZmq10GbData.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h index 4a2ad2286..093aa223d 100644 --- a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h +++ b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h @@ -91,14 +91,14 @@ class moench04CtbZmq10GbData : public slsDetectorData { } else { row = 200 + i / sc_width; } - if (nds > 0) + // if (nds > 0) dataMap[row][col] = - ((nadc + 4) * i + iadc) * 2 + off; //+16*(ip+1); - else - dataMap[row][col] = - (nadc * i + iadc) * 2 + off; //+16*(ip+1); + ((nadc ) * i + iadc) * 2 + off; //+16*(ip+1); + //else + // dataMap[row][col] = + // (nadc * i + iadc) * 2 + off; //+16*(ip+1); if (dataMap[row][col] < 0 || - dataMap[row][col] >= aSamples * 2 * 32 + off) + dataMap[row][col] >= aSamples * 2 * 32 + off) cout << "Error: pointer " << dataMap[row][col] << " out of range " << endl; }