From d4a2af1693c78e4d5064764e2af1a058d4e2b79e Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Wed, 21 Aug 2019 17:31:25 +0200
Subject: [PATCH] CTB fixed 10Gb data structures for the GUI (to be tested)

---
 .../dataStructures/moench04CtbZmq10GbData.h   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h
index c62d483b5..28a579123 100644
--- a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h
+++ b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h
@@ -29,18 +29,18 @@ class moench04CtbZmq10GbData : public slsDetectorData<uint16_t> {
 
   */
   //moench04CtbZmq10GbData(int nas=5000, int nds=0): slsDetectorData<uint16_t>(400, 400, nas*2*32+nds*8), aSamples(nas), dSamples(nds), nadc(32), sc_width(25), sc_height(200) {
- moench04CtbZmq10GbData(int nas=5000, int nds=0):  aSamples(nas), dSamples(nds), nadc(32), sc_width(25), sc_height(200) {
+ moench04CtbZmq10GbData(int nas=5000, int nds=0): slsDetectorData<uint16_t>(400, 400, (nas > 0) && (nds>0) ? max(nas,nds)*(32*2+8) : nas*32*2+nds*8), aSamples(nas), dSamples(nds), nadc(32), sc_width(25), sc_height(200) {
 
-    int ds;
-    if (nas && nds)
-      if (nds>nas)
-	ds=nds*(32*2+8);
-      else
-	ds=nas*(32*2+8);
-    else
-      ds=nas*32*2+nds*8;
+    /* int ds; */
+    /* if (nas && nds) */
+    /*   if (nds>nas) */
+    /* 	ds=nds*(32*2+8); */
+    /*   else */
+    /* 	ds=nas*(32*2+8); */
+    /* else */
+    /*   ds=nas*32*2+nds*8; */
 
-    slsDetectorData<uint16_t>(400, 400, ds);
+    /* new slsDetectorData<uint16_t>(400, 400, ds); */
 
     int adc_nr[32]={9, 8,11,10,13,12,15,14,1,0,3,2,5,4,7,6,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24 };