Merge branch 'main-rc' into b2.3.0

This can be used to check compatibility

.gitignore

@@ -8,3 +8,10 @@ slsReceiverSoftware/
 slsDetectorCalibration/
 slsImageReconstruction/
 .settings
+JCTBGui/
+*.aux
+*.log
+*.out
+*.toc
+build
+tests

CMakeLists.txt

@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 2.8)
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+find_package(Qt4)
+find_package(Qwt 6)
+find_package(CBF)
+find_package(Doxygen)
+
+add_subdirectory(slsDetectorSoftware)
+add_subdirectory(slsReceiverSoftware)
+add_subdirectory(slsImageReconstruction)
+if (QT4_FOUND AND QWT_FOUND)
+    add_subdirectory(slsDetectorGui)
+endif()
+
+if (DEFINED ENV{ROOTSYS})
+    find_package(ROOT)
+    if (ROOT_FOUND)
+        add_subdirectory(calibrationWizards)
+    endif()
+endif()

JCTBGui/JCTBGui.cpp

@@ -1,157 +0,0 @@
-#include <TApplication.h>
-#include <TColor.h>
-
-#include <TStyle.h>
-#include <TROOT.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-
-
-#include "multiSlsDetector.h"
-#include "sls_detector_defs.h"
-#include "sls_receiver_defs.h"
-#include "jctbMain.h"
-using namespace std;
-
-
-int main(int argc, char **argv) {
-
-
-  string afname, cfname, pfname;
-  int id=0;
-
-  int af=0, cf=0, pf=0;
-
-
-  cout << " *** " << argc << endl;
-  for (int ia=0; ia<argc; ia++) {
-    if (strcmp(argv[ia],"-alias")==0) {
-      if (ia+1<argc) {
-	afname=argv[ia+1];
-	ia++;
-	af=1;
-      }
-
-    } else if  (strcmp(argv[ia],"-config")==0) {
-      if (ia+1<argc) {
-	cfname=argv[ia+1];
-	ia++;
-	cf=1;
-      }
-
-
-    } else if  (strcmp(argv[ia],"-par")==0) {
-      if (ia+1<argc) {
-	pfname=argv[ia+1];
-	ia++;
-	pf=1;
-      }
-
-
-    } else if  (strcmp(argv[ia],"-id")==0) {
-      if (ia+1<argc) {
-	id=atoi(argv[ia+1]);
-	ia++;
-      }
-    } 
-  }
-  
-
-  cout << " *** "  << endl;
-  
-  /****** Create detector ****************/
-  multiSlsDetector *myDet=new multiSlsDetector(id);
-  myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
-
-
-  if (cf) {
-    myDet->readConfigurationFile(cfname);
-  } else
-    cout << "No config file specified" << endl;
-
-
-  cout << "Created multi detector id " << id << " hostname " << myDet->getHostname() << endl;
-
-  if (pf) {
-    myDet->retrieveDetectorSetup(pfname);
-  } else
-    cout << "No parameter file specified" << endl;
-
-
-
-
-
-  /***********Create GUI stuff *******************/
-   TApplication theApp("App",&argc,argv);
-
-
- gStyle->SetDrawBorder(0);
-  gStyle->SetCanvasColor(kWhite);
-  gStyle->SetCanvasDefH(800);
-  gStyle->SetCanvasDefW(800);
-  gStyle->SetCanvasBorderMode(0);
-  gStyle->SetPadBorderMode(0);
-  gStyle->SetPaintTextFormat("5.2f");
-  gStyle->SetLineWidth(2);
-  gStyle->SetTextSize(1.1);
-  gStyle->SetLabelSize(0.04,"xy");
-  gStyle->SetTitleSize(0.05,"xy");
-  gStyle->SetTitleOffset(1.0,"x");
-  gStyle->SetTitleOffset(1.1,"y");
-  gStyle->SetPadTopMargin(0.15);
-  gStyle->SetPadRightMargin(0.15);
-  gStyle->SetPadBottomMargin(0.15);
-  gStyle->SetPadLeftMargin(0.15);
-  gStyle->SetLegendBorderSize(1);
-  gStyle->SetFrameBorderMode(0);
-  gStyle->SetFrameFillColor(kWhite);
-  // gStyle->SetLegendFillColor(kWhite);
-  gStyle->SetTitleFillColor(kWhite);
-  gStyle->SetFillColor(kWhite);
-  gStyle->SetStatFontSize(0.03);
-  gStyle->SetStatBorderSize(1);
-  gStyle->SetStatFormat("6.4g");
-  gStyle->SetStatX(0.95);
-  gStyle->SetStatY(0.95);
-  gStyle->SetStatW(0.2);
-  gStyle->SetStatH(0.2);
-  gStyle->SetTitleX(0.1);
-  gStyle->SetTitleY(0.95);
-  gStyle->SetTitleBorderSize(0);
-  gStyle->SetTitleFontSize(0.05);
-  gROOT->SetStyle("Default");
-
-
-  TColor::InitializeColors();
-  const Int_t NRGBs = 5;
-  const Int_t NCont = 90;
-
-  Double_t stops[NRGBs] = { 0.00, 0.34, 0.61, 0.84, 1.00 };
-  Double_t red[NRGBs]   = { 0.00, 0.00, 0.87, 1.00, 0.51 };
-  Double_t green[NRGBs] = { 0.00, 0.81, 1.00, 0.20, 0.00 };
-  Double_t blue[NRGBs]  = { 0.51, 1.00, 0.12, 0.00, 0.00 };
-  TColor::CreateGradientColorTable(NRGBs, stops, red, green, blue, NCont);
-  gStyle->SetNumberContours(NCont);
-
-
-  gROOT->ForceStyle();
-  jctbMain *mf=new jctbMain(gClient->GetRoot(),myDet);
-
-  cout << " *** " << argc << endl;
-  for (int ia=0; ia<argc; ia++)
-    cout << argv[ia] << endl;
-  
-
-  cout << " *** "  << endl;
-  
-  if (af)
-    mf->loadAlias(afname);
-  else
-    cout << "no alias specified" << endl;
-
-   theApp.Run();
-   return 0;
-}

JCTBGui/Makefile

@@ -1,29 +0,0 @@
-
-SRC=jctbDict.cpp jctbMain.cpp jctbDacs.cpp jctbDac.cpp  jctbPattern.cpp  jctbSignals.cpp jctbSignal.cpp jctbAdcs.cpp jctbAcquisition.cpp
-INCS=jctbSignals.h jctbSignal.h jctbPattern.h jctbDacs.h jctbDac.h jctbMain.h jctbAdcs.h jctbAcquisition.h
-LINKDEF=jctbLinkDef.h 
-
-INCDIR=-I../slsReceiverSoftware/include/ -I../slsDetectorSoftware/multiSlsDetector/ -I../slsDetectorSoftware/slsDetector -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetectorAnalysis -I../slsDetectorSoftware/slsDetectorUsers -I../slsDetectorSoftware/usersFunctions
-LDFLAG=-L../bin -lSlsDetector -L/usr/lib64/ -lpthread
-
-MAIN=JCTBGui.cpp
-
-DESTDIR?=../bin
-
-all: $(DESTDIR)/JCTBGui
-
-doc:
-	cd manual && make DESTDIR=$(DESTDIR)
-
-htmldoc:
-	cd manual && make html DESTDIR=$(DESTDIR)
-
-jctbDict.cpp: $(INCS)  $(LINKDEF)	
-	rootcint -f jctbDict.cpp -c $(INCS) $(LINKDEF)	
-
-$(DESTDIR)/JCTBGui: $(SRC) $(MAIN)  $(LINKDEF)	$(INCS)
-	g++ -DMYROOT `root-config --cflags --glibs` -lMinuit $(LDFLAG) -o JCTBGui $(INCDIR) $(SRC)  $(MAIN)
-	mv JCTBGui $(DESTDIR)	
-
-clean:
-	rm -f JCTBGui *.o jctbDict.*

JCTBGui/example.alias

@@ -1,176 +0,0 @@
-# this is a comment (every line starting with no keyword is such)
-
-# space in label not allowed (tbf)
-
-#BITX bitName plotFlag plotColorRGB (from 0!)
-
-
-#BIT1 compTestOUT  1 2  #you can put comments also here (leave a space bef. #)
-
-BIT1 compTestIN
-
-BIT32 curON
-
-BIT2 side_clk
-
-BIT3 side_din
-
-BIT4 clear_shr
-
-BIT5 bottom_din
-
-BIT6 bottom_clk
-
-BIT7 gHF
-
-BIT31 bypassCDS
-
-BIT8 ENprechPRE
-
-BIT9 res
-
-BIT30 pulseOFF
-
-BIT27 connCDS #INVERTED NAME to match logical behaviour, chipname disconnCDS
-
-BIT24 Dsg_1
-
-BIT25 Dsg_2
-
-BIT23 Dsg_3
-
-BIT10 sto0
-
-BIT11 sto1
-
-BIT12 sto2
-
-BIT13 resCDS
-
-BIT14 prechargeConnect
-
-BIT15 pulse
-
-BIT21 PCT_mode
-
-BIT16 res_DGS
-
-#BIT26 dbit1
-
-#BIT27 dbit0
-
-#CMOS_IN
-
-#CMOS_IN1 out_DGS
-
-#LVDS_IN
-
-# now the names of ADC channels (lt. 12 characters)
-
-ADC1 T_boa.(C)
-
-ADC2 Va+
-
-ADC3 Vdd_ps
-
-ADC4 Vsh
-
-ADC5 Vcc_int
-
-ADC6 Vcc_iochip
-
-ADC7 Vcc1.8A
-
-ADC8 Vcc1.8D
-
-ADC9 T_chip
-
-ADC10 _nc 
-
-ADC11 _nc 
-
-ADC12 _Vcc_io # 0.068 ohm resistor
-
-ADC13 _nc  # 0.068 ohm resistor
-
-ADC14 _Va # 0.068 ohm resistor
-
-ADC15 _nc 
-
-ADC16 _vdd_ana
-
-I1 _I_va(mA) # this values are computed as spec.
-
-I1a 2  #by the following lines ((ADCa-ADCb)/R)
-
-I1b 14  # all the values comes mainly from the adapter board 
-
-I1r 0.068
-
-I2 _I_vdd(mA) #
-
-I2a 3
-
-I2b 16
-
-I2r 0.068 #
-
-I3 _nn
-
-I3a 14
-
-I3b 2
-
-I3r 0.068
-
-I4 _I_io(mA)
-
-I4a 6
-
-I4b 12
-
-I4r 0.068 #shuld be 5000000 for mA readout
-
-# now the names of DAC channels (lt. 12 characters)
-
-DAC7 vbp_colbuf
-
-DAC8 vIpreCDS
-
-DAC9 vIpre
-
-DAC10 VprechPre
-
-DAC11 prechargeV
-
-DAC12 ibias_SFP
-
-DAC1 vcasc_SFP
-
-DAC3 VPH
-
-DAC4 VPL
-
-DAC2 ibias_CS
-
-DAC5 vrefDGS
-
-DAC6 vIpreDGS
-
-DAC1 vcascSFP
-
-DAC13 s2d_vcascp
-
-#POT1 s2d_vcascn
-
-DAC14 vin_com
-
-DAC15 vout_com
-
-DAC16 vb_sda
-
-# number (1-16) of the adc "reading" the pot controlled VR. (should be always 2)
-
-DACFORPOTVR 2
-
-#SCHEMATIC jungfrau01_ADP.pdf #those files are located in doc/ folder

JCTBGui/jctbAcquisition.cpp

