From e7af4d75180992bf57a6368df445bc8afe4e054e Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Fri, 9 Aug 2019 12:01:26 +0200
Subject: [PATCH] removed measurments from ctb gui

---
 ctbGui/ctbAcquisition.cpp                     |  5 +-
 ctbGui/ctbPattern.cpp                         | 52 +++++++++----------
 ctbGui/ctbPattern.h                           |  4 +-
 .../dataStructures/deserializer.h             |  4 +-
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/ctbGui/ctbAcquisition.cpp b/ctbGui/ctbAcquisition.cpp
index 6a6c82086..4f7cf87a5 100755
--- a/ctbGui/ctbAcquisition.cpp
+++ b/ctbGui/ctbAcquisition.cpp
@@ -1133,13 +1133,12 @@ void ctbAcquisition::changePlot(){
       if (rb2D->IsOn()) {
 	if (h2DMapDig)
 	  h2DMapDig->Draw("colz");
+	else if (h1DMap)
+	  h1DMap->Draw();
       } else if (bitStack)
 	bitStack->Draw("NOSTACK");
       else
 	cout << "bitStack is NULL" << endl;
-      
-      
-      
     }
     
     
diff --git a/ctbGui/ctbPattern.cpp b/ctbGui/ctbPattern.cpp
index 4823f8570..e25974988 100755
--- a/ctbGui/ctbPattern.cpp
+++ b/ctbGui/ctbPattern.cpp
@@ -510,24 +510,24 @@ ctbPattern::ctbPattern(TGVerticalFrame *page, multiSlsDetector *det)
    e->Connect("ReturnPressed()","ctbPattern",this,"setCycles()");
 
 
-   sprintf(tit, "Number of measurements: ");
+   // sprintf(tit, "Number of measurements: ");
 
-   label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
+   // label= new TGLabel(hframe, tit);
+   // hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
+   // label->MapWindow();
+   // label->SetTextJustify(kTextLeft);
 
 
 
   
-   eMeasurements = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-   hframe->AddFrame( eMeasurements,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eMeasurements->MapWindow();
-   eMeasurements->Resize(150,30);
-   e= eMeasurements->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","ctbPattern",this,"setMeasurements()");
+   // eMeasurements = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
+   //                                             TGNumberFormat::kNEANonNegative, 
+   //                                             TGNumberFormat::kNELNoLimits);
+   // hframe->AddFrame( eMeasurements,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
+   // eMeasurements->MapWindow();
+   // eMeasurements->Resize(150,30);
+   // e= eMeasurements->TGNumberEntry::GetNumberEntry();
+   // e->Connect("ReturnPressed()","ctbPattern",this,"setMeasurements()");
 
 
   hframe=new TGHorizontalFrame(this, 800,800);
@@ -910,14 +910,14 @@ try {
   eCycles->SetNumber(n);
 
 
- try {
-   myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1);
-      } catch (...) {
+ // try {
+ //   myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1);
+ //      } catch (...) {
     
-      cout << "Do nothing for this error" << endl;
-  }
+ //      cout << "Do nothing for this error" << endl;
+ //  }
    
-  eMeasurements->SetNumber(n);
+ //  eMeasurements->SetNumber(n);
 
   start=-1;
   stop=-1;
@@ -1049,14 +1049,14 @@ void ctbPattern::setCycles() {
   }
 }
 
-void ctbPattern::setMeasurements() {
-  try {
-  myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,eFrames->GetNumber());
-      } catch (...) {
+// void ctbPattern::setMeasurements() {
+//   try {
+//   myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,eFrames->GetNumber());
+//       } catch (...) {
     
-      cout << "Do nothing for this error" << endl;
-  }
-}
+//       cout << "Do nothing for this error" << endl;
+//   }
+// }
 
 
 
diff --git a/ctbGui/ctbPattern.h b/ctbGui/ctbPattern.h
index fdfc0412b..b6fa45baa 100755
--- a/ctbGui/ctbPattern.h
+++ b/ctbGui/ctbPattern.h
@@ -100,7 +100,7 @@ private:
    TGNumberEntry *eFrames;
    TGNumberEntry *ePeriod;
    TGNumberEntry *eCycles;
-   TGNumberEntry *eMeasurements;
+   // TGNumberEntry *eMeasurements;
    TGNumberEntry *eAdcPipeline;
    TGNumberEntry *eDBitPipeline;
    
@@ -139,7 +139,7 @@ public:
    void setDBitPipeline();
    void setFrames();
    void setCycles();
-   void setMeasurements();
+   // void setMeasurements();
    void setPeriod();
 
    
diff --git a/slsDetectorCalibration/dataStructures/deserializer.h b/slsDetectorCalibration/dataStructures/deserializer.h
index de32eb75e..ef4007637 100644
--- a/slsDetectorCalibration/dataStructures/deserializer.h
+++ b/slsDetectorCalibration/dataStructures/deserializer.h
@@ -67,11 +67,11 @@ class deserializer : public slsDetectorData<int> {
    }
    wp=(int64_t*)ptr;
    
-   for (iw=0; iw<nch*dr/nb; iw) {
+   for (iw=0; iw<nch/nb; iw) {
      word=*wp;;
      if (ioff<off) {
        ioff++;
-       cout <<"*";
+       // cout <<"*";
      }  else {
        //if (idr<16) {
        ib=0;