From 31d2250cba1e8babb49e00e7d4790007b343e292 Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Fri, 9 Aug 2019 12:57:29 +0200
Subject: [PATCH] fixed callback args and return types, removed set online

---
 ctbGui/ctbAcquisition.cpp | 17 +++++++++--------
 ctbGui/ctbAcquisition.h   |  4 ++--
 ctbGui/ctbGui.cpp         |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ctbGui/ctbAcquisition.cpp b/ctbGui/ctbAcquisition.cpp
index 4f7cf87a5..1b385fe3e 100755
--- a/ctbGui/ctbAcquisition.cpp
+++ b/ctbGui/ctbAcquisition.cpp
@@ -773,9 +773,10 @@ void ctbAcquisition::setCanvas(TCanvas* c) {
   myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)0x%x)->canvasClicked()",this));
   // myCanvas->AddExec("ex","canvasClicked()");
 }
-int ctbAcquisition::dataCallback(detectorData *data, int index, int dum, void* pArgs) {
+void ctbAcquisition::dataCallback(detectorData *data, long unsigned int index, unsigned int dum, void* pArgs) {
 
-  return ((ctbAcquisition*)pArgs)->plotData(data,index);
+  // return 
+  ((ctbAcquisition*)pArgs)->plotData(data,index);
 }
 
 
@@ -836,8 +837,8 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 
 
   //  cout <<"global plot is " << globalPlot << endl;
-  cout << "*******************************************" <<endl;
-  cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
+  // cout << "*******************************************" <<endl;
+  // cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
   if (globalPlot || cbGetPedestal->IsOn()) {
     //#ifdef TESTADC
     //  cout <<"------"<<  index << " " << ip << " " << data->npoints << endl;
@@ -904,7 +905,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
   i=0;
 
 
-  char *d_data=	data->cvalues+2*nadc*nAnalogSamples;
+  char *d_data=	data->data+2*nadc*nAnalogSamples;
   char dval;
 
 
@@ -914,7 +915,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
     for (int x=0; x<nx; x++) {
       for (int y=0; y<ny; y++) {
 	ped=0;
-	aval=dataStructure->getValue(data->cvalues,x,y);
+	aval=dataStructure->getValue(data->data,x,y);
       
 	if (cbGetPedestal->IsOn()) {
 	  if (photonFinder) {
@@ -934,7 +935,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
       
       
       if (h2DMapDig)
-	h2DMapDig->SetBinContent(x+1,y+1,dataStructure->getGain(data->cvalues,x,y));
+	h2DMapDig->SetBinContent(x+1,y+1,dataStructure->getGain(data->data,x,y));
       
       
       }
@@ -1684,7 +1685,7 @@ void* ctbAcquisition::ThreadHandle(void *arg)
 
 }
  
- int ctbAcquisition::progressCallback(double f,void* arg) {
+ void ctbAcquisition::progressCallback(double f,void* arg) {
 
 
    // ctbAcquisition *acq = static_cast<ctbAcquisition*>(arg);
diff --git a/ctbGui/ctbAcquisition.h b/ctbGui/ctbAcquisition.h
index 1f18dd2e5..12abd313e 100755
--- a/ctbGui/ctbAcquisition.h
+++ b/ctbGui/ctbAcquisition.h
@@ -191,8 +191,8 @@ class ctbAcquisition : public TGGroupFrame {
    void setGraph (int i ,int en, Pixel_t col);
    void setBitGraph (int i ,int en, Pixel_t col);
    void startAcquisition();
-   static   int progressCallback(double,void*);
-   static int dataCallback(detectorData*, int,int,  void*);
+   static   void progressCallback(double,void*);
+   static void dataCallback(detectorData*, long unsigned int, unsigned int,  void*);
    int StopFlag;
    
    int plotData(detectorData*, int);
diff --git a/ctbGui/ctbGui.cpp b/ctbGui/ctbGui.cpp
index e5df8b6db..3cec6ea0d 100755
--- a/ctbGui/ctbGui.cpp
+++ b/ctbGui/ctbGui.cpp
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
   
   /****** Create detector ****************/
   multiSlsDetector *myDet=new multiSlsDetector(id);
-  myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
+  // myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
 
   //cout << id << " " << myDet << " " << myDet->setOnline() << endl;
   if (cf) {