@@ -1,228 +0,0 @@
-
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TThread.h>
-
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "jctbAcquisition.h"
-#include "multiSlsDetector.h"
-#include "sls_detector_defs.h"
-
-using namespace std;
-
-
-
-
-jctbAcquisition::jctbAcquisition(TGVerticalFrame *page, multiSlsDetector *det) : TGGroupFrame(page,"Acquisition",kVerticalFrame),  myDet(det) {
-
-    page->AddFrame(this,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
-    MapWindow();
-
-    TGHorizontalFrame *hframe=new TGHorizontalFrame(this, 800,50);
-    AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
-    hframe->MapWindow();
-
-    char tit[100];
-    
-
-   cFileSave= new TGCheckButton(hframe, "Output file: ");
-   hframe->AddFrame(cFileSave,new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5));
-   cFileSave->MapWindow();
-   cFileSave->SetTextJustify(kTextRight);
-   cFileSave->Connect("Toggled(Bool_t)","jctbAcquisition",this,"setFsave(Bool_t)");
-
-  
-   eFname = new TGTextEntry(hframe, (myDet->getFileName()).c_str());
-
-   hframe->AddFrame(eFname,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-   eFname->MapWindow();
-   eFname->Resize(150,30);
-
-   eFname->Connect("ReturnPressed()","jctbAcquisition",this,"setFname()");
-
-
-   TGLabel *label=new TGLabel(hframe,"index: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   label->MapWindow();
-   label->SetTextJustify(kTextRight);
-
-
-   eFindex = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-					 TGNumberFormat::kNELNoLimits);
-   hframe->AddFrame( eFindex,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eFindex->MapWindow();
-   eFindex->Resize(150,30);
-    TGTextEntry *e= eFindex->TGNumberEntry::GetNumberEntry();
-    e->Connect("ReturnPressed()","jctbAcquisition",this,"setFindex()");
-
-
-   hframe=new TGHorizontalFrame(this, 800,50);
-   AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
-   hframe->MapWindow();
-
-   label=new TGLabel(hframe,"Output directory: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   label->MapWindow();
-   label->SetTextJustify(kTextRight);
-
-
-
-   eOutdir = new TGTextEntry(hframe, (myDet->getFilePath()).c_str());
-
-   hframe->AddFrame(eOutdir,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-   eOutdir->MapWindow();
-   eOutdir->Resize(150,30);
-
-
-   eOutdir->Connect("ReturnPressed()","jctbAcquisition",this,"setOutdir()");
-
-   hframe=new TGHorizontalFrame(this, 800,50);
-    AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
-    hframe->MapWindow();
-
-    bStatus=new TGTextButton(hframe, "Start");
-    hframe->AddFrame(bStatus,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-    bStatus->MapWindow();
-    bStatus->Connect("Clicked()","jctbAcquisition",this,"toggleAcquisition()");
-
-
-    acqThread = new TThread("acqThread",
-               jctbAcquisition::ThreadHandle,(void*)this);
-    // acqThread->Run();
-   
-    myDet->registerProgressCallback(&progressCallback,(void*)this);
-
-    
-    myDet->registerDataCallback(&dataCallback, (void*)this);
-
-}
-
-int jctbAcquisition::dataCallback(detectorData *data, int index, void* pArgs) {
-
-
-  cout <<"------"<<  index << " " << data->npoints << " "<< data->npy << endl;
-
-  
-
-
-}
-
-
-
-
-void jctbAcquisition::setOutdir() {
-
-  myDet->setFilePath(eOutdir->GetText());
-
-//   //  cout << "setting dac! "<< id << endl;
-
-//   myDet->setDAC(dacsEntry->GetIntNumber(), (slsDetectorDefs::dacIndex)id, dacsUnit->IsOn());
-
-//   getValue();
-
-}
-
-void jctbAcquisition::setFname() {
-  myDet->setFileName(eFname->GetText());
-//   int val=myDet->setDAC(-1, (slsDetectorDefs::dacIndex)id, dacsUnit->IsOn());
-//   char s[100];
-
-//   sprintf(s,"%d",val);
-
-//   dacsValue->SetText(s);
-  
-
-//   return val;
-
-}
-
-void jctbAcquisition::setFindex() {
-  myDet->setFileIndex(eFindex->GetNumber());
-
-}
-
-
-void jctbAcquisition::setFsave(Bool_t b) {
-  myDet->enableWriteToFile(b);
-  eFname->SetState(b);
-  eOutdir->SetState(b);
-  
-}
-
-void jctbAcquisition::update() {
-
-  
-  eFname->SetText((myDet->getFileName()).c_str());
-  eOutdir->SetText((myDet->getFilePath()).c_str());
-  eFindex->SetNumber(myDet->getFileIndex()); 
-  cFileSave->SetOn(myDet->enableWriteToFile());
-  eFname->SetState(cFileSave->IsOn());
-  eOutdir->SetState(cFileSave->IsOn());
-  eFindex->SetState(cFileSave->IsOn());
-
-}
-
-
-
-void jctbAcquisition::toggleAcquisition() {
-
-
-
-  if (acqThread->GetState()==1 || acqThread->GetState()==6) {
-    bStatus->SetText("Stop");
-    acqThread->Run();
-    //myDet->startAcquisition();
-    StopFlag=0;
-  } else {
-    StopFlag=1; 
-    myDet->stopAcquisition();
-    bStatus->SetText("Start");
-    //  acqThread->Kill();
-  }
-}
-
-void jctbAcquisition::acquisitionFinished() {
-    bStatus->SetText("Start");
-}
-
-void jctbAcquisition::startAcquisition(){
-  cout << "Detector started " << endl;
-  myDet->acquire();
-}
-
-void* jctbAcquisition::ThreadHandle(void *arg)
-{
-   jctbAcquisition *acq = static_cast<jctbAcquisition*>(arg);
-   int i=0;
-
-   acq->startAcquisition();
-   acq->acquisitionFinished();
-
-   //  while(!(classInstance->StopFlag))
-   // {
-   // cout << "thread " << i++ << endl;
-   // usleep(100000);
-   // }
-   //myDet->readFrame();
-
-}
- 
- int jctbAcquisition::progressCallback(double f,void* arg) {
-
-
-   // jctbAcquisition *acq = static_cast<jctbAcquisition*>(arg);
-
-
-   cout << "*********" << f << "*******" << endl;
-
-
-
-
- }

JCTBGui/jctbAcquisition.h

@@ -1,60 +0,0 @@
-#ifndef JCTBACQUISITION_H
-#define JCTBACQUISITION_H
-#include  <TGFrame.h>
-
-
-
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-class TThread;
-
-class 	TGTextButton;
-
-class multiSlsDetector;
-class detectorData;
-
-#include <string>
-using namespace std;
-
-class jctbAcquisition : public TGGroupFrame {
-
-
- private:
-  TGTextEntry *eOutdir;
-  TGTextEntry *eFname;
-  TGNumberEntry *eFindex;
-  TGCheckButton *cFileSave;
-  TGTextButton *bStatus;
-  // TGTextButton 
-  
-  TThread *acqThread;
-
-  multiSlsDetector* myDet;
-  
-
-  
-
-
- public:
-   jctbAcquisition(TGVerticalFrame*,  multiSlsDetector*);
-   void setOutdir();
-   void setFname();
-   void setFsave(Bool_t);
-   void setFindex();
-   void toggleAcquisition();
-   static void* ThreadHandle(void *arg);
-   void update();
-   void acquisitionFinished();
-
-   void startAcquisition();
-   static   int progressCallback(double,void*);
-   static int dataCallback(detectorData*, int, void*);
-   int StopFlag;
-
-   ClassDef(jctbAcquisition,0)
-};
-
-
-#endif

JCTBGui/jctbAdcs.cpp

@@ -1,215 +0,0 @@
-#include <TApplication.h>
-#include <TGClient.h>
-#include <TCanvas.h>
-#include <TF1.h>
-#include <TRandom.h>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TGFileDialog.h>
-#include <TGComboBox.h>
-#include <TH2F.h>
-#include <TColor.h>
-#include <TH1F.h>
-#include <TGraphErrors.h>
-#include <TGColorSelect.h>
-#include <THStack.h>
-#include <TGTab.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "jctbAdcs.h"
-#include "multiSlsDetector.h"
-
-using namespace std;
-
-
-
-jctbAdc::jctbAdc(TGVerticalFrame *page, int i, multiSlsDetector *det)
-  : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
-
-  TGHorizontalFrame *hframe=this;
-  char tit[100];
-
-   page->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-   hframe->MapWindow();
-
-
-   
-
-
-   sprintf(tit, "ADC%d", id);
-
-   sAdcLabel= new TGLabel(hframe, tit);
-   hframe->AddFrame(sAdcLabel,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sAdcLabel->MapWindow();
-   sAdcLabel->SetTextJustify(kTextLeft);
-
-
-
-   
-
-   sAdcEnable= new TGCheckButton(hframe, "Enable");
-   hframe->AddFrame( sAdcEnable,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sAdcEnable->MapWindow();
-   sAdcEnable->SetOn(kTRUE);
-   sAdcEnable->SetEnabled(kFALSE);
-
-
-
-   sAdcPlot= new TGCheckButton(hframe, "Plot");
-   hframe->AddFrame( sAdcPlot,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sAdcPlot->MapWindow();
-
-
-   sAdcPlot->Connect("Toggled(Bool_t)","jctbAdc",this,"ToggledPlot(Bool_t)");
-
-
-
-   fColorSel = new TGColorSelect(hframe, id+1, 0);
-   hframe->AddFrame(fColorSel, new TGLayoutHints(kLHintsTop |
-                          kLHintsLeft, 2, 0, 2, 2));
-   
-
-   fColorSel->SetColor(TColor::Number2Pixel(id+1));
-
-
-};
-
-void jctbAdc::setAdcAlias(char *tit, int plot, int color) {
-  if (tit)
-    sAdcLabel->SetText(tit);
-  if (plot)
-    sAdcPlot->SetOn(kTRUE,kTRUE);
-  else
-    sAdcPlot->SetOn(kFALSE,kTRUE);
-  if (color>=0)
-    fColorSel->SetColor(color);
-  fColorSel->SetEnabled(sAdcPlot->IsOn());
-}
-
-
-string jctbAdc::getAdcAlias() {
-
-  char line[1000];
-  sprintf(line,"ADC%d %s %d %x\n",id,sAdcLabel->GetText()->Data(),sAdcPlot->IsOn(),fColorSel->GetColor());
-  return string(line);
-}
-
-void jctbAdc::update() {
-
-}
-
-
-void jctbAdc::ToggledPlot(Bool_t b){
-
-  Long_t mask=b<<id;
-  ToggledAdcPlot(mask);
-  fColorSel->SetEnabled(b);
-
-}
-
-void jctbAdc::ToggledAdcPlot(Int_t b){
-
-  
-  Emit("ToggledAdcPlot(Int_t)", id);
-
-}
-
-
-
-
-
-
-
-
-jctbAdcs::jctbAdcs(TGVerticalFrame *page, multiSlsDetector *det)
-  : TGGroupFrame(page,"Adcs",kVerticalFrame), myDet(det) {
-
-
-  SetTitlePos(TGGroupFrame::kLeft);
-  page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  MapWindow();
-  
-  char tit[100];
-
- 
-  TGHorizontalFrame* hframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-
-
-  int idac=0;
-
-
-
-
- 
-  TGHorizontalFrame* hhframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hhframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hhframe->MapWindow();
-
-  TGVerticalFrame *vframe;
-
-
-
-
-  for (idac=0; idac<NADCS; idac++) {
-    if (idac%16==0) {
-
-
-    vframe=new TGVerticalFrame(hhframe, 400,800);
-     hhframe->AddFrame(vframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    vframe->MapWindow();
-   
-  
-
-    }
-
-    sAdc[idac]=new jctbAdc(vframe,idac,myDet);
-  }
-
-
-}
-
-void jctbAdcs::update() {
-
-  
-  ;
-
-  
-
-}
-
-int jctbAdcs::setAdcAlias(string line) {
-
-  int is=-1, plot=0, color=-1;
-  char tit[100];
-  int narg=sscanf(line.c_str(),"ADC%d %s %d %x",&is,tit,&plot, &color);
-  if (narg<2)
-    return -1;
-  if (narg!=3)
-    color=-1;
-  if (is>=0 && is<NADCS) {
-    sAdc[is]->setAdcAlias(tit,plot,color);
-  }
-  return is;
-
-}
-
-string jctbAdcs::getAdcAlias() {
-
-  ostringstream line;
-
-  for (int is=0; is<NADCS; is++)
-    line << sAdc[is]->getAdcAlias();
-
-  return line.str();
-}

JCTBGui/jctbAdcs.h

@@ -1,83 +0,0 @@
-#ifndef JCTBADCS_H
-#define JCTBADCS_H
-#include  <TGFrame.h>
-
-
-#define NADCS 32
-
-class TRootEmbeddedCanvas;
-class TGButtonGroup;
-class TGVerticalFrame;
-class TGHorizontalFrame;
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TH2F;
-class TGComboBox;
-class TGCheckButton;
-class TGColorSelect;
-
-class   THStack;
-class   TGraphErrors;
-class  TGTextButton;
-class  TGTab;
-
-class TGraph;
-
-class multiSlsDetector;
-
-#include <string>
-using namespace std;
-
-class jctbAdc : public TGHorizontalFrame {
-
-
- private:
-  
-
-   TGLabel *sAdcLabel;
-   TGCheckButton *sAdcEnable;
-   TGCheckButton *sAdcPlot;
-
-   TGColorSelect  *fColorSel;
-
-   TGraph *gADC;
-
-   int id;
-   multiSlsDetector *myDet;
-   
- public:
-   jctbAdc(TGVerticalFrame *page, int i, multiSlsDetector *det);
-
-
-   void setAdcAlias(char *tit, int plot, int color);
-   string getAdcAlias();
-   void ToggledAdcPlot(Int_t b);
-   void ToggledPlot(Bool_t b);
-   
-   void update();
-
-   ClassDef(jctbAdc,0)
-     };
-
-
-
-class jctbAdcs : public TGGroupFrame {
-private:
-  
-  jctbAdc *sAdc[NADCS];
-  
-   multiSlsDetector *myDet;
-   
-public:
-
-   jctbAdcs(TGVerticalFrame *page, multiSlsDetector *det);
-   int setAdcAlias(string line);
-   string getAdcAlias();
-
-   void update();
-
-   ClassDef(jctbAdcs,0)
-};
-
-#endif

JCTBGui/jctbDac.cpp

@@ -1,122 +0,0 @@
-
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "jctbDac.h"
-#include "multiSlsDetector.h"
-#include "sls_detector_defs.h"
-
-using namespace std;
-
-
-
-
-jctbDac::jctbDac(TGGroupFrame *page, int idac, multiSlsDetector *det) : TGHorizontalFrame(page, 800,50) , id(idac), myDet(det) {
-
-
-    TGHorizontalFrame *hframe=this;
-
-    page->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
-    MapWindow();
-
-    char tit[100];
-    
-
-   sprintf(tit, "DAC %d:",idac);
-
-   dacsLabel= new TGLabel(hframe, tit);
-   
-   hframe->AddFrame(dacsLabel,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   dacsLabel->MapWindow();
-   dacsLabel->SetTextJustify(kTextLeft);
-
-  
-   dacsEntry = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 65535);
-
-  hframe->AddFrame(dacsEntry,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-   dacsEntry->MapWindow();
-   dacsEntry->Resize(150,30);
-
-
-   dacsUnit= new TGCheckButton(hframe, "mV");
-   hframe->AddFrame( dacsUnit,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   dacsUnit->MapWindow();
-
-
-
-   sprintf(tit, "xxx");
-   dacsValue= new TGLabel(hframe, tit);
-   hframe->AddFrame( dacsValue,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   dacsValue->MapWindow();
-   dacsValue->SetTextJustify(kTextLeft);
-
-   TGTextEntry *e=dacsEntry->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbDac",this,"setValue()");
-   //  cout << "(((((((((((((((((((((((((((((((" << dacsEntry->GetListOfSignals()->At(0)->IsA() << endl;
-   
-
-}
-
-
-
-int jctbDac::setLabel(char *tit, int mv) {
-  if(tit)
-    dacsLabel->SetText(tit);
-  if (mv>0)
-    dacsUnit->SetOn(kTRUE,kTRUE);
-  else if (mv==0)
-    dacsUnit->SetOn(kFALSE,kTRUE);
-  
-      
-  return id;
-
-}
-
-string jctbDac::getLabel() {
-
-  ostringstream line;
-  
-  line << "DAC" << dec << id << " " <<  dacsUnit->IsOn() << endl;
-
-  return line.str();
-
-}
-
-
-void jctbDac::setValue() {
-
-
-
-  //  cout << "setting dac! "<< id << endl;
-
-  myDet->setDAC(dacsEntry->GetIntNumber(), (slsDetectorDefs::dacIndex)id, dacsUnit->IsOn());
-
-  getValue();
-
-}
-
-int jctbDac::getValue() {
-  
-  int val=myDet->setDAC(-1, (slsDetectorDefs::dacIndex)id, dacsUnit->IsOn());
-  char s[100];
-  cout << "dac " << id << " " << val << endl;
-  sprintf(s,"%d",val);
-
-  dacsValue->SetText(s);
-  
-
-  return val;
-
-}
-
-
-

JCTBGui/jctbDac.h

@@ -1,44 +0,0 @@
-#ifndef JCTBDAC_H
-#define JCTBDAC_H
-#include  <TGFrame.h>
-
-
-
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-
-
-class multiSlsDetector;
-
-#include <string>
-using namespace std;
-
-class jctbDac : public TGHorizontalFrame {
-
-
- private:
-   TGLabel *dacsLabel;
-   TGNumberEntry *dacsEntry;
-   TGCheckButton *dacsUnit;
-   TGLabel *dacsValue;
-   int id;
-
-   multiSlsDetector* myDet;
- public:
-   jctbDac(TGGroupFrame*, int , multiSlsDetector*);
-   void setValue();
-   int getValue();
-  
-   
-   int setLabel(char *tit, int mv);
-   string getLabel();
-
-
-
-   ClassDef(jctbDac,0)
-};
-
-
-#endif

JCTBGui/jctbDacs.cpp

@@ -1,88 +0,0 @@
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "jctbDac.h"
-#include "jctbDacs.h"
-#include "multiSlsDetector.h"
-#include "sls_detector_defs.h"
-
-using namespace std;
-
-
-
-
-
-
-jctbDacs::jctbDacs(TGVerticalFrame *page, multiSlsDetector *det)   : TGGroupFrame(page,"DACs",kVerticalFrame) , myDet(det){
-
-
-  SetTitlePos(TGGroupFrame::kLeft);
-  page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  MapWindow();
-  
-  // cout << "window mapped " << endl;
-
-  for (int idac=0; idac<NDACS; idac++) {
-
-     dacs[idac]=new jctbDac(this, idac, myDet);
-
-  }
-
-
-}
-
-
-int jctbDacs::setDacAlias(string line) {
-
-  int is=-1, mv=0;
-  char tit[100];
-  int narg=sscanf(line.c_str(),"DAC%d %s %d",&is,tit,&mv);
-  if (narg<2)
-    return -1;
-  if (is>=0 && is<NDACS) 
-    dacs[is]->setLabel(tit,mv);
-  return is;
-
-}
-
-string jctbDacs::getDacAlias() {
-
-  ostringstream line;
-
-  for (int i=0; i<NDACS; i++)
-    line << dacs[i]->getLabel() << endl;
-  return line.str();
-
-}
-
-
-
-
-string jctbDacs::getDacParameters() {
-
-
-  ostringstream line;
-
-  for (int i=0; i<NDACS; i++) {
-    //line << "dacs:" << i << " " << dacs[i]->getValue << endl;
-    line << "dac:" << i << " " << dacs[i]->getValue() << endl;
-  } 
-  return line.str();
-
-
-}
-
-
-
-void  jctbDacs::update() {
-
-  for (int idac=0; idac<NDACS; idac++) {
-
-    dacs[idac]->getValue();
-
-  }
-
-
-}

JCTBGui/jctbDacs.h

@@ -1,40 +0,0 @@
-#ifndef JCTBDACS_H
-#define JCTBDACS_H
-#include  <TGFrame.h>
-
-
-#define NDACS 16
-
-
-
-
-
-class multiSlsDetector;
-class jctbDac;
-
-#include <string>
-using namespace std;
-
-
-class jctbDacs : public TGGroupFrame {
-private:
-  
-
-
-   jctbDac *dacs[NDACS];
-
-   multiSlsDetector* myDet;
-
-public:
-   jctbDacs(TGVerticalFrame *page, multiSlsDetector*);
-
-   int setDacAlias(string line);
-   string getDacAlias();
-   string getDacParameters();
-
-   void update();
-
-   ClassDef(jctbDacs,0)
-};
-
-#endif

JCTBGui/jctbDict.h

@@ -1,98 +0,0 @@
-/********************************************************************
-* jctbDict.h
-* CAUTION: DON'T CHANGE THIS FILE. THIS FILE IS AUTOMATICALLY GENERATED
-*          FROM HEADER FILES LISTED IN G__setup_cpp_environmentXXX().
-*          CHANGE THOSE HEADER FILES AND REGENERATE THIS FILE.
-********************************************************************/
-#ifdef __CINT__
-#error jctbDict.h/C is only for compilation. Abort cint.
-#endif
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#define G__ANSIHEADER
-#define G__DICTIONARY
-#define G__PRIVATE_GVALUE
-#include "G__ci.h"
-#include "FastAllocString.h"
-extern "C" {
-extern void G__cpp_setup_tagtablejctbDict();
-extern void G__cpp_setup_inheritancejctbDict();
-extern void G__cpp_setup_typetablejctbDict();
-extern void G__cpp_setup_memvarjctbDict();
-extern void G__cpp_setup_globaljctbDict();
-extern void G__cpp_setup_memfuncjctbDict();
-extern void G__cpp_setup_funcjctbDict();
-extern void G__set_cpp_environmentjctbDict();
-}
-
-
-#include "TObject.h"
-#include "TMemberInspector.h"
-#include "jctbSignals.h"
-#include "jctbSignal.h"
-#include "jctbPattern.h"
-#include "jctbDacs.h"
-#include "jctbDac.h"
-#include "jctbMain.h"
-#include "jctbAdcs.h"
-#include "jctbAcquisition.h"
-#include <algorithm>
-namespace std { }
-using namespace std;
-
-#ifndef G__MEMFUNCBODY
-#endif
-
-extern G__linked_taginfo G__jctbDictLN_TClass;
-extern G__linked_taginfo G__jctbDictLN_TBuffer;
-extern G__linked_taginfo G__jctbDictLN_TMemberInspector;
-extern G__linked_taginfo G__jctbDictLN_TObject;
-extern G__linked_taginfo G__jctbDictLN_string;
-extern G__linked_taginfo G__jctbDictLN_vectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgR;
-extern G__linked_taginfo G__jctbDictLN_reverse_iteratorlEvectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__jctbDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR;
-extern G__linked_taginfo G__jctbDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__jctbDictLN_TGObject;
-extern G__linked_taginfo G__jctbDictLN_TQObject;
-extern G__linked_taginfo G__jctbDictLN_TGWindow;
-extern G__linked_taginfo G__jctbDictLN_TGFrame;
-extern G__linked_taginfo G__jctbDictLN_TGCompositeFrame;
-extern G__linked_taginfo G__jctbDictLN_TGLayoutHints;
-extern G__linked_taginfo G__jctbDictLN_iteratorlEbidirectional_iterator_tagcOTObjectmUcOlongcOconstsPTObjectmUmUcOconstsPTObjectmUaNgR;
-extern G__linked_taginfo G__jctbDictLN_TGTextButton;
-extern G__linked_taginfo G__jctbDictLN_TGVerticalFrame;
-extern G__linked_taginfo G__jctbDictLN_TGHorizontalFrame;
-extern G__linked_taginfo G__jctbDictLN_TGMainFrame;
-extern G__linked_taginfo G__jctbDictLN_TGGroupFrame;
-extern G__linked_taginfo G__jctbDictLN_TGNumberEntry;
-extern G__linked_taginfo G__jctbDictLN_multiSlsDetector;
-extern G__linked_taginfo G__jctbDictLN_jctbSignal;
-extern G__linked_taginfo G__jctbDictLN_jctbSignals;
-extern G__linked_taginfo G__jctbDictLN_TGTextEntry;
-extern G__linked_taginfo G__jctbDictLN_TGLabel;
-extern G__linked_taginfo G__jctbDictLN_TGCheckButton;
-extern G__linked_taginfo G__jctbDictLN_TH1I;
-extern G__linked_taginfo G__jctbDictLN_TGColorSelect;
-extern G__linked_taginfo G__jctbDictLN_TRootEmbeddedCanvas;
-extern G__linked_taginfo G__jctbDictLN_TGButtonGroup;
-extern G__linked_taginfo G__jctbDictLN_TGTab;
-extern G__linked_taginfo G__jctbDictLN_jctbLoop;
-extern G__linked_taginfo G__jctbDictLN_jctbWait;
-extern G__linked_taginfo G__jctbDictLN_jctbPattern;
-extern G__linked_taginfo G__jctbDictLN_jctbDac;
-extern G__linked_taginfo G__jctbDictLN_jctbDacs;
-extern G__linked_taginfo G__jctbDictLN_TGMenuBar;
-extern G__linked_taginfo G__jctbDictLN_TGPopupMenu;
-extern G__linked_taginfo G__jctbDictLN_TGDockableFrame;
-extern G__linked_taginfo G__jctbDictLN_jctbAdcs;
-extern G__linked_taginfo G__jctbDictLN_jctbAcquisition;
-extern G__linked_taginfo G__jctbDictLN_jctbMain;
-extern G__linked_taginfo G__jctbDictLN_TGraph;
-extern G__linked_taginfo G__jctbDictLN_jctbAdc;
-extern G__linked_taginfo G__jctbDictLN_TThread;
-extern G__linked_taginfo G__jctbDictLN_detectorData;
-
-/* STUB derived class for protected member access */

JCTBGui/jctbLinkDef.h

@@ -1,11 +0,0 @@
-#pragma link C++ class jctbMain;
-#pragma link C++ class jctbDacs;
-#pragma link C++ class jctbDac;
-#pragma link C++ class jctbSignals;
-#pragma link C++ class jctbSignal;
-#pragma link C++ class jctbAdc;
-#pragma link C++ class jctbAdcs;
-#pragma link C++ class jctbLoop;
-#pragma link C++ class jctbWait;
-#pragma link C++ class jctbPattern;
-#pragma link C++ class jctbAcquisition;

JCTBGui/jctbMain.cpp

@@ -1,665 +0,0 @@
-#include <TApplication.h>
-#include <TGClient.h>
-#include <TCanvas.h>
-#include <TF1.h>
-#include <TRandom.h>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TGFileDialog.h>
-#include <TGComboBox.h>
-#include <TH2F.h>
-#include <TColor.h>
-#include <TH1F.h>
-#include <TGraphErrors.h>
-#include <THStack.h>
-#include <TGTab.h>
-#include <TApplication.h>
-
-
-
-#include <TGMenu.h>
-#include <TGDockableFrame.h>
-//#include <TGMenuBar.h>
-//#include <TGPopupMenu.h>
-
-
-
-
-
-
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-
-#include "multiSlsDetector.h"
-#include "jctbMain.h"
-#include "jctbDacs.h"
-#include "jctbSignals.h"
-#include "jctbPattern.h"
-#include "jctbAdcs.h"
-#include "jctbAcquisition.h"
-
-using namespace std;
-
-
-
-jctbMain::jctbMain(const TGWindow *p, multiSlsDetector *det)
-  : TGMainFrame(p,800,800) {
-
-  myDet=det;
-
-  Connect("CloseWindow()", "jctbMain", this, "CloseWindow()");
-
-
-
-
-
-//   fMenuDock = new TGDockableFrame(this);
-//   AddFrame(fMenuDock, new TGLayoutHints(kLHintsExpandX, 0, 0, 1, 0));
-//   fMenuDock->SetWindowName("GuiTest Menu");
-
-  fMenuBarLayout = new TGLayoutHints(kLHintsTop | kLHintsExpandX);
-  fMenuBarItemLayout = new TGLayoutHints(kLHintsTop | kLHintsLeft, 0, 4, 0, 0);
-  fMenuBarHelpLayout = new TGLayoutHints(kLHintsTop | kLHintsRight);
-
-  fMenuFile = new TGPopupMenu(gClient->GetRoot());
-  int im=0;
-
-   fMenuFile->AddEntry("Open Alias", im++);
-   fMenuFile->AddEntry("Save Alias", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Open Parameters", im++);
-   fMenuFile->AddEntry("Save Parameters", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Open Configuration", im++);
-   fMenuFile->AddEntry("Save Configuration", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Open Pattern", im++);
-   fMenuFile->AddEntry("Save Pattern", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Exit", im++);
-
-    fMenuFile->Connect("Activated(Int_t)", "jctbMain", this,
-                       "HandleMenu(Int_t)");
- //    fMenuFile->Connect("PoppedUp()", "TestMainFrame", this, "HandlePopup()");
-//     fMenuFile->Connect("PoppedDown()", "TestMainFrame", this, "HandlePopdown()");
-
-
-
-
-//    fCascade2Menu = new TGPopupMenu(gClient->GetRoot());
-//    fCascade2Menu->AddEntry("ID = 2&3", im++);
-//    fCascade2Menu->AddEntry("ID = 2&4", im++);
-//    fCascade2Menu->AddEntry("ID = 2&5", im++);
-
-//    fCascade1Menu = new TGPopupMenu(gClient->GetRoot());
-//    fCascade1Menu->AddEntry("ID = 4&1", 41);
-//    fCascade1Menu->AddEntry("ID = 4&2", 42);
-//    fCascade1Menu->AddEntry("ID = 4&3", 43);
-//    fCascade1Menu->AddSeparator();
-//    fCascade1Menu->AddPopup("Cascade&d 2", fCascade2Menu);
-
-//    fCascadeMenu = new TGPopupMenu(gClient->GetRoot());
-//    fCascadeMenu->AddEntry("ID = 5&1", 51);
-//    fCascadeMenu->AddEntry("ID = 5&2", 52);
-//    fCascadeMenu->AddEntry("ID = 5&3", 53);
-//    fCascadeMenu->AddSeparator();
-//    fCascadeMenu->AddPopup("&Cascaded 1", fCascade1Menu);
-
-//    fMenuTest = new TGPopupMenu(gClient->GetRoot());
-//    fMenuTest->AddLabel("Test different features...");
-//    fMenuTest->AddSeparator();
-//    fMenuTest->AddEntry("&Dialog...", im++);
-//    fMenuTest->AddEntry("&Message Box...", im++);
-//    fMenuTest->AddEntry("&Sliders...", im++);
-//    fMenuTest->AddEntry("Sh&utter...", im++);
-//    fMenuTest->AddEntry("&List Directory...", im++);
-//    fMenuTest->AddEntry("&File List...", im++);
-//    fMenuTest->AddEntry("&Progress...", im++);
-//    fMenuTest->AddEntry("&Number Entry...", im++);
-//    fMenuTest->AddEntry("F&ont Dialog...", im++);
-//    fMenuTest->AddSeparator();
-//    fMenuTest->AddEntry("Add New Menus", im++);
-//    fMenuTest->AddSeparator();
-//    fMenuTest->AddPopup("&Cascaded menus", fCascadeMenu);
-
-//    fMenuView = new TGPopupMenu(gClient->GetRoot());
-//    fMenuView->AddEntry("&Dock", im++);
-//    fMenuView->AddEntry("&Undock", im++);
-//    fMenuView->AddSeparator();
-//    fMenuView->AddEntry("Enable U&ndock", im++);
-//    fMenuView->AddEntry("Enable &Hide", im++);
-//    fMenuView->DisableEntry(im);
-
-//    fMenuDock->EnableUndock(kTRUE);
-//    fMenuDock->EnableHide(kTRUE);
-//    fMenuView->CheckEntry(im);
-//    fMenuView->CheckEntry(im);
-
-//    // When using the DockButton of the MenuDock,
-//    // the states 'enable' and 'disable' of menus have to be updated.
-//    fMenuDock->Connect("Undocked()", "TestMainFrame", this, "HandleMenu(=M_VIEW_UNDOCK)");
-
-//    fMenuHelp = new TGPopupMenu(gClient->GetRoot());
-//    fMenuHelp->AddEntry("&Contents", im++);
-//    fMenuHelp->AddEntry("&Search...", im++);
-//    fMenuHelp->AddSeparator();
-//    fMenuHelp->AddEntry("&About", im++);
-
-//    fMenuNew1 = new TGPopupMenu();
-//    fMenuNew1->AddEntry("Remove New Menus", im++);
-
-//    fMenuNew2 = new TGPopupMenu();
-//    fMenuNew2->AddEntry("Remove New Menus", im++);
-
-   // Menu button messages are handled by the main frame (i.e. "this")
-   // HandleMenu() method.
-//    fMenuFile->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                       "HandleMenu(Int_t)");
-//    fMenuFile->Connect("PoppedUp()", "TestMainFrame", this, "HandlePopup()");
-//    fMenuFile->Connect("PoppedDown()", "TestMainFrame", this, "HandlePopdown()");
-//    fMenuTest->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                       "HandleMenu(Int_t)");
-//    fMenuView->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                       "HandleMenu(Int_t)");
-//    fMenuHelp->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                       "HandleMenu(Int_t)");
-//    fCascadeMenu->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                          "HandleMenu(Int_t)");
-//    fCascade1Menu->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                           "HandleMenu(Int_t)");
-//    fCascade2Menu->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                           "HandleMenu(Int_t)");
-//    fMenuNew1->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                       "HandleMenu(Int_t)");
-//    fMenuNew2->Connect("Activated(Int_t)", "TestMainFrame", this,
-//                       "HandleMenu(Int_t)");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  TGVerticalFrame *vframe=new TGVerticalFrame(this, 800,1200); //main frame
-
-
-
-   fMenuBar = new TGMenuBar(vframe, 1, 1, kHorizontalFrame);
-   fMenuBar->AddPopup("&File", fMenuFile, fMenuBarItemLayout);
-//    fMenuBar->AddPopup("&Test", fMenuTest, fMenuBarItemLayout);
-//    fMenuBar->AddPopup("&View", fMenuView, fMenuBarItemLayout);
-//    fMenuBar->AddPopup("&Help", fMenuHelp, fMenuBarHelpLayout);
-
-   vframe->AddFrame(fMenuBar, fMenuBarLayout);
-
-
-
-
-
-
-
-
- 
-  TGHorizontalFrame* hpage=new TGHorizontalFrame(vframe, 800,1200); //horizontal frame. Inside there should be the tab and the canvas
-  mtab=new TGTab(hpage, 1500, 1200); //tab!
-  //  page=new TGVerticalFrame(mtab, 1500,1200);
-
-  TGCompositeFrame *tf = mtab->AddTab("DACs");
-  TGVerticalFrame *page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  dacs=new jctbDacs(page, myDet);
-
-  
-  tf = mtab->AddTab("Signals");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  sig=new jctbSignals(page, myDet);
-
-
-  tf = mtab->AddTab("ADCs");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  adcs=new jctbAdcs(page, myDet);
-
-
-
-
-  tf = mtab->AddTab("Pattern");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  pat=new jctbPattern(page, myDet);
-
-
-
-  tf = mtab->AddTab("Acquisition");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  acq=new jctbAcquisition(page, myDet);
-
-
-
-
-
-  hpage->AddFrame(mtab,new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-
-  vframe->AddFrame(hpage,new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  
-  AddFrame(vframe,new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  vframe->MapWindow();
-  hpage->MapWindow();
-  mtab->MapWindow();
-  page->MapWindow();
-
-  // Sets window name and shows the main frame
-   SetWindowName("JCTB Gui");
-   MapSubwindows();
-   MapWindow();
-   Resize(1500,1200);
-
-
-//    // Creates widgets of the example
-  fEcanvas = new TRootEmbeddedCanvas ("Ecanvas",hpage,800,800);
-  fEcanvas->Resize();
-  fEcanvas->GetCanvas()->Update();
-  
-  hpage->AddFrame(fEcanvas, new TGLayoutHints(kLHintsBottom | kLHintsCenterX | kLHintsExpandX | kLHintsExpandY, 10,10,10,10));
-
-
-  fEcanvas->MapWindow();
-  hpage->MapSubwindows();
-   mtab->Connect("Selected(Int_t)","jctbMain",this,"tabSelected(Int_t)");
-
-
-   tabSelected(0);
-}
-
-void jctbMain::CloseWindow() {
-   gApplication->Terminate();
-}
-
-
-
-
-
-void jctbMain::HandleMenu(Int_t id)
-{
-   // Handle menu items.
-   
-  
- 
-
-   switch (id) {
-
-   case 0:   // fMenuFile->AddEntry("Open Alias", im++);
-     cout << "Open Alias" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDOpen, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename);
-	     // dir = fi.fIniDir;
-	     loadAlias(fi.fFilename);
-          }
-         break;
-
-   case 1: // fMenuFile->AddEntry("Save Alias", im++);
-     cout << "Save Alias" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDSave, &fi);
-             printf("Save file: %s (dir: %s)\n", fi.fFilename);
-	     // dir = fi.fIniDir;
-	     saveAlias(fi.fFilename);
-          }
-         break;
-
-   case 2: //fMenuFile->AddEntry("Open Parameters", im++);
-     cout << "Open Parameters" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDOpen, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     loadParameters(fi.fFilename);
-          }
-         break;
-
-   case 3: //fMenuFile->AddEntry("Save Parameters", im++);
-     cout << "Save Parameters" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDSave, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     saveParameters(fi.fFilename);
-          }
-         break;
-
-   case 4: // fMenuFile->AddEntry("Open Configuration", im++);
-     cout << "Open configuration" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDOpen, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-          }
-         break;
- 
-   case 5: //  fMenuFile->AddEntry("Save Configuration", im++);
-     cout << "Save configuration" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDSave, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-          }
-         break;
-
-   case 6: //fMenuFile->AddEntry("Open Pattern", im++);
-     cout << "Open pattern" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDOpen, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-          }
-     break;
-
-   case 7:   //fMenuFile->AddEntry("Save Pattern", im++);
-     cout << "Save pattern" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDSave, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-          }
-         break;
-
-   case 8: //  fMenuFile->AddEntry("Exit", im++);
-     CloseWindow();
-
-      default:
-         printf("Menu item %d selected\n", id);
-         break;
-   }
-}
-
-
-
-
-
-
-
-int  jctbMain::loadConfiguration(string fname) {
-
-    myDet->readConfigurationFile(fname);
-
-//   string line;
-//   int i;
-//   ifstream myfile (fname.c_str());
-//   if (myfile.is_open())
-//   {
-//     while ( getline (myfile,line) )
-//     {
-
-	
-      
-//     }
-//     myfile.close();
-//   }
-
-//   else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-int  jctbMain::saveConfiguration(string fname) {
-
-
-  string line;
-  int i;
-  ofstream myfile (fname.c_str());
-  if (myfile.is_open())
-  {
-
-
-   myfile.close();
-  }
-
-  else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-
-
-int  jctbMain::loadParameters(string fname) {
-
-    myDet->retrieveDetectorSetup(fname);
-
-//   string line;
-//   int i;
-//   ifstream myfile (fname.c_str());
-//   if (myfile.is_open())
-//   {
-//     while ( getline (myfile,line) )
-//     {
-
-	
-      
-//     }
-//     myfile.close();
-//   }
-
-//   else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-int  jctbMain::saveParameters(string fname) {
-
-
-  string line;
-  int i;
-  ofstream myfile (fname.c_str());
-  if (myfile.is_open())
-  {
-
-   myfile << dacs->getDacParameters();
-   myfile.close();
-  }
-
-  else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-int  jctbMain::loadAlias(string fname) {
-
-
-  string line;
-  int i;
-  ifstream myfile (fname.c_str());
-  if (myfile.is_open())
-  {
-    while ( getline (myfile,line) )
-    {
-      // cout << line ;
-      if (sscanf(line.c_str(),"BIT%d",&i)>0) {
-	//cout << "*******" << line<< endl;
-	sig->setSignalAlias(line);
-      // cout << line ;
-      } else if (sscanf(line.c_str(),"DAC%d",&i)>0) {
-	dacs->setDacAlias(line);
-	//	cout << "+++++++++" << line<< endl;
-      } else if (sscanf(line.c_str(),"ADC%d",&i)>0) {
-	adcs->setAdcAlias(line);
-	//	cout << "---------" << line<< endl;
-      }      //  else
-      //	cout << "<<<<<<<" << line << endl;
-	
-      
-    }
-    myfile.close();
-  }
-
-  else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-int  jctbMain::saveAlias(string fname) {
-
-
-  string line;
-  int i;
-  ofstream myfile (fname.c_str());
-  if (myfile.is_open())
-  {
-    //while ( getline (myfile,line) )
-    // {
-      // cout << line ;
-      //if (sscanf(line.c_str(),"BIT%d",&i)>0) {
-	//cout << "*******" << line<< endl;
-    myfile << sig->getSignalAlias();
-      // cout << line ;
-    //  } else if (sscanf(line.c_str(),"DAC%d",&i)>0) {
-    myfile << dacs->getDacAlias();
-	//	cout << "+++++++++" << line<< endl;
-    //  } else if (sscanf(line.c_str(),"ADC%d",&i)>0) {
-    myfile << adcs->getAdcAlias();
-	//	cout << "---------" << line<< endl;
-    //  }      //  else
-      //	cout << "<<<<<<<" << line << endl;
-	
-      
-    //}
-    myfile.close();
-  }
-
-  else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-
-
-
-
-
-
-void jctbMain::tabSelected(Int_t i) {
-
-  //  cout << "Selected tab " << i << endl;
-  // cout << "Current tab is " <<  mtab->GetCurrent() << endl;
-
-  switch (i) {
-
-  case 0: //dacs
-    dacs->update();
-    break;
-  case 1: //signals
-    sig->update();
-    break;
-
-  case 2: //adcs
-    adcs->update();
-    break;
-
-  case 3: //pattern
-    pat->update();
-    break;
-
-  case 4: //acq
-    acq->update();
-    break;
-
-  default:
-    ;
-
-
-  }
-
-
-}

JCTBGui/jctbMain.h

@@ -1,94 +0,0 @@
-#ifndef JCTBMAIN_H
-#define JCTBMAIN_H
-#include <TGFrame.h>
-
-
-class TRootEmbeddedCanvas;
-class TGButtonGroup;
-class TGVerticalFrame;
-class TGHorizontalFrame;
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TH2F;
-class TGComboBox;
-class TGCheckButton;
-
-class   THStack;
-class   TGraphErrors;
-class  TGTextButton;
-class  TGTab;
-
-class   TGMenuBar;
-class   TGPopupMenu;
-class   TGDockableFrame;
-class TGLayoutHints;
-
-class   jctbDacs;
-
- 
-class  jctbSignals;
-
-class multiSlsDetector;
-
-class  jctbPattern;
-class  jctbAdcs;
-class  jctbAcquisition;
-
-#include <string>
-using namespace std;
-
-class jctbMain : public TGMainFrame {
-private:
-
-
-  multiSlsDetector *myDet;
-
-
-
-   TRootEmbeddedCanvas *fEcanvas;
-   TRootEmbeddedCanvas *fModulecanvas;
-   TGButtonGroup *br;
-   
-   TGTab *mtab;
-
-
-   jctbDacs *dacs;
-
- 
-  jctbSignals *sig;
-  jctbAdcs *adcs;
-
-
-
-  jctbPattern *pat;
-  jctbAcquisition *acq;
-
-   TGDockableFrame    *fMenuDock;
-
-   TGMenuBar          *fMenuBar;
-   TGPopupMenu        *fMenuFile, *fMenuTest, *fMenuView, *fMenuHelp;
-   TGPopupMenu        *fCascadeMenu, *fCascade1Menu, *fCascade2Menu;
-   TGPopupMenu        *fMenuNew1, *fMenuNew2;
-   TGLayoutHints      *fMenuBarLayout, *fMenuBarItemLayout, *fMenuBarHelpLayout;
-
-public:
-   jctbMain(const TGWindow *p, multiSlsDetector *det);
-
-
-   int  loadAlias(string fname);
-   int  saveAlias(string fname);
-   int  loadParameters(string fname);
-   int  saveParameters(string fname);
-   int  loadConfiguration(string fname);
-   int  saveConfiguration(string fname);
-   void tabSelected(Int_t);
-
-   void CloseWindow();
-
-   void HandleMenu(Int_t);
-
-   ClassDef(jctbMain,0)
-};
-
-#endif

JCTBGui/jctbPattern.cpp

@@ -1,532 +0,0 @@
-#include <TApplication.h>
-#include <TGClient.h>
-#include <TCanvas.h>
-#include <TF1.h>
-#include <TRandom.h>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TGFileDialog.h>
-#include <TGComboBox.h>
-#include <TH2F.h>
-#include <TColor.h>
-#include <TH1F.h>
-#include <TGraphErrors.h>
-#include <THStack.h>
-#include <TGTab.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "jctbPattern.h"
-#include "multiSlsDetector.h"
-
-using namespace std;
-
-
-
-
-
-jctbLoop::jctbLoop(TGGroupFrame *page, int i, multiSlsDetector *det) : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
-
-  TGHorizontalFrame *hframe=this;
-  
-  char tit[100];
-
-  page->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  MapWindow();
-
-
-   
-
-  
-  sprintf(tit, "Loop %d Repetitions: ", id);
-  
-  TGLabel *label= new TGLabel(hframe, tit);
-  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-  label->MapWindow();
-  label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eLoopNumber = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-					 TGNumberFormat::kNELNoLimits);
-   hframe->AddFrame( eLoopNumber,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eLoopNumber->MapWindow();
-   eLoopNumber->Resize(150,30);
-    TGTextEntry *e= eLoopNumber->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbLoop",this,"setNLoops()");
-
-
-
-
-   sprintf(tit, "Start Address: ");
-
-   label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eLoopStartAddr = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 1024);
-   hframe->AddFrame( eLoopStartAddr,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eLoopStartAddr->MapWindow();
-   eLoopStartAddr->Resize(150,30);
-
-    eLoopStartAddr->SetState(kFALSE);
-   
-   label= new TGLabel(hframe, "Stop Address: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-
-  
-   eLoopStopAddr = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 1024);
-   hframe->AddFrame( eLoopStopAddr,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eLoopStopAddr->MapWindow();
-   eLoopStopAddr->Resize(150,30);
-
-
-
-    eLoopStopAddr->SetState(kFALSE);
-}
-
-void jctbLoop::setNLoops() {
-
-  int start, stop, n;
-  
-
-    start=-1;
-    stop=-1;
-    n=eLoopNumber->GetNumber();
-    myDet->setCTBPatLoops(id,start, stop,n);
-
-
-}
-
-
-
-void jctbLoop::update() {
-
-  int start, stop, n;
-  
-
-    start=-1;
-    stop=-1;
-    n=-1;
-    myDet->setCTBPatLoops(id,start, stop,n);
-    eLoopStartAddr->SetHexNumber(start);
-    eLoopStopAddr->SetHexNumber(stop);
-    eLoopNumber->SetNumber(n);
-
-}
-
-
-
-jctbWait::jctbWait(TGGroupFrame *page, int i, multiSlsDetector *det) : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
-
-  char tit[100];
-  TGHorizontalFrame *hframe=this;
-  page->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  MapWindow();
-
-
-
-   sprintf(tit, "Wait %d (run clk): ", id);
-
-   TGLabel *label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eWaitTime = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-					 TGNumberFormat::kNELNoLimits);
-   hframe->AddFrame( eWaitTime,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eWaitTime->MapWindow();
-   eWaitTime->Resize(150,30);
-    TGTextEntry *e= eWaitTime->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbWait",this,"setWaitTime()");
-
-
-
-   sprintf(tit, "Wait Address: ");
-
-   label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eWaitAddr = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 1024);
-   hframe->AddFrame( eWaitAddr,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eWaitAddr->MapWindow();
-   eWaitAddr->Resize(150,30);
-
-   eWaitAddr->SetState(kFALSE);
-  
-}
-
-
-
-void jctbWait::setWaitTime() {
-
-
-  Long64_t t=eWaitTime->GetNumber();
-  
-  t=myDet->setCTBPatWaitTime(id,t);
-}
-
-
-
-void jctbWait::update() {
-
-  int start, stop, n, addr;
-  
-  Long64_t t=-1;
-
-
-    t=myDet->setCTBPatWaitTime(id,t);
-    addr=myDet->setCTBPatWaitAddr(id,-1);
-    eWaitAddr->SetHexNumber(addr);
-    eWaitTime->SetNumber(t);
-
-}
-
-
-
-
-
-
-
-
-
-jctbPattern::jctbPattern(TGVerticalFrame *page, multiSlsDetector *det)
-  : TGGroupFrame(page,"Pattern",kVerticalFrame), myDet(det) {
-
-
-  SetTitlePos(TGGroupFrame::kLeft);
-  page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  MapWindow();
-  
-
-  char tit[100];
-
- 
-  TGHorizontalFrame* hframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-   sprintf(tit, "ADC Clock Frequency (MHz): ");
-
-   TGLabel *label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eAdcClkFreq = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 40);
-   hframe->AddFrame( eAdcClkFreq,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eAdcClkFreq->MapWindow();
-   eAdcClkFreq->Resize(150,30);   
-   TGTextEntry *e= eAdcClkFreq->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbPattern",this,"setAdcFreq()");
- 
-   
-   label= new TGLabel(hframe, " Phase (0.15ns step): ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-
-  
-   eAdcClkPhase = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 200);
-   hframe->AddFrame( eAdcClkPhase,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eAdcClkPhase->MapWindow();
-   eAdcClkPhase->Resize(150,30);
-   e= eAdcClkPhase->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbPattern",this,"setAdcPhase()");
- 
-
-
-   hframe=new TGHorizontalFrame(this, 800,800);
-   AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-   hframe->MapWindow();
-
-
-   sprintf(tit, "Run Clock Frequency (MHz): ");
-
-   label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eRunClkFreq = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 160);
-   hframe->AddFrame( eRunClkFreq,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eRunClkFreq->MapWindow();
-   eRunClkFreq->Resize(150,30);
-   e= eRunClkFreq->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbPattern",this,"setRunFreq()");
- 
-
-   
-   label= new TGLabel(hframe, " Phase (0.15ns step): ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-
-  
-   eRunClkPhase = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 200);
-   hframe->AddFrame( eRunClkPhase,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eRunClkPhase->MapWindow();
-   eRunClkPhase->Resize(150,30);
-   e= eRunClkPhase->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbPattern",this,"setRunPhase()");
-
-
-
-
-
-
-
-  hframe=new TGHorizontalFrame(this, 800,800);
-   AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-   hframe->MapWindow();
-
-
-   sprintf(tit, "Number of frames: ");
-
-   label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eFrames = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-   hframe->AddFrame( eFrames,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eFrames->MapWindow();
-   eFrames->Resize(150,30);
-   e= eFrames->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbPattern",this,"setFrames()");
-
-   
-   label= new TGLabel(hframe, " Period (s): ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-
-  
-   ePeriod = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-   hframe->AddFrame( ePeriod,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   ePeriod->MapWindow();
-   ePeriod->Resize(150,30);
-   e= ePeriod->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","jctbPattern",this,"setPeriod()");
-
-
-
-
-
-
-   hframe=new TGHorizontalFrame(this, 800,800);
-   AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-   hframe->MapWindow();
-
-
-   sprintf(tit, "Start Address: ");
-
-   label= new TGLabel(hframe, tit);
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-  
-   eStartAddr = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 1024);
-   hframe->AddFrame( eStartAddr,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eStartAddr->MapWindow();
-   eStartAddr->Resize(150,30);
-
-   eStartAddr->SetState(kFALSE);
-   
-   label= new TGLabel(hframe, "Stop Address: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-
-
-  
-   eStopAddr = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 1024);
-   hframe->AddFrame( eStopAddr,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eStopAddr->MapWindow();
-   eStopAddr->Resize(150,30);
-
-  
-
-
-    eStopAddr->SetState(kFALSE);
-
-
-
-
-
-
-  int idac=0;
-  for (idac=0; idac<NLOOPS; idac++) {
-
-    eLoop[idac]=new jctbLoop(this,idac,myDet);
-
-
- 
-  }
-
-
-
-
-  for (idac=0; idac<NWAITS; idac++) {
- 
-
-   eWait[idac]=new jctbWait(this,idac,myDet);
-
-   
-
-  }
-
-
-
-  
-
-
-
-}
-
-void jctbPattern::update() {
-
-  int start, stop, n, addr;
-  
-  Long_t t;
-
-
-
-  eAdcClkFreq->SetNumber(myDet->setSpeed(slsDetectorDefs::ADC_CLOCK,-1));
-  eRunClkFreq->SetNumber(myDet->setSpeed(slsDetectorDefs::CLOCK_DIVIDER,-1));
-  //ADC_PHASE
-  //PHASE_SHIFT
-  eFrames->SetNumber(myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,-1));
-  ePeriod->SetNumber(((Double_t)myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,-1))*1E-9);
-
-  start=-1;
-  stop=-1;
-  n=-1;
-  myDet->setCTBPatLoops(-1,start, stop,n);
-  eStartAddr->SetHexNumber(start);
-  eStopAddr->SetHexNumber(stop);
-
-  for (int iloop=0; iloop<NLOOPS; iloop++) {
-    eLoop[iloop]->update();
-    
-  }
-
-  for (int iwait=0; iwait<NWAITS; iwait++) {
-    eWait[iwait]->update();
-  }
-
-  
-
-}
-
-void jctbPattern::setFrames() {
-  myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,eFrames->GetNumber());
-}
-
-void jctbPattern::setPeriod() {
-  myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,eFrames->GetNumber()*1E9);
-}
-
-
-
-
-void jctbPattern::setAdcFreq() {
-  myDet->setSpeed(slsDetectorDefs::ADC_CLOCK,eAdcClkFreq->GetNumber());
-}
-void jctbPattern::setRunFreq() {
-  myDet->setSpeed(slsDetectorDefs::CLOCK_DIVIDER,eRunClkFreq->GetNumber());
-
-}
-void jctbPattern::setAdcPhase() {
-  myDet->setSpeed(slsDetectorDefs::ADC_PHASE,eAdcClkPhase->GetNumber());
-
-}
-
-
-void jctbPattern::setRunPhase() {
-  myDet->setSpeed(slsDetectorDefs::PHASE_SHIFT,eRunClkPhase->GetNumber());
-
-}
-   

JCTBGui/jctbPattern.h

@@ -1,124 +0,0 @@
-#ifndef JCTBPATTERN_H
-#define JCTBPATTERN_H
-#include  <TGFrame.h>
-
-
-#define NLOOPS 3
-#define NWAITS 3
-#define NADCS 32
-#define PATLEN 1024
-
-class TRootEmbeddedCanvas;
-class TGButtonGroup;
-class TGVerticalFrame;
-class TGHorizontalFrame;
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TH2F;
-class TGComboBox;
-class TGCheckButton;
-
-class   THStack;
-class   TGraphErrors;
-class energyCalibration;
-class  TGTextButton;
-class  TGTab;
-
-class multiSlsDetector;
-
-
-#include <string>
-using namespace std;
-
-
-
-class jctbLoop : public TGHorizontalFrame {
- 
-
- private:
-
-   TGNumberEntry *eLoopStartAddr; 
-   TGNumberEntry *eLoopStopAddr; 
-   TGNumberEntry *eLoopNumber; 
-
-   int id;
-
-   multiSlsDetector *myDet;
-
- public:
-   jctbLoop(TGGroupFrame *page, int i,multiSlsDetector *det);
-   
-   void setNLoops();
-   void update();
-
-   ClassDef(jctbLoop,0)
-     };
-
-class jctbWait : public TGHorizontalFrame {
- 
-
- private:
-
-   TGNumberEntry *eWaitAddr; 
-   TGNumberEntry *eWaitTime; 
-
-   int id;
-
-   multiSlsDetector *myDet;
-
- public:
-   jctbWait(TGGroupFrame *page, int i,multiSlsDetector *det);
-   
-   void setWaitTime();
-   void update();
-
-   ClassDef(jctbWait,0)
-     };
-
-
-
-
-
-
-
-class jctbPattern : public TGGroupFrame {
-private:
-   
-
-   TGNumberEntry *eAdcClkFreq;
-   TGNumberEntry *eRunClkFreq;
-   TGNumberEntry *eAdcClkPhase;
-   TGNumberEntry *eRunClkPhase;
-
-   TGNumberEntry *eStartAddr;
-   TGNumberEntry *eStopAddr;
-   TGNumberEntry *eFrames;
-   TGNumberEntry *ePeriod;
-   
-   jctbLoop *eLoop[NLOOPS];
-   jctbWait *eWait[NWAITS];
-
-
-   char pat[PATLEN*8];
-
-   multiSlsDetector *myDet;
-
-public:
-
-   jctbPattern(TGVerticalFrame *page, multiSlsDetector *det);
-
-   void update();
-   void setAdcFreq();
-   void setRunFreq();
-   void setAdcPhase();
-   void setRunPhase();
-   void setFrames();
-   void setPeriod();
-
-   
-
-   ClassDef(jctbPattern,0)
-};
-
-#endif

JCTBGui/jctbSignal.cpp

@@ -1,186 +0,0 @@
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <TColor.h>
-#include <TGColorSelect.h>
-
-
-#include "jctbSignal.h"
-#include "multiSlsDetector.h"
-
-using namespace std;
-
-
-
-jctbSignal::jctbSignal(TGFrame *page, int i,  multiSlsDetector *det)
-  : TGHorizontalFrame(page, 800,50), myDet(det), id(i), hsig(NULL) {
-
-
-  TGHorizontalFrame *hframe=this;
-  char tit[100];
-
-
-   
-   sprintf(tit, "BIT%d ",id);
-
-   sLabel= new TGLabel(hframe, tit);
-   hframe->AddFrame( sLabel,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sLabel->MapWindow();
-   sLabel->SetTextJustify(kTextLeft);
-
-
-
-   sOutput= new TGCheckButton(hframe, "Out");
-   hframe->AddFrame( sOutput,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sOutput->MapWindow();
-
- 
-   sOutput->Connect("Toggled(Bool_t)","jctbSignal",this,"ToggledOutput(Bool_t)");
-
-   sClock= new TGCheckButton(hframe, "Clk");
-   hframe->AddFrame( sClock,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sClock->MapWindow();
-
-   sClock->Connect("Toggled(Bool_t)","jctbSignal",this,"ToggledClock(Bool_t)");
-
-
-   sPlot= new TGCheckButton(hframe, "Plot");
-   hframe->AddFrame( sPlot,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sPlot->MapWindow();
-
-   sPlot->Connect("Toggled(Bool_t)","jctbSignal",this,"ToggledPlot(Bool_t)");
-   
-   fColorSel = new TGColorSelect(hframe, id+1, 0);
-   hframe->AddFrame(fColorSel, new TGLayoutHints(kLHintsTop |
-                          kLHintsLeft, 2, 0, 2, 2));
-   
-
-   fColorSel->SetColor(TColor::Number2Pixel(id+1));
-
-   
-   ToggledOutput(kFALSE);
-
-   if (id==63) {
-     sOutput->SetOn(kTRUE);
-     sClock->SetOn(kFALSE);
-     sOutput->SetEnabled(kFALSE);
-     sClock->SetEnabled(kFALSE);
-   }
-     
-
-}
-int jctbSignal::setSignalAlias(char *tit, int plot, int col) {
-
-  if (tit)
-    sLabel->SetText(tit);
-
-  if (plot>0) {
-      sPlot->SetOn(kTRUE,kTRUE); 
-  } else if (plot==0)
-      sPlot->SetOn(kFALSE,kTRUE);
-    
-  if (col>=0)
-    fColorSel->SetColor(col);//TColor::Number2Pixel(col+1));
-
-  fColorSel->SetEnabled(sPlot->IsOn());
-  return 0;
-
-}
-
-string jctbSignal::getSignalAlias() {
-  
-
-  ostringstream oss;
-  oss << "BIT" << dec << id << " " << sLabel->GetText()->Data() << " " << sPlot->IsOn() << hex << " " << fColorSel->GetColor() << endl;
-  return oss.str();
-
-
-
-
-}
-int jctbSignal::setOutput(Long64_t r) {
-
-
-  //  cout << hex << r << dec <<endl;
-
-  Long64_t mask=((Long64_t)1<<id);
-
-  if (r&mask)
-      sOutput->SetOn(kTRUE,kTRUE);
-  else 
-      sOutput->SetOn(kFALSE,kTRUE);
-    
-  return sOutput->IsOn();
-
-}
-
-int jctbSignal::setClock(Long64_t r) {
-
-  Long64_t mask=((Long64_t)1<<id);
-
-  // cout << hex << r << dec <<endl;
-
-  if (r&mask)
-      sClock->SetOn(kTRUE,kTRUE);
-  else 
-      sClock->SetOn(kFALSE,kTRUE);
-    
-  return sClock->IsOn();
-
-}
-
-int jctbSignal::isClock() { sClock->IsOn();}
-int jctbSignal::isOutput() { sOutput->IsOn();}
-int jctbSignal::isPlot() { sPlot->IsOn();}
-
-
-void jctbSignal::ToggledOutput(Bool_t b) {
-  Long_t mask=b<<id;
-  ToggledSignalOutput(b<<id);
-  if (b) {
-    sClock->SetEnabled(kTRUE);
-    sPlot->SetEnabled(kTRUE);
-    if ( sPlot->IsOn())
-      fColorSel->SetEnabled(kTRUE);
-    else
-      fColorSel->SetEnabled(kFALSE);
-  } else {
-    sClock->SetEnabled(kFALSE);
-    sPlot->SetEnabled(kFALSE);
-    fColorSel->SetEnabled(kFALSE);
-  }
-
-
-}
-void jctbSignal::ToggledClock(Bool_t b){
-  Long_t mask=b<<id;
-  ToggledSignalClock(mask);
-
-
-}
-void jctbSignal::ToggledPlot(Bool_t b){
-  Long_t mask=b<<id;
-  ToggledSignalPlot(mask);
-    fColorSel->SetEnabled(b);
-
-}
-
-
-void jctbSignal::ToggledSignalOutput(Int_t b) {
-  Emit("ToggledSignalOutput(Int_t)", id);
-
-}
-void jctbSignal::ToggledSignalClock(Int_t b){
-  Emit("ToggledSignalClock(Int_t)", id);
-
-
-}
-void jctbSignal::ToggledSignalPlot(Int_t b){
-  Emit("ToggledSignalPlot(Int_t)", id);
-
-}

JCTBGui/jctbSignal.h

@@ -1,71 +0,0 @@
-#ifndef JCTBSIGNAL_H
-#define JCTBSIGNAL_H
-#include  <TGFrame.h>
-
-
-
-
-
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-class TH1I;
-class  TGTextButton;
-class TGColorSelect;
-
-
-
-class multiSlsDetector;
-
-#include <string>
-using namespace std;
-
-class jctbSignal : public TGHorizontalFrame {
-
-  // RQ_OBJECT("jctbSignal")
-
-private:
-
-   TGLabel *sLabel;
-   TGCheckButton *sOutput;
-   TGCheckButton *sClock;
-   TGCheckButton *sPlot;
-   TGLabel *sValue;
-   TGNumberEntry *sEntry;
-   TGColorSelect *fColorSel;
-
-   multiSlsDetector *myDet;
-   Int_t id;
-
-   TH1I *hsig;
-
-public:
-
-   jctbSignal(TGFrame *page, int i, multiSlsDetector *det);
-   int setSignalAlias(char *tit, int plot, int col);
-   string getSignalAlias();
-
-   TH1I *getPlot() {return hsig;};
-   int setOutput(Long64_t);
-   int setClock(Long64_t);
-
-   void ToggledOutput(Bool_t); 
-   void ToggledClock(Bool_t); 
-   void ToggledPlot(Bool_t); 
-
-   int isClock();
-   int isOutput();
-   int isPlot();
-
-
-   void ToggledSignalOutput(Int_t); //*SIGNAL*
-   void ToggledSignalClock(Int_t); //*SIGNAL*
-   void ToggledSignalPlot(Int_t); //*SIGNAL*
-
-
-
-   ClassDef(jctbSignal,0)
-};
-
-#endif

JCTBGui/jctbSignals.cpp

@@ -1,257 +0,0 @@
-#include <TApplication.h>
-#include <TGClient.h>
-#include <TCanvas.h>
-#include <TF1.h>
-#include <TRandom.h>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TGFileDialog.h>
-#include <TGComboBox.h>
-#include <TH2F.h>
-#include <TColor.h>
-#include <TH1F.h>
-#include <TGraphErrors.h>
-#include <THStack.h>
-#include <TGTab.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "jctbSignals.h"
-#include "jctbSignal.h"
-#include "multiSlsDetector.h"
-
-using namespace std;
-
-
-
-#define DEFAULTFN "run_0.encal"
-
-
-jctbSignals::jctbSignals(TGVerticalFrame *page, multiSlsDetector *det)
-  : TGGroupFrame(page,"IO Signals",kVerticalFrame), myDet(det) {
-
-
-  SetTitlePos(TGGroupFrame::kLeft);
-  page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  MapWindow();
-  
-  cout << "window mapped " << endl;
-
-  TGHorizontalFrame *hframe;
-  char tit[100];
- 
-  TGHorizontalFrame* hhframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hhframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hhframe->MapWindow();
-
-  TGVerticalFrame *vframe;
-
-
-
-
-  int idac=0;
-  for (idac=0; idac<NIOSIGNALS; idac++) {
-    if (idac%27==0) {
-
-
-    vframe=new TGVerticalFrame(hhframe, 400,800);
-     hhframe->AddFrame(vframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    vframe->MapWindow();
-   
-  
-
-    }
-
-
-    signals[idac]=new jctbSignal(vframe,idac,myDet);
-    signals[idac]->Connect(" ToggledSignalOutput(Int_t)","jctbSignals",this,"ToggledOutReg(Int_t)");
-    signals[idac]->Connect(" ToggledSignalClock(Int_t)","jctbSignals",this,"ToggledClockReg(Int_t)");
-    signals[idac]->Connect(" ToggledSignalPlot(Int_t)","jctbSignals",this,"ToggledPlot(Int_t)");
- 
-    vframe->AddFrame(signals[idac],new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    signals[idac]->MapWindow();
-
-  }
-  idac=63;
-  signals[idac]=new jctbSignal(vframe,idac,myDet);
-  vframe->AddFrame(signals[idac],new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  signals[idac]->MapWindow();
-  sprintf(tit,"ADC Latch");
-
-  signals[idac]->setSignalAlias(tit,-1,-1);
-
-    signals[idac]->Connect(" ToggledSignalOutput(Int_t)","jctbSignals",this,"ToggledOutReg(Int_t)");
-    signals[idac]->Connect(" ToggledSignalClock(Int_t)","jctbSignals",this,"ToggledClockReg(Int_t)");
-    signals[idac]->Connect(" ToggledSignalPlot(Int_t)","jctbSignals",this,"ToggledPlot(Int_t)");
- 
-
-
-  hframe=new TGHorizontalFrame(vframe, 800,50);
-  vframe->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-  TGLabel *label= new TGLabel(hframe, "IO Control Register");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-   eIOCntrlRegister = new TGNumberEntry(hframe, 0, 16,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-
-  hframe->AddFrame(eIOCntrlRegister,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eIOCntrlRegister->MapWindow();
-   eIOCntrlRegister->Resize(150,30);
-
-
-
-
-    hframe=new TGHorizontalFrame(vframe, 800,50);
-    vframe->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    hframe->MapWindow();
-   
-
-   label= new TGLabel(hframe, "Clock Control Register");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-   eClkCntrlRegister = new TGNumberEntry(hframe, 0, 16,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-
-  hframe->AddFrame(eClkCntrlRegister,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eClkCntrlRegister->MapWindow();
-   eClkCntrlRegister->Resize(150,30);
-   
-   eIOCntrlRegister->SetState(kFALSE);
-   eClkCntrlRegister->SetState(kFALSE);
-
-}
-
-
-
-
-int jctbSignals::setSignalAlias(string line) {
-
-  int is=-1, plot=0, col=-1;
-  char tit[100];
-  int narg=sscanf(line.c_str(),"BIT%d %s %d %d",&is,tit,&plot,&col);
-  if (narg<2)
-    return -1;
-  if (is>=0 && is<NIOSIGNALS) {
-    signals[is]->setSignalAlias(tit,plot,col);
-  }
-  return is;
-
-}
-
-string jctbSignals::getSignalAlias() {
-
-  ostringstream oss;
-  for (int is=0; is<NIOSIGNALS; is++)
-    oss << signals[is]->getSignalAlias() << endl;
-
-
-    return oss.str();
-
-}
-
-
-void jctbSignals::update() {
-  Long64_t oreg=myDet->setCTBWord(-1,-1);
-  Long64_t creg=myDet->setCTBWord(-2,-1);
-
-
-  char val[1000];
-  cout << hex << oreg << dec << endl;
-  cout << hex << creg << dec << endl;
-
-  sprintf(val,"%llX",oreg);
-  //  eIOCntrlRegister->SetHexNumber(oreg);
-  eIOCntrlRegister->SetText(val);
-  sprintf(val,"%llX",creg);
-  //  eClkCntrlRegister->SetHexNumber(creg);
-  eClkCntrlRegister->SetText(val);
-
-  for (int idac=0; idac<NIOSIGNALS; idac++) {
-    signals[idac]->setOutput(oreg);
-    signals[idac]->setClock(creg);
-  }
-
-
-
-}
-
-void jctbSignals::ToggledOutReg(Int_t mask) {
-  
-  char val[1000];
-  Long64_t oreg=myDet->setCTBWord(-1,-1);
-  Long64_t m=((Long64_t)1)<<mask;
-  
-
-  if (signals[mask]->isOutput())
-    oreg|=m;
-  else
-    oreg&=~m;
-  
-  cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg << endl;
-
-  myDet->setCTBWord(-1,oreg);
-  oreg=myDet->setCTBWord(-1,-1);
-
-  cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg << endl;
-
-  sprintf(val,"%llX",oreg);
-  //  eIOCntrlRegister->SetHexNumber(oreg);
-  eIOCntrlRegister->SetText(val);
-  //  eIOCntrlRegister->SetNumber(oreg);
-
-}
-
-
-
-void jctbSignals::ToggledClockReg(Int_t mask){
-  
-  char val[1000];
-  Long64_t oreg=myDet->setCTBWord(-2,-1);
-  Long64_t m=((Long64_t)1)<<mask;
-
-  
-
-  if (signals[mask]->isClock())
-    oreg|=m;
-  else
-    oreg&=~m;
-  
-  cout << hex << "clkreg " << oreg << endl;
-
-  myDet->setCTBWord(-2,oreg);
-  oreg=myDet->setCTBWord(-2,-1);
-  sprintf(val,"%llX",oreg);
-  //  eIOCntrlRegister->SetHexNumber(oreg);
- 
-  eClkCntrlRegister->SetText(val);
-
-}
-
-
-
-
-void jctbSignals::ToggledPlot(Int_t mask) {
-  
-  if (signals[mask]->isPlot())
-    cout << "plot signal " << mask << endl;
-  else
-    cout << "unplot signal " << mask << endl;
-
-}

JCTBGui/jctbSignals.h

@@ -1,44 +0,0 @@
-#ifndef JCTBSIGNALS_H
-#define JCTBSIGNALS_H
-#include  <TGFrame.h>
-
-
-#define NSIGNALS 64
-#define NIOSIGNALS 52
-#define ADCLATCH 63
-
-
-
-
-class TGNumberEntry;
-class multiSlsDetector;
-class jctbSignal;
-
-#include <string>
-using namespace std;
-
-class jctbSignals : public TGGroupFrame {
-private:
- 
-  jctbSignal *signals[NSIGNALS];
-
-  TGNumberEntry *eIOCntrlRegister;
-  TGNumberEntry *eClkCntrlRegister;
-
-  multiSlsDetector *myDet;
-
-public:
-  jctbSignals(TGVerticalFrame *page, multiSlsDetector *det);
-   int setSignalAlias(string line);
-   string getSignalAlias();
-
-   void update();
-
-
-   void ToggledOutReg(Int_t);
-   void ToggledClockReg(Int_t);
-   void ToggledPlot(Int_t);
-   ClassDef(jctbSignals,0)
-};
-
-#endif

Makefile

@@ -19,7 +19,7 @@ CALWIZDIR		=	$(WD)/calibrationWizards
 MANDIR			=	$(WD)/manual
 CALIBDIR		=	$(WD)/slsDetectorCalibration
 
-
+ 
 INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface  -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(ASM)
 
 INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM) 

README.md

@@ -0,0 +1,44 @@
+# slsDetector package
+
+
+## Installation
+
+### Get source
+The source code is organised into several submodules, and the top level module is
+sls_detectors_package.
+
+```
+    $ git clone git@git.psi.ch:sls_detectors_software/sls_detectors_package.git
+    $ cd sls_detectors_package
+    $ ./checkout.sh
+```
+
+### Setup dependencies
+The GUI client requires Qt 4.8 and Qwt 6.0
+```
+    export QTDIR=/usr/local/Trolltech/
+    export QWTDIR=/usr/local/qwt-6.0.1/
+```
+If either of them does not exist, the GUI client will not be built.
+
+The calibration wizards require ROOT
+```
+    export ROOTSYS=/usr/local/root-5.34
+```
+
+### Compile
+Use cmake to create out-of-source builds, by creating an build folder parallel to source directory.
+```
+    $ cd ..
+    $ mkdir sls_detectors_package-build
+    $ cd sls_detectors_package-build
+    $ cmake ../sls_detectors_package
+    $ make
+```
+
+The libraries and executables will be found at `bin` directory
+```
+    $ ls bin/
+    gui_client  libSlsDetector.a  libSlsDetector.so  libSlsReceiver.a  libSlsReceiver.so
+    sls_detector_acquire  sls_detector_get  slsDetectorGui  sls_detector_help  sls_detector_put  slsReceiver
+```

RELEASE.txt

@@ -0,0 +1,135 @@
+SLS Detector Package 2.3.0 released on 2017-03-23
+================================================================================
+
+
+
+
+INTRODUCTION
+
+This document describes the differences between previous versions and 2.3.0 releases.
+
+Manuals can be found under the 'manual' folder.
+
+User documentation and other help can be accessed directly at this location:
+
+    https://www.psi.ch/detectors/users-support
+
+If you have any software related questions or comments, please send them to:
+
+    dhanya.thattil@psi.ch
+
+
+
+
+CONTENTS
+
+- Changes in User Interface
+- New Features
+- Resolved Issues
+- Known Issues
+
+
+
+
+Changes in User Interface
+=========================
+
+This release supports the following features:
+
+  	
+	Receiver
+    	--------
+	- The files will be written in this format in the default mode:
+		* ASCII file header of 1024 bytes (only for EIGER detectors)
+		* series of images, each preceded by a Standard Header image 
+		(header described below)
+	
+
+	- Stanard Header image header in file and call back
+	arguments defined. It is in the following format defined as 
+	sls_detector_header defined in 
+	slsReceiverSoftware/include/sls_receiver_defs.h
+	Mostly 0 if not applicatble or implemented, but updated in next release 
+	from firmware.
+		
+		* Frame Number       : 8 bytes 	# Image Number
+		* Exposure Length    : 4 bytes  # sub frame number in 32 bit mode
+		  		       Eiger. 
+		* Packet Number      : 4 bytes	# Number of packets in an image
+		* Bunch ID           : 8 bytes  # Bunch Id in beamline for jungfrau. 
+		* Timestamp          : 8 bytes  # Not implemened
+		* Module Id          : 2 bytes  # Not implemented
+		* X Coordinate       : 2 bytes  # Id of part of detector in 1D
+		* Y Coordinate       : 2 bytes  # Not implemented
+		* Z Coordinate       : 2 bytes  # Not implemented
+		* Debug              : 4 bytes  # Not implemented
+		* Round Robin Number : 2 bytes  # Not implemented
+		* Detector Type      : 1 byte   # Detector type defined by enum
+				                  detectorType in slsReceiverSoftware
+						  /include/sls_receiver_defs.h
+		* Header Version     : 1 byte   # 1
+	
+
+	
+	- The call back value for Start Acquisition Call back is insignificant at the 
+	moment and left for future use. Instead, the following rules apply:
+		* If file write is enabled from the client, we will write the files.
+		* If callbacks are registered, they will be called.
+	For example, the user prefers to write the data himself, one must disable
+	file write (so we dont write) and register the callbacks (so the user gets 
+	the data).
+		
+		
+
+
+
+New Features
+============
+	Eiger
+    	-----
+	- Tau is moved to settings file, Gain and offset are removed from calibration
+	file. Put settings only sets client variable, whereas putting threshold loads 
+	settings files to the server.
+	
+	- Mode argument in starting up receiver is removed. FlippedData command is used
+	in config file to specify bottom.
+	
+	
+	Receiver
+    	--------
+	- Image Reconstruction from the files are different as packet headers are not
+	stored and a standard image header is used.
+
+	
+	General
+    	-------
+	
+	- Users folder that gives an example on how to user the slsDetectorUsers and
+	slsReceiverUsers class.
+	
+	- Data is streamed from Receiver to Gui via ZMQ if gui call back defined.
+	
+
+
+
+Resolved Issues
+===============
+
+	Eiger
+    	-----
+	- Frame and packet counters in server to check delays were buggy.
+
+
+Known Issues
+============
+	- X, Y and Z Coordinates do not exactly define the position of the
+	detector in 3d. This will be defined in the next release. Other header
+	parameters will be complete in the next release.
+	
+	- Too many split files per detector especially for Eiger. Next Release will
+	have a HDF5 version, with virtual file mapping all the split files in an
+	acquisition.
+	
+	- This version is tested only for Eiger and Jungfrau.
+
+

checkout.sh

@@ -10,6 +10,8 @@ git clone $1@git.psi.ch:sls_detectors_software/sls_receiver_software.git slsRece
 
 git clone $1@git.psi.ch:sls_detectors_software/sls_detector_calibration.git slsDetectorCalibration
 
-git clone $1@git.psi.ch:sls_detectors_software/sls_image_reconstruction.git slsImageReconstruction
+#git clone $1@git.psi.ch:sls_detectors_software/sls_image_reconstruction.git slsImageReconstruction
 
 git clone $1@git.psi.ch:sls_detectors_software/calibration_wizards.git calibrationWizards
+
+#git clone git@git.psi.ch:sls_detectors_software/tests.git tests

cmake/FindCBF.cmake

@@ -0,0 +1,11 @@
+FIND_PATH (CBF_INCLUDE_DIR
+    ${CBF_DIR}/include
+    ${CBF_DIR}/include/cbflib
+)
+FIND_LIBRARY (CBF_LIBRARY
+    NAMES cbf
+    HINTS ${CBF_DIR}/lib
+)
+INCLUDE ( FindPackageHandleStandardArgs )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (CBF DEFAULT_MSG CBF_LIBRARY CBF_INCLUDE_DIR )
+

cmake/FindQwt.cmake

@@ -0,0 +1,118 @@
+# Qt Widgets for Technical Applications
+# available at http://www.http://qwt.sourceforge.net/
+#
+# The module defines the following variables:
+#  QWT_FOUND - the system has Qwt
+#  QWT_INCLUDE_DIR - where to find qwt_plot.h
+#  QWT_INCLUDE_DIRS - qwt includes
+#  QWT_LIBRARY - where to find the Qwt library
+#  QWT_LIBRARIES - aditional libraries
+#  QWT_MAJOR_VERSION - major version
+#  QWT_MINOR_VERSION - minor version
+#  QWT_PATCH_VERSION - patch version
+#  QWT_VERSION_STRING - version (ex. 5.2.1)
+#  QWT_ROOT_DIR - root dir (ex. /usr/local)
+
+#=============================================================================
+# Copyright 2010-2013, Julien Schueller
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met: 
+# 
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution. 
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies, 
+# either expressed or implied, of the FreeBSD Project.
+#=============================================================================
+
+
+find_path ( QWT_INCLUDE_DIR
+  NAMES qwt_plot.h
+  HINTS $ENV{QWTDIR} $ENV{QWTDIR}/src ${QT_INCLUDE_DIR}
+  PATH_SUFFIXES qwt qwt-qt3 qwt-qt4 qwt-qt5
+)
+
+set ( QWT_INCLUDE_DIRS ${QWT_INCLUDE_DIR} )
+
+# version
+set ( _VERSION_FILE ${QWT_INCLUDE_DIR}/qwt_global.h )
+if ( EXISTS ${_VERSION_FILE} )
+  file ( STRINGS ${_VERSION_FILE} _VERSION_LINE REGEX "define[ ]+QWT_VERSION_STR" )
+  if ( _VERSION_LINE )
+    string ( REGEX REPLACE ".*define[ ]+QWT_VERSION_STR[ ]+\"(.*)\".*" "\\1" QWT_VERSION_STRING "${_VERSION_LINE}" )
+    string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" QWT_MAJOR_VERSION "${QWT_VERSION_STRING}" )
+    string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" QWT_MINOR_VERSION "${QWT_VERSION_STRING}" )
+    string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3" QWT_PATCH_VERSION "${QWT_VERSION_STRING}" )
+  endif ()
+endif ()
+
+
+# check version
+set ( _QWT_VERSION_MATCH TRUE )
+if ( Qwt_FIND_VERSION AND QWT_VERSION_STRING )
+  if ( Qwt_FIND_VERSION_EXACT )
+    if ( NOT Qwt_FIND_VERSION VERSION_EQUAL QWT_VERSION_STRING )
+      set ( _QWT_VERSION_MATCH FALSE )
+    endif ()
+  else ()
+    if ( QWT_VERSION_STRING VERSION_LESS Qwt_FIND_VERSION )
+      set ( _QWT_VERSION_MATCH FALSE )
+    endif ()
+  endif ()
+endif ()
+
+
+find_library ( QWT_LIBRARY
+  NAMES qwt qwt-qt3 qwt-qt4 qwt-qt5
+  HINTS $ENV{QWTDIR}/lib ${QT_LIBRARY_DIR}
+)
+
+set ( QWT_LIBRARIES ${QWT_LIBRARY} )
+
+
+# try to guess root dir from include dir
+if ( QWT_INCLUDE_DIR )
+  string ( REGEX REPLACE "(.*)/include.*" "\\1" QWT_ROOT_DIR ${QWT_INCLUDE_DIR} )
+# try to guess root dir from library dir
+elseif ( QWT_LIBRARY )
+  string ( REGEX REPLACE "(.*)/lib[/|32|64].*" "\\1" QWT_ROOT_DIR ${QWT_LIBRARY} )
+endif ()
+
+
+# handle the QUIETLY and REQUIRED arguments
+include ( FindPackageHandleStandardArgs )
+if ( CMAKE_VERSION LESS 2.8.3 )
+  find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARY QWT_INCLUDE_DIR _QWT_VERSION_MATCH )
+else ()
+  find_package_handle_standard_args( Qwt REQUIRED_VARS QWT_LIBRARY QWT_INCLUDE_DIR _QWT_VERSION_MATCH VERSION_VAR QWT_VERSION_STRING )
+endif ()
+
+
+mark_as_advanced (
+  QWT_LIBRARY 
+  QWT_LIBRARIES
+  QWT_INCLUDE_DIR
+  QWT_INCLUDE_DIRS
+  QWT_MAJOR_VERSION
+  QWT_MINOR_VERSION
+  QWT_PATCH_VERSION
+  QWT_VERSION_STRING
+  QWT_ROOT_DIR
+)

cmake/FindROOT.cmake

@@ -0,0 +1,167 @@
+# - Finds ROOT instalation
+# This module sets up ROOT information 
+# It defines:
+# ROOT_FOUND          If the ROOT is found
+# ROOT_INCLUDE_DIR    PATH to the include directory
+# ROOT_LIBRARIES      Most common libraries
+# ROOT_GUI_LIBRARIES  Most common libraries + GUI
+# ROOT_LIBRARY_DIR    PATH to the library directory 
+
+
+find_program(ROOT_CONFIG_EXECUTABLE root-config
+  PATHS $ENV{ROOTSYS}/bin)
+
+if(NOT ROOT_CONFIG_EXECUTABLE)
+  set(ROOT_FOUND FALSE)
+else()    
+  set(ROOT_FOUND TRUE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --prefix 
+    OUTPUT_VARIABLE ROOTSYS 
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --version 
+    OUTPUT_VARIABLE ROOT_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --incdir
+    OUTPUT_VARIABLE ROOT_INCLUDE_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --libs
+    OUTPUT_VARIABLE ROOT_LIBRARIES
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --glibs
+    OUTPUT_VARIABLE ROOT_GUI_LIBRARIES
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  #set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof)
+  #set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lProofPlayer -lMLP -lSpectrum -lEve -lRGL -lGed -lXMLParser -lPhysics)
+  set(ROOT_LIBRARY_DIR ${ROOTSYS}/lib)
+
+  # Make variables changeble to the advanced user
+  mark_as_advanced(ROOT_CONFIG_EXECUTABLE)
+
+  if(NOT ROOT_FIND_QUIETLY)
+    message(STATUS "Found ROOT ${ROOT_VERSION} in ${ROOTSYS}")
+  endif()
+endif()
+
+
+include(CMakeParseArguments)
+find_program(ROOTCINT_EXECUTABLE rootcint PATHS $ENV{ROOTSYS}/bin)
+find_program(GENREFLEX_EXECUTABLE genreflex PATHS $ENV{ROOTSYS}/bin)
+find_package(GCCXML)
+
+#----------------------------------------------------------------------------
+# function ROOT_GENERATE_DICTIONARY( dictionary   
+#                                    header1 header2 ... 
+#                                    LINKDEF linkdef1 ... 
+#                                    OPTIONS opt1...)
+function(ROOT_GENERATE_DICTIONARY dictionary)
+  CMAKE_PARSE_ARGUMENTS(ARG "" "" "LINKDEF;OPTIONS" "" ${ARGN})
+  #---Get the list of header files-------------------------
+  set(headerfiles)
+  foreach(fp ${ARG_UNPARSED_ARGUMENTS})
+    file(GLOB files ${fp})
+    if(files)
+      foreach(f ${files})
+        if(NOT f MATCHES LinkDef)
+          set(headerfiles ${headerfiles} ${f})
+        endif()
+      endforeach()
+    else()
+      set(headerfiles ${headerfiles} ${fp})
+    endif()
+  endforeach()
+  #---Get the list of include directories------------------
+  get_directory_property(incdirs INCLUDE_DIRECTORIES)
+  set(includedirs) 
+  foreach( d ${incdirs})    
+   set(includedirs ${includedirs} -I${d})
+  endforeach()
+  #---Get LinkDef.h file------------------------------------
+  set(linkdefs)
+  foreach( f ${ARG_LINKDEF})
+    if( IS_ABSOLUTE ${f})
+      set(linkdefs ${linkdefs} ${f})
+    else() 
+      if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/inc/${f})
+        set(linkdefs ${linkdefs} ${CMAKE_CURRENT_SOURCE_DIR}/inc/${f})
+      else()
+        set(linkdefs ${linkdefs} ${CMAKE_CURRENT_SOURCE_DIR}/${f})
+      endif()
+    endif()
+  endforeach()
+  #---call rootcint------------------------------------------
+  add_custom_command(OUTPUT ${dictionary}.cxx ${dictionary}.h
+                     COMMAND ${ROOTCINT_EXECUTABLE} -cint -f  ${dictionary}.cxx 
+                                          -c ${ARG_OPTIONS} ${includedirs} ${headerfiles} ${linkdefs} 
+                     DEPENDS ${headerfiles} ${linkdefs})
+endfunction()
+
+#----------------------------------------------------------------------------
+# function REFLEX_GENERATE_DICTIONARY(dictionary   
+#                                     header1 header2 ... 
+#                                     SELECTION selectionfile ... 
+#                                     OPTIONS opt1...)
+function(REFLEX_GENERATE_DICTIONARY dictionary)  
+  CMAKE_PARSE_ARGUMENTS(ARG "" "" "SELECTION;OPTIONS" "" ${ARGN})
+  #---Get the list of header files-------------------------
+  set(headerfiles)
+  foreach(fp ${ARG_UNPARSED_ARGUMENTS})
+    file(GLOB files ${fp})
+    if(files)
+      foreach(f ${files})
+        set(headerfiles ${headerfiles} ${f})
+      endforeach()
+    else()
+      set(headerfiles ${headerfiles} ${fp})
+    endif()
+  endforeach()
+  #---Get Selection file------------------------------------
+  if(IS_ABSOLUTE ${ARG_SELECTION})
+    set(selectionfile ${ARG_SELECTION})
+  else() 
+    set(selectionfile ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SELECTION})
+  endif()
+  #---Get the list of include directories------------------
+  get_directory_property(incdirs INCLUDE_DIRECTORIES)
+  set(includedirs) 
+  foreach( d ${incdirs})    
+    set(includedirs ${includedirs} -I${d})
+  endforeach()
+  #---Get preprocessor definitions--------------------------
+  get_directory_property(defs COMPILE_DEFINITIONS)
+  foreach( d ${defs})    
+   set(definitions ${definitions} -D${d})
+  endforeach()
+  #---Nanes and others---------------------------------------
+  set(gensrcdict ${dictionary}.cpp)
+  if(MSVC)
+    set(gccxmlopts "--gccxmlopt=\"--gccxml-compiler cl\"")
+  else()
+    #set(gccxmlopts "--gccxmlopt=\'--gccxml-cxxflags -m64 \'")
+    set(gccxmlopts)
+  endif()  
+  #set(rootmapname ${dictionary}Dict.rootmap)
+  #set(rootmapopts --rootmap=${rootmapname} --rootmap-lib=${libprefix}${dictionary}Dict)
+  #---Check GCCXML and get path-----------------------------
+  if(GCCXML)
+    get_filename_component(gccxmlpath ${GCCXML} PATH)
+  else()
+    message(WARNING "GCCXML not found. Install and setup your environment to find 'gccxml' executable")
+  endif()
+  #---Actual command----------------------------------------
+  add_custom_command(OUTPUT ${gensrcdict} ${rootmapname}     
+                     COMMAND ${GENREFLEX_EXECUTABLE} ${headerfiles} -o ${gensrcdict} ${gccxmlopts} ${rootmapopts} --select=${selectionfile}
+                             --gccxmlpath=${gccxmlpath} ${ARG_OPTIONS} ${includedirs} ${definitions}
+                     DEPENDS ${headerfiles} ${selectionfile})
+endfunction()
+  

manual/manual-client/Eiger_short.tex

@@ -11,29 +11,30 @@
 \title{\E - short manual}
 \date{\today}
 \maketitle
+\tableofcontents
 
 \section{Usage}
 
 \subsection{Mandatory setup - Hardware}
-A EIGER single module (500~kpixels) needs:
+An EIGER single module (500~kpixels) needs:
 \begin{itemize}
 \item A chilled (water+alcohol) at approximately 21~$^{\circ}$C, which needs to dissipate 85~W.
 \item A power supply (12~V, 8~A).
-\item 2$\times$1~Gb/s ethernet connectors to control the detector and, optionally, receive data at low rate. A DHCP server that gives IPs to the 1~Gb/s connectors of the detector is needed.
+\item 2$\times$1~Gb/s Ethernet connectors to control the detector and, optionally, receive data at low rate. A DHCP server that gives IPs to the 1~Gb/s connectors of the detector is needed. Note that flow control has to be enabled on the switch you are using.
 \item 2$\times$10~Gb/s transceivers to optionally, receive data at high rate.
- \end{itemize}
-
-Figure~\ref{fig:1} shows the relationship between the \textbf{Client} (which sits on a beamline control PC), the \textbf{Receiver} (which can run in multiple instances on one or more PCs which receive data from the detector. The receiver(s) does not necessary have to be running on the same PC as the client.) It is important that the receiver is closely connected to the detector.
+\end{itemize}
+The equipment scales linearly with the number of modules.
+Figure~\ref{fig:1} shows the relationship between the \textbf{Client} (which sits on a beamline control PC), the \textbf{Receiver} (which can run in multiple instances on one or more PCs which receive data from the detector. The receiver(s) does not necessary have to be running on the same PC as the client.) It is important that the receiver is closely connected to the detector (they have to be on the same network). Note that if you implement the 1Gb/s readout only: client, receiver and detector have to be all three in the same network. If you implement the 10Gb/s readout, then client, the 1~GbE of the detector and the receiver have to stay on the 1GbE. But the receiver data receiving device and the 10GbE detector can be on their private network, minimizing the missing packets.  
 
 \begin{figure}[t]
 \begin{center}
 \includegraphics[width=.8\textwidth]{Client2}
 \end{center}
-\caption{Communications protocol between the Client PC, the receiver pc and the detector.}
+\caption{Communications protocol between the Client PC, the receiver PC and the detector.}
 \label{fig:1}
 \end{figure}
 
-The Client talks to control over 1~Gb ethernet connection using TCP/IP to the detector and to the receiver. The detector sends data in UDP packets to the receiver. This data sending can be done over 1~Gb/s or 10~Gb/s. 
+The Client talks to control over 1~Gb Ethernet connection using TCP/IP to the detector and to the receiver. The detector sends data in UDP packets to the receiver. This data sending can be done over 1~Gb/s or 10~Gb/s. 
  
 
 \subsection{Mandatory setup - Receiver}
@@ -42,10 +43,10 @@ The receiver is a process run on a PC closely connected to the detector. Open on
 
 \begin{itemize}
 \item {\tt{./slsReceiver --rx\_tcpport xxxx}} 
-\item {\tt{./slsReceiver --rx\_tcpport yyyy --mode 1}}
+\item {\tt{./slsReceiver --rx\_tcpport yyyy}}
 \end{itemize}
-
-where xxxx, yyyy are the tcp port numbers. Use 1955 and 1956 for example. Note that {\tt{--mode 1}} is used only for the ``bottom'' half module. \\ Open as many receiver as half module boards. A single module has two half module boards.
+where xxxx, yyyy are the tcp port numbers. Use 1955 and 1956 for example. Note that in older version of the software {\tt{--mode 1}} was used only for the ``bottom'' half module. Now, the receiver for the bottom is open without arguments anymore, but still in the configuration file one needs to write {\tt{n:flippeddatax 1}}, where {\tt{n}} indicated the half module number, 1 if it is a module.
+\\ Open as many receiver as half module boards. A single module has two half module boards.
 
 \subsection{Mandatory setup - Client}
 
@@ -59,7 +60,6 @@ The command line interface consists in these main functions:
 \item[sls\_detector\_get] to retrieve detector parameters
 \end{description}
 
-
 First, your detector should always be configured for each PC that you might want to use for controlling the detector. All the examples given here show the command {\tt{0-}}, which could be omitted for the EIGER system $0$. In the case more EIGER systems are controlled at once, the call of {\tt{1-}},.. becomes compulsory.
 
 To make sure the shared memory is cleaned, before starting, one should do:  
@@ -70,9 +70,39 @@ To do that:
 \begin{verbatim}
 sls_detector_put 0-config mydetector.config
 \end{verbatim}
-Refer to sample configuration files to produce the appropriate one for your detector.
-\underline{In the case of cSAXS the {\tt{mydetector.config}} *at present* is:}\\ 
-\underline{/sls/X12SA/data/x12saop/EigerPackage/beb\_1.5M\_1Gb\_fiber.config}
+
+In the config file, if client, receiver and detector are using \textbf{1GbE} the following lines are mandatory:
+\begin{verbatim}
+detsizechan 1024 512 #detetctor geometry, long side of the module first
+hostname beb059+beb058+ #1Gb detector hostname for controls
+0:rx_tcpport 1991 #tcpport for the first halfmodule                 
+0:rx_udpport 50011 #udp port first quadrant, first halfmodule         
+0:rx_udpport2 50012 #udp port second quadrant, first halfmodule       
+1:rx_tcpport 1992 #tcpport for the second halfmodule               
+1:rx_udpport 50013 #udp port first quadrant, second halfmodule       
+1:rx_udpport2 50014 #udp port second quadrant, second halfmodule      
+rx_hostname x12sa-vcons #1Gb receiver pc hostname
+outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+\end{verbatim}
+
+In the config file, if client, receiver and detector commands are on 1Gb, but detector data to receiver are sent using \textbf{10GbE} the following lines are mandatory:
+\begin{verbatim}
+detsizechan 1024 512 #detetctor geometry, long side of the module first
+hostname beb059+beb058+ #1Gb detector hostname for controls
+0:rx_tcpport 1991 #tcpport for the first halfmodule                 
+0:rx_udpport 50011 #udp port first quadrant, first halfmodule       
+0:rx_udpport2 50012 #udp port second quadrant, first halfmodule       
+0:rx_udpip 10.0.30.210 #udp IP of the receiver over 10Gb              
+0:detectorip 10.0.30.100  #first half module 10 Gb IP 
+1:rx_tcpport 1992 #tcpport for the second halfmodule                  
+1:rx_udpport 50013 #udp port first quadrant, second halfmodule     
+1:rx_udpport2 50014 #udp port second quadrant, second halfmodule  
+1:rx_udpip 10.0.40.210  #udp IP of the receiver over 10Gb, 
+                        can be the same or different from 0:rx_udpip                                   
+1:detectorip 10.0.40.101 #second half module 10 Gb IP 
+rx_hostname x12sa-vcons #1Gb receiver pc hostname
+outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+\end{verbatim}
 
 One can configure all the detector settings in a parameter file {\tt{setup.det}}, which is loaded by doing:
 \begin{verbatim}
@@ -82,7 +112,7 @@ sls_detector_put 0-parameters setup.det
 In the case of \E, the proper bias voltage of the sensor has to be setup, i.e. the {\tt{setup.det}} file needs to contain the line {\tt{vhighvoltage 150}}. Other detector functionality, which are rarely changed can be setup here. 
 Other important settings that are configured in the {\tt{setup.det}} file are:
 \begin{itemize}
-\item {\tt{tengiga 0/1}}, which sets whether the detector is enabled to send data through the 1~or the 10~Gb ethernet.
+\item {\tt{tengiga 0/1}}, which sets whether the detector is enabled to send data through the 1~or the 10~Gb Ethernet.
 \item {\tt{flags parallel/nonparallel}}, which sets whether the detector is set in parallel acquisition and readout or in sequential mode. This changes the readout time of the chip and affects the frame rate capability (faster is {\tt{parallel}}, with higher noise but needed when the frame rate is $>2$~kHz. 
 \item {\tt{dr 32/16}} sets the detector in autosumming mode (32 bit counter or not autosumming, 12 bit out of the chip). This is strictly connected to what is required for the readout clock of chip. See next point.
 \item {\tt{clkdivider 0/1/2}}. Changes the readout clock: 200, 100, 50~MHz. Note that autosumming mode ({\tt{dr 32}} only works at {clkdivider 2}). By selecting Refer to readout timing specifications in~section\ref{timing} for how to set the detector. 
@@ -92,20 +122,45 @@ Other important settings that are configured in the {\tt{setup.det}} file are:
 One should notice that, by default, by choosing the option {\tt{dr 32}}, then the software automatically sets the detector to  {\tt{clkdivider 2}}. By choosing the option {\tt{dr 16}}, the software automatically sets the detector to  {\tt{clkdivider 1}}. One needs to choose {\tt{clkdivider 0}} after setting the {\tt{dr 16}} option to have the fastest frame rate. 
 We would recommend expert users (beamline people) to write their parameters file for the users. 
 
-\subsection{Standard acquisition}
 
-You will then need to setup the detector threshold and settings, the exposure time, the number of real time frames and eventually how many real time frames should be acquired:
+\section{API versioning}
+The eigerDetectorServer running on the boards has a versioning API scheme that will make it crash if used with a wrong firmware.
+You can also check your versioning by hand with the code:
+\begin{verbatim}
+ sls_detector_get softwareversion
+\end{verbatim}
+gets the server (slsDetectorSoftware) version (answer is something like: {\tt{softwareversion 111920160722}}.
+ \begin{verbatim}
+sls_detector_get thisversion 
+\end{verbatim}
+returns the client version. The answer can be {\tt{thisversion 111220160718}}.
+\begin{verbatim}
+/sls_detector_get detectorversion
+\end{verbatim}
+returns the firmware version . The answer can be {\tt{detectorversion 11}}.
+
+\section{Setting up the threshold}
+\begin{verbatim}
+sls_detector_put 0-trimen N xxxx yyyy zzzz
+sls_detector_put 0-settings standard #[veryhighgain/highgain/lowgain/verylowgain] also possible
+sls_detector_put 0-threshold energy_in_eV
+\end{verbatim}
+The first line requires to specify how many ({\tt{N}}) and at which energies in eV {\{tt{xxxx}}, {\tt{yyyy}}, {\tt{zzzz}} and so on) trimmed files were generated (to allow for an interpolation). This line should normally be included into the {\tt{mydetector.config}} file and should be set for you by one of the detector group.
+NORMALLY, in this new calibration scheme, only {\tt{settings standard}} will be provided to you, unless specific cases to be discussed.
+The threshold at 6000 eV , for example would be set as:{\tt{sls\_detector\_put 0-threshold 6000}}.
+
+\section{Standard acquisition}
+
+After you setup the setting and the threshold, you need to specify the exposure time, the number of real time frames and eventually how many real time frames should be acquired:
 \begin{verbatim}
-sls_detector_put 0-settings [standard/highgain/lowgain]
-sls_detector_put 0-threshold 6000
 sls_detector_put 0-exptime 1[time_is_s]
 sls_detector_put 0-frames 10
 sls_detector_put 0-period 0[time_is_s]
 \end{verbatim}
-In this case 10 consecutive 1~s frames will be acquired. Note that {\tt{period}} defines the sum of the acquisition time and the desired dead time before the next frame. If {\tt{period}} is set to 0, then the next frame will start as soon as the detector is ready to take another acquisition. \\
+In this acquisition 10 consecutive 1~s frames will be acquired. Note that {\tt{period}} defines the sum of the acquisition time and the desired dead time before the next frame. If {\tt{period}} is set to 0, then the next frame will start as soon as the detector is ready to take another acquisition. \\
 
-For \E, at the moment 3 settings are possible: {\tt{standard}}, {\tt{lowgain}} and {\tt{highgain}}. According to the setting chosen, one can reach different energies. Refer to the settings requirements for your detector.\\ 
-Notice that the option  {\tt{settings standard/highgain/lowgain}} actually loads the trimbit files so it is time consuming. Only setting the {\tt{threshold}} does not load trimbit files.  
+For \E, at the moment 5 settings are possible: {\tt{standard}}, {\tt{lowgain}}, {\tt{verylowgain}}, {\tt{veryhighgain}} and {\tt{highgain}}. According to the setting chosen, one can reach different requirements (low noise or high rate). Refer to the settings requirements for your detector.\\ 
+Notice that the option {\tt{settings standard/highgain/lowgain/veryhighgain/verylowgain}} actually loads the trimbit files so it is time consuming. Only setting the {\tt{threshold}} does not load trimbit files.  
 
 The threshold is expressed in (eV) as the proper threshold setting, i.e. normally is set to 50\% of the beam energy.  
 
@@ -123,19 +178,43 @@ To acquire simply type:
 \begin{verbatim}
 sls_detector_acquire 0-
 \end{verbatim}
+Note that acquiring is blocking.
+You can poll the status of the detector with:
+\begin{verbatim}
+sls_detector_get status
+\end{verbatim}
+If the detector is still acquiring, the answer will return {\tt{running}}. If the detector has finished and ready for the next acquisition, then it will return {\tt{idle}}.
+You can also ask for the status of the receiver, to know when it has returned and finished getting the data with:
+\begin{verbatim}
+sls_detector_get receiver
+\end{verbatim}
+
+There is a more complex way of performing an acquisition, that is useful for debugging and in case one wants a non blocking behavior: 
+\begin{itemize}
+\item {\tt{sls\_detector\_put 0-receiver start}} 
+\item {\tt{sls\_detector\_put 0-status start}} 
+\end{itemize}
 
 You can poll the detector status using:
 \begin{verbatim}
 sls_detector_get 0-status 
 \end{verbatim}
-If the receiver has not yet received the finished signal by the detector, the answer will return {\tt{running}}. If the detector has finished and ready for the next acquisition, then it will return {\tt{idle}}.
+When the detector is {\tt{idle}}, then you need to stop the receiver doing:
+\begin{itemize}
+\item {\tt{sls\_detector\_put 0-receiver stop}} 
+\end{itemize}
+You can then reset to zero the number of frames caught, if you desire:
+\begin{itemize}
+\item {\tt{sls\_detector\_put 0-resetframescaught 0}} 
+\end{itemize}
+
 The detector will not accept other commands while acquiring. If an acquisition wishes to be properly aborted, then:
-\begin{verbatim}
-sls_detector_put 0-status stop 
-\end{verbatim}
+\begin{itemize}
+\item {\tt{sls\_detector\_put 0-status stop}} 
+\end{itemize}
 this same command can be used after a non proper abortion of the acquisition to reset to normal status the detector.
 
-\subsection{Readout timing- maximum frame rate}\label{timing}
+\section{Readout timing- maximum frame rate}\label{timing}
 IMPORTANT: to have faster readout and smaller dead time, one can configure {\tt{clkdivider}}, i.e. the speed at which the data are read, i.e. 200/100/50~MHz for {\tt{clkdivider 0/1/2}} and the dead time between frames through {\tt{flags parallel}}, i.e. acquire and read at the same time or acquire and then read out.
 The configuration of this timing variables allows to achieve different frame rates. NOTE THAT IN EIGER, WHATEVER YOU DO, THE FRAME RATE LIMITATIONS COME FROM THE NETWORK BOTTLENECK AS THE HARDWARE GOES FASTER THAN THE DATA OUT.
 
@@ -150,7 +229,7 @@ In the case of REAL CONTINUOUS readout, i.e. continuous acquire and readout from
 \end{itemize}
 Note that in the {\tt{continuous}} mode, some buffering is still done on the memories, so a higher frame rate than the proper real continuos one can be achieved. Still, this extra buffering is possible till the memories are not saturated. 
 The number of images that can be stored on memories are:
-\ \\
+\begin{table}
 \begin{tabular}{|c|c|}
 \hline
 dynamic range & images\\
@@ -162,12 +241,14 @@ dynamic range & images\\
 16 & 7600\\
 \hline
 \end{tabular}
+\caption{Amount of images that can be stored on board.}
+\end{table}
 
 The maximum frame rate achievable with 10~GbE, {\tt{dr 16}}, {\tt{flags continuous}}, {\tt{flags parallel}},{\tt{clkdivider 0}}, \textbf{6.1~kHz}. This is currently limited by the connection between the Front End Board and the Backend board. We expect the 32 bit mode limit to be \textbf{2~kHz} ({\tt{clkdivider 2}}).
  In dynamic range {\tt{dr 8}} the frame rate is \textbf{11~kHz} and for{\tt{dr 4}} is \textbf{22~kHz}. For 4 and 8 bit mode the frame rate are directly limited by the speed of the detector chip and not by the readout boards.    
 
 Here is a list of all the readout times in the different configurations:
-\ \\
+\begin{table}
 \begin{tabular}{|c|c|c|c|c|}
 \hline
 dynamic range & clkdivider & mode & readout time ($\mu$s) & max frame rate (kHz)\\
@@ -189,11 +270,12 @@ dynamic range & clkdivider & mode & readout time ($\mu$s) & max frame rate (kHz)
 32 & 2 & nonparallel & 504 & $<2$\\
 \hline
 \end{tabular}
-
+\caption{Readout settings.}
+\end{table}
 \textbf{As if you run too fast, the detector could become noisier, it is important to match the detector settings to your frame rate. This can be done having more parameters files and load the one suitable with your experiment.} We experienced that {\tt{highgain}} settings could not be used at 6~kHz.
 
 
-\subsection{External triggering options}
+\section{External triggering options}
 The detector can be setup such to receive external triggers. Connect a LEMO signal to the TRIGGER IN connector in the Power Distribution Board. The logic 0 for the board is passed by low level 0$-$0.7~V, the logic 1 is passed to the board with a signal between 1.2$-$5~V. Eiger is 50~$\Omega$ terminated. By default the positive polarity is used (negative should not be passed to the board).  
 \begin{verbatim}
 sls_detector_put 0-timing [auto/trigger/burst_trigger/gating]
@@ -214,9 +296,8 @@ Here are the implemented options so far:
 Hardware-wise, the ENABLE OUT signal outputs when the chips are really acquiring. This means that the single subframes will be outputted in 32 bit mode. The TRIGGER OUT outputs the sum-up-signal at the moment (which is useless). This will be changed in the future to output the envelop of the enable signal. 
 
 We are planning to change some functionality, i.e. unify the {\tt{trigger}} and {\tt{burst}} trigger modes and make both {\tt{frames}} and {\tt{cycles}} configurable at the same time.
- 
 
-\subsection{Advanced autosumming and rate corrections}
+\section{Autosumming and rate corrections}
 
 In the case of autosumming mode, i.e, {\tt{dr 32}}, the acquisition time ({\tt{exptime}} is broken in as many subframes as they fit into the acquisition time minus all the subframes readout times. By default the {\tt{subexptime}} is set to 2.621440~ms. This implies that 12 bit counter of \E will saturate when the rate is above or equal to 1.57~MHz/pixel. The minimum value is of order of 10~ns (although as explained values smaller than 500~$\mu$s do not make sense). The maximum value is 5.2~s.
 
@@ -227,7 +308,7 @@ sls_detector_put 0-subexptime [time_in_s]
 
 One needs to realize that the readout time, for each subframe is 10.5~$\mu$s if the detector is in parallel mode. 500~$\mu$s if the detector is in non parallel mode. Note that in {\tt{dr 32}}, as the single frame readout from the chip is 500~$\mu$s, no {\tt{subexptime}}$<$500~$\mu$s can be set in {\tt{parallel}} mode. To have smaller {\tt{subexptime}}, you need the {\tt{nonparallel}} mode, although this will have a larger deadtime than the acquisition time.\\
 
-Online rate corrections can be activated. They are particularly useful and implemented \textbf{only} in the autosumming mode, i.e. when {\tt{dr 32}} is activated as  every single subframe is corrected before summing it. To correct for rate, the subframe duration has to be known to the correction algorithm.    
+Online rate corrections can be activated for {\tt{dr=32}}. They are particularly useful in the autosumming mode as  every single subframe is corrected before summing it. To correct for rate, the subframe duration has to be known to the correction algorithm. Rate corrections for {\tt{dr=16}} will be activated as well in the next firmware release.     
 To activate the rate corrections, one should do:\\
 \begin{verbatim}
 sls_detector_put 0-ratecorr [tauval_in_ns]
@@ -236,13 +317,87 @@ To deactivate:
 \begin{verbatim}
 sls_detector_put 0-ratecorr 0
 \end{verbatim}
-Default values for tau can be loaded from the calibration files. In this case, one needs to make sure the appropriate tau value is written in the calibration file, then need to load the appropriate {\tt{settings}} or {\tt{calibrations}} at least once before. Now to activate the rate corrections with the value written in the calibrations, once would do: 
+Default values for tau can be loaded from the trimbit files. In this case, one needs to make sure the appropriate tau value is written in the trimbit files, then need to load the appropriate {\tt{settings}} and {\tt{vthreshold}} before. Now to activate the rate corrections with the value written in the trimbit file or interpolated from there, once would do: 
 \begin{verbatim}
 sls_detector_put 0-ratecorr -1
 \end{verbatim}
 
 Every time either the rate corrections are activated, $\tau$ is changed or the subframe length is changed, then a new correction table is evaluated. Note that computing the correction table is time consuming. 
+\section{1Gb/s, 10Gb/s links}
+\subsection{Checking the 1Gb/s, 10Gb/s physical links}
+LEDs on the backpanel board at the back of each half module signal:
+\begin{itemize}
+\item  the 1Gb/s physical link is signaled by the most external LED (should be green) 
+\item the 10Gb/s physical link is signaled by the second most external LED next to the 1Gb/s one (should be green) 
+\end{itemize}
 
+\subsection{Delays in sending for 1Gb/s, 10Gb/s, 10Gb flow control, receiver fifo}
+
+Extremely advanced options allow to:
+\begin{itemize}
+\item Activate the flow control for 10~Gb/s~E (by default the 1~Gb/s~E is always active and cannot be switched off:
+\begin{verbatim}
+./sls_detector_put flowcontrol_10g 1
+\end{verbatim}
+\item  Delay the transmission of the left port. This delay option is useful in the case of many simultaneous receivers running, such that it reduces the throughput to the receivers all at the same time. To be used board by board (i.e {\tt{X:, Y:,etc..}} with different units:
+\begin{verbatim}
+./sls_detector_put X:txndelay_left xxxx 
+\end{verbatim}
+\item  Transmission delay of the right port, same as above. The value here should be different from the left port to spread the transmission even more 
+\begin{verbatim}
+./sls_detector_put X:txndelay_right yyyy
+\end{verbatim}
+As example:
+\begin{verbatim}
+for X in \$(seq 0 4); do ./sls_detector_put \$X:txndelay_left \$((X*100000)); done
+ \end{verbatim}
+\begin{verbatim}
+./sls_detector_put \$X:txndelay_right \$((X*100000)); X=\$((X+1)); done
+\end{verbatim}
+
+\item Set transmission delay of the entire frame. This is required as you want to finish sending the first frame to all receivers before starting sending the second frame to the receivers with shorter delay time.  This value has to be greater than the maximum of the transmission delays of each port.      
+\begin{verbatim}
+./sls_detector_put txndelay_frame zzzz
+\end{verbatim}
+In the example before, it would be: {\tt{zzzz}}=4*100000+ 100000
+
+\item Readjust the size of the fifo of the receiver between listening and writing (useful when writing is limited)
+\begin{verbatim}
+./sls_detector_put rx_fifodepth xxxx
+\end{verbatim}
+ {\tt{xxxx}} is 100 images by default.
+\item Deactivate a half module (for ROI or debugging):
+\begin{verbatim}
+./sls_detector_put X:activated 0 
+\end{verbatim}
+where $X$ is the half module you want to deactivate.
+The receiver at this point will return fake data (overflow) for this module. If you wish to eliminate the receiver overall for this module, then you need to run a configuration file where this module has been removed.
+To activate back a module, do:
+\begin{verbatim}
+./sls_detector_put X:activated 1
+\end{verbatim}
+
+\end{itemize}
+\subsection{Setting up 10Gb correctly: experience so far}
+
+For configuring well the 10Gb card not to loose packets, as root, do:
+\begin{verbatim}
+ ethtool -G xth1 rx 4096, ethtool -C xth1 rx-usecs 100 
+\end{verbatim}
+where {\tt{xth1}} can be replaced with the correct 10Gb device. To minimise loosing packets, priorities are set better as root user, so have the receiver as root.
+To try to bypass being root, we trued something like this:
+\begin{verbatim}
+/etc/security/limits.conf  username – rtprio 99
+\end{verbatim}
+but somehow it did  not fully worked  so we kept the trick of being root.
+
+Very important is to activate the flow control in 10Gb (in 1Gb it is on by default and not configurable)
+\begin{verbatim}
+./sls_detector_put flowcontrol_10g 1
+\end{verbatim}
+Set the transmission delays as explained in the manual.
+
+\section{Offline processing and monitoring}
 \subsection{Offline image reconstruction}
 The offline image reconstruction is in {\tt{slsDetectorsPackage/slsImageReconstruction}}.
 
@@ -258,12 +413,150 @@ eg.
 
 To use it for a 1.5 multi modules:
 \begin{verbatim}
-cbfMaker [filename] [pixels x] [pixels y] [start det]
+cbfMaker [filename] [pixels x] [pixels y] ([singlemodulelongside_x] [start det])
 \end{verbatim}
 eg.
-{\tt cbfMaker /scratch/run\_63\_d0\_f000000000000\_3.raw  3072 512 0}.\\
-\underline{The executable {\tt{bcfMakerMulti [file\_name\_with\_dir]}} contains the hardcoded}\\\underline{ geometry for the 1.5M at CSAXS.} 
-Missing packets in a frame and border pixels ($\times 2$ and $/times 4$ are given with value $-1$ at the present mode.
+{\tt cbfMaker /scratch/run\_63\_d0\_f000000000000\_3.raw  3072 512 1 0}.\\
+The {\tt{[singlemodulelongside\_x]}} and {\tt{[start det]}} param are optional. Defaults are ``1'', the detector long side is on the x coordinate and start to reconstruct from module 0. 
+The executables: 
+\begin{verbatim}
+bcfMaker1.5M [file_name_with_dir]
+bcfMaker9M [file_name_with_dir]
+\end{verbatim}
+contain the hardcoded geometry for the 1.5M (3 modules horizontal on the long side) and for the 9M at cSAXS: 6(short side)$\times$3 (long side) modules.\\ 
+Missing packets in a frame and border pixels ($\times 2$ and $\times 4$ are given with value $-1$ at the present time.
+
+It is important to know, that the pixels at the edge between 2 chips count more as double size. We can virtually introduced 1 virtual pixel per double larger pixel, so to have an even number of counts everywhere. Virtual pixels (not filled ) between module gaps are also inserted.
+
+ \begin{verbatim}
+   GapPixelsBetweenChips_x = 2;
+   GapPixelsBetweenChips_y = 2;
+   GapPixelsBetweenModules_x = 8;
+   GapPixelsBetweenModules_y = 36;
+ \end{verbatim}
+
+\subsection{Read temperatures/HV from boards}
+
+With an updated kernel on the linux boards (ask to the SLS detector group for specifications), it is possible to monitor the temperature on the Back End Boards: 
+\begin{verbatim}
+temp_fpga   #gets the temperature of the fpga
+temp_fpgaext   #gets the temperature close to the fpga
+temp_10ge   #gets the temperature close to the 10GE
+temp_dcdc   #gets the temperature close to the dc dc converter
+temp_sodl   #gets the temperature close to the left so-dimm memory
+temp_sodr   #gets the temperature close to the right so-dimm memory
+temp_fpgafl   #gets the temperature of the left front end board fpga
+temp_fpgafr   #gets the temperature of the right front end board fpga
+
+\end{verbatim}
+
+You need to use the command specifying from which board you desire the temperature readings, for example:
+\begin{verbatim}
+./sls_detector_get 0:temp_fpga
+./sls_detector_get 1:temp_fpga
+\end{verbatim}
+In 500k--2M pixel systems there is a hardware temperature safety switch, which will cut power to the BEBs when reaching a too high temperature. For the 9M system, there is a temperature sensor read by the bchip100 PCU which will shutdown the detector when above a certain temperature.
+ 
+The HV can also be set and read through the software:
+\begin{verbatim}
+./sls_detector_put vhighvoltage 150
+./sls_detector_get vhighvoltage 
+\end{verbatim}
+Note that the get {\tt{vhighvoltage}} would return the measured HV from the master module only.
+
+\appendix
+
+\section{Kill the server, copy a new server, start the server}
+All the below operations are form a terminal and assume you login to the boards.\\
+Kill current server:
+\begin{verbatim}
+ssh root@bebxxx #password is root
+killall eigerDetectorServer # kill server and stopserver
+\end{verbatim}
+Copy a new version of the server (if necessary, otherwise skip it):
+\begin{verbatim}
+cd executables
+scp user@pc:/path/eigerDetectorServerNewVersion .
+chmod 777 eigerDetectorServerNewVersion
+mv eigerDetectorServerNewVersion eigerDetectorServer
+sync
+\end{verbatim}
+Start the server again:
+\begin{verbatim}
+./eigerDetectorServer &
+\end{verbatim}
+
+
+\section{Loading firmware bitfiles}
+
+A \textbf{bcp} executable (which needs \textbf{tftp} installed on the PC, is needed. First of all, you need to press something on the detector: to programm bitfiles (firmware files), do a hard reset with a pin/thin stuff in the holes at the very back of the module. They are between the top 7 LED and the bottom 1 and opposite for the other side. Push hard till all LEDs are alternating green and red. After booting only the central one should be on green and red alternating. From a terminal, do:
+\begin{verbatim}
+nc -p 3000 -u bebxxx 3000 
+\end{verbatim} 
+where {\tt{xxx}} is the board number. It is enough top monitor with {\tt{nc}} only one board. Pres enter twice (till you see a prompt with the board hostname printed) and keep this terminal to monitor. It takes a bit of time to load the bitfiles, but the terminal tells you.\\
+From another terminal you do:
+\begin{verbatim}
+./bcp feb_left.bit bebxxx:/febl
+sleep 300; #or till the screen over netcat has told you Successful
+./bcp feb_right.bit bebxxx:/febr
+sleep 300; #or till the screen over netcat has told you Successful
+./bcp download.bit bebxxx:/fw0
+sleep 300; #or till the screen over netcat has told you Successful
+\end{verbatim}
+If you need to program a new kernel (only needed when told to do so):
+\begin{verbatim}
+ ./bcp kernel_local bebxxx:/kernel
+sleep 300; #or till the screen over netcat has told you Successful
+\end{verbatim}
+do the same for the other boards. You can program in parallel many boards, but you cannot load two bitfiles on the same board till loading and copying one process has finished. So load all left febs together, then proceed to the right febs, then the bebs. Power off completely everything. Power it on.
+
+\section{Pulsing the detector}
+There are two ways to pulse the detector: 
+\begin{itemize}
+\item \textbf{Pulse digitally:} when you are interested to the output readout and do not care about the analog response from the pixels:
+ \begin{verbatim}
+sls_detector_put vthreshold 4000
+sls_detector_put vtr 4000
+sls_detector_put pulsechip N #to pulse N
+sls_detector_put pulsechip -1 #to get out of testing mode 
+\end{verbatim}
+Note that the answer will be $2 \cdot \textrm{{\tt{N}}} +2$ in this case.
+
+\item  \textbf{Pulse analogically:} You want to really check the analogical part of the detcetor, not just the readout.
+
+ \begin{verbatim}
+sls_detector_put vcall 3600
+sls_detector_put vthreshold 1700
+sls_detector_put vrf 3100
+for i in $(seq 0 7) ; 
+do px=$((-255+i)); 
+sls_detector_put  pulse 0 $px 0;
+for j in $(seq 0 255) ; do
+sls_detector_put pulsenmove N 0 1;
+done;
+done;
+sls_detector_p resmat 0
+sls_detector_acquire
+\end{verbatim}
+You read {\tt{N}} in every pixel if you are setup correctly. 
+\end{itemize}
+ 
+\section{Load a noise pattern with shape}
+For debug purposes, we have created a noise pattern with a shape. If you reconstruct correctly your image, you should be able to read ".EIGER'' in the same direction for both the top and bottom in normal human readable orientation.
+To load the special noise file look at {\tt{settingsdir/eiger/standard/eigernoise.sn0xx}} in the package. 
+\begin{verbatim}
+sls_detector_put trimbits ../settingsdir/eiger/standard/eigernoise
+sls_detector_put vthreshold 4000
+sls_detector_put vtr 4000
+\end{verbatim}
+
+\section{Running the (9M at cSAXS. For now)}
+\begin{itemize}
+\item login as {\tt{x12saop@xbl-daq-27}}
+\item {\tt{setup\_eiger}} \#loads environmental variables and brings you to the right directory to execute commands
+\item slsReceiverScript3 1991 36 \# from one shell.. opens 36 receivers
+\item p config ../../eiger\_9m\_10gb\_xbl-daq-27\_withbottom.config
+\end{itemize}
 
 \end{document}
 

manual/manual-client/slsDetectorClientHowTo.tex

@@ -287,7 +287,7 @@ Please refer to SLS Detectors FAQ documentation for more detailed information ab
 \item[rx\_udpport i] sets the communication port between detector and receiver. Should be left to the configuration file. 
 \item[rx\_hostname s] sets the hostname (or IP address) of the receiver for the TCP/IP interface with the client.
 \item[rx\_udpip ip] sets the IP address of the receiver for the UDP interface with the detector.
-\item[rx\_fifodepth v] sets receiver fifo depth to value v. Default for \E is 100.
+\item[rx\_fifodepth v] sets receiver fifo depth to value v. Default for \E is 100 frames betweeen listening and writing.
 \item[r\_online b] sets the receiver in online (1) or offline (0) mode.           
 %\item[r\_checkonline]      
 %\item[framescaught]         

manual/manual-main/slsDetector-softFAQ.tex

@@ -396,3 +396,43 @@ where the default functions performing these actions are implemented and modify
 A simple high-level solution in case you need to maintain the software for several beamlines and don't want to recompile for all of them is to call external scripts.
 
 
+\section{In which data format are written the data?} \label{sec:dataFormat}
+
+For MYTHEN the data are writen in ASCII fomat, one file per frame, in columns, either channel number - counts for the \textit{.raw} files or angle (or channel number)-counts-error for the \textit{.dat} files.
+
+For the other detectors the files are written in binary format, and must be decoded depending on the detector.
+
+\subsection{GOTTHARD}
+Each file contains 100 frames.
+\begin{description}
+\item[Normal mode]
+Each frame is split into 2 packets of 1286 bytes each, where actual data is 1280 bytes each. Both the packets (incl header and footer) are written one after the other into the file.
+
+Representation of each packet:
+\begin{itemize}
+\item
+The first 4 bytes represents a number from which, the frame number and packet number can be derived.
+If the number was 108601, increment it by 1 to get 108602.\\
+Then this $(108602\&0xFFFFFFFE)>>1 = 54301$ is the frame number
+and  $(108602\&0x1) =0$ is the packet number.\\
+0 is the packet on the left and 1 is the packet on the right.\\
+On a side note, when you use the data call back, we also give you the derived frame number as an argument.
+
+\item Data of 1280 bytes. 16 bits per pixel.
+
+\item  2 bytes of insignificant footer.
+\end{itemize}
+
+\item[Short Frame Mode]
+One Frame has only one packet of 518 bytes, where actual data is 512 bytes.
+\begin{itemize}
+\item   first 4 bytes is the frame number. There is no packet number or increment required herecompared to the normal mode.
+\item   Data of 512 bytes.
+\item   2 bytes of insignificant footer.
+\end{itemize}
+
+\end{description}
+
+\subsection{EIGER}
+
+\subsection{JUNGFRAU}

serverBin/eigerDetectorServer

@@ -1 +1 @@
-../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.0
+../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.2

serverBin/jungfrauDetectorServer

@@ -1 +1 @@
-../slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.0.3
+../slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.1

settingsdir/eiger/highgain/highgain.cal

@@ -1,4 +1,4 @@
-3433.58  486.39
-3470.99  483.471
-3480.06  479.017
-3409.62  476.202
+3486.22 365.75
+3518.43 368.23
+3519.11 357.62
+3491.49 365.08

settingsdir/eiger/lowgain/lowgain.cal

@@ -1,4 +1,4 @@
-3685.67  246.055
-3732.38  246.328
-3741.86  245.924
-3696.84  246.167
+3415.26 226.24
+3406.35 223.45
+3407.89 225.60
+3385.72 220.54

settingsdir/eiger/standard/standard.cal

@@ -1,4 +1,4 @@
-3538.73  389.187
-3499.86  374.654
-3462.84  364.88
-3514.72  381.02
+3419.26 282.68
+3451.04 285.35
+3451.30 277.63
+3431.27 283.41

settingsdir/eiger/veryhighgain/standard.cal

@@ -1,4 +0,0 @@
-3538.73  389.187
-3499.86  374.654
-3462.84  364.88
-3514.72  381.02

settingsdir/eiger/veryhighgain/veryhighgain.cal

@@ -0,0 +1,4 @@
+3381.13 493.21
+3385.45 490.36
+3374.03 492.96
+3363.40 483.72

settingsdir/eiger/verylowgain/standard.cal

@@ -1,4 +0,0 @@
-3538.73  389.187
-3499.86  374.654
-3462.84  364.88
-3514.72  381.02

settingsdir/eiger/verylowgain/verylowgain.cal

@@ -0,0 +1,4 @@
+3323.57 124.58
+3336.87 124.85
+3302.45 123.64
+3338.19 124.44

settingsdir/jungfrau/dynamicgain/settings.sn

@@ -1,17 +1,8 @@
-VDAC0 1250
-VDAC1 600
-VDAC2 3000
-VDAC3 830
-VDAC4 1630
+VDAC0 1220
+VDAC1 3000
+VDAC2 1053
+VDAC3 1450
+VDAC4 750
 VDAC5 1000
 VDAC6 480
-VDAC7 400
-VDAC8 1500
-VDAC9 3000
-VDAC10 1053
-VDAC11 1000
-VDAC12 750
-VDAC13 1220
-VDAC14 0
-VDAC15 0
-
+VDAC7 420

settingsdir/jungfrau/dynamichg0

@@ -0,0 +1 @@
+dynamicgain

settingsdir/jungfrau/dynamichg0/calibration.sn

@@ -1 +0,0 @@
-../dynamicgain/calibration.sn

settingsdir/jungfrau/dynamichg0/settings.sn

@@ -1 +0,0 @@
-../dynamicgain/settings.sn

settingsdir/jungfrau/fixgain1

@@ -0,0 +1 @@
+dynamicgain

settingsdir/jungfrau/fixgain1/calibration.sn

@@ -1 +0,0 @@
-../dynamicgain/calibration.sn

settingsdir/jungfrau/fixgain1/settings.sn

@@ -1 +0,0 @@
-../dynamicgain/settings.sn

settingsdir/jungfrau/fixgain2

@@ -0,0 +1 @@
+dynamicgain

settingsdir/jungfrau/fixgain2/calibration.sn

@@ -1 +0,0 @@
-../dynamicgain/calibration.sn

settingsdir/jungfrau/fixgain2/settings.sn

@@ -1 +0,0 @@
-../dynamicgain/settings.sn

settingsdir/jungfrau/forceswitchg1

@@ -0,0 +1 @@
+dynamicgain

settingsdir/jungfrau/forceswitchg1/calibration.sn

@@ -1 +0,0 @@
-../dynamicgain/calibration.sn

settingsdir/jungfrau/forceswitchg1/settings.sn

@@ -1 +0,0 @@
-../dynamicgain/settings.sn

settingsdir/jungfrau/forceswitchg2

@@ -0,0 +1 @@
+dynamicgain

settingsdir/jungfrau/forceswitchg2/calibration.sn

@@ -1 +0,0 @@
-../dynamicgain/calibration.sn

settingsdir/jungfrau/forceswitchg2/settings.sn

@@ -1 +0,0 @@
-../dynamicgain/settings.sn

slsDetectorCalibration/eigerHalfModuleData.h

@@ -19,169 +19,91 @@ public:
 	 */
 
 
-	eigerHalfModuleData(int dr, int np, int bsize, int dsize, bool top, double c=0): slsReceiverData<uint32_t>(xpixels, ypixels, np, bsize),
-	xtalk(c), bufferSize(bsize), actualDataSize(dsize), dynamicRange(dr), numberOfPackets(np), top(top),header_t(0), footer_t(0){
+	eigerHalfModuleData(bool t, bool l, int dr, int tg, int psize, int dsize, int npf, int x, int y, double c=0):
+		slsReceiverData<uint32_t>(x, y, npf, psize),
+		top(t), left(l),
+		dynamicRange(dr), tenGiga(tg),
+		packetSize(psize), onepacketdataSize(dsize), numberofPacketsPerFrame(npf),
+		xtalk(c),
+		header_t(0), footer_t(0){
 
-		tenGiga = false;
-		if(actualDataSize == TEN_GIGA_PACKET_SIZE)
-			tenGiga = true;
 
 		int **dMap;
 		uint32_t **dMask;
 
-		dMap=new int*[ypixels];
-		dMask=new uint32_t*[ypixels];
+		dMap=new int*[ny];
+		dMask=new uint32_t*[ny];
 
 
-		for (int i = 0; i < ypixels; i++) {
-			dMap[i] = new int[xpixels];
-			dMask[i] = new uint32_t[xpixels];
+		for (int i = 0; i < ny; i++) {
+			dMap[i] = new int[nx];
+			dMask[i] = new uint32_t[nx];
 		}
 
 		//Map
-		int totalNumberOfBytes = numberOfPackets * bufferSize;
-		int iPacket1 = 8;
-		int iPacket2 = (totalNumberOfBytes/2) + 8;
-		int iData1 = 0, iData2 = 0;
+		int totalNumberOfBytes = numberofPacketsPerFrame * packetSize;
+		int iPacket = 8;
+		int iData = 0;
 		int increment = (dynamicRange/8);
 		int ic_increment = 1;
 		if (dynamicRange == 4) {
 			increment = 1;
 			ic_increment = 2;
 		}
-		int iPort;
 
 		if(top){
-			for (int ir=0; ir<ypixels; ir++) {
-				for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
-					iPort = ic / (xpixels/2);
-					if(!iPort){
-						dMap[ir][ic]  = iPacket1;
-						iPacket1 += increment;
-						iData1 += increment;
-						//increment header
-						if(iData1 >= actualDataSize){
-							iPacket1 += 16;
-							iData1 = 0;
-						}
-					}else{
-						dMap[ir][ic]  = iPacket2;
-						iPacket2 += increment;
-						iData2 += increment;
-						//increment header
-						if(iData2 >= actualDataSize){
-							iPacket2 += 16;
-							iData2 = 0;
-						}
+			for (int ir=0; ir<ny; ir++) {
+				for (int ic=0; ic<nx; ic = ic + ic_increment) {
+					dMap[ir][ic]  = iPacket;
+					iPacket += increment;
+					iData += increment;
+					//increment header
+					if(iData >= onepacketdataSize){
+						iPacket += 16;
+						iData = 0;
 					}
+
 				}
 			}
 		}
 
-
 		//bottom
 		else{
-			iData1 = 0; iData2 = 0;
-			int numbytesperlineperport;
-
+			iData = 0;
+			int numbytesperline;
 			switch(dynamicRange){
-				case 4: numbytesperlineperport = 256; break;
-				case 8:	numbytesperlineperport = 512; break;
-				case 16:numbytesperlineperport = 1024; break;
-				case 32:numbytesperlineperport = 2048; break;
+				case 4: numbytesperline = 256; break;
+				case 8:	numbytesperline = 512; break;
+				case 16:numbytesperline = 1024; break;
+				case 32:numbytesperline = 2048; break;
 			}
+			iPacket = totalNumberOfBytes - numbytesperline - 8;
+			if((dynamicRange == 32) && (!tenGiga))
+					iPacket -= 16;
 
-
-
-			iPacket1 = (totalNumberOfBytes/2) - numbytesperlineperport - 8;
-			iPacket2 = totalNumberOfBytes - numbytesperlineperport - 8;
-			if (dynamicRange == 32){
-				if(numbytesperlineperport>actualDataSize){ //1Giga
-					iPacket1 -= 16;
-					iPacket2 -= 16;
-				}else{ //10Giga
-					;//iPacket1 -= numbytesperlineperport;
-					//iPacket2 -= numbytesperlineperport;
-				}
-			}
-
-			for (int ir=0; ir<ypixels; ir++) {
-				for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
-					iPort = ic / (xpixels/2);
-					if(!iPort){
-						dMap[ir][ic]  = iPacket1;
-						iPacket1 += increment;
-						iData1 += increment;
-
-						//--------------------32 bit -------------------------
-						if(dynamicRange == 32){
-							if(numbytesperlineperport>actualDataSize){ //1Giga
-								if(iData1 == numbytesperlineperport){
-									iPacket1 -= (numbytesperlineperport*2 + 16*3);//1giga
-									iData1 = 0;
-								}
-								if(iData1 == actualDataSize){
-									iPacket1 += 16;
-								}
-							}else{ //10Giga
-								if((iData1 % numbytesperlineperport)==0){
-									iPacket1 -= (numbytesperlineperport*2);
-								}
-								if(iData1 == actualDataSize){
-									iPacket1 -= 16;
-									iData1 = 0;
-								}
-							}
-						}//------------end of 32 bit -------------------------
-
-						else if((iData1 % numbytesperlineperport) == 0){
-							iPacket1 -= (numbytesperlineperport*2);
-							if(iData1 == actualDataSize){
-								iPacket1 -= 16;
-								iData1 = 0;
-							}
+			for (int ir=0; ir<ny; ir++) {
+				for (int ic=0; ic<nx; ic = ic + ic_increment) {
+					dMap[ir][ic]  = iPacket;
+					iPacket += increment;
+					iData += increment;
+					//--------------------32 bit 1giga -------------------
+					if((dynamicRange == 32) && (!tenGiga)){
+						if(iData == numbytesperline){
+							iPacket -= (numbytesperline*2 + 16*3);
+							iData = 0;
 						}
-						//------------end of other bits -------------------------
-
-					}
-					//other port
-					else{
-						dMap[ir][ic]  = iPacket2;
-						iPacket2 += increment;
-						iData2 += increment;
-
-
-						//--------------------32 bit -------------------------
-						if(dynamicRange == 32){
-							if(numbytesperlineperport>actualDataSize){ //1Giga
-								if(iData2 == numbytesperlineperport){
-									iPacket2 -= (numbytesperlineperport*2 + 16*3);
-									iData2 = 0;
-								}
-								if(iData2 == actualDataSize){
-									iPacket2 += 16;
-								}
-							}else{//10Giga
-								if((iData2 % numbytesperlineperport)==0){
-									iPacket2 -= (numbytesperlineperport*2);
-								}
-								if(iData2 == actualDataSize){
-									iPacket2 -= 16;
-									iData2 = 0;
-								}
-							}
-						}//------------end of 32 bit -------------------------
-
-						else if((iData2 % numbytesperlineperport) == 0){
-							iPacket2 -= (numbytesperlineperport*2);
-							if(iData2 == actualDataSize){
-								iPacket2 -= 16;
-								iData2 = 0;
-							}
+						if(iData == onepacketdataSize){
+							iPacket += 16;
+						}
+					}//------------end of 32 bit -------------------------
+					else if((iData % numbytesperline) == 0){
+						iPacket -= (numbytesperline*2);
+						if(iData == onepacketdataSize){
+							iPacket -= 16;
+							iData = 0;
 						}
-						//------------end of other bits -------------------------
-
 					}
+					//---------------------------------------------------
 				}
 			}
 		}
@@ -190,16 +112,13 @@ public:
 
 
 		//Mask
-		for(int ir=0; ir<ypixels; ++ir)
-			for(int ic=0; ic<xpixels; ++ic)
+		for(int ir=0; ir<ny; ++ir)
+			for(int ic=0; ic<nx; ++ic)
 				dMask[ir][ic] = 0x0;
 
 		setDataMap(dMap);
 		setDataMask(dMask);
 
-
-
-
 	};
 
 
@@ -211,7 +130,7 @@ public:
 	     \returns frame number
 	 */
 	int getFrameNumber(char *buff){
-		footer_t = (eiger_packet_footer_t*)(buff + actualDataSize + sizeof(eiger_packet_header_t));
+		footer_t = (eiger_packet_footer_t*)(buff + onepacketdataSize + sizeof(eiger_packet_header_t));
 		return ((uint32_t)(*( (uint64_t*) footer_t)));
 	};
 
@@ -224,7 +143,7 @@ public:
      	 \returns packet number
 	 */
 	int getPacketNumber(char *buff){
-		footer_t = (eiger_packet_footer_t*)(buff + actualDataSize + sizeof(eiger_packet_header_t));
+		footer_t = (eiger_packet_footer_t*)(buff + onepacketdataSize + sizeof(eiger_packet_header_t));
 		return(*( (uint16_t*) footer_t->packetnum));
 	};
 
@@ -287,10 +206,10 @@ public:
 
 			// ------check if missing packet, get to pixel at start of packet-----------------
 
-			//to get the starting of a packet, ix is divided by 512pixels because of 2 ports (except 1g 32 bit)
-			newix = ix - (ix%512);
+			//to get the starting of a packet (except 1g 32 bit)
+			newix = 0;
 			// 0.5 Lines per packet for 1g 32 bit
-			if(dynamicRange ==32 && !tenGiga)
+			if(dynamicRange == 32 && !tenGiga)
 				newix = ix - (ix%256);
 
 			//iy divided by linesperpacket depending on bitmode
@@ -300,9 +219,11 @@ public:
 				newiy = (iy - (iy%linesperpacket));
 
 			header_t = (eiger_packet_header_t*)((char*)(data +(dataMap[newiy][newix]-8)));
-			if(*( (uint16_t*) header_t->missingpacket)==0xFFFF){
-			  //	cprintf(RED,"missing packet\n");
-			  return -1;
+			uint16_t identifier = (uint16_t)*( (uint16_t*) header_t->missingpacket);
+
+			if(identifier==deactivatedPacketValue){
+				//	cprintf(RED,"deactivated packet\n");
+				return -2;
 			}
 			// -----END OF CHECK -------------------------------------------------------------
 
@@ -342,25 +263,188 @@ public:
 	 */
 	double getXTalk() {return xtalk;}
 
+	void getChannelArray(double* data, char* buffer){
+		for(int iy = 0; iy < ny; iy++){
+			for(int ix = 0; ix < nx; ix++){
+				data[iy*nx+ix] = getValue((char*)buffer,ix,iy);
+				//cprintf(BLUE,"%d,%d :%f\n",ix,iy,value);
+			}
+		}
+	}
+
+
+	int* decodeData(int *datain) {
+
+		int dataBytes = numberofPacketsPerFrame * onepacketdataSize;
+		int nch = nx*ny;
+		int* dataout = new int [nch];
+		char *ptr=(char*)datain;
+		char iptr;
+
+		const int bytesize=8;
+		int ival=0;
+		int  ipos=0, ichan=0, ibyte;
+
+		switch (dynamicRange) {
+		case 4:
+			for (ibyte=0; ibyte<dataBytes; ++ibyte) {//for every byte (1 pixel = 1/2 byte)
+				iptr=ptr[ibyte]&0xff;				//???? a byte mask
+				for (ipos=0; ipos<2; ++ipos) {		//loop over the 8bit (twice)
+					ival=(iptr>>(ipos*4))&0xf;		//pick the right 4bit
+					dataout[ichan]=ival;
+					ichan++;
+				}
+			}
+			break;
+		case 8:
+			for (ichan=0; ichan<dataBytes; ++ichan) {//for every pixel (1 pixel = 1 byte)
+				ival=ptr[ichan]&0xff;				//????? a byte mask
+				dataout[ichan]=ival;
+			}
+			break;
+		case 16:
+			for (ichan=0; ichan<nch; ++ichan) { 	//for every pixel
+				ival=0;
+				for (ibyte=0; ibyte<2; ++ibyte) { 	//for each byte (concatenate 2 bytes to get 16 bit value)
+					iptr=ptr[ichan*2+ibyte];
+					ival|=((iptr<<(ibyte*bytesize))&(0xff<<(ibyte*bytesize)));
+				}
+				dataout[ichan]=ival;
+			}
+			break;
+		default:
+													//for every 32 bit (every element in datain array)
+			for (ichan=0; ichan<nch; ++ichan) { 	//for every pixel
+				ival=datain[ichan]&0xffffff;
+				dataout[ichan]=ival;
+			}
+		}
 
 
 
+		return dataout;
+
+	};
+
+
+	int* readNextFrameOnlyData(ifstream &filebin, int& fnum) {
+		int framesize = numberofPacketsPerFrame * onepacketdataSize;
+
+		int* data = new int[framesize/(sizeof(int))];
+		char *packet=new char[packetSize];
+		fnum = -1;
+		int pn=-1;
+		int dataoffset = 0;
+
+		if (filebin.is_open()) {
+
+			while (filebin.read(packet,packetSize)) {
+
+				fnum = getFrameNumber(packet); //cout << "fn:"<<fn<<endl;
+				pn = getPacketNumber(packet); //cout << "pn:"<<pn<<endl;
+
+				memcpy(((char*)data)+dataoffset,packet+DATA_PACKET_HEADER_SIZE,onepacketdataSize);
+				dataoffset+=onepacketdataSize;
+				if(pn == numberofPacketsPerFrame)
+					break;
+			}
+		}
+
+		delete [] packet;
+		if(!dataoffset){
+			delete [] data;
+			return NULL;
+		}
+
+		return data;
+
+	}
+	/*
+	when u get packet form next frames
+	//to remember the position to read next frame
+	filebin.seekg (position, filebin.beg);
+	position = filebin.tellg();
+
+	*/
+
+	int *readNextFramewithMissingPackets(ifstream &filebin, int& fnum) {
+
+		int* data = new int[(numberofPacketsPerFrame * onepacketdataSize)/(sizeof(int))];
+		char *packet=new char[packetSize];
+		fnum = -1;
+		int pnum = 0;
+		int fn = -1;
+		int pn =-1;
+		int dataoffset = 0;
+		int missingpackets;
+
+
+		if (filebin.is_open()) {
+
+			while (filebin.read(packet,packetSize)) {
+
+				fn = getFrameNumber(packet); //cout << "fn:"<<fn<<endl;
+				pn = getPacketNumber(packet); //cout << "pn:"<<pn<<endl;
+
+				//first packet
+				if(fnum == -1){
+					fnum = fn;
+				}
+				//next frame packet
+				else if (fnum != fn){
+					//set file reading to the last frame's packet in file
+					filebin.seekg(-packetSize, ios::cur);//filebin.beg
+					break;
+				}
+
+				//missing packets
+				missingpackets = pn - pnum - 1;
+				if(missingpackets){
+					memset(((char*)data)+dataoffset,0xFF,missingpackets*onepacketdataSize);
+					dataoffset+=(missingpackets*onepacketdataSize);
+					pnum+=missingpackets;
+				}
+
+				memcpy(((char*)data)+dataoffset,packet+DATA_PACKET_HEADER_SIZE,onepacketdataSize);
+				dataoffset+=onepacketdataSize;
+				pnum++;
+				if(pnum == numberofPacketsPerFrame)
+					break;
+
+			}
+		}
+
+		delete [] packet;
+		if(!pnum){
+			delete [] data;
+			return NULL;
+		}
+
+		//missing packets (added here to also catch end of file)
+		missingpackets = numberofPacketsPerFrame - pnum;
+		if(missingpackets){
+			memset(((char*)data)+dataoffset,0xFF,missingpackets*onepacketdataSize);
+			dataoffset+=(missingpackets*onepacketdataSize);
+		}
+
+		return data;
+	}
 
 
 
 private:
+	/** Missing Packet identifier value */
+	const static uint16_t deactivatedPacketValue = 0xFEFE;
 
-	double xtalk; /**<output buffer crosstalk correction parameter */
-
-	const static int xpixels = 1024;
-	const static int ypixels = 256;
-	const int bufferSize;
-	const int actualDataSize;
+	const static int DATA_PACKET_HEADER_SIZE = 8;
+	const bool top;
+	const bool left;
 	const int dynamicRange;
-	const int numberOfPackets;
-	bool top;
-	bool tenGiga;
-	static const int TEN_GIGA_PACKET_SIZE = 4096;
+	const bool tenGiga;
+	const int packetSize;
+	const int onepacketdataSize;
+	const int numberofPacketsPerFrame;
+	double xtalk; /**<output buffer crosstalk correction parameter */
 
 
 	/** structure of an eiger packet*/

slsDetectorCalibration/slsReceiverData.h

@@ -214,6 +214,7 @@ public:
 					} else {
 						//  cout << "." << endl;;
 						np++;
+						//cout<<"np:"<<np<<endl;
 					}
 				}
 			}
@@ -221,7 +222,10 @@ public:
 			return NULL;
 		};
 
-
+		virtual int* readNextFramewithMissingPackets(ifstream &filebin, int& fnum) {return NULL;}
+		virtual void getChannelArray(double* data, char* buffer){};
+		virtual int* readNextFrameOnlyData(ifstream &filebin, int& fnum) {return NULL;};
+		virtual int* decodeData(int* datain) {return NULL;};
 
 private:
 	const int nPackets; /**<number of UDP packets constituting one frame */

slsDetectorGui/.gitignore

@@ -0,0 +1,5 @@
+Makefile.gui
+forms/include/
+mocs/
+objs/
+qrc_icons.cpp

slsDetectorGui/CMakeLists.txt

@@ -0,0 +1,130 @@
+
+set(CMAKE_AUTOMOC ON)
+
+set(SOURCES
+    slsDetectorPlotting/src/SlsQt1DPlot.cxx
+    slsDetectorPlotting/src/SlsQt1DZoomer.cxx
+    slsDetectorPlotting/src/SlsQt2DHist.cxx
+    slsDetectorPlotting/src/SlsQt2DPlot.cxx
+    slsDetectorPlotting/src/SlsQt2DPlotLayout.cxx
+    slsDetectorPlotting/src/SlsQtNumberEntry.cxx
+    src/qDetectorMain.cpp
+    src/qDrawPlot.cpp
+    src/qCloneWidget.cpp
+    src/qTabMeasurement.cpp
+    src/qTabDataOutput.cpp
+    src/qTabPlot.cpp
+    src/qTabActions.cpp
+    src/qActionsWidget.cpp
+    src/qScanWidget.cpp
+    src/qTabAdvanced.cpp
+    src/qTabSettings.cpp
+    src/qTabDebugging.cpp
+    src/qTabDeveloper.cpp
+    src/qTabMessages.cpp
+    src/qServer.cpp
+)
+
+set(FORMS
+    forms/form_detectormain.ui
+    forms/form_tab_measurement.ui
+    forms/form_tab_dataoutput.ui
+    forms/form_tab_plot.ui
+    forms/form_tab_advanced.ui
+    forms/form_tab_settings.ui
+    forms/form_tab_debugging.ui
+    forms/form_action.ui
+    forms/form_scan.ui
+)
+
+qt4_wrap_ui(FORMS_H ${FORMS})
+
+set(HEADERS
+    slsDetectorPlotting/include/SlsQt1DPlot.h
+    slsDetectorPlotting/include/SlsQt1DZoomer.h
+    slsDetectorPlotting/include/SlsQt2DHist.h
+    slsDetectorPlotting/include/SlsQt2DPlot.h
+    slsDetectorPlotting/include/SlsQt2DPlotLayout.h
+    slsDetectorPlotting/include/SlsQt2DZoomer.h
+    slsDetectorPlotting/include/SlsQtValidators.h
+    slsDetectorPlotting/include/SlsQtNumberEntry.h
+    include/qDefs.h
+    include/qDebugStream.h
+    include/qDetectorMain.h
+    include/qDrawPlot.h
+    include/qCloneWidget.h
+    include/qTabMeasurement.h
+    include/qTabDataOutput.h
+    include/qTabPlot.h
+    include/qTabActions.h
+    include/qActionsWidget.h
+    include/qScanWidget.h
+    include/qTabAdvanced.h
+    include/qTabSettings.h
+    include/qTabDebugging.h
+    include/qTabDeveloper.h
+    include/qTabMessages.h
+    include/gitInfoGui.h
+    include/qServer.h
+)
+set(RESOURCES
+    include/icons.qrc
+)
+qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
+
+include_directories(
+    include
+    slsDetectorPlotting/include
+    ../slsDetectorSoftware/commonFiles 
+    ../slsDetectorSoftware/slsReceiverInterface   
+    ../slsDetectorSoftware/slsDetector  
+    ../slsDetectorSoftware/slsDetectorAnalysis  
+    ../slsDetectorSoftware/multiSlsDetector   
+    ../slsDetectorSoftware/usersFunctions  
+    ../slsReceiverSoftware/include
+    ${QT_INCLUDE_DIR}
+    ${QT_QTCORE_INCLUDE_DIR}
+    ${QT_QTGUI_INCLUDE_DIR}
+    ${QWT_INCLUDE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+add_definitions(
+    -DDACS_INT -DVERBOSE -DPRINT_LOG
+)
+
+add_executable(slsDetectorGui
+    ${SOURCES}
+    ${HEADERS}
+    ${FORMS_H}
+    ${RESOURCES_SRCS}
+)
+
+set_target_properties(slsDetectorGui PROPERTIES
+    LINKER_LANGUAGE CXX
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+add_library(zmq STATIC IMPORTED )
+
+set_target_properties(zmq PROPERTIES
+    IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../slsReceiverSoftware/include/libzmq.a
+)
+
+target_link_libraries(slsDetectorGui 
+    slsDetectorShared
+    ${QT_QTCORE_LIBRARIES}
+    ${QT_QTGUI_LIBRARIES}
+    ${QWT_LIBRARIES}
+    pthread
+    zmq
+    rt
+)
+
+add_executable(gui_client
+    client/qClient.h
+    client/qClient.cpp
+)
+set_target_properties(gui_client PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)

slsDetectorGui/Makefile

@@ -0,0 +1,59 @@
+# LEO: Won't compile without libSlsDetector
+  
+include ../Makefile.include
+
+$(info )
+$(info ##################################)
+$(info #    Compiling slsDetectorGui    #)
+$(info ##################################)
+$(info )
+
+
+
+PROG		= 	$(DESTDIR)/slsDetectorGui
+
+DESTDIR		?=	../bin
+LIBDIR		?=	$(DESTDIR)
+DOCDIR		?=	docs
+
+LIBRARYDIR		?=	../slsDetectorSoftware
+LIBRARYRXRDIR 	?= 	../slsReceiverSoftware
+INCLUDES	?= 	$(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP  -I$(LIBRARYDIR)/slsReceiverInterface   -I$(LIBRARYDIR)/slsDetector  -I$(LIBRARYDIR)/slsDetectorAnalysis  -I$(LIBRARYDIR)/multiSlsDetector   -I$(LIBRARYDIR)/usersFunctions  -I$(LIBRARYRXRDIR)/includes
+
+#ifeq ( $(EIGERSLS), yes)  	
+#	LDFLAG += $(EIGERFLAGS)
+#else ifeq ( $(ROOTSLS), yes)  	
+#	LDFLAG += $(ROOTFLAGS)
+#endif
+
+.PHONY: all lib clean mm doc htmldoc guiclient
+
+
+all: lib $(PROG) Makefile.gui guiclient
+
+lib:
+	cd ../ && $(MAKE) lib
+
+clean: 
+	if test -e Makefile.gui; then $(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean; 	rm Makefile.gui; else 	$(MAKE) Makefile.gui; 	$(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean;  fi
+	cd client &&  $(MAKE) clean
+#	cd manual && make clean
+
+
+Makefile.gui: mm
+
+mm:
+	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAGDET)'
+
+doc:
+	cd manual && $(MAKE) DESTDIR=$(DOCDIR)
+
+htmldoc:
+	cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
+
+$(PROG): Makefile.gui $(DIR)
+	$(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
+
+guiclient:
+	echo $(WD)
+	cd client && $(MAKE) DESTDIR=$(DESTDIR)

slsDetectorGui/client/Makefile

@@ -0,0 +1,36 @@
+CC			=	g++ 
+CLAGS		+=  -DVERBOSE #VERYBOSE
+LDLIBS		+= 	-lm  -lstdc++ -lpthread 
+
+LDIR 		=	../../slsDetectorSoftware
+RDIR 		= 	../../slsReceiverSoftware
+
+INCLUDES	= 	-I $(LDIR)/commonFiles  -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include
+SRC_CLNT	= 	qClient.cpp $(RDIR)/src/MySocketTCP.cpp
+
+PROGS		= 	gui_client 
+DESTDIR		?= 	bin
+INSTMODE	= 	0777
+
+FINALDIR    = ../../bin
+
+OBJS 		= 	$(SRC_CLNT:.cpp=.o) 
+
+
+all: clean $(PROGS)
+
+boot: $(OBJS)
+
+$(PROGS):
+	echo $(OBJS)
+	mkdir -p $(DESTDIR) 
+	gcc $(SRC_CLNT) $(INCLUDES) $(FLAGS) $(LDLIBS) -o $@   
+	mv $(PROGS) $(FINALDIR)
+
+clean:
+	rm -rf $(DESTDIR)/$(PROGS)  *.o  $(FINALDIR)/$(PROGS)
+
+
+
+
+

slsDetectorGui/client/qClient.cpp

@@ -0,0 +1,234 @@
+/*
+ * qClient.cpp
+ *
+ *  Created on: Feb 27, 2013
+ *      Author: Dhanya Maliakal
+ */
+// Qt Project Class Headers
+#include "qClient.h"
+// Project Class Headers
+#include "MySocketTCP.h"
+#include "slsDetectorBase.h"
+
+// C++ Include Headers
+#include <iostream>
+#include <sstream>
+using namespace std;
+
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+int main(int argc, char *argv[]){
+
+	qClient *cl =new qClient(argv[1]);
+	cl->executeLine(argc-2, argv+2);
+
+	delete cl;
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+qClient::qClient(char* hostname){
+	//create socket
+	mySocket = new MySocketTCP(hostname, DEFAULT_GUI_PORTNO);
+	if (mySocket->getErrorStatus()){
+		cout << "Error: could not connect to host:" << hostname << " with port " << DEFAULT_GUI_PORTNO << endl;
+		delete mySocket;
+		exit(-1);
+	}
+
+	//create socket to connect to stop server
+	myStopSocket = new MySocketTCP(hostname, DEFAULT_GUI_PORTNO+1);
+	if (myStopSocket->getErrorStatus()){
+		cout << "Error: could not connect to host:" << hostname << " with port " << DEFAULT_GUI_PORTNO + 1 << endl;
+		delete myStopSocket;
+		exit(-1);
+	}
+
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+qClient::~qClient() {
+	if(mySocket) delete mySocket;
+	if(myStopSocket) delete myStopSocket;
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+int qClient::executeLine(int narg, char *args[]){
+
+	char arg[MAX_STR_LENGTH] = "";
+	int iarg = -1;
+	char answer[100];
+	string retval = "";
+	string cmd = args[0];
+	string argument;
+
+
+	//validate command structure
+	if(narg<1){
+		cout << "Error: no command parsed" << endl;
+		return FAIL;
+	}
+
+
+	//help
+	if (cmd == "help"){
+		retval = printCommands();
+	}
+
+	//file name
+	else if (cmd == "status"){
+
+		if(narg>1){
+			argument = args[1];
+			//start acquisition
+			if(argument == "start")
+				startAcquisition();
+			else if (argument == "stop")
+				stopAcquisition();
+			else{
+				cout << "Error: could not parse arguments: " << argument << endl;
+				printCommands();
+				return FAIL;
+			}
+		}
+		retval = getStatus();
+	}
+
+
+	else if (cmd == "acquire"){
+		startAcquisition(true);
+		retval = getStatus();
+	}
+
+
+	else if (cmd == "exit"){
+		return exitServer();
+	}
+
+
+	//unrecognized command
+	else{
+		cout << "Error: unrecognized command" << endl;
+		return FAIL;
+	}
+
+
+	//print result
+	cout << cmd << ": " << retval << endl;
+
+	return OK;
+}
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+string qClient::printCommands(){
+	ostringstream os;
+	os << "\nexit \t exits servers in gui" << std::endl;
+	os << "status \t gets status of acquisition in gui. - can be running or idle" << std::endl;
+	os << "status i  starts/stops acquistion in gui-non blocking. i is start or stop" << std::endl;
+	os << "acquire  starts acquistion in gui-blocking" << std::endl;
+	return os.str();
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+string qClient::getStatus(){
+	int fnum = F_GET_RUN_STATUS;
+	int ret = FAIL;
+	runStatus retval=ERROR;
+	int progress = 0;
+	char answer[100];
+
+	if  (myStopSocket->Connect() >= 0) {
+		myStopSocket->SendDataOnly(&fnum,sizeof(fnum));
+		myStopSocket->ReceiveDataOnly(&ret,sizeof(ret));
+		myStopSocket->ReceiveDataOnly(&retval,sizeof(retval));
+		myStopSocket->ReceiveDataOnly(&progress,sizeof(progress));
+		myStopSocket->Disconnect();
+	}else
+		exit(-1);
+
+
+	sprintf(answer,"%d%% ",progress);
+	strcat(answer,slsDetectorBase::runStatusType((runStatus)retval).c_str());
+
+	return string(answer);
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+int qClient::startAcquisition(bool blocking){
+	int fnum = F_START_ACQUISITION;
+	if(blocking) fnum = F_START_AND_READ_ALL;
+	int ret = FAIL;
+
+	if  (mySocket->Connect() >= 0) {
+		mySocket->SendDataOnly(&fnum,sizeof(fnum));
+		mySocket->ReceiveDataOnly(&ret,sizeof(ret));
+		if (ret == FAIL){
+			mySocket->ReceiveDataOnly(mess,sizeof(mess));
+			std::cout<< "Gui returned error: " << mess << std::endl;
+		}
+		mySocket->Disconnect();
+	}else
+		exit(-1);
+
+	return ret;
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+int qClient::stopAcquisition(){
+	int fnum = F_STOP_ACQUISITION;
+	int ret = FAIL;
+
+	if  (myStopSocket->Connect() >= 0) {
+		myStopSocket->SendDataOnly(&fnum,sizeof(fnum));
+		myStopSocket->ReceiveDataOnly(&ret,sizeof(ret));
+		if (ret == FAIL){
+			myStopSocket->ReceiveDataOnly(mess,sizeof(mess));
+			std::cout<< "Gui returned error: " << mess << std::endl;
+		}
+		myStopSocket->Disconnect();
+	}else
+		exit(-1);
+
+	return ret;
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+int qClient::exitServer(){
+	int fnum = F_EXIT_SERVER;
+	int ret = FAIL;
+
+	if  (myStopSocket->Connect() >= 0) {
+		myStopSocket->SendDataOnly(&fnum,sizeof(fnum));
+		myStopSocket->ReceiveDataOnly(&ret,sizeof(ret));
+		myStopSocket->ReceiveDataOnly(mess,sizeof(mess));
+		cout << mess << endl;
+		myStopSocket->Disconnect();
+	}else
+		exit(-1);
+
+	return ret;
+}

slsDetectorGui/client/qClient.h

@@ -0,0 +1,65 @@
+/*
+ * qClient.h
+ *
+ *  Created on: Feb 27, 2013
+ *      Author: Dhanya Maliakal
+ */
+#ifndef QCLIENT_H
+#define QCLIENT_H
+
+
+/** Qt Project Class Headers */
+/** Project Class Headers */
+class MySocketTCP;
+#include "sls_detector_defs.h"
+/** C++ Include Headers */
+#include <stdlib.h>
+#include <string>
+using namespace std;
+
+/**
+ *@short Sets up the gui server
+ */
+class qClient: public virtual slsDetectorDefs{
+
+
+public:
+	/** \short The constructor*/
+	qClient(char* hostname);
+	/** Destructor	 */
+	virtual ~qClient();
+
+	/**Execute command*/
+	int executeLine(int narg, char *args[]);
+
+private:
+	/** Print list of commands */
+	string printCommands();
+
+	/** Start Acquisition
+	 * @param blocking true if its a blocking acquistion
+	 */
+	int startAcquisition(bool blocking = false);
+
+	/** Stops Acquisition */
+	int stopAcquisition();
+
+	/** Gets run status */
+	string getStatus();
+
+	/** Exits Server */
+	int exitServer();
+
+	/** client socket */
+	MySocketTCP *mySocket;
+
+	/** client socket */
+	MySocketTCP *myStopSocket;
+
+	char mess[MAX_STR_LENGTH];
+
+};
+
+
+
+#endif /* QCLIENT_H */

slsDetectorGui/doxy.config

@@ -8,9 +8,7 @@ EXTRACT_ALL            = YES
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation.
 
-EXTRACT_PRIVATE        = NO
-
-
+EXTRACT_PRIVATE        = YES
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
@@ -60,35 +58,49 @@ HIDE_UNDOC_CLASSES     = NO
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-INTERNAL_DOCS = NO
-
-SHOW_INCLUDE_FILES = NO
-
-SHOW_FILES = NO
-
-SHOW_NAMESPACES = NO
-
-COMPACT_LATEX = YES
-
-PAPER_TYPE = a4
-
-PDF_HYPERLINKS = YES
-
-USE_PDFLATEX = YES
-
-LATEX_HIDE_INDICES = YES
-
-PREDEFINED           = __cplusplus
-
-HAVE_DOT	= YES
-CALL_GRAPH	= YES
-CALLER_GRAPH	= YES
-
-
-INPUT            =  Beb.h                  Eiger.h              FebControl.h  FebInterface.h     gitInfoEiger.h     HardwareIO.h            LocalLinkInterface.h  sls_detector_funcs.h       slsDetectorServer_defs.h   sls_receiver_defs.h   xfs_types.h communication_funcs.h  EigerRegisterDefs.h  Feb.h         FebRegisterDefs.h  gitInfoEigerTmp.h  HardwareMMappingDefs.h  sls_detector_defs.h   slsDetectorFunctionList.h  slsDetectorServer_funcs.h  sls_receiver_funcs.h  xparameters.h Beb.cxx  BebServer.cxx  Eiger.cxx  EigerTest.cxx  FebControl.cxx  Feb.cxx  FebInterface.cxx  FebServer.cxx  HardwareIO.cxx  LocalLinkInterface.cxx  LocalLinkTest.cxx  Test.cxx
-
-
-
+INPUT            = 			\
+							slsDetectorPlotting/include/SlsQt1DPlot.h\
+							slsDetectorPlotting/src/SlsQt1DPlot.cxx	
+							slsDetectorPlotting/include/SlsQt1DZoomer.h\
+							slsDetectorPlotting/src/SlsQt1DZoomer.cxx\
+							slsDetectorPlotting/include/SlsQt2DHist.h\
+							slsDetectorPlotting/src/SlsQt2DHist.cxx\
+							slsDetectorPlotting/include/SlsQt2DPlot.h\
+							slsDetectorPlotting/src/SlsQt2DPlot.cxx\
+							slsDetectorPlotting/include/SlsQt2DPlotLayout.h\
+							slsDetectorPlotting/src/SlsQt2DPlotLayout.cxx\
+							slsDetectorPlotting/include/SlsQtNumberEntry.h\
+							slsDetectorPlotting/src/SlsQtNumberEntry.cxx\
+							slsDetectorPlotting/include/SlsQt2DZoomer.h\
+							slsDetectorPlotting/include/SlsQtValidators.h\
+							include/qDetectorMain.h\
+							src/qDetectorMain.cpp\
+							include/qDrawPlot.h\
+							src/qDrawPlot.cpp\
+							include/qCloneWidget.h\
+							src/qCloneWidget.cpp\							
+							include/qTabMeasurement.h\
+							src/qTabMeasurement.cpp\
+							include/qTabDataOutput.h\
+							src/qTabDataOutput.cpp\
+							include/qTabPlot.h\
+							src/qTabPlot.cpp\
+							include/qTabActions.h\
+							src/qTabActions.cpp\
+							include/qActionsWidget.h\
+							src/qActionsWidget.cpp\
+							include/qScanWidget.h\
+							src/qScanWidget.cpp\							
+							include/qTabAdvanced.h\							
+							src/qTabAdvanced.cpp\
+							include/qTabSettings.h\							
+							src/qTabSettings.cpp\
+							include/qTabDebugging.h\							
+							src/qTabDebugging.cpp\
+							include/qTabDeveloper.h\							
+							src/qTabDeveloper.cpp\
+							include/qDefs.h
+							
 
 OUTPUT_DIRECTORY = docs
 

slsDetectorGui/forms/form_action.ui

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ActionsObject</class>
+ <widget class="QWidget" name="ActionsObject">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>680</width>
+    <height>25</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>1000</width>
+    <height>1000</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="5">
+    <spacer name="horizontalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0">
+    <widget class="QComboBox" name="comboScript">
+     <item>
+      <property name="text">
+       <string>None</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Custom Script</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLineEdit" name="dispScript">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="6">
+    <widget class="QLabel" name="lblParameter">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Additional Parameter:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QPushButton" name="btnBrowse">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Browse</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../include/icons.qrc">
+       <normaloff>:/icons/images/browse.png</normaloff>:/icons/images/browse.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="7">
+    <spacer name="horizontalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="8">
+    <widget class="QLineEdit" name="dispParameter">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../include/icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>

slsDetectorGui/forms/form_detectormain.ui

@@ -0,0 +1,521 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DetectorMainObject</class>
+ <widget class="QMainWindow" name="DetectorMainObject">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>848</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="palette">
+   <palette>
+    <active>
+     <colorrole role="WindowText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="Text">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="ButtonText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="Shadow">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+    </active>
+    <inactive>
+     <colorrole role="WindowText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="Text">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="ButtonText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="Shadow">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+    </inactive>
+    <disabled>
+     <colorrole role="WindowText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>185</red>
+        <green>185</green>
+        <blue>185</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="Text">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>185</red>
+        <green>185</green>
+        <blue>185</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="ButtonText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>185</red>
+        <green>185</green>
+        <blue>185</blue>
+       </color>
+      </brush>
+     </colorrole>
+     <colorrole role="Shadow">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>89</red>
+        <green>89</green>
+        <blue>89</blue>
+       </color>
+      </brush>
+     </colorrole>
+    </disabled>
+   </palette>
+  </property>
+  <property name="font">
+   <font>
+    <pointsize>9</pointsize>
+   </font>
+  </property>
+  <property name="windowTitle">
+   <string>SLS Detector GUI</string>
+  </property>
+  <property name="inputMethodHints">
+   <set>Qt::ImhNone</set>
+  </property>
+  <property name="documentMode">
+   <bool>false</bool>
+  </property>
+  <property name="tabShape">
+   <enum>QTabWidget::Rounded</enum>
+  </property>
+  <property name="dockNestingEnabled">
+   <bool>false</bool>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>395</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>524287</width>
+     <height>395</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>25</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>16777215</width>
+     <height>25</height>
+    </size>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>9</pointsize>
+    </font>
+   </property>
+   <property name="focusPolicy">
+    <enum>Qt::StrongFocus</enum>
+   </property>
+   <property name="defaultUp">
+    <bool>false</bool>
+   </property>
+   <property name="nativeMenuBar">
+    <bool>true</bool>
+   </property>
+   <widget class="QMenu" name="menuUtilities">
+    <property name="font">
+     <font>
+      <pointsize>9</pointsize>
+     </font>
+    </property>
+    <property name="title">
+     <string>&amp;Utilities</string>
+    </property>
+    <addaction name="actionOpenSetup"/>
+    <addaction name="actionSaveSetup"/>
+    <addaction name="separator"/>
+    <addaction name="actionOpenConfiguration"/>
+    <addaction name="actionSaveConfiguration"/>
+    <addaction name="separator"/>
+    <addaction name="actionLoadTrimbits"/>
+    <addaction name="actionSaveTrimbits"/>
+    <addaction name="separator"/>
+    <addaction name="actionLoadCalibration"/>
+    <addaction name="actionSaveCalibration"/>
+   </widget>
+   <widget class="QMenu" name="menuModes">
+    <property name="title">
+     <string>&amp;Modes</string>
+    </property>
+    <addaction name="actionDebug"/>
+    <addaction name="actionExpert"/>
+    <addaction name="actionDockable"/>
+    <addaction name="actionListenGuiClient"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
+   <addaction name="menuUtilities"/>
+   <addaction name="menuModes"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QDockWidget" name="dockWidgetPlot">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>36</width>
+     <height>422</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>524287</width>
+     <height>524287</height>
+    </size>
+   </property>
+   <property name="font">
+    <font>
+     <family>Sans Serif</family>
+     <pointsize>11</pointsize>
+     <weight>50</weight>
+     <bold>false</bold>
+    </font>
+   </property>
+   <property name="toolTip">
+    <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#00007f;&quot;&gt;Left Click :zoom in&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#00007f;&quot;&gt;Righ&lt;/span&gt;&lt;span style=&quot; color:#00007f;&quot;&gt;t Click &lt;/span&gt;&lt;span style=&quot; color:#00007f;&quot;&gt;: zoom out by 1&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#00007f;&quot;&gt;Middle Click : panning&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#00007f;&quot;&gt;Ctrl+Right Click : zoom out to full size&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+   <property name="statusTip">
+    <string/>
+   </property>
+   <property name="layoutDirection">
+    <enum>Qt::LeftToRight</enum>
+   </property>
+   <property name="features">
+    <set>QDockWidget::NoDockWidgetFeatures</set>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::BottomDockWidgetArea</set>
+   </property>
+   <property name="windowTitle">
+    <string>SLS Detector Plot</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>8</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContentsPlot">
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <property name="minimumSize">
+     <size>
+      <width>0</width>
+      <height>400</height>
+     </size>
+    </property>
+    <property name="maximumSize">
+     <size>
+      <width>16777215</width>
+      <height>16777215</height>
+     </size>
+    </property>
+    <property name="palette">
+     <palette>
+      <active>
+       <colorrole role="WindowText">
+        <brush brushstyle="SolidPattern">
+         <color alpha="255">
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </brush>
+       </colorrole>
+      </active>
+      <inactive>
+       <colorrole role="WindowText">
+        <brush brushstyle="SolidPattern">
+         <color alpha="255">
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </brush>
+       </colorrole>
+      </inactive>
+      <disabled>
+       <colorrole role="WindowText">
+        <brush brushstyle="SolidPattern">
+         <color alpha="255">
+          <red>119</red>
+          <green>119</green>
+          <blue>119</blue>
+         </color>
+        </brush>
+       </colorrole>
+      </disabled>
+     </palette>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>9</pointsize>
+      <weight>50</weight>
+      <bold>false</bold>
+     </font>
+    </property>
+   </widget>
+  </widget>
+  <action name="actionOpenSetup">
+   <property name="text">
+    <string>&amp;Load &amp;Setup</string>
+   </property>
+   <property name="font">
+    <font/>
+   </property>
+  </action>
+  <action name="actionSaveSetup">
+   <property name="text">
+    <string>&amp;Save &amp;Setup</string>
+   </property>
+   <property name="font">
+    <font/>
+   </property>
+  </action>
+  <action name="actionMeasurementWizard">
+   <property name="text">
+    <string>&amp;Measurement Wizard</string>
+   </property>
+  </action>
+  <action name="actionOpenConfiguration">
+   <property name="text">
+    <string>&amp;Load &amp;Configuration</string>
+   </property>
+  </action>
+  <action name="actionSaveConfiguration">
+   <property name="text">
+    <string>&amp;Save &amp;Configuration</string>
+   </property>
+  </action>
+  <action name="actionEnergyCalibration">
+   <property name="text">
+    <string>&amp;Energy Calibration</string>
+   </property>
+  </action>
+  <action name="actionAngularCalibration">
+   <property name="text">
+    <string>&amp;Angular Calibration</string>
+   </property>
+  </action>
+  <action name="actionDebug">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Debug</string>
+   </property>
+  </action>
+  <action name="actionBeamline">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Beamline</string>
+   </property>
+  </action>
+  <action name="actionExpert">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Expert</string>
+   </property>
+  </action>
+  <action name="actionConfiguration">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Configuration</string>
+   </property>
+  </action>
+  <action name="actionVersion">
+   <property name="text">
+    <string>&amp;Version</string>
+   </property>
+  </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>&amp;About</string>
+   </property>
+  </action>
+  <action name="actionDockable">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>D&amp;ockable Windows</string>
+   </property>
+  </action>
+  <action name="actionLoadTrimbits">
+   <property name="text">
+    <string>&amp;Load &amp;Trimbits</string>
+   </property>
+  </action>
+  <action name="actionSaveTrimbits">
+   <property name="text">
+    <string>&amp;Save &amp;Trimbits</string>
+   </property>
+  </action>
+  <action name="actionLoadCalibration">
+   <property name="text">
+    <string>&amp;Load C&amp;alibration</string>
+   </property>
+  </action>
+  <action name="actionSaveCalibration">
+   <property name="text">
+    <string>&amp;Save C&amp;alibration</string>
+   </property>
+  </action>
+  <action name="actionListenGuiClient">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Listen to Gui Client</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

slsDetectorGui/forms/form_scan.ui

@@ -0,0 +1,488 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ScanObject</class>
+ <widget class="QWidget" name="ScanObject">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>724</width>
+    <height>125</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>1000</width>
+    <height>1000</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>5</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="2" column="2" rowspan="3" colspan="3">
+    <widget class="QGroupBox" name="group">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>180</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>5</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>2</number>
+      </property>
+      <property name="horizontalSpacing">
+       <number>0</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>5</number>
+      </property>
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_7">
+        <item>
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>10</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioRange">
+          <property name="toolTip">
+           <string>&lt;nobr&gt;
+Defines scan range for a &lt;b&gt;Constant Step Size&lt;/b&gt; with the following constraints:
+&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;
+1. &lt;b&gt;Number of Steps&lt;/b&gt; &gt;=2.
+&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;
+2. &lt;b&gt;Size&lt;/b&gt; not equal to 0.
+&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;
+3. &lt;b&gt;From&lt;/b&gt; not equal to &lt;b&gt;To&lt;/b&gt;.
+&lt;/nobr&gt;&lt;br&gt;</string>
+          </property>
+          <property name="text">
+           <string>Constant Step Size</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioCustom">
+          <property name="toolTip">
+           <string>&lt;nobr&gt;Measures only at specific values listed by the user.&lt;/nobr&gt;&lt;br&gt;
+&lt;nobr&gt;Number of entries is restricted to &lt;b&gt;Number of Steps&lt;/b&gt; field.&lt;/nobr&gt;</string>
+          </property>
+          <property name="text">
+           <string>Specific Values</string>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioFile">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>&lt;nobr&gt;Measures only at the specific values listed in a file.&lt;/nobr&gt;&lt;br&gt;
+&lt;nobr&gt;Select the file, where these values are listed.&lt;/nobr&gt;</string>
+          </property>
+          <property name="text">
+           <string>Values from File</string>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>10</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_8">
+        <item>
+         <widget class="QWidget" name="stackedWidget" native="true"/>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="4">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="lblPrecision">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Precision:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_7">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>5</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="spinPrecision">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="4">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="lblParameter">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Additional Parameter:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>5</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="dispParameter">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="2">
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="lblSteps">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Number of Steps:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_8">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>5</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="spinSteps">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="keyboardTracking">
+        <bool>false</bool>
+       </property>
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>1000000</number>
+       </property>
+       <property name="value">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0">
+    <widget class="QComboBox" name="comboScript">
+     <item>
+      <property name="text">
+       <string>None</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Energy Scan (eV)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Threshold Scan</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Trimbits Scan</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Position Scan</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Custom Script</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLineEdit" name="dispScript">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>5</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnBrowse">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Browse</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../include/icons.qrc">
+         <normaloff>:/icons/images/browse.png</normaloff>:/icons/images/browse.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>30</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="3">
+    <spacer name="horizontalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>comboScript</tabstop>
+  <tabstop>dispScript</tabstop>
+  <tabstop>btnBrowse</tabstop>
+  <tabstop>dispParameter</tabstop>
+  <tabstop>spinSteps</tabstop>
+  <tabstop>spinPrecision</tabstop>
+  <tabstop>radioRange</tabstop>
+  <tabstop>radioCustom</tabstop>
+  <tabstop>radioFile</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../include/icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>

slsDetectorGui/forms/form_tab_dataoutput.ui

@@ -0,0 +1,718 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TabDataOutputObject</class>
+ <widget class="QWidget" name="TabDataOutputObject">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>775</width>
+    <height>345</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>1000</width>
+    <height>1000</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QGroupBox" name="boxOutDir">
+   <property name="geometry">
+    <rect>
+     <x>15</x>
+     <y>30</y>
+     <width>747</width>
+     <height>116</height>
+    </rect>
+   </property>
+   <property name="toolTip">
+    <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+   </property>
+   <property name="title">
+    <string>Output Directory</string>
+   </property>
+   <widget class="QFrame" name="frameOutput">
+    <property name="geometry">
+     <rect>
+      <x>5</x>
+      <y>10</y>
+      <width>731</width>
+      <height>96</height>
+     </rect>
+    </property>
+    <property name="toolTip">
+     <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+    </property>
+    <property name="frameShape">
+     <enum>QFrame::NoFrame</enum>
+    </property>
+    <property name="frameShadow">
+     <enum>QFrame::Plain</enum>
+    </property>
+    <widget class="QWidget" name="horizontalLayoutWidget">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>10</y>
+       <width>716</width>
+       <height>92</height>
+      </rect>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="verticalSpacing">
+       <number>4</number>
+      </property>
+      <item row="1" column="2">
+       <widget class="QLineEdit" name="dispReadOutputDir">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="toolTip">
+         <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+        </property>
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="echoMode">
+         <enum>QLineEdit::Normal</enum>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="lblDetector">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="palette">
+         <palette>
+          <active>
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
+              <red>2</red>
+              <green>2</green>
+              <blue>2</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </active>
+          <inactive>
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </inactive>
+          <disabled>
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
+              <red>119</red>
+              <green>119</green>
+              <blue>119</blue>
+             </color>
+            </brush>
+           </colorrole>
+          </disabled>
+         </palette>
+        </property>
+        <property name="toolTip">
+         <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+        </property>
+        <property name="text">
+         <string>Readout:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLineEdit" name="dispOutputDir">
+        <property name="focusPolicy">
+         <enum>Qt::StrongFocus</enum>
+        </property>
+        <property name="toolTip">
+         <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="comboDetector">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>180</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="3">
+       <widget class="QPushButton" name="btnOutputBrowse">
+        <property name="toolTip">
+         <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+        </property>
+        <property name="text">
+         <string>Browse</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../include/icons.qrc">
+          <normaloff>:/icons/images/browse.png</normaloff>:/icons/images/browse.png</iconset>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </widget>
+  </widget>
+  <widget class="QGroupBox" name="boxCorrection_2">
+   <property name="geometry">
+    <rect>
+     <x>15</x>
+     <y>160</y>
+     <width>746</width>
+     <height>170</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Options</string>
+   </property>
+   <widget class="QWidget" name="gridLayoutWidget_3">
+    <property name="geometry">
+     <rect>
+      <x>17</x>
+      <y>21</y>
+      <width>192</width>
+      <height>137</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_3">
+     <property name="verticalSpacing">
+      <number>6</number>
+     </property>
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="chkTenGiga">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>&lt;nobr&gt;
+Compression using Root. Available only for Gotthard in Expert Mode.
+&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;
+ #r_compression#
+&lt;/nobr&gt;</string>
+       </property>
+       <property name="text">
+        <string>10GbE</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="chkCompression">
+       <property name="toolTip">
+        <string>&lt;nobr&gt;
+Compression using Root. Available only for Gotthard in Expert Mode.
+&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;
+ #r_compression#
+&lt;/nobr&gt;</string>
+       </property>
+       <property name="text">
+        <string>Compression</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="chkAngular">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Angular Conversion</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="chkDiscardBad">
+       <property name="text">
+        <string>Discard Bad Channels</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="gridLayoutWidget_2">
+    <property name="geometry">
+     <rect>
+      <x>255</x>
+      <y>21</y>
+      <width>476</width>
+      <height>76</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <property name="verticalSpacing">
+      <number>6</number>
+     </property>
+     <item row="1" column="4">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>10</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="chkRate">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Rate:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="8">
+      <widget class="QPushButton" name="btnFlatField">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Flat field corrections. 
+ #flatfield# filename</string>
+       </property>
+       <property name="text">
+        <string>Browse</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../include/icons.qrc">
+         <normaloff>:/icons/images/browse.png</normaloff>:/icons/images/browse.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2" colspan="6">
+      <widget class="QLineEdit" name="dispFlatField">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::ClickFocus</enum>
+       </property>
+       <property name="toolTip">
+        <string>Flat field corrections. 
+ #flatfield# filename</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="chkFlatField">
+       <property name="toolTip">
+        <string>Flat field corrections. 
+ #flatfield# filename</string>
+       </property>
+       <property name="text">
+        <string>Flat Field File:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>10</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="5">
+      <widget class="QLabel" name="lblDeadTime">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="palette">
+        <palette>
+         <active>
+          <colorrole role="WindowText">
+           <brush brushstyle="SolidPattern">
+            <color alpha="255">
+             <red>2</red>
+             <green>2</green>
+             <blue>2</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="WindowText">
+           <brush brushstyle="SolidPattern">
+            <color alpha="255">
+             <red>0</red>
+             <green>0</green>
+             <blue>0</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="WindowText">
+           <brush brushstyle="SolidPattern">
+            <color alpha="255">
+             <red>119</red>
+             <green>119</green>
+             <blue>119</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="toolTip">
+        <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+       </property>
+       <property name="text">
+        <string>Dead Time:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="6" colspan="3">
+      <widget class="QSpinBox" name="spinDeadTime">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="suffix">
+        <string>ns</string>
+       </property>
+       <property name="minimum">
+        <number>-1</number>
+       </property>
+       <property name="maximum">
+        <number>200000000</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2" colspan="2">
+      <widget class="QPushButton" name="btnDefaultRate">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>&lt;nobr&gt;
+Directory where one saves the data.
+&lt;/nobr&gt;&lt;br&gt;
+ #outdir#
+&lt;br&gt;
+</string>
+       </property>
+       <property name="text">
+        <string>Default</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../include/icons.qrc">
+         <normaloff>:/icons/images/calculate.png</normaloff>:/icons/images/calculate.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="Line" name="line">
+    <property name="geometry">
+     <rect>
+      <x>230</x>
+      <y>21</y>
+      <width>20</width>
+      <height>134</height>
+     </rect>
+    </property>
+    <property name="frameShadow">
+     <enum>QFrame::Raised</enum>
+    </property>
+    <property name="orientation">
+     <enum>Qt::Vertical</enum>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widgetEiger" native="true">
+    <property name="geometry">
+     <rect>
+      <x>244</x>
+      <y>92</y>
+      <width>491</width>
+      <height>72</height>
+     </rect>
+    </property>
+    <widget class="QWidget" name="gridLayoutWidget">
+     <property name="geometry">
+      <rect>
+       <x>11</x>
+       <y>4</y>
+       <width>475</width>
+       <height>62</height>
+      </rect>
+     </property>
+     <layout class="QGridLayout" name="gridEiger">
+      <item row="1" column="2">
+       <widget class="QComboBox" name="comboEigerFlags1">
+        <property name="maximumSize">
+         <size>
+          <width>200</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <item>
+         <property name="text">
+          <string>Continous</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Store in RAM</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="lblClkDivider">
+        <property name="maximumSize">
+         <size>
+          <width>105</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Clock Divider:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>10</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="comboEigerClkDivider">
+        <property name="maximumSize">
+         <size>
+          <width>200</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <item>
+         <property name="text">
+          <string>Full Speed</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Half Speed</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Quarter Speed</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Super Slow Speed</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>10</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="lblEigerFlags">
+        <property name="maximumSize">
+         <size>
+          <width>105</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Flags:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <widget class="QComboBox" name="comboEigerFlags2">
+        <item>
+         <property name="text">
+          <string>Parallel</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Non Parallel</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Safe</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </widget>
+  </widget>
+  <zorder>boxOutDir</zorder>
+  <zorder>boxCorrection_2</zorder>
+  <zorder>btnOutputBrowse</zorder>
+ </widget>
+ <tabstops>
+  <tabstop>dispReadOutputDir</tabstop>
+  <tabstop>chkFlatField</tabstop>
+  <tabstop>dispFlatField</tabstop>
+  <tabstop>btnFlatField</tabstop>
+  <tabstop>chkRate</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../include/icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>

slsDetectorGui/forms/form_tab_debugging.ui

@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TabDebuggingObject</class>
+ <widget class="QWidget" name="TabDebuggingObject">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>775</width>
+    <height>345</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>1000</width>
+    <height>1000</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QGroupBox" name="groupBox">
+   <property name="geometry">
+    <rect>
+     <x>45</x>
+     <y>75</y>
+     <width>686</width>
+     <height>231</height>
+    </rect>
+   </property>
+   <property name="focusPolicy">
+    <enum>Qt::NoFocus</enum>
+   </property>
+   <property name="title">
+    <string>Tests</string>
+   </property>
+   <widget class="QWidget" name="gridLayoutWidget_2">
+    <property name="geometry">
+     <rect>
+      <x>15</x>
+      <y>110</y>
+      <width>141</width>
+      <height>51</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="chkDetectorFirmware">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Readout Firmware</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="chkDetectorSoftware">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Readout Software</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="horizontalLayoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>15</x>
+      <y>185</y>
+      <width>656</width>
+      <height>36</height>
+     </rect>
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="btnTest">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Run Test   </string>
+       </property>
+       <property name="icon">
+        <iconset resource="../include/icons.qrc">
+         <normaloff>:/icons/images/start.png</normaloff>:/icons/images/start.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="gridLayoutWidget_5">
+    <property name="geometry">
+     <rect>
+      <x>415</x>
+      <y>30</y>
+      <width>256</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_5">
+     <item row="0" column="0">
+      <widget class="QLabel" name="lblModule">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>100</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Module:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QComboBox" name="comboModule">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+       <item>
+        <property name="text">
+         <string>All Modules</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>10</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="gridLayoutWidget_3">
+    <property name="geometry">
+     <rect>
+      <x>280</x>
+      <y>110</y>
+      <width>141</width>
+      <height>51</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_3">
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="chkDetectorBus">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Readout Bus</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="chkDetectorMemory">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Readout Memory</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="gridLayoutWidget_6">
+    <property name="geometry">
+     <rect>
+      <x>530</x>
+      <y>110</y>
+      <width>141</width>
+      <height>26</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_6">
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="chkChip">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Chip</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="gridLayoutWidget_4">
+    <property name="geometry">
+     <rect>
+      <x>15</x>
+      <y>30</y>
+      <width>276</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_4">
+     <item row="0" column="0">
+      <widget class="QLabel" name="lblDetector">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>150</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Readout:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QComboBox" name="comboDetector">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>10</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="horizontalLayoutWidget_4">
+    <property name="geometry">
+     <rect>
+      <x>15</x>
+      <y>60</y>
+      <width>276</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLabel" name="lblStatusLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>150</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Status:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>10</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblStatus">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>IDLE</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QWidget" name="gridLayoutWidget_7">
+    <property name="geometry">
+     <rect>
+      <x>530</x>
+      <y>135</y>
+      <width>141</width>
+      <height>26</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_7">
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="chkModuleFirmware">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Module Firmware</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="Line" name="line">
+    <property name="geometry">
+     <rect>
+      <x>5</x>
+      <y>95</y>
+      <width>676</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="orientation">
+     <enum>Qt::Horizontal</enum>
+    </property>
+   </widget>
+   <widget class="Line" name="line_2">
+    <property name="geometry">
+     <rect>
+      <x>5</x>
+      <y>165</y>
+      <width>676</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="orientation">
+     <enum>Qt::Horizontal</enum>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QWidget" name="horizontalLayoutWidget_3">
+   <property name="geometry">
+    <rect>
+     <x>45</x>
+     <y>25</y>
+     <width>686</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <item>
+     <widget class="QPushButton" name="btnGetInfo">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>Get  ID Information   </string>
+      </property>
+      <property name="icon">
+       <iconset resource="../include/icons.qrc">
+        <normaloff>:/icons/images/download.png</normaloff>:/icons/images/download.png</iconset>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <tabstops>
+  <tabstop>btnGetInfo</tabstop>
+  <tabstop>comboDetector</tabstop>
+  <tabstop>comboModule</tabstop>
+  <tabstop>btnTest</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../include/icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>

slsDetectorGui/forms/form_tab_messages.ui

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TabMessagesObject</class>
+ <widget class="QWidget" name="TabMessagesObject">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>775</width>
+    <height>345</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" rowspan="2">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLineEdit" name="lineEdit"/>
+     </item>
+     <item row="2" column="0" rowspan="2">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QLineEdit" name="lineEdit_2"/>
+     </item>
+     <item row="0" column="0" colspan="3">
+      <widget class="QTextEdit" name="textEdit"/>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

slsDetectorGui/forms/form_tab_settings.ui

@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TabSettingsObject</class>
+ <widget class="QWidget" name="TabSettingsObject">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>775</width>
+    <height>345</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>1000</width>
+    <height>1000</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QWidget" name="gridLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>20</y>
+     <width>316</width>
+     <height>171</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QLabel" name="label_3">
+      <property name="text">
+       <string>Settings:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2" colspan="2">
+     <widget class="QComboBox" name="comboSettings">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip">
+       <string>Settings of the detector. 
+ #settings#</string>
+      </property>
+      <item>
+       <property name="text">
+        <string>Standard</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Fast</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>High Gain</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Dynamic Gain</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Low Gain</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Medium Gain</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Very High Gain</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Low Noise</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Dynamic HG0</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Fix Gain 1</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Fix Gain 2</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Force Switch G1</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Force Switch G2</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Very Low Gain</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Undefined</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Uninitialized</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="1" column="2" colspan="2">
+     <widget class="QSpinBox" name="spinThreshold">
+      <property name="keyboardTracking">
+       <bool>false</bool>
+      </property>
+      <property name="suffix">
+       <string> eV</string>
+      </property>
+      <property name="minimum">
+       <number>-100000</number>
+      </property>
+      <property name="maximum">
+       <number>100000</number>
+      </property>
+      <property name="singleStep">
+       <number>100</number>
+      </property>
+      <property name="value">
+       <number>-1</number>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="label_5">
+      <property name="text">
+       <string>Number of Modules:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0">
+     <widget class="QLabel" name="label_6">
+      <property name="text">
+       <string>Dynamic Range:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="2" colspan="2">
+     <widget class="QComboBox" name="comboDynamicRange">
+      <item>
+       <property name="text">
+        <string>1.67772e+07</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>65535</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>255</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>7</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="2" column="2" colspan="2">
+     <widget class="QSpinBox" name="spinNumModules">
+      <property name="minimum">
+       <number>1</number>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::Fixed</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="lblThreshold">
+      <property name="text">
+       <string>Threshold:</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <tabstops>
+  <tabstop>comboSettings</tabstop>
+  <tabstop>spinThreshold</tabstop>
+  <tabstop>spinNumModules</tabstop>
+  <tabstop>comboDynamicRange</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../include/icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>

slsDetectorGui/gitInfo.txt

@@ -0,0 +1,9 @@
+Path: slsDetectorsPackage/slsDetectorGui 
+URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
+Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
+Repsitory UUID: c43f58653a9b90aade45b9649810ff11225ca844 
+Revision: 379 
+Branch: 2.3-rc 
+Last Changed Author: Dhanya_Maliakal 
+Last Changed Rev: 379 
+Last Changed Date: 2016-12-16 14:46:02 +0100