more tests

.clang-tidy

@@ -17,8 +17,7 @@ Checks:          '*,
                     -google-runtime-references, 
                     -google-readability-todo, 
                     -google-readability-braces-around-statements,
-                    -modernize-use-trailing-return-type,
-                    -readability-isolate-declaration'
+                    -modernize-use-trailing-return-type'
 
 HeaderFilterRegex: \.h
 AnalyzeTemporaryDtors: false

.travis.yml

@@ -4,6 +4,12 @@ language: cpp
 
 os: linux
 
+# env: 
+#   matrix: 
+#      - CONDA_PY="3.7"
+
+
+
 dist: bionic
 
 install:
@@ -33,6 +39,5 @@ deploy:
   provider: script
   script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
   on:
-    branch: developer
-    tags: true
+    branch: udp
 

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 project(slsDetectorPackage)
 set(PROJECT_VERSION 5.0.0)
 include(CheckIPOSupported)
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+
 
 cmake_policy(SET CMP0074 NEW)
 include(cmake/project_version.cmake)
@@ -44,19 +44,6 @@ option(SLS_USE_PYTHON "Python bindings" OFF)
 option(SLS_USE_CTBGUI "ctb GUI" OFF)
 option(SLS_BUILD_DOCS "docs" OFF)
 option(SLS_BUILD_EXAMPLES "examples" OFF)
-option(SLS_TUNE_LOCAL "tune to local machine" OFF)
-
-# Use ld.gold if it is available and isn't disabled explicitly
-option(SLS_USE_LD_GOLD "Use GNU gold linker" ON)
-if (SLS_USE_LD_GOLD)
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-    if ("${LD_VERSION}" MATCHES "GNU gold")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
-    else ()
-        message(WARNING "GNU gold linker isn't available, using the default system linker.")
-    endif ()
-endif ()
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -124,11 +111,6 @@ if(SLS_USE_SANITIZER)
     # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
-if(SLS_TUNE_LOCAL)
-    target_compile_options(slsProjectOptions INTERFACE -mtune=native -march=native)
-endif()
-
-
 #rapidjson
 add_library(rapidjson INTERFACE)
 target_include_directories(rapidjson INTERFACE
@@ -177,7 +159,7 @@ endif (SLS_USE_RECEIVER)
 
 if (SLS_USE_GUI)   
     find_package(Qt4 REQUIRED)
-    find_package(Qwt 6.1 REQUIRED)
+    find_package(Qwt 6 REQUIRED)
     if (QT4_FOUND AND QWT_FOUND)
         add_subdirectory(slsDetectorGui)
     endif()
@@ -213,9 +195,11 @@ if(SLS_BUILD_DOCS)
     add_subdirectory(docs)
 endif(SLS_BUILD_DOCS)
 
+
+
 if(SLS_MASTER_PROJECT)
     # Set install dir CMake packages
-    set(CMAKE_INSTALL_DIR "share/cmake/${PROJECT_NAME}")
+    set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/sls)
     # Set the list of exported targets
     set(PROJECT_LIBRARIES slsSupportLib slsDetectorShared slsReceiverShared)
     # Generate and install package config file and version

README.md

@@ -2,67 +2,90 @@
 Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support)
 
 ### Binaries
-Binaries for the slsDetectorPackage are available through conda. 
-```
-#Add conda channels
-conda config --add channels conda-forge
-conda config --add channels slsdetectorgroup
-
-conda install slsdetlib   #only shared lib and command line
-conda install slsdet      #python bindings (includes slsdetlib)
-conda install slsdetgui   #gui (includes qt4)
-
-#Install specific version
-conda install slsdet=2020.03.02.dev0 #developer version from 3 March 2020
-
-```
+Documentation to obtain the binaries via the conda package is available for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui)
 
 ### Source code
-One can also obtain the source code from this repository and compile.
+One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
 
 ```
-#### Dependencies 
-* Lib: c++11 compiler (gcc=>4.8), ZeroMQ 4
-* Gui: Qt 4.8 and Qwt 6.0
-* Calibration wizards and ctbGUI: ROOT
-* Optional: HDF5
+#### Setup dependencies 
+* Gui Client <br>
+Requirements: 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.
 
+* Advanced user Calibration wizards<br>
+Requirements: ROOT
+```
+    export ROOTSYS=/usr/local/root-5.34
+```
 
 #### Compilation 
 
-Compiling can be done in two ways. Either with the convenience script
-cmk.sh or directly with cmake for more control.
+Compiling can be done in two ways.
 
 **1. Compile using script cmk.sh**<br>
 
 After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory<br>
 
-Usage: [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
- -[no option]: only make
- -c: Clean
- -b: Builds/Rebuilds CMake files normal mode
- -p: Builds/Rebuilds Python API
- -h: Builds/Rebuilds Cmake files with HDF5 package
- -d: HDF5 Custom Directory
- -t: Build/Rebuilds only text client
- -r: Build/Rebuilds only receiver
- -g: Build/Rebuilds only gui
- -s: Simulator
- -u: Chip Test Gui
- -j: Number of threads to compile through
- -e: Debug mode
- -i: Builds tests
-  
-eg. Rebuild when you switch to a new build and compile in parallel:
-./cmk.sh -bj5
+Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]<br>
+ * -[no option]: only make<br>
+ * -c: Clean<br>
+ * -b: Builds/Rebuilds CMake files normal mode<br>
+ * -h: Builds/Rebuilds Cmake files with HDF5 package<br>
+ * -d: HDF5 Custom Directory<br>
+ * -t: Build/Rebuilds only text client<br>
+ * -r: Build/Rebuilds only receiver<br>
+ * -g: Build/Rebuilds only gui<br>
+ * -j: Number of threads to compile through<br>
+ * -e: Debug mode
+ 
+Basic Option:
+./cmk.sh -b
+ 
+For only make:
+./cmk.sh
+
+For make clean;make:
+./cmk.sh -c
+
+For using hdf5 without custom dir /blabla:
+./cmk.sh -h -d /blabla
+
+For rebuilding cmake without hdf5 
+./cmk.sh -b
+
+For using multiple cores to compile faster:
+./cmk.sh -j9<br>
+
+
+For rebuilding only certain sections<br>
+./cmk.sh -tg #only text client and gui<br>
+./cmk.sh -r #only receiver<br>
+
 
 **2. Compile without script**<br>
-Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. This would create a debug build with address sanitizers.
+Use cmake to create out-of-source builds, by creating a build folder parallel to source directory.
 ```
-    $ mkdir build
-    $ cd build
-    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON
-    $ make -j12 #or whatever number of threads wanted
+    $ cd ..
+    $ mkdir slsDetectorPackage-build
+    $ cd slsDetectorPackage-build
+    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=OFF 
+    $ make
+```
+
+Use the following as an example to compile statically and using specific hdf5 folder
+```
+    $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=ON
+ ```  
+After compiling, 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 slsMultiReceiver
 ```

cmake/package_config.cmake

@@ -15,20 +15,17 @@ configure_package_config_file(
 write_basic_package_version_file(
   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake"
   VERSION ${PROJECT_VERSION}
-  COMPATIBILITY SameMajorVersion
-)
+  COMPATIBILITY SameMajorVersion)
 
 install(FILES
   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake"
   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake"
   COMPONENT devel
-  DESTINATION ${CMAKE_INSTALL_DIR}
-)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER})
 
 if (PROJECT_LIBRARIES OR PROJECT_STATIC_LIBRARIES)
   install(
     EXPORT "${TARGETS_EXPORT_NAME}"
     FILE ${PROJECT_NAME_LOWER}-targets.cmake
-    DESTINATION ${CMAKE_INSTALL_DIR}
-    )
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER})
 endif ()

cmk.sh

@@ -11,7 +11,6 @@ PYTHON=0
 TESTS=0
 SIMULATOR=0
 CTBGUI=0
-MANUALS=0
 
 
 CLEAN=0
@@ -20,7 +19,7 @@ CMAKE_PRE=""
 CMAKE_POST=""
 
 usage() { echo -e "
-Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
+Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
  -[no option]: only make
  -c: Clean
  -b: Builds/Rebuilds CMake files normal mode
@@ -35,7 +34,6 @@ Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [-h] [-d <HDF5 director
  -j: Number of threads to compile through
  -e: Debug mode
  -i: Builds tests
- -m: Manuals
 
 Rebuild when you switch to a new build and compile in parallel:
 ./cmk.sh -bj5
@@ -71,7 +69,7 @@ For rebuilding only certain sections
  
  " ; exit 1; }
 
-while getopts ":bpchd:j:trgeisum" opt ; do
+while getopts ":bpchd:j:trgeisu" opt ; do
 	case $opt in
 	b) 
 		echo "Building of CMake files Required"
@@ -126,10 +124,6 @@ while getopts ":bpchd:j:trgeisum" opt ; do
 		echo "Compiling Options: Simulator" 
 		SIMULATOR=1
 		;; 
-	m)	
-		echo "Compiling Manuals"
-		MANUALS=1
-		;;
 	u)
 		echo "Compiling Options: Chip Test Gui"
 		CTBGUI=1
@@ -193,8 +187,8 @@ fi
 
 #Debug
 if [ $DEBUG -eq 1 ]; then
-#	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
-	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
+# CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
 	echo "Debug Option enabled"
 fi 
 
@@ -204,12 +198,6 @@ if [ $SIMULATOR -eq 1 ]; then
 	echo "Simulator Option enabled"
 fi 
 
-#Manuals
-if [ $MANUALS -eq 1 ]; then
-	CMAKE_POST+=" -DSLS_BUILD_DOCS=ON "
-	echo "Manuals Option enabled"
-fi 
-
 #Chip Test Gui
 if [ $CTBGUI -eq 1 ]; then
 	CMAKE_POST+=" -DSLS_USE_CTBGUI=ON "
@@ -263,9 +251,6 @@ else
 	make
 fi
 
-if [ $MANUALS -eq 1 ]; then
-	make docs
-fi 
 
 
 

conda-recepie/copy_lib.sh

@@ -5,20 +5,18 @@ mkdir $PREFIX/include
 mkdir $PREFIX/include/slsDetectorPackage
 
 #Shared and static libraries
-# cp build/bin/libSlsDetector.so $PREFIX/lib/.
-# cp build/bin/libSlsReceiver.so $PREFIX/lib/.
-# cp build/bin/libSlsSupport.so $PREFIX/lib/.
-
-cp build/install/lib/* $PREFIX/lib/
+cp build/bin/libSlsDetector.so $PREFIX/lib/.
+cp build/bin/libSlsReceiver.so $PREFIX/lib/.
+cp build/bin/libSlsSupport.so $PREFIX/lib/.
 
 #Binaries
-cp build/install/bin/sls_detector_acquire $PREFIX/bin/.
-cp build/install/bin/sls_detector_get $PREFIX/bin/.
-cp build/install/bin/sls_detector_put $PREFIX/bin/.
-cp build/install/bin/sls_detector_help $PREFIX/bin/.
-cp build/install/bin/slsReceiver $PREFIX/bin/.
-cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
+cp build/bin/sls_detector_acquire $PREFIX/bin/.
+cp build/bin/sls_detector_get $PREFIX/bin/.
+cp build/bin/sls_detector_put $PREFIX/bin/.
+cp build/bin/sls_detector_help $PREFIX/bin/.
+cp build/bin/slsReceiver $PREFIX/bin/.
+cp build/bin/slsMultiReceiver $PREFIX/bin/.
 
-
-cp build/install/include/* $PREFIX/include/
-cp -r build/install/share/ $PREFIX/share
+#Which headers do we need for development??
+cp build/install/include/* $PREFIX/include/slsDetectorPackage/
+# cp include/some_lib.h $PREFIX/include/.

conda-recepie/meta.yaml

@@ -1,13 +1,13 @@
 
 package:
   name: sls_detector_software
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
+  version: "udp"
 
 source:
   - path: ..
 
 build:
-  number: 0
+  number: 1
   binary_relocation: True
   rpaths:
     - lib/
@@ -37,7 +37,6 @@ requirements:
   host:
     - libstdcxx-ng
     - libgcc-ng
-    - zeromq
     - xorg-libx11
     - xorg-libice
     - xorg-libxext
@@ -47,7 +46,6 @@ requirements:
     - xorg-libxfixes
 
   run:
-    - zeromq
     - libstdcxx-ng
     - libgcc-ng 
 

ctbGui/ctbAcquisition.cpp

@@ -29,10 +29,9 @@
 #include "sls_detector_defs.h"
 #include "ctbMain.h"
 #include "moench03CtbData.h" 
-//#include "moench03TCtbData.h" 
-//#include "moench03T1CtbData.h" 
+#include "moench03TCtbData.h" 
+#include "moench03T1CtbData.h" 
 #include "moench03CommonMode.h" 
-#include "moench03T1ZmqDataNew.h" 
 #include "moench02CtbData.h" 
 //#include "jungfrau10ModuleData.h" 
 #include "moenchCommonMode.h" 
@@ -44,9 +43,6 @@
 #include "moench04CtbZmq10GbData.h"
 #include "deserializer.h"
 #include "detectorData.h"
-#include "imageZmq16bit.h"
-#include "imageZmq32bit.h"
-
 
 using namespace std;
 
@@ -236,10 +232,7 @@ hframe=new TGHorizontalFrame(this, 800,50);
   cbDetType->AddEntry("MOENCH02", MOENCH02);
   cbDetType->AddEntry("MOENCH04", MOENCH04);
   // cbDetType->AddEntry("JUNGFRAU1.0", 2);
-  cbDetType->AddEntry("MOENCH03",MOENCH03);
-  cbDetType->AddEntry("IMAGE32BIT",IMAGE32B);
-  cbDetType->AddEntry("IMAGE16BIT",IMAGE16B);
-
+  //cbDetType->AddEntry("MOENCH03 T", iiii++);
   //cbDetType->AddEntry("MOENCH03", iiii++);
   // cbDetType->AddEntry("MYTHEN3 0.1", MYTHEN301);
   // cbDetType->AddEntry("ADCSAR2", ADCSAR2);
@@ -278,7 +271,7 @@ hframe=new TGHorizontalFrame(this, 800,50);
 
 
 
-  //  cout << "off "<< endl;
+    cout << "off "<< endl;
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -297,8 +290,8 @@ hframe=new TGHorizontalFrame(this, 800,50);
                                                TGNumberFormat::kNEANonNegative, 
 			     TGNumberFormat::kNELLimitMinMax,0,16535);
    hframe->AddFrame(eSerOff,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eSerOff->MapWindow();
-   eSerOff->SetNumber(0);
+   eSerOff->MapWindow();;
+   eSerOff->SetNumber(5);
    e= eSerOff->TGNumberEntry::GetNumberEntry();
    eSerOff->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeSerialOffset(Long_t)");
    e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeSerialOffset()");
@@ -344,53 +337,6 @@ hframe=new TGHorizontalFrame(this, 800,50);
    
 
 
-  hframe=new TGHorizontalFrame(this, 800,50);
-  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  hframe->MapWindow();
-    
- 
-
-  label=new TGLabel(hframe,"Image Pixels");
-  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-  label->MapWindow();
-  label->SetTextJustify(kTextLeft);
-
-
-  label=new TGLabel(hframe,"X: ");
-  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-  label->MapWindow();
-  label->SetTextJustify(kTextRight);
-
-
-  ePixX=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-			     TGNumberFormat::kNELLimitMinMax,0,16535);
-   hframe->AddFrame(ePixX,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   ePixX->MapWindow();
-   ePixX->SetNumber(400);
-   e= ePixX->TGNumberEntry::GetNumberEntry();
-   ePixX->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
-   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
-
-
-
-  label=new TGLabel(hframe,"Y: ");
-  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-  label->MapWindow();
-  label->SetTextJustify(kTextRight);
-
-
-  ePixY=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-			     TGNumberFormat::kNELLimitMinMax,0,16535);
-   hframe->AddFrame(ePixY,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   ePixY->MapWindow();
-   ePixY->SetNumber(400);
-   e= ePixY->TGNumberEntry::GetNumberEntry();
-   ePixY->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
-   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
-
-
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -663,10 +609,8 @@ hframe=new TGHorizontalFrame(this, 800,50);
   cout <<"Registering data callback" << endl;
   try {
     myDet->registerDataCallback(&dataCallback, (void*)this);
-  } CATCH_DISPLAY ("Could not get register call back.", "ctbAcquisition::ctbAcquisition") 
-      try {
-	myDet->setRxZmqDataStream(true); 
-      } CATCH_DISPLAY ("Could not get set RxZmqDataStream.", "ctbAcquisition::ctbAcquisition") 
+  } CATCH_DISPLAY ("Could not get register call back.", "ctbAcquisition::ctbAcquisition")
+
   cout <<"Done" << endl;
   
     //  mgAdcs=new TMultiGraph();
@@ -888,7 +832,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 
   //  cout <<"global plot is " << globalPlot << endl;
   // cout << "*******************************************" <<endl;
-   cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " nx:" << data->nx << " ny: " << data->ny << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
+  // cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
   if (globalPlot || cbGetPedestal->IsOn()) {
     //#ifdef TESTADC
     //  cout <<"------"<<  index << " " << ip << " " << data->npoints << endl;
@@ -915,11 +859,6 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
     nx=eNumCount->GetIntNumber();
     dr=eDynRange->GetIntNumber();
     soff=eSerOff->GetIntNumber();
-    // cout <<"deserializer: " << endl;
-    // cout << "Number of chans:\t" << nx << endl;
-    // cout << "Serial Offset:\t" << soff << endl;
-    // cout << "Dynamic range:\t" << dr << endl;
-    
   }
 
   i=0;
@@ -984,8 +923,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
       for (int y=0; y<ny; y++) {
 	ped=0;
 	aval=dataStructure->getValue(data->data,x,y);
-	//aval=dataStructure->getChannel(data->data,x,y);
-	cout << x << " " <<y << " "<< aval << endl;
+      
 	if (cbGetPedestal->IsOn()) {
 	  if (photonFinder) {
 	    photonFinder->addToPedestal(aval,x,y);
@@ -1156,20 +1094,8 @@ void ctbAcquisition::Draw(){
 void ctbAcquisition::changePlot(){
   if (rbPlotOff->IsOn()) {
     adcPlot=0;
-    dbitPlot=0;   
-    try {
-      myDet->registerDataCallback(nullptr, this);  
-    } CATCH_DISPLAY ("Could not get unregister call back.", "ctbAcquisition::ctbAcquisition")   
-    try {
-      myDet->setRxZmqDataStream(false); 
-    } CATCH_DISPLAY ("Could not get unset RxZmqDataStream.", "ctbAcquisition::ctbAcquisition") 
+    dbitPlot=0;
   } else {
-  try {
-    myDet->registerDataCallback(&dataCallback, (void*)this);
-  } CATCH_DISPLAY ("Could not get register call back.", "ctbAcquisition::ctbAcquisition")   
-    try {
-      myDet->setRxZmqDataStream(true); 
-    } CATCH_DISPLAY ("Could not get set RxZmqDataStream.", "ctbAcquisition::ctbAcquisition") 
     adcPlot=0;
     dbitPlot=0;
     for (int ii=0; ii<NADCS; ii++)
@@ -1274,9 +1200,6 @@ void ctbAcquisition::changeDetector(){
    eNumCount->SetState(kFALSE);
   eDynRange->SetState(kFALSE);
   eSerOff->SetState(kFALSE);
-  ePixX->SetState(kFALSE);
-  ePixY->SetState(kFALSE);
-    
   deserializer=0;
   if (rb2D->IsOn() ) {//|| rbScan->IsOn()
     switch  (cbDetType->GetSelected()) {
@@ -1287,6 +1210,7 @@ void ctbAcquisition::changeDetector(){
       // commonMode=new moench03CommonMode();
       break;
      case MOENCH04:
+
       try {
         auto retval = myDet->getTenGiga().tsquash("Different values");
         if (retval) {
@@ -1299,54 +1223,6 @@ void ctbAcquisition::changeDetector(){
        cout << "MOENCH 0.4!" << endl;
        commonMode=new moench03CommonMode();
       break;
-     case MOENCH03:
-       //try {
-	// auto retval = myDet->getTenGiga().tsquash("Different values");
-	// if (retval) {
-          dataStructure=new moench03T1ZmqDataNew(nAnalogSamples); 
-        // } else {
-        //   dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
-        // }
-	  //} CATCH_DISPLAY ("Could not get ten giga enable.", "ctbAcquisition::changeDetector")
-
-       cout << "MOENCH 0.3! USE JUNGFRAU MODULE!" << endl;
-       commonMode=new moench03CommonMode();
-      break;
-       case IMAGE32B:
-       //try {
-       	// auto retval = myDet->getTenGiga().tsquash("Different values");
-       	// if (retval) {
-       	// if (deserializer) {
-       	   ePixX->SetState(kTRUE);
-       	   ePixY->SetState(kTRUE);
-       	   // }
-       	 dataStructure=new imageZmq32bit(ePixX->GetIntNumber(),ePixY->GetIntNumber()); 
-        // } else {
-        //   dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
-        // }
-       	  //} CATCH_DISPLAY ("Could not get ten giga enable.", "ctbAcquisition::changeDetector")
-
-       	 cout << "Image 32bit, no channel shuffling" << endl;
-       commonMode=NULL;
-       break;
-   
-       case IMAGE16B:
-       //try {
-	// auto retval = myDet->getTenGiga().tsquash("Different values");
-	// if (retval) {
-	// if (deserializer) {
-	   ePixX->SetState(kTRUE);
-	   ePixY->SetState(kTRUE);
-	   // }
-	 dataStructure=new imageZmq16bit(ePixX->GetIntNumber(),ePixY->GetIntNumber()); 
-        // } else {
-        //   dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
-        // }
-	  //} CATCH_DISPLAY ("Could not get ten giga enable.", "ctbAcquisition::changeDetector")
-
-	 cout << "Image 16bit, no channel shuffling" << endl;
-       commonMode=NULL;
-       break;
    
     // case 1:
     //   cout << "************** T!!!!!!!!!!" << endl;
@@ -1410,7 +1286,6 @@ void ctbAcquisition::changeDetector(){
 	photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode 
 	//photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode
 	dataStructure->getDetectorSize(nx,ny);
-	
       }
       if (deserializer) {
 	ny=1;
@@ -1636,23 +1511,20 @@ void ctbAcquisition::update() {
 
    if (dataStructure) {
      cout << cbDetType->GetSelected()<< endl;
-    // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
-    //   cout << "settings deserialiation parameters for MYTHEN" << endl;
-    //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-    //   eSerOff->SetNumber( ms->setSerialOffset(-1));
-    //   eDynRange->SetNumber( ms->setDynamicRange(-1));
-    //   eNumCount->SetNumber( ms->setNumberOfCounters(-1));
-    // }
+    if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
+      cout << "settings deserialiation parameters for MYTHEN" << endl;
+      mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+      eSerOff->SetNumber( ms->setSerialOffset(-1));
+      eDynRange->SetNumber( ms->setDynamicRange(-1));
+      eNumCount->SetNumber( ms->setNumberOfCounters(-1));
+    }
     
    }
 
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-    dBitOffset = 0;
-  } else {
-    try {
-      dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
-    } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::update")
-  }
+  try {
+    dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
+  } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::update")
+
   try {
     tenG = myDet->getTenGiga().tsquash("Different values");
   } CATCH_DISPLAY ("Could not get ten giga enable", "ctbAcquisition::update")
@@ -1738,13 +1610,9 @@ void ctbAcquisition::toggleAcquisition() {
     setDigitalSamples(retval);
   } CATCH_DISPLAY ("Could not get number of digital samples", "ctbAcquisition::toggleAcquisition")
   
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-    dBitOffset = 0;
-  } else {
   try {
-      dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
-    } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::toggleAcquisition")
-  }
+    dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
+  } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::toggleAcquisition")
 
   try {
     roMode = static_cast<int>(myDet->getReadoutMode().tsquash("Different values"));
@@ -1981,18 +1849,14 @@ void ctbAcquisition::setDbitEnable(Int_t reg){
 void ctbAcquisition::updateChans() {
 
   // dbit list
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+  try { 
+    auto retval = myDet->getRxDbitList().tsquash("Different values");
     dbitlist.clear();
-  } else {
-    try {
-      auto retval = myDet->getRxDbitList().tsquash("Different values");
-      dbitlist.clear();
-      if (!retval.empty()) {
-        for (const auto &value : retval) 
-          dbitlist.push_back(value);
-      }
-    } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbAcquisition::updateChans")
-  }
+    if (!retval.empty()) {
+      for (const auto &value : retval) 
+        dbitlist.push_back(value);
+    }
+  } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbAcquisition::updateChans")
 
   // adc mask
   try { 
@@ -2113,22 +1977,20 @@ void ctbAcquisition::ChangeNumberOfChannels(Long_t a){
 
 
 void ctbAcquisition::ChangeSerialOffset(){
-  changeDetector();
   // if (dataStructure) {
 
-  //    cout << cbDetType->GetSelected()<< endl;
-  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
-  //     cout << "settings offsets for MYTHEN" << endl;
-  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-  //     ms->setSerialOffset(eSerOff->GetIntNumber());
+  //   //  cout << cbDetType->GetSelected()<< endl;
+  //   // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
+  //   //   cout << "settings offsets for MYTHEN" << endl;
+  //   //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+  //   //   ms->setSerialOffset(eSerOff->GetIntNumber());
       
-  //   }
+  //   // }
   // }
 };
 
 
 void ctbAcquisition::ChangeDynamicRange(){
-  changeDetector();
   // if (dataStructure) {
 
   //    cout << cbDetType->GetSelected()<< endl;
@@ -2142,7 +2004,6 @@ void ctbAcquisition::ChangeDynamicRange(){
 };
 
 void ctbAcquisition::ChangeNumberOfChannels(){
-  changeDetector();
   // if (dataStructure) {
   //    cout << cbDetType->GetSelected()<< endl;
   //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
@@ -2156,24 +2017,6 @@ void ctbAcquisition::ChangeNumberOfChannels(){
     changePlot();
 };
 
-void ctbAcquisition::ChangeImagePixels(Long_t a){
-  ChangeImagePixels();
-};
-
-void ctbAcquisition::ChangeImagePixels(){
-  changeDetector();
-  // if (dataStructure) {
-  //    cout << cbDetType->GetSelected()<< endl;
-  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
-  //     cout << "settings number of channels for MYTHEN" << endl;
-  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-  //     ms->setNumberOfCounters(eNumCount->GetIntNumber());
-      
-  //   }
-  // }
-  // if (deserializer)
-  //  changePlot();
-};
 
 
 void ctbAcquisition::ChangeHistoLimitsPedSub(Long_t a){

ctbGui/ctbAcquisition.h

@@ -42,7 +42,7 @@ using namespace std;
 class ctbAcquisition : public TGGroupFrame {
 
 
-  enum {DESERIALIZER, MOENCH04, MOENCH02, MOENCH03, IMAGE32B, IMAGE16B, ADCSAR2, MYTHEN301, MYTHEN302};
+  enum {DESERIALIZER, MOENCH04, MOENCH02, ADCSAR2, MYTHEN301, MYTHEN302};
 
 
  private:
@@ -57,9 +57,6 @@ class ctbAcquisition : public TGGroupFrame {
   TGNumberEntry *eNumCount;
 
 
-  TGNumberEntry *ePixX;
-  TGNumberEntry *ePixY;
-
   TGNumberEntry *eFitADC;
   TGNumberEntry *eBitPlot;
   TGNumberEntry *eMinRaw;
@@ -234,8 +231,7 @@ class ctbAcquisition : public TGGroupFrame {
    void ChangeNumberOfChannels(Long_t);
    void ChangeDynamicRange();
    void ChangeDynamicRange(Long_t);
-   void ChangeImagePixels();
-   void ChangeImagePixels(Long_t);
+
 
    void canvasClicked();
    void FitADC();

ctbGui/ctbDacs.cpp

@@ -108,26 +108,15 @@ string ctbDac::getLabel() {
 
 }
 
-int ctbDac::getMoenchDacId() {
-  slsDetectorDefs::dacIndex moenchDacIndices[8] = {slsDetectorDefs::VBP_COLBUF, slsDetectorDefs::VIPRE, slsDetectorDefs::VIN_CM, slsDetectorDefs::VB_SDA, slsDetectorDefs::VCASC_SFP, slsDetectorDefs::VOUT_CM, slsDetectorDefs::VIPRE_CDS, slsDetectorDefs::IBIAS_SFP}; 
-
-  if (id >= 8) {
-    return id;
-  }
-  return static_cast<int>(moenchDacIndices[id]);
-}
 
 void ctbDac::setValue(Long_t a) {setValue();}
 
 void ctbDac::setValue() {
+
   cout << "setting dac! "<< id << " value " << dacsEntry->GetIntNumber() << " units " << dacsUnit->IsOn() << endl;
 
   try {
-    int sid = id;
-    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-      sid = getMoenchDacId();
-    }
-    myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsEntry->GetIntNumber(), dacsUnit->IsOn()); 
+    myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(id), dacsEntry->GetIntNumber(), dacsUnit->IsOn()); 
   } CATCH_DISPLAY ("Could not set dac " + to_string(id) + ".", "ctbDac::setValue")
 
   getValue();
@@ -139,11 +128,7 @@ void ctbDac::setOn(Bool_t b) {
     setValue();
   } else {
     try {
-      int sid = id;
-      if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-	sid = getMoenchDacId();
-      }
-      myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), -100, false);
+      myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(id), -100, false);
     } CATCH_DISPLAY ("Could not power off dac " + to_string(id) + ".", "ctbDac::setOn")
   }
   getValue();
@@ -151,11 +136,7 @@ void ctbDac::setOn(Bool_t b) {
 
 int ctbDac::getValue() { 
   try {
-    int sid = id;
-    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-      sid = getMoenchDacId();
-    }
-    int val = myDet->getDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsUnit->IsOn()).tsquash("Different values"); 
+    int val = myDet->getDAC(static_cast<slsDetectorDefs::dacIndex>(id), dacsUnit->IsOn()).tsquash("Different values"); 
     cout << "dac " << id << " " << val << endl;
     dacsValue->SetText(to_string(val).c_str());
     if (val >= 0) {

ctbGui/ctbDacs.h

@@ -45,7 +45,7 @@ class ctbDac : public TGHorizontalFrame {
    
    int setLabel(char *tit, int mv);
    string getLabel();
-int getMoenchDacId();
+
 
 
    ClassDef(ctbDac,0)
@@ -54,6 +54,8 @@ int getMoenchDacId();
 class ctbDacs : public TGGroupFrame {
 private:
   
+
+
    ctbDac *dacs[NDACS+2];
 
    sls::Detector* myDet;

ctbGui/ctbDefs.h

@@ -71,14 +71,14 @@ class ctbDefs {
                     std::string exceptionMessage,
                     std::string source) {
         // because sls_detector_exceptions cannot be included
-      if (exceptionMessage.find("hared memory") != std::string::npos) {
+        if (exceptionMessage.find("hared memory")) {
             throw;
         }
-      if (exceptionMessage.find("annot connect") != std::string::npos) {
+        if (exceptionMessage.find("annot connect")) {
             throw;
         }
         cprintf(RED, "Warning (%s): %s [Caught Exception: %s]\n", source.c_str(), message.c_str(), exceptionMessage.c_str());
         //return Message(qDefs::WARNING, message + std::string("\nCaught exception:\n") + exceptionMessage, source);
     }; 
 
-};
+};

ctbGui/ctbMain.cpp

@@ -259,10 +259,8 @@ ctbMain::ctbMain(const TGWindow *p, sls::Detector *det)
 
    cout << "connect mtab" << endl;
 
-  try{  
-   setReadoutMode(pat->getReadoutMode());  
-  } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
-
+   
+   setReadoutMode(pat->getReadoutMode());
    setADCEnable(adcs->setEnable());
    setAnalogSamples(pat->getAnalogSamples());
    setDigitalSamples(pat->getDigitalSamples());

ctbGui/ctbPattern.cpp

@@ -1035,42 +1035,33 @@ void ctbPattern::readoutModeChanged(int flags) {
 
 }
 
-int ctbPattern::getReadoutMode() {  
- int retval=slsDetectorDefs::ANALOG_ONLY;
-    
- if (myDet->getDetectorType().squash() == slsDetectorDefs::CHIPTESTBOARD) {
-   try{
-     retval = myDet->getReadoutMode().tsquash("Different values");
-   } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
-      
-   switch(retval) {
-   case slsDetectorDefs::ANALOG_AND_DIGITAL:
-     cout << "analog and digital" << endl;
-     cbAnalog->SetOn(kTRUE);
-     cbDigital->SetOn(kTRUE);
-     break;
-   case slsDetectorDefs::DIGITAL_ONLY:
-     cout << "digital only" << endl;
-     cbAnalog->SetOn(kFALSE);
-     cbDigital->SetOn(kTRUE);
-     break;
-   case slsDetectorDefs::ANALOG_ONLY:
-     cout << "analog only" << endl;
-     cbAnalog->SetOn(kTRUE);
-     cbDigital->SetOn(kFALSE);    
-     break;
-   default:
-     throw("unknown readout flag");
-   }
- } else {
-   cbAnalog->SetOn(kTRUE);
-   cbDigital->SetOn(kFALSE);    
- }
-    
+int ctbPattern::getReadoutMode() {
+  try{
+    auto retval = myDet->getReadoutMode().tsquash("Different values");
+    switch(retval) {
+      case slsDetectorDefs::ANALOG_AND_DIGITAL:
+        cout << "analog and digital" << endl;
+        cbAnalog->SetOn(kTRUE);
+        cbDigital->SetOn(kTRUE);
+        break;
+      case slsDetectorDefs::DIGITAL_ONLY:
+        cout << "digital only" << endl;
+        cbAnalog->SetOn(kFALSE);
+        cbDigital->SetOn(kTRUE);
+        break;
+      case slsDetectorDefs::ANALOG_ONLY:
+        cout << "analog only" << endl;
+        cbAnalog->SetOn(kTRUE);
+        cbDigital->SetOn(kFALSE);    
+        break;
+      default:
+        throw("unknown readout flag");
+    }
     Emit("readoutModeChanged(int)",static_cast<int>(retval));
     return retval;
- 
- 
+  } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
+
+  return -1;
 }
 
 int ctbPattern::getAnalogSamples() {
@@ -1084,17 +1075,13 @@ int ctbPattern::getAnalogSamples() {
   return -1;
 }
    
-int ctbPattern::getDigitalSamples() { 
-  int retval=0;
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::CHIPTESTBOARD) {
-    try{
-      auto retval = myDet->getNumberOfDigitalSamples().tsquash("Different values"); 
-    } CATCH_DISPLAY ("Could not get number of digital samples.", "ctbPattern::getDigitalSamples")
-	}
-  eDigitalSamples->SetNumber((Double_t)retval);
-  Emit("digitalSamplesChanged(const int)", eDigitalSamples->GetNumber());
-  return eDigitalSamples->GetNumber();
- 
+int ctbPattern::getDigitalSamples() {
+  try{
+    auto retval = myDet->getNumberOfDigitalSamples().tsquash("Different values");
+    eDigitalSamples->SetNumber((Double_t)retval);
+    Emit("digitalSamplesChanged(const int)", eDigitalSamples->GetNumber());
+    return eDigitalSamples->GetNumber();
+  } CATCH_DISPLAY ("Could not get number of triggers.", "ctbPattern::update")
 
   return -1;
 }

ctbGui/ctbSignals.cpp

@@ -374,43 +374,33 @@ void ctbSignals::update() {
 
   } CATCH_DISPLAY ("Could not get patternIOcontrol.", "ctbSignals::update")
 
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+  try {
+
+    auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
     // enable all
-    for (int is=0; is<64; is++) {
-      signals[is]->setDbitList(1);
-    } 
-    eDbitOffset->SetNumber(0);
-  } 
-  
-  // ctb
-  else {
-    try {
-
-      auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
-      // enable all
-      if (dbitlist.empty()) {
-        for (int is=0; is<64; is++) {
-          signals[is]->setDbitList(1);
-        } 
+    if (dbitlist.empty()) {
+      for (int is=0; is<64; is++) {
+        signals[is]->setDbitList(1);
+      } 
+    }
+    else {
+      // disable all
+      for (int is=0; is<64; is++) {
+        signals[is]->setDbitList(0);
       }
-      else {
-        // disable all
-        for (int is=0; is<64; is++) {
-          signals[is]->setDbitList(0);
-        }
-        // enable selected
-        for (const auto &value : dbitlist)  {
-          signals[value]->setDbitList(1);
-        }
+      // enable selected
+      for (const auto &value : dbitlist)  {
+        signals[value]->setDbitList(1);
       }
+    }
 
-    } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbSignals::update")
+  } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbSignals::update")
+
+  try {
+    auto val = myDet->getRxDbitOffset().tsquash("Different values");
+    eDbitOffset->SetNumber(val);
+  } CATCH_DISPLAY ("Could not get receiver dbit offset.", "ctbSignals::update")
 
-    try {
-      auto val = myDet->getRxDbitOffset().tsquash("Different values");
-      eDbitOffset->SetNumber(val);
-    } CATCH_DISPLAY ("Could not get receiver dbit offset.", "ctbSignals::update")
-  }
 }
 
 

docs/CMakeLists.txt

@@ -1,69 +1,69 @@
-find_package(Doxygen REQUIRED)
-find_package(Sphinx REQUIRED)
+find_package(Doxygen)
+find_package(Sphinx)
 
 
+if (DOXYGEN_FOUND AND SPHINX_FOUND)
+    message(${CMAKE_PROJECT_SORURCE_DIR}/slsDetectorSoftware/src)
+    # Utility to generate command line documentation
+    add_executable(gendoc src/gendoc.cpp)
+    # This is a bit hacky, but better than exposing stuff? 
+    target_include_directories(gendoc PRIVATE ${PROJECT_SOURCE_DIR}/slsDetectorSoftware/src)
+    target_link_libraries(gendoc PRIVATE
+      slsDetectorShared
+    )
+    set_target_properties(gendoc PROPERTIES 
+      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+    )
 
+    
+    
 
-# Utility to generate command line documentation
-add_executable(gendoc src/gendoc.cpp)
-# This is a bit hacky, but better than exposing stuff? 
-target_include_directories(gendoc PRIVATE ${PROJECT_SOURCE_DIR}/slsDetectorSoftware/src)
-target_link_libraries(gendoc PRIVATE
-  slsDetectorShared
-)
-set_target_properties(gendoc PROPERTIES 
-  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-)
+    #Doxygen
+    set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
+    set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+    configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
 
+    #Sphinx
+    set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+    set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR})
 
+    set(SPHINX_SOURCE_FILES
+      src/commandline.rst
+      src/container_utils.rst
+      src/dependencies.rst
+      src/detector.rst
+      src/index.rst
+      src/installation.rst
+      src/pydetector.rst
+      src/pyenums.rst
+      src/pyexamples.rst
+      src/receiver.rst
+      src/result.rst
+      src/type_traits.rst
+      src/ToString.rst
+      
+    )
 
+    foreach(filename ${SPHINX_SOURCE_FILES})
+      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${filename} 
+                    "${SPHINX_BUILD}/${filename}")
+    endforeach(filename ${SPHINX_SOURCE_FILES})
 
-#Doxygen
-set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
-set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
-
-#Sphinx
-set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR})
-
-set(SPHINX_SOURCE_FILES
-  src/commandline.rst
-  src/container_utils.rst
-  src/consuming.rst
-  src/dependencies.rst
-  src/detector.rst
-  src/index.rst
-  src/installation.rst
-  src/pydetector.rst
-  src/pyenums.rst
-  src/pyexamples.rst
-  src/receiver.rst
-  src/result.rst
-  src/type_traits.rst
-  src/ToString.rst
-  src/examples.rst
-  
-)
-
-foreach(filename ${SPHINX_SOURCE_FILES})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${filename} 
-              "${SPHINX_BUILD}/${filename}")
-endforeach(filename ${SPHINX_SOURCE_FILES})
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
-  "${SPHINX_BUILD}/conf.py"
-  @ONLY)
-
-add_custom_target(docs
-              gendoc
-              COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
-              COMMAND ${SPHINX_EXECUTABLE} -a -b html
-              -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
-              -c "${SPHINX_BUILD}"
-              ${SPHINX_BUILD}/src 
-              ${SPHINX_BUILD}/html
-              COMMENT "Generating documentation with Sphinx")
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
+        "${SPHINX_BUILD}/conf.py"
+        @ONLY)
 
+    add_custom_target(docs
+                    gendoc
+                    COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+                    COMMAND ${SPHINX_EXECUTABLE} -a -b html
+                    -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
+                    -c "${SPHINX_BUILD}"
+                    ${SPHINX_BUILD}/src 
+                    ${SPHINX_BUILD}/html
+                    COMMENT "Generating documentation with Sphinx")
 
+else (DOXYGEN_FOUND AND SPHINX_FOUND)
+  message("Doxygen and Sphinx are needed to build documentation")
+endif (DOXYGEN_FOUND AND SPHINX_FOUND)

docs/src/consuming.rst

@@ -1,116 +0,0 @@
-Consuming slsDetectorPackage
-===============================
-
-Depending on how you want to build your integration with 
-slsDetectorPackage there are a few different ways to 
-consume our package. The recommended way is to use one of the 
-CMake approaches. 
-
-
-
-CMake: slsDetectorPackage as submodule in your project
----------------------------------------
-
-If you are using CMake to build your integration and want to build everything
-in one go, we support adding slsDetectorPackage as a subfolder in your cmake project. 
-
-A minimal CMakeLists.txt could look like this: 
-
-.. code-block:: cmake
-
-    project(myDetectorIntegration)
-    cmake_minimum_required(VERSION 3.12)
-    add_subdirectory(slsDetectorPackage)
-
-    #Add your executable
-    add_executable(example main.cpp)
-    target_compile_features(example PRIVATE cxx_std_11)
-
-    #Link towards slsDetectorShared
-    target_link_libraries(example slsDetectorShared)
-
-A fully working example can be found at:
-
-https://github.com/slsdetectorgroup/cmake-subfolder-example
-
-
-CMake: find_package(slsDetectorPackage)
-------------------------------------------
-
-If you have compiled and installed slsDetectorPackage we also support
-find_package in CMake. If installed in a system wide location no path
-should be needed, otherwise specify cmake prefix path. 
-
-.. code-block:: cmake 
-
-    cmake_minimum_required(VERSION 3.12)
-    project(myintegration)
-
-    find_package(slsDetectorPackage 5.0 REQUIRED)
-    add_executable(example main.cpp)
-    target_link_libraries(example slsDetectorShared)
-
-
-Then assuming the slsDetectorPackage is installed in /path/to/sls/install
-you should be able to configure and build your project in this way. 
-
-.. code-block:: bash
-
-    cmake ../path/to/your/source -DCMAKE_PREFIX_PATH=/path/to/sls/install
-    make
-
-
-A minimal example is available at: https://github.com/slsdetectorgroup/minimal-cmake
-
-
-CMake: find_package and conda
-----------------------------------
-
-.. note::
-
-    conda can also be used for installing dependencies such as zmq, Qt4 etc. 
-
-find_package(slsDetectorPackage) also works if you have installed slsDetectorPackage using conda.
-The only difference is that you point CMake to $CONDA_PREFIX 
-
-
-.. code-block:: bash
-
-    #assuming myenv contains slsdetlib
-    conda activate myenv
-    cmake ../path/to/your/source -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
-    make
-
-Depending on your system compiler you might also have to install gxx_linux-64 to compiled.
-
-No tools minimal approach
------------------------------
-
-While not recommended it is still possible to specify the include and library paths
-manually when invoking g++. This can sometimes be handy for a quick try. 
-
-.. code-block:: cpp
-
-    #include "Detector.h"
-    #include <iostream>
-    int main(){
-
-        sls::Detector det;
-
-        //Get all values and print them
-        std::cout << "Hostname: " << det.getHostname() << "\n";
-        std::cout << "Type: " << det.getDetectorType() << "\n";
-        std::cout << "Udp ip: " << det.getSourceUDPIP() << "\n";
-
-
-        //Get mac addr 
-        const int module = 0;
-        auto mac = det.getSourceUDPMAC()[module];
-        std::cout << "Mac addr of module "<< module <<  " is " <<  mac.str() << '\n'; 
-
-    }     
-
-
-.. code-block:: bash
-
-    g++ -I/install/path/include/  -L/install/path/lib64/ myapp.cpp -lSlsDetector -lSlsSupport -Wl,-rpath=../install/path/lib64

docs/src/dependencies.rst

@@ -13,7 +13,7 @@ To use the basic building blocks, meaning sls_detector_get/put and
 the shared libraries these are needed: 
 
  * Linux, preferably recent kernel (currently no cross platform support)
- * CMake > 3.12 
+ * CMake > 3.9 
  * C++11 compatible compiler. (We test with gcc and clang)
  * ZeroMQ version 4
 
@@ -24,7 +24,7 @@ GUI
 The GUI is currently using Qt4 but watch out for an upgrade to 5. 
 
  * Qt 4.8
- * Qwt 6.1
+ * Qwt 6
 
 -----------------------
 Python bindings

docs/src/examples.rst

@@ -1,115 +0,0 @@
-
-
-
-Examples
-===========
-
-Setup 
-------------
-
-The examples here assume that you have compiled and installed slsDetectorPackage
-to ~/sls/install and that the option for SLS_USE_SIMULATOR was enabled. This also builds
-the virtual detector servers that we will be using for testing. 
-
-We also add ~/sls/detector/install/bin to the path for convenience. 
-
-Compile examples
--------------------
-
-The source code of the examples is available at:
-https://github.com/slsdetectorgroup/api-examples
-
-
-.. code-block:: bash
-
-    git clone https://github.com/slsdetectorgroup/api-examples.git
-    mkdir build && cd build
-    cmake ../api-examples -DCMAKE_PREFIX_PATH=~/sls/detector/install
-    make
-
-Below follows a short description of what is included in the examples.
-
-
-Running a config file [e1]
------------------------------
-
-
-.. code-block:: cpp
-
-    #include "Detector.h"
-    ...
-    sls::Detector det;
-    det.loadConfig("path/to/config/file.config");
-
-
-
-To configure the connection between PC and detector the easiest 
-is to run a config file. For this example we first launch a virtual Jungfrau server and
-then set up the detector. 
-
-**Launch a virtual detector server**
-
-.. code-block:: bash
-
-    jungfrauDetectorServer_virtual
-
-This launches a virtual Jungfrau detector server. As default is uses port 1952 and 1953
-for communication over TCP. Most commands go on 1952 and only stop and status on 1953. 
-
-**Run example to configure**
-
-.. code-block:: bash
-
-    ./e1-config one_det_no_receiver.config
-    - 12:01:06.371 INFO: Shared memory deleted /slsDetectorPackage_multi_0_sls_0
-    - 12:01:06.371 INFO: Shared memory deleted /slsDetectorPackage_multi_0
-    - 12:01:06.372 INFO: Shared memory created /slsDetectorPackage_multi_0
-    - 12:01:06.376 INFO: Loading configuration file: one_det_no_receiver.config
-    - 12:01:06.376 INFO: Adding detector localhost
-    - 12:01:06.377 INFO: Shared memory created /slsDetectorPackage_multi_0_sls_0
-    - 12:01:06.377 INFO: Checking Detector Version Compatibility
-    - 12:01:06.378 INFO: Detector connecting - updating!
-    hostname [localhost]
-
-
-    Jungfrau detector with 1 modules configured
-
-
-Using the return type sls::Result [e2]
------------------------------------------
-
-Since many our detectors have multiple modules we cannot return
-a single value when reading from the Detector. Hostname, Ip and also
-for example exposure time can differ between modules. 
-
-Therefore we return Result<T> which is a thin wrapper around
-std::vector. 
-
-.. code-block:: cpp
-
-    sls::Result<int> res1{1, 1, 1};
-    std::cout << "res1: " << res1 << '\n';
-    res1.squash();
-    res1.squash(-1);
-
-
-
-Setting exposure time [e3]
------------------------------------------
-
-For setting times, like exposure time, period, delay etc. 
-we use std::chrono::duration. 
-
-Example 3 shows how to set and read exposure time as well
-as converting to floating point. 
-
-.. code-block:: cpp
-
-    #include "Detector.h"
-    #include <chrono>
-    ...
-    std::chrono::microseconds t0{500};
-    det.setExptime(t0);
-
-
-

docs/src/index.rst

@@ -6,18 +6,12 @@
 Welcome to slsDetectorPackage's documentation!
 ==============================================
 
-.. note :: 
-
-    This is the documentation for the latest development version of slsDetectorPackage
-    For documentation on current and previous releases visit the official page: https://www.psi.ch/en/detectors/documentation
-
 .. toctree::
     :maxdepth: 1
     :caption: Installation:
 
     installation
     dependencies
-    consuming
    
 .. toctree::
     :caption: C++ API
@@ -26,7 +20,6 @@ Welcome to slsDetectorPackage's documentation!
     detector
     result
     receiver
-    examples
 
 .. toctree::
     :caption: Python API

docs/src/installation.rst

@@ -2,68 +2,4 @@
 Installation
 ==============================================
 
-Build from source using CMake
----------------------------------
-
-.. note :: 
-
-    The default branch of our git repository is developer. It contains the 
-    latest development version. It is expected to compile and work but 
-    features might be added or tweaked. In some cases the API might also change
-    without being communicated. If absolute stability of the API is needed please
-    use one of the release versions. 
-
-.. code-block:: bash
-
-    git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
-    mkdir build && cd build
-    cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
-    make -j12
-    make install
-
-Install binaries using conda
---------------------------------
-
-.. code-block:: bash
-
-    #Add channels for dependencies and our library
-    conda config --add channels conda-forge
-    conda config --add channels slsdetectorgroup
-    conda config --set channel_priority strict
-
-    #cerate an environment with our library, then activate
-    conda create -n myenv slsdetlib=2020.03.18.dev2
-    codna activate myenv
-
-    #ready to use
-    sls_detector_get exptime
-    etc ...
-
-
-
-Build from source on old distributions
------------------------------------------
-
-If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
-it's possible to install a newer gcc using conda and build the slsDetectorPackage
-using this compiler
-
-.. code-block:: bash
-
-    #Create an environment with the dependencies
-    conda create -n myenv gxx_linux-64 cmake zmq
-    conda activate myenv
-    cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
-    make -j12
-
-
-Build this documentation
--------------------------------
-
-The documentation for the slsDetectorPackage is build using a combination 
-of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
-is to use conda 
-
-.. code-block:: bash
-
-    conda create -n myenv python sphinx sphinx_rtd_theme
+get the source etc.

docs/src/pydetector.rst

@@ -1,9 +1,9 @@
 Detector
 =====================================================
 
-.. py:currentmodule:: slsdet
+.. py:currentmodule:: sls_detector
 
-.. autoclass:: Detector
+.. autoclass:: ExperimentalDetector
     :members:  
     :undoc-members:
     :show-inheritance:

examples/moench01_T1_lab.config

@@ -1,14 +1,4 @@
-initialchecks 0
-#############################################
-### edit with hostname or IP address of your detector 
-############################################
-hostname bchip181+
-runclk 40
-adcclk 20
-dbitclk 40
-
-
-
+hostname bchip085+
 
 patword 0000 0000000000000000
 patword 0001 0000000000000000
@@ -418,84 +408,84 @@ patnloop1 0
 patloop2 0400 0400
 patnloop2 0
 patwait0 00aa
-patwaittime0 10000
+patwaittime0 40000
 patwait1 0400
 patwaittime1 0
 patwait2 0400
 patwaittime2 0
 
 
-#0:rx_tcpport 1977
+####mcp2011
+#0:rx_udpip 10.1.1.102
+#0:detectorip 10.1.1.19
+#0:rx_udpport 32410
+####gui listening to 
+#zmqip 129.129.202.131
+#zmqport 30001
+####data streaming out of
+#rx_zmqip 10.1.2.103
+#rx_zmqport 30003
+#0:rx_hostname mpc2011
 
-#############################################
-### edit with 10 Gbs IP of your server
-############################################
-0:udp_dstip 10.1.1.102
-#0:udp_dstip 129.129.202.136
-#############################################
-### edit with any number in the subnet of your server (first 3 numbers as above)
-############################################
-0:udp_srcip 10.1.1.19
-#0:udp_srcip 129.129.202.13
-
-0:udp_dstport 33410
-#############################################
-### edit with 10 Gbs IP of your server
-############################################
-#zmqip 129.129.202.110
-#rx_zmqip 10.1.1.102
-#rx_zmqport 30001
-#############################################
-### edit with 1 Gbs IP of PC where you will run the GUI
-############################################
-#zmqip 129.129.202.110
-#zmqport 50001
+####mx-test-1
+0:rx_udpip 10.1.1.100
+0:detectorip 10.1.1.19
+0:rx_udpport 32410
+####gui listening to (on receiver pc)
+zmqip 129.129.202.92
+zmqport 30001
+####data streaming out of
+rx_zmqip 10.1.1.100
+rx_zmqport 30003
+0:rx_hostname pcmoench01
 
 
-#############################################
-### edit with hostname or 1Gbs IP address of your server
-############################################
-rx_hostname mpc2011
 
-tengiga 1
 
+
+
+
+
+
+
+
+#turn on datastream from commandline
 rx_datastream 1
-rx_readfreq 1
+
+r_readfreq 1
+
+#0:configuremac -1
+rx_datastream 1
+
+r_readfreq 1
 
 
-dac 6 800
-dac 0 1300
-dac 4 1428
-dac 1 1000
-dac 7 900
-dac 3 680
-dac 2 1400
-dac 5 1200
+dac:6 800
+dac:0 1300
+dac:4 1428
+dac:1 1000
+dac:7 900
+dac:3 680
+dac:2 1400
+dac:5 1200
 adcinvert 4a342593
-#0xb5cbda6c
-asamples 5000
-dsamples 0
-adcphase 30 deg
-adcpipeline 14
+samples 5000
+adcphase 90
+adcpipeline 15
 adcreg 14 40
-
-
-frames 1000
-period 0.001
-#############################################
-### edit with directory you want to write to
-############################################
-fpath /tmp/
-fwrite 0
-
-romode analog
-#rx_jsonaddheader frameMode
-rx_jsonpara frameMode newpedestal
-#rx_jsonaddheader detectorMode
-rx_jsonpara detectorMode analog
-#flags newpedestal
-#flags analog
-
-reg 0x5e 0x00010000
-#powerchip 1
+powerchip 1
 vhighvoltage 90
+period 0.005
+
+
+
+
+
+
+frames 100
+period 0.1
+outdir /scratch/
+enablefwrite 0
+
+
+

examples/moench03_T1.config

@@ -1,63 +0,0 @@
-initialchecks 0
-#############################################
-### edit with hostname or IP address of your detector 
-############################################
-hostname bchip181+
-
-#############################################
-### edit with hostname or 1Gbs IP address of your server
-############################################
-rx_hostname mpc2011
-
-rx_tcpport 1954
-#############################################
-### edit with 10 Gbs IP of your server
-############################################
-udp_dstip 10.1.1.102
-#############################################
-### edit with any number in the subnet of your server (first 3 numbers as above)
-############################################
-udp_srcip 10.1.1.19
-udp_dstport 32411
-
-#############################################
-### edit with 10 Gbs IP of your server
-############################################
-rx_zmqip 10.1.1.102
-rx_zmqport 50003
-#############################################
-### edit with 1 Gbs IP of PC where you will run the GUI
-############################################
-zmqip 129.129.202.136
-zmqport 50001
-
-
-
-
-tengiga 1
-rx_datastream 1
-
-
-
-frames 100000
-period 0.0006
-#############################################
-### edit with directory you want to write to
-############################################
-fpath /mnt/moench_data/scratch/
-fwrite 0
-rx_datastream 1
-
-rx_jsonpara frameMode frame
-rx_jsonpara detectorMode counting
-rx_discardpolicy discardpartial
-
-
-adcpipeline 15
-
-powerchip 1
-vhighvoltage 90
-
-#adcreg 0x14 0x40
-
-

integrationTests/test-integrationDectector.cpp

@@ -4,7 +4,7 @@
 #include "ClientSocket.h"
 #include "logger.h"
 #include "DetectorImpl.h"
-#include "Module.h"
+#include "slsDetector.h"
 #include "sls_detector_defs.h"
 
 #include "Timer.h"
@@ -23,10 +23,10 @@
 // extern dt type;
 
 TEST_CASE("Single detector no receiver", "[.integration][.single]") {
-    auto t = Module::getTypeFromDetector(test::hostname);
+    auto t = slsDetector::getTypeFromDetector(test::hostname);
     CHECK(t == test::type);
 
-    Module d(t);
+    slsDetector d(t);
     CHECK(d.getDetectorTypeAsEnum() == t);
     CHECK(d.getDetectorTypeAsString() == test::detector_type);
 
@@ -51,7 +51,7 @@ TEST_CASE("Set control port then create a new object with this control port",
     int new_cport = 1993;
     int new_sport = 2000;
     {
-        Module d(test::type);
+        slsDetector d(test::type);
         d.setHostname(test::hostname);
         CHECK(d.getControlPort() == old_cport);
         d.setControlPort(new_cport);
@@ -60,7 +60,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
     {
-        Module d(test::type);
+        slsDetector d(test::type);
         d.setHostname(test::hostname);
         d.setControlPort(new_cport);
         d.setStopPort(new_sport);
@@ -73,7 +73,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
 
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.getStopPort() == DEFAULT_PORTNO + 1);
     d.freeSharedMemory();
@@ -86,11 +86,11 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
     SingleDetectorConfig c;
 
     // Read type by connecting to the detector
-    auto type = Module::getTypeFromDetector(c.hostname);
+    auto type = slsDetector::getTypeFromDetector(c.hostname);
     CHECK(type == c.type_enum);
 
-    // Create Module of said type and set hostname and detector online
-    Module d(type);
+    // Create slsDetector of said type and set hostname and detector online
+    slsDetector d(type);
     CHECK(d.getDetectorTypeAsEnum() == type);
     CHECK(d.getDetectorTypeAsString() == c.type_string);
 
@@ -133,7 +133,7 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
 
 
 TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
 
     // Check that detector server is unlocked then lock
@@ -155,7 +155,7 @@ TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
 }
 
 TEST_CASE("Set settings", "[.integration][.single]"){
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD);
 }
@@ -185,7 +185,7 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
     // MEASURED_SUBPERIOD,	/**< measured subperiod */
     // MAX_TIMERS
 
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
 
     // Number of frames
@@ -226,8 +226,8 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
 
 // TEST_CASE("Aquire", "[.integration][eiger]"){
 //     SingleDetectorConfig c;
-//     auto type = Module::getTypeFromDetector(c.hostname);
-//     Module d(type);
+//     auto type = slsDetector::getTypeFromDetector(c.hostname);
+//     slsDetector d(type);
 //     d.setHostname(c.hostname);
 
 //     auto period = 1000000000;

manual/manual-client/Eiger_short.tex

@@ -176,7 +176,6 @@ One can configure all the detector settings in a parameter file {\tt{setup.det}}
 \begin{verbatim}
 sls_detector_put 0-parameters setup.det
 \end{verbatim}
-Note that the parameter file for any realease before 4.1.1 has not the possibility to understand parameters to be set differently for different half modules, i.e.  {\tt{0:txndelay\_left xxxxx},\tt{1:txndelay\_left yyyyy}}. 
 
 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:
@@ -610,19 +609,18 @@ The detector can be setup such to receive external triggers. Connect a LEMO sign
 \begin{verbatim}
 sls_detector_put 0-timing [auto/trigger/burst_trigger/gating]
 sls_detector_put 0-frames x
-sls_detector_put 0-cycles y
+sls_detector_put 0-triggers y
 sls_detector_acquire 0-
 \end{verbatim}
 No timeout is expected between the start of the acquisition and the arrival of the first trigger. 
 
 Here are the implemented options so far:
 \begin{itemize}
-\item {\tt{auto}} is the software controlled acquisition (does not use triggers), where {\tt{exptime}} and {\tt{period}} have to be set. Set number of cycles (i.e. triggers) to 1 using {\tt{cycles}}. Set number of frames using {\tt{frames}}.
-\item {\tt{trigger}} 1 frame taken for 1 trigger. Your {\tt{frames}} needs to be  1 always, {\tt{cycles}} can be changed and defines how many triggers are considered.  {\tt{exptime}} needs to be set. In the GUI this is called trigger exposure series.  
-\item {\tt{burst\_trigger}} gets only 1 trigger, but allows to take many frames. With {\tt{frames}} one can change the number of frames. {\tt{cycles}} needs to be 1.  {\tt{exptime}} and {\tt{period}} have to be set. In the gui it is called trigger readout.
-\item{\tt{gating}} allows to get a frame only when the trigger pulse is gating. Note that in this case the exp time and period only depend on the gating signal. {\tt{cycles}} allows to select how many gates to consider.  Set number of frames to 1 using {\tt{frames}}. IMPORTANT: Up to firmware 23, the last subframe is oblige to finish being taken, despite the gate signal going down. This will be configurable from later fw and software version. Also, in gating mode, due to timimg of the state machine, you need to leave 500~$\mu$s deadtime between the end on an acquisition and the next. This is as the state machine is unable to check for changes in the status in the first 500~$\mu$s. ATTENTION: if you are in 16 bit mode and you are applying online rate corrections, as now the exptime is generated by the trigger, you might not have correct rate corrections. If you know what the exposure time is in the gating signal, then you can set the {\tt{exptime}} once and the rate corrections will be correct. In 32 bit mode, it does not matter as the rate corrections depends on the {\tt{subexptime}} which is software set independently from the gate exptime.
+\item {\tt{auto}} is the software controlled acquisition (does not use triggers), where {\tt{exptime}} and {\tt{period}} have to be set. Set number of triggers (i.e. triggers) to 1 using {\tt{triggers}}. Set number of frames using {\tt{frames}}.
+\item {\tt{trigger}} 1 frame taken for 1 trigger. Your {\tt{frames}} needs to be  1 always, {\tt{triggers}} can be changed and defines how many triggers are considered.  {\tt{exptime}} needs to be set. In the GUI this is called trigger exposure series.  
+\item {\tt{burst\_trigger}} gets only 1 trigger, but allows to take many frames. With {\tt{frames}} one can change the number of frames. {\tt{triggers}} needs to be 1.  {\tt{exptime}} and {\tt{period}} have to be set. In the gui it is called trigger readout.
+\item{\tt{gating}} allows to get a frame only when the trigger pulse is gating. Note that in this case the exp time and period only depend on the gating signal. {\tt{triggers}} allows to select how many gates to consider.  Set number of frames to 1 using {\tt{frames}}. IMPORTANT: Up to firmware 23, the last subframe is oblige to finish being taken, despite the gate signal going down. This will be configurable from later fw and software version. Also, in gating mode, due to timimg of the state machine, you need to leave 500~$\mu$s deadtime between the end on an acquisition and the next. This is as the state machine is unable to check for changes in the status in the first 500~$\mu$s. ATTENTION: if you are in 16 bit mode and you are applying online rate corrections, as now the exptime is generated by the trigger, you might not have correct rate corrections. If you know what the exposure time is in the gating signal, then you can set the {\tt{exptime}} once and the rate corrections will be correct. In 32 bit mode, it does not matter as the rate corrections depends on the {\tt{subexptime}} which is software set independently from the gate exptime.
 
-ATTENTION: From release 4.1.1 with the {\tt{trigger}} option it is possible to have software triggers as a debugging tool (instead of the hardware trigger signal. One should start the acquisition (with the blocking {\tt{sls\_detector\_acquire}} if wanted and with another client one can send the softare trigger {\tt{sls\_detector\_put status trigger}}. This option allows for example to perform a motor scan (moving a motor in between single images) and still writing all images to the same file. 
 When using 32-bit mode, by default the acquisition ends the last complete subframe that was started when still the acquisition time was valid. This has been chosen as many people wants to know the exact acquisition time for when the detector was taking data and also, if {\tt{ratecorr}} are active, the last subframe will be correctly corrected, while otherwise it will be corrected with a wrong subdeadtime. 
 However, from 4.1.0, in gating mode, an option to immediately terminate the subframe when the gate signal goes down it is implemented to stop the acquisition at the same time.  This option is {\tt{./sls\_detector\_put interruptsubframe 1}} while the default option is {\tt{./sls\_detector\_put interruptsubframe 0}}.  
 
@@ -630,13 +628,13 @@ However, from 4.1.0, in gating mode, an option to immediately terminate the subf
 
 Hardware-wise, the ENABLE OUT signal outputs when the chips are really acquiring. This means that the single subframes will be output 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}} trigger modes and make both {\tt{frames}} and {\tt{cycles}} configurable at the same time.
+We are planning to change some functionality, i.e. unify the {\tt{trigger}} and {\tt{burst\_trigger}} trigger modes and make both {\tt{frames}} and {\tt{triggers}} configurable at the same time.
 
 There is the possibility to use {\tt{timing trigger/burst\_trigger}} and send software single commands to fake the trigger. This is done with:
 \begin{verbatim}
 sls_detector_put 0-timing [trigger/burst_trigger]
 sls_detector_put 0-frames x
-sls_detector_put 0-cycles y
+sls_detector_put 0-triggers y
 sls_detector_status trigger
 \end{verbatim}
  Note that this functionality is very (!) useful if you need to do something between and acquisition and the next. This can be used to do a fast threshold scan for example. See section~\ref{sec:fastthresholdscan}.
@@ -717,7 +715,7 @@ If \textbf{dr} is 32 and \textbf{clkdivider} is not 2, whatever the detector get
 Here is a list of parameters that should be reset:
 \begin{enumerate}
 \item  \textbf{resetframescaught} should be reset to zero after every acquisition taken with {\tt{receiver start}},{\tt{status start}},{\tt{receiver stop}}. If the acquisition is taken with {\tt{sls\_detector\_acquire}}, there is no need to reset this.
-\item After changing the {\tt{timing}} mode of the detector, one should reset to '1' the unused value, in that specific timing mode, between \textbf{frames} and \textbf{cycles}. See section~\ref{triggering} for how to use the timing. At the present moment the detector will acquire more frames than planned if the variable not used between \textbf{frames} and \textbf{cycles} is not reset. In future releases, the unused variable will be ignored. Still resetting is a good practice.
+\item After changing the {\tt{timing}} mode of the detector, one should reset to '1' the unused value, in that specific timing mode, between \textbf{frames} and \textbf{triggers}. See section~\ref{triggering} for how to use the timing. At the present moment the detector will acquire more frames than planned if the variable not used between \textbf{frames} and \textbf{triggers} is not reset. In future releases, the unused variable will be ignored. Still resetting is a good practice.
       
 \end{enumerate}
 
@@ -990,14 +988,13 @@ Packets Caught Mask        : 64 bytes
 Note that if one wants to  reconstruct the real time the detector was acquiring in 32 bit (autosumming mode), one would have to multiply the SubExptime (ns) for the SubFrame Number. 
 
 \subsection{Offline image reconstruction}
-The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. However, it can be retrieved from \\
-{\tt{git clone https://github.com/slsdetectorgroup/slsImageReconstruction.git slsImageReconstruction}}.\\
-Checkout the {\tt{v3.1}} branch if in a 3.1.X release, the {\tt{v4.0.0}} branch if in 4.0.X release, or the {\tt{v4.1}} branch if in 4.1.X release of the {\tt{slsDetector}} code. There is a {\tt{developer}} branch that has newer updates but needs to be tested.
+The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. The code is still available doing \\
+{\tt{git clone git@git.psi.ch:sls\_detectors\_software/sls\_image\_reconstruction.git slsImageReconstruction}}.
+Checkout the {\tt{developer}} branch if in a 3.1.X release, the {\tt{v4.0.0}} branch if in 4.0.X release, or the {\tt{v4.1}} branch if in 4.1.X release of the {\tt{slsDetector}} code.
 
-Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5}. \textbf{tiff} and  \textbf{root} format. The detector writes 2 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
+Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5} and \textbf{root} format. The detector writes 4 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
 
-Note that the number of images per file in the 3.1.X release is hardcoded and needs to match whatever you are using in \\
-{\tt{slsDetectorsPackage/slsReceiverSoftware/include/sls\_receiver\_defs.h}}:
+Note that the number of images per file in the 3.1.X release is hardcoded and needs to match whatever you are using in {\tt{slsDetectorsPackage/slsReceiverSoftware/include/sls\_receiver\_defs.h}}:
 \begin{verbatim}
 #define EIGER_MAX_FRAMES_PER_FILE	2000
 \end{verbatim}
@@ -1046,12 +1043,11 @@ cbfMaker9M [file_name_with_dir]
 contain the hardcoded geometry for the 1.5M (3 modules horizontal on the long side), the 1.5M OMNY geometry (3 modules next to each other 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.
 
-From the new {{v4.1.1}} all the define that you see below need only to be modified in the Makefile.
-
 Make sure the following options are uncommented in the {\tt{slsImageReconstruction/src/main\_csaxs.cpp}} file. 
 \begin{verbatim}
 #define MYCBF
-##following line only if you need to process with BUBBLE
+##following line only if you need to process with 
+##BUBBLE (Material Science / uXAS beamlines).
 #define MSHeader 
 \end{verbatim}
 Compile it with: 
@@ -1100,10 +1096,6 @@ To use it any geometry:\\
 eg.
 {\tt image /scratch/run\_63\_d0\_f000000000000\_3.raw  3072 512 1 2 ``Eiger'' 0}.\\
 
-With new new software, the new options to run the cbfMaker/hdf5Maker executablesare: 
-
-./hdf5Maker -f [filename] -d [outdirname] -x [npix\_x] -y [npix\_y] -v  (v flags that longedge is vertical, no argument) -n [name\_of\_hdf5\_dataset] -m (mask\_hot\_pixels, need to be in file maskpix.txt in the samedir as executable, no argument) -g [0,no filling/1,division/2,interpolation/3,interpolate,alternative]  
-
 \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 boards: 
@@ -1265,7 +1257,7 @@ We have also been requested if we could speed up the threshold scan. At the mome
 ./sls_detector_put enablefwrite 0
 ./sls_detector_put resetframescaught 0 
 ./sls_detector_put index 0
-./sls_detector_put cycles 21
+./sls_detector_put triggers 21
 ./sls_detector_put receiver start
 ./sls_detector_put status start 
 for i in $(seq 0 20); 
@@ -1523,8 +1515,8 @@ frames number
 where {\tt{number}} is a string to be interpreted as an integer.
 
 \item \begin{verbatim}
-sls_detector_get cycles
-cycles number 
+sls_detector_get triggers
+triggers number 
 \end{verbatim}
 where {\tt{number}} is a string to be interpreted as an integer.
 

python/scripts/basic.py

@@ -3,9 +3,9 @@ import sys
 import numpy as np
 sys.path.append(os.path.join(os.getcwd(), 'bin'))
 
-from slsdet import Detector, Mythen3, Eiger, Jungfrau, DetectorDacs, Dac, Ctb
-from slsdet import dacIndex, readoutMode
-from slsdet.lookup import view, find
+from sls_detector import Detector, Mythen3, Eiger, Jungfrau, DetectorDacs, Dac, Ctb
+from sls_detector import dacIndex, readoutMode
+from sls_detector.lookup import view, find
 
 d = Detector()
 # e = Eiger()

python/scripts/cmd_python.py

@@ -4,11 +4,10 @@ out = subprocess.run(['g', 'list'], stdout = subprocess.PIPE, encoding=locale.ge
 cmd = out.stdout.splitlines()
 cmd.pop(0)
 
-from slsdet import Detector, Eiger, Ctb
+from sls_detector import Detector, Eiger, Ctb
 
 pycmd = dir(Detector)+dir(Eiger)+dir(Ctb)
 
-#Add commands that we should not expect as direct commands in python
 pycmd += ['vrf', 'vtr', 'vrs', 'vtgstv', 'vsvn', 'vtrim',
 'vsvp', 'vth1', 'vth2', 'vth3', 'vshaper', 'vshaperneg', 'rxb_rb',
 'rxb_lb', 'vref_prech', 'vref_rstore', 'vref_cds',

python/scripts/generate_functions.py

@@ -13,18 +13,12 @@ import argparse
 
 from parse import system_include_paths
 
-default_build_path = "/home/l_frojdh/sls/build/"
+default_build_path = "/home/l_frojdh/sls/build/" 
 fpath = "../../slsDetectorSoftware/src/Detector.cpp"
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument(
-    "-p",
-    "--build_path",
-    help="Path to the build database",
-    type=str,
-    default=default_build_path,
-)
+parser.add_argument("-p", "--build_path", help="Path to the build database", type = str, default=default_build_path)
 cargs = parser.parse_args()
 
 db = cindex.CompilationDatabase.fromDirectory(cargs.build_path)
@@ -32,7 +26,7 @@ index = cindex.Index.create()
 args = db.getCompileCommands(fpath)
 args = list(iter(args).__next__().arguments)[0:-1]
 args = args + "-x c++ --std=c++11".split()
-syspath = system_include_paths("clang++")
+syspath = system_include_paths('clang++')
 incargs = ["-I" + inc for inc in syspath]
 args = args + incargs
 
@@ -45,7 +39,6 @@ ag = []
 
 lines = []
 
-ag2 = []
 
 def get_arguments(node):
     args = [a.type.spelling for a in node.get_arguments()]
@@ -53,21 +46,9 @@ def get_arguments(node):
         "py::arg() = Positions{}" if item == "sls::Positions" else "py::arg()"
         for item in args
     ]
-    args = ", ".join(args)
+    args = ', '.join(args)
     if args:
-        args = f", {args}"
-    return args
-
-
-def get_fdec(node):
-    args = [a.type.spelling for a in node.get_arguments()]
-    if node.result_type.spelling:
-        return_type = node.result_type.spelling
-    else:
-        return_type = 'void'
-    
-    args = ", ".join(args)
-    args = f'({return_type}(Detector::*)({args}))'
+        args = f', {args}'
     return args
 
 
@@ -81,36 +62,23 @@ def visit(node):
                 ):
                     m.append(child)
                     args = get_arguments(child)
-                    fs = get_fdec(child)
-                    lines.append(
-                        f'.def("{child.spelling}",{fs} &Detector::{child.spelling}{args})'
-                    )
+                    lines.append(f'.def(\"{child.spelling}\", &Detector::{child.spelling}{args})')
     for child in node.get_children():
         visit(child)
 
-        # .def("setRxHostname",
-        #      (void (Detector::*)(const std::string &, Positions)) &
-        #          Detector::setRxHostname,
-        #      py::arg(), py::arg() = Positions{})
-        # .def("setRxHostname",
-        #      (void (Detector::*)(const std::vector<std::string> &)) &
-        #          Detector::setRxHostname,
-        #      py::arg())
-
 
 visit(tu.cursor)
 
 
-with open("../src/detector_in.cpp") as f:
+with open('../src/detector_in.cpp') as f:
     data = f.read()
-s = "".join(lines)
-s += ";"
-text = data.replace("[[FUNCTIONS]]", s)
-warning = "/* WARINING This file is auto generated any edits might be overwritten without warning */\n\n"
-with open("../src/detector.cpp", "w") as f:
+s = ''.join(lines)
+s += ';'
+text = data.replace('[[FUNCTIONS]]', s)
+warning = '/* WARINING This file is auto generated any edits might be overwritten without warning */\n\n'
+with open('../src/detector.cpp', 'w') as f:
     f.write(warning)
     f.write(text)
 
 # run clang format on the output
-subprocess.run(["clang-format", "../src/detector.cpp", "-i"])
-
+subprocess.run(['clang-format', '../src/detector.cpp', '-i'])

python/scripts/list_tested_cmd.py

@@ -1,19 +1,11 @@
-"""
-Utility to find and list which command line functions have tests and
-where the tests are located
-"""
-#local import for for parsing c++
 import parse
-
-#General python stuff
+from pathlib import Path
 import os
 import locale
 import argparse
-import subprocess
-from pathlib import Path
-
-#Realative path from this dir
 path  = Path('../../slsDetectorSoftware/tests/')
+import subprocess
+
 parser = argparse.ArgumentParser()
 parser.add_argument("-s", "--startswith", help="for filter", type = str, default=None)
 args = parser.parse_args()
@@ -23,12 +15,15 @@ tested = []
 for fname in files:
     with open(path/fname) as f:
         data = f.read()
+
     data = parse.remove_comments(data)
     data = data.splitlines()
+
+
     for line in data:
         if 'TEST_CASE' in line or 'SECTION' in line:
             cmd = line.split("\"")[1]
-            tested.append([cmd, fname])
+            tested.append(cmd)
 
 out = subprocess.run(['g', 'list'], stdout = subprocess.PIPE, encoding=locale.getpreferredencoding())
 all_cmd = out.stdout.splitlines()
@@ -38,18 +33,18 @@ all_cmd.pop(0)
 
 if args.startswith is not None:
     all_cmd = [cmd for cmd in all_cmd if cmd.startswith(args.startswith)]
-    tested = [cmd for cmd in tested if cmd[0].startswith(args.startswith)]
+    tested = [cmd for cmd in tested if cmd.startswith(args.startswith)]
 
-tn = [cmd[0] for cmd in tested]
 
-not_tested = [cmd for cmd in all_cmd if cmd not in tn]
-misnamed = [cmd for cmd in tn if cmd not in all_cmd]
-tested = [cmd for cmd in tested if cmd[0] in all_cmd]
+
+not_tested = [cmd for cmd in all_cmd if cmd not in tested]
+misnamed = [cmd for cmd in tested if cmd not in all_cmd]
+tested = [cmd for cmd in tested if cmd in all_cmd]
 
 
 print("\nThe following commands are tested:")
 for cmd in tested:
-    print(f'{cmd[0]:>18} : {cmd[1]}')
+    print(cmd)
 
 print("\nThe following commands are NOT tested:")
 for cmd in not_tested:

python/setup.py

@@ -8,7 +8,7 @@ import sys
 import setuptools
 import os
 
-__version__ = os.environ.get('GIT_DESCRIBE_TAG', 'developer')
+__version__ = 'udp'
 
 
 def get_conda_path():
@@ -45,7 +45,7 @@ ext_modules = [
             # get_pybind_include(),
             # get_pybind_include(user=True),
             os.path.join('../libs/pybind11/include'),
-            os.path.join(get_conda_path(), 'include'),
+            os.path.join(get_conda_path(), 'include/slsDetectorPackage'),
 
         ],
         libraries=['SlsDetector', 'SlsReceiver', 'zmq'],

python/slsdet/detector.py

@@ -1,6 +1,5 @@
 from _slsdet import CppDetectorApi
 from _slsdet import slsDetectorDefs
-from _slsdet import IpAddr, MacAddr
 
 runStatus = slsDetectorDefs.runStatus
 speedLevel = slsDetectorDefs.speedLevel
@@ -13,13 +12,12 @@ import datetime as dt
 
 from functools import wraps
 from collections import namedtuple
-import socket
 
 def freeze(cls):
     cls._frozen = False
 
     def frozensetattr(self, key, value):
-        if self._frozen and not key in dir(self):
+        if self._frozen and not hasattr(self, key):
             raise AttributeError(
                 "Class {} is frozen. Cannot set {} = {}".format(
                     cls.__name__, key, value
@@ -60,6 +58,7 @@ class Detector(CppDetectorApi):
         self._adc_register = Adc_register(self)
 
 
+
     # CONFIGURATION
     def __len__(self):
         return self.size()
@@ -72,6 +71,9 @@ class Detector(CppDetectorApi):
     def free(self):
         self.freeSharedMemory()
 
+
+
+
     @property
     def config(self):
         return NotImplementedError("config is set only")
@@ -90,7 +92,6 @@ class Detector(CppDetectorApi):
 
     @property
     def hostname(self):
-        print('getting host!')
         return self.getHostname()
 
     @hostname.setter
@@ -421,9 +422,7 @@ class Detector(CppDetectorApi):
 
     @udp_dstip.setter
     def udp_dstip(self, ip):
-        if ip == 'auto':
-            ip = socket.gethostbyname(self.rx_hostname)
-        self.setDestinationUDPIP(IpAddr(ip))
+        self.getDestinationUDPIP(ip)
 
     @property
     def udp_dstip2(self):
@@ -431,9 +430,7 @@ class Detector(CppDetectorApi):
 
     @udp_dstip2.setter
     def udp_dstip2(self, ip):
-        if ip == 'auto':
-            ip = socket.gethostbyname(self.rx_hostname)
-        self.setDestinationUDPIP2(IpAddr(ip))
+        self.getDestinationUDPIP2(ip)
 
     @property
     def udp_dstmac(self):
@@ -441,7 +438,7 @@ class Detector(CppDetectorApi):
 
     @udp_dstmac.setter
     def udp_dstmac(self, mac):
-        self.setDestinationUDPMAC(MacAddr(mac))
+        self.getDestinationUDPMAC2(mac)
 
     @property
     def udp_dstmac2(self):
@@ -449,7 +446,7 @@ class Detector(CppDetectorApi):
 
     @udp_dstmac2.setter
     def udp_dstmac2(self, mac):
-        self.setDestinationUDPMAC2(MacAddr(mac))
+        self.getDestinationUDPMAC2(mac)
 
 
     @property
@@ -458,7 +455,7 @@ class Detector(CppDetectorApi):
 
     @udp_srcip.setter
     def udp_srcip(self, ip):
-        self.setSourceUDPIP(IpAddr(ip))
+        self.setSourceUDPIP(ip)
 
     @property
     def udp_srcip2(self):
@@ -490,7 +487,7 @@ class Detector(CppDetectorApi):
 
     @src_udpmac.setter
     def src_udpmac(self, mac):
-        self.setSourceUDPMAC(MacAddr(mac))
+        self.setSourceUDPMAC(mac)
 
     @property
     def src_udpip2(self):
@@ -498,7 +495,7 @@ class Detector(CppDetectorApi):
 
     @src_udpip2.setter
     def src_udpip2(self, ip):
-        self.setSourceUDPIP(IpAddr(ip))
+        self.setSourceUDPIP(ip)
 
     @property
     def src_udpip(self):
@@ -506,7 +503,7 @@ class Detector(CppDetectorApi):
 
     @src_udpip.setter
     def src_udpip(self, ip):
-        self.setSourceUDPIP(IpAddr(ip))
+        self.setSourceUDPIP(ip)
 
 
     @property
@@ -515,7 +512,7 @@ class Detector(CppDetectorApi):
 
     @src_udpmac2.setter
     def src_udpmac2(self, mac):
-        self.setSourceUDPMAC2(MacAddr(mac))
+        self.setSourceUDPMAC2(mac)
 
     @property
     def vhighvoltage(self):

python/slsdet/lookup.py

@@ -1,9 +1,9 @@
 from .detector import Detector
 
-def view(name, det = Detector):
-    names =  find(name, det)
+def view(name):
+    names =  find(name)
     for n in names:
         print(n)
 
-def find(name, det = Detector):
-    return [n for n in dir(det) if name.lower() in n.lower()]
+def find(name):
+    return [n for n in dir(Detector) if name in n]

python/src/detector_in.cpp

@@ -12,8 +12,6 @@ namespace py = pybind11;
 void init_det(py::module &m) {
     using sls::Detector;
     using sls::Positions;
-    using sls::Result;
-    using sls::defs;
     
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi

python/src/enums.cpp

@@ -184,11 +184,6 @@ void init_enums(py::module &m) {
         .value("VB_PIXBUF", slsDetectorDefs::dacIndex::VB_PIXBUF)
         .value("VIN_COM", slsDetectorDefs::dacIndex::VIN_COM)
         .value("VDD_PROT", slsDetectorDefs::dacIndex::VDD_PROT)
-        .value("VBP_COLBUF", slsDetectorDefs::dacIndex::VBP_COLBUF)
-        .value("VB_SDA", slsDetectorDefs::dacIndex::VB_SDA)
-        .value("VCASC_SFP", slsDetectorDefs::dacIndex::VCASC_SFP)
-        .value("VIPRE_CDS", slsDetectorDefs::dacIndex::VIPRE_CDS)
-        .value("IBIAS_SFP", slsDetectorDefs::dacIndex::IBIAS_SFP)
         .value("V_POWER_A", slsDetectorDefs::dacIndex::V_POWER_A)
         .value("V_POWER_B", slsDetectorDefs::dacIndex::V_POWER_B)
         .value("V_POWER_C", slsDetectorDefs::dacIndex::V_POWER_C)
@@ -229,18 +224,6 @@ void init_enums(py::module &m) {
         .value("FORCESWITCHG2",
                slsDetectorDefs::detectorSettings::FORCESWITCHG2)
         .value("VERYLOWGAIN", slsDetectorDefs::detectorSettings::VERYLOWGAIN)
-        .value("G1_HIGHGAIN", slsDetectorDefs::detectorSettings::G1_HIGHGAIN)
-        .value("G1_LOWGAIN", slsDetectorDefs::detectorSettings::G1_LOWGAIN)
-        .value("G2_HIGHCAP_HIGHGAIN",
-               slsDetectorDefs::detectorSettings::G2_HIGHCAP_HIGHGAIN)
-        .value("G2_HIGHCAP_LOWGAIN",
-               slsDetectorDefs::detectorSettings::G2_HIGHCAP_LOWGAIN)
-        .value("G2_LOWCAP_HIGHGAIN",
-               slsDetectorDefs::detectorSettings::G2_LOWCAP_HIGHGAIN)
-        .value("G2_LOWCAP_LOWGAIN",
-               slsDetectorDefs::detectorSettings::G2_LOWCAP_LOWGAIN)
-        .value("G4_HIGHGAIN", slsDetectorDefs::detectorSettings::G4_HIGHGAIN)
-        .value("G4_LOWGAIN", slsDetectorDefs::detectorSettings::G4_LOWGAIN)
         .value("UNDEFINED", slsDetectorDefs::detectorSettings::UNDEFINED)
         .value("UNINITIALIZED",
                slsDetectorDefs::detectorSettings::UNINITIALIZED)
@@ -301,11 +284,4 @@ void init_enums(py::module &m) {
         .value("BURST_INTERNAL", slsDetectorDefs::burstMode::BURST_INTERNAL)
         .value("BURST_EXTERNAL", slsDetectorDefs::burstMode::BURST_EXTERNAL)
         .export_values();
-
-    py::enum_<slsDetectorDefs::timingSourceType>(Defs, "timingSourceType")
-        .value("TIMING_INTERNAL",
-               slsDetectorDefs::timingSourceType::TIMING_INTERNAL)
-        .value("TIMING_EXTERNAL",
-               slsDetectorDefs::timingSourceType::TIMING_EXTERNAL)
-        .export_values();
 }

python/src/network.cpp

@@ -15,11 +15,10 @@ using sls::IpAddr;
 using sls::MacAddr;
 void init_network(py::module &m) {
 
-    py::class_ <IpAddr>(m, "IpAddr")
-    .def(py::init())
+    py::class_ <IpAddr> IpAddr(m, "IpAddr");
+    IpAddr.def(py::init())
     .def(py::init<const std::string&>())
     .def(py::init<uint32_t>())
-    .def(py::init<const IpAddr&>())
     .def("hex", &IpAddr::hex)
     .def("uint32", &IpAddr::uint32)
     .def(py::self == py::self)
@@ -27,11 +26,10 @@ void init_network(py::module &m) {
     .def("str", &IpAddr::str);
 
 
-    py::class_ <MacAddr>(m, "MacAddr")
-    .def(py::init())
+    py::class_ <MacAddr> MacAddr(m, "MacAddr");
+    MacAddr.def(py::init())
     .def(py::init<const std::string&>())
     .def(py::init<uint64_t>())
-    .def(py::init<const MacAddr&>())
     .def("hex", &MacAddr::hex)
     .def(py::self == py::self)
     .def("uint64", &MacAddr::uint64)

sample/CMakeLists.txt

@@ -1,35 +1,36 @@
-add_executable(using_logger using_logger.cpp)
-target_link_libraries(using_logger 
+add_executable(a api.cpp)
+target_link_libraries(a 
+    slsDetectorShared
     slsSupportLib
     pthread
     rt
 )  
 
-set_target_properties(using_logger PROPERTIES
+set_target_properties(a PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 )
 
 
-# add_executable(result useResult.cpp)
-# target_link_libraries(result 
-#     slsDetectorShared
-# )  
+add_executable(result useResult.cpp)
+target_link_libraries(result 
+    slsDetectorShared
+)  
 
-# set_target_properties(result PROPERTIES
-#     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-# )
+set_target_properties(result PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
 
-# add_executable(udp udp.cpp)
-# target_link_libraries(udp 
-#     slsDetectorShared
-#     slsSupportLib
-#     pthread
-#     rt
-#     fmt
-# )  
+add_executable(udp udp.cpp)
+target_link_libraries(udp 
+    slsDetectorShared
+    slsSupportLib
+    pthread
+    rt
+    fmt
+)  
 
-# set_target_properties(udp PROPERTIES
-#     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-# )
+set_target_properties(udp PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
 
 

sample/using_logger.cpp

@@ -1,42 +0,0 @@
-#include "logger.h"
-#include <iostream>
-#include <chrono>
-int main() {
-
-    //compare old and new
-    std::cout << "Compare output between old and new:\n";
-    LOG(logINFO) << "Some info message";
-    LOG(logERROR) << "This is an error";
-    LOG(logWARNING) << "While this is only a warning";
-
-    //Logging level can be configure at runtime
-    std::cout << "\n\n";
-    std::cout << "The default macro controlled level is: "
-              << sls::Logger::ToString(LOG_MAX_REPORTING_LEVEL) << '\n';
-    
-    sls::Logger::ReportingLevel() = logERROR;
-    LOG(logINFO) << "Now this is not written";
-    LOG(logWARNING) << "and also not this";
-
-    sls::Logger::ReportingLevel() = logINFO;
-    LOG(logINFO) << "But now we can see it";
-
-
-    //The output can be redirected to another buffer 
-    std::ostringstream local;
-    auto clog_buff = std::clog.rdbuf();
-    std::clog.rdbuf(local.rdbuf());
-
-    LOG(logINFOBLUE) << "A message";
-    LOG(logWARNING) << "And another one";
-
-    std::clog.rdbuf(clog_buff); // restore
-
-    std::cout << "local buf:\n" << local.str(); 
-
-    LOG(logINFO) << "After reset we should print directly";
-    LOG(logINFOBLUE) << "some infoBLUE text";
-    LOG(logINFOGREEN) << "some infoGREEN text";
-    LOG(logINFORED) << "some infoRED text";
-
-}

slsDetectorCalibration/MovingStat.h

@@ -14,27 +14,27 @@ class MovingStat
       /** constructor
 	  \param nn number of samples  parameter to be used
       */
-    MovingStat(int nn) : n(nn), m_n(0), m_newM(0),m_newM2(0)  {}
-      //  void setPointers(double *me, double *va) {mean=me; var=va;}
+      MovingStat(int nn=1000) : n(nn), m_n(0) {}
+
 	/**
 	   clears the moving average number of samples parameter, mean and standard deviation
 	*/
-      void Clear()
-      {
+        void Clear()
+        {
 	  m_n = 0; 
 	  m_newM=0; 
 	  m_newM2=0;
-      }
+        }
 
 	/**
 	   clears the moving average number of samples parameter, mean and standard deviation
 	*/
         void Set(double val, double rms=0, int m=-1)
         {
-	  if (m>=0) m_n = m;  else m_n = n; 
+	  if (m>0) m_n = m;  else m_n = n; 
 	  m_newM=val*m_n; 
-	  SetRMS(rms);
 	  // cout << "set " << val << " " << m << " " << m_n << " " << m_newM << endl;
+	  SetRMS(rms);
         }
 	/**
 	   clears the moving average number of samples parameter, mean and standard deviation
@@ -42,15 +42,12 @@ class MovingStat
         void SetRMS(double rms)
         {
 	  if (rms<=0) {
-	    if (m_n>0)
-	      m_newM2=m_newM*m_newM/m_n;
-	    else
-	      m_newM2=0;
+	    m_newM2=m_newM*m_newM/n;
 	    //m_n=0;
 	  } else {
-	    if (m_n>0) {
+	    if (m_n>0)
 	      m_newM2=(m_n*rms*rms+m_newM*m_newM/m_n);
-	    } else {
+	    else {
 	      m_newM2=(m_n*rms*rms+m_newM*m_newM/n);
 	      m_n=0;
 	    }
@@ -105,14 +102,13 @@ class MovingStat
 	      m_newM = x;
 	      m_newM2 = x*x;
 	      m_n++;
-            }             
-	  else             {
-	    m_newM = m_newM + x - m_newM/m_n;
-	    m_newM2 = m_newM2 + x*x - m_newM2/m_n;
-	  }
-	  
+            }             else             {
+                m_newM = m_newM + x - m_newM/m_n;
+		m_newM2 = m_newM2 + x*x - m_newM2/m_n;
+            }
+
         }
-	
+
 	/** returns the current number of elements of the moving average
 	    \returns  returns the current number of elements of the moving average
 	 */
@@ -126,9 +122,7 @@ class MovingStat
         inline double Mean() const
         {
 	  //  cout << "get " <<  m_n << " " << m_newM << " " << m_newM/m_n << endl;
-	 
-	  
-	    return (m_n > 0) ? m_newM/m_n : 0.0;
+            return (m_n > 0) ? m_newM/m_n : 0.0;
         }
 
 	/** returns the squared mean, 0 if no elements are inside
@@ -144,7 +138,7 @@ class MovingStat
 	 */
         inline double Variance() const
         {
-	  return (m_n > 0) ? m_newM2/m_n-m_newM/m_n*m_newM/m_n : 0.0;
+	  return ( (m_n > 1) ? (M2()-Mean()*Mean()) : 0.0 );
         }
 
 	/** returns the standard deviation, 0 if no elements are inside
@@ -152,8 +146,7 @@ class MovingStat
 	 */
         inline double StandardDeviation() const
         {
-	  
-	  return sqrt(Variance());//
+	  return ( (Variance() > 0) ? sqrt( Variance() ) : -1 );
         }
 
     private:

slsDetectorCalibration/analogDetector.h

@@ -68,15 +68,10 @@ template <class dataType> class analogDetector {
       det->getDetectorSize(nx,ny);
     
     stat=new pedestalSubtraction*[ny];
-    /* pedMean=new double*[ny]; */
-    /* pedVariance=new double*[ny]; */
     for (int i=0; i<ny; i++) {
       stat[i]=new pedestalSubtraction[nx];
-      /* pedMean[i]=new double[nx]; */
-      /* pedVariance[i]=new double[nx]; */
-      for (ix=0; ix<nx; ++ix) {
+      for (int ix=0; ix<nx; ix++) {
 	stat[i][ix].SetNPedestals(nped);
-	/* stat[i][ix].setPointers(&(pedMean[iy][ix]),&(pedVariance[iy][ix])); */
       }
     }
     image=new int[nx*ny];
@@ -100,16 +95,7 @@ template <class dataType> class analogDetector {
   /**
      destructor. Deletes the pdestalSubtraction array and the image
   */
-  virtual ~analogDetector() {
-    for (int i=0; i<ny; i++) {
-      delete [] stat[i]; 
-      /* delete [] pedMean[i];  */
-      /* delete [] pedVariance[i]; */
-    }; 
-    /* delete [] pedMean;  */
-    /* delete [] pedVariance; */ 
-    delete [] stat; 
-    delete [] image;
+  virtual ~analogDetector() {for (int i=0; i<ny; i++) delete [] stat[i]; delete [] stat; delete [] image;
 #ifdef ROOTSPECTRUM
     delete hs;
 #ifdef ROOTCLUST
@@ -146,23 +132,16 @@ template <class dataType> class analogDetector {
     
 
     stat=new pedestalSubtraction*[ny];
-    /* pedMean=new double*[ny]; */
-    /* pedVariance=new double*[ny]; */
     for (int i=0; i<ny; i++) {
       stat[i]=new pedestalSubtraction[nx];
-      /* pedMean[i]=new double[nx]; */
-      /* pedVariance[i]=new double[nx]; */
     }
     
     int nped=orig->SetNPedestals();
     //cout << nped << " " << orig->getPedestal(ix,iy) << orig->getPedestalRMS(ix,iy) << endl;
-    for (iy=0; iy<ny; ++iy) {
-      for (ix=0; ix<nx; ++ix) {
-	//stat[iy][ix].setPointers(&(pedMean[iy][ix]),&(pedVariance[iy][ix]));
+    for (int iy=0; iy<ny; iy++) {
+      for (int ix=0; ix<nx; ix++) {
 	stat[iy][ix].SetNPedestals(nped);
 	setPedestal(ix,iy,orig->getPedestal(ix,iy),orig->getPedestalRMS(ix,iy),orig->GetNPedestals(ix,iy));
-	/* if (ix==50 && iy==50)  */
-	/*   cout << "clone ped " <<  " " << ix << " " << iy << " " << getPedestal(ix,iy) << " " << getPedestalRMS(ix,iy)<< " " << GetNPedestals(ix,iy) << endl; */
       }
     }
     image=new int[nx*ny];
@@ -220,7 +199,7 @@ template <class dataType> class analogDetector {
      \param nns reference to number of subpixels for interpolating detector, will always be 1 in this case
      \returns number of pixels of the detector image
    */
-  virtual int getImageSize(int &nnx, int &nny, int &nnsx, int &nnsy){nnx=nx; nny=ny; nnsx=1; nnsy=1; return nx*ny;}; 
+  virtual int getImageSize(int &nnx, int &nny, int &nns){nnx=nx; nny=ny; nns=1; return nx*ny;}; 
  /**
      Returns data size of the detector image matrix
      \param nnx reference to pixel size in x
@@ -252,8 +231,8 @@ template <class dataType> class analogDetector {
     if (gm) {
       if (gmap) delete [] gmap; 
       gmap=new double[nnx*nny];
-      for (iy=0; iy<nny; ++iy) {
-	for (ix=0; ix<nnx; ++ix) {
+      for (int iy=0; iy<nny; iy++) {
+	for (int ix=0; ix<nnx; ix++) {
 	  gmap[iy*nnx+ix]=gm[iy*nnx+ix];
 	  // cout << gmap[iy*nnx+ix] << " " ;
 	}
@@ -272,8 +251,8 @@ template <class dataType> class analogDetector {
     void *ret;
     if (gmap)  {
       gm=new float[nx*ny];
-      for (iy=0; iy<ny; ++iy) {
-	for (ix=0; ix<nx; ++ix) {
+	for (int iy=0; iy<ny; iy++) {
+      for (int ix=0; ix<nx; ix++) {
 	  gm[iy*nx+ix]=gmap[iy*nx+ix];
 	}
       }
@@ -288,8 +267,8 @@ template <class dataType> class analogDetector {
     
   virtual void newDataSet(){
     iframe=-1; 
-    for (iy=0; iy<ny; ++iy) 
-      for (ix=0; ix<nx; ++ix) {
+    for (int iy=0; iy<ny; iy++) 
+      for (int ix=0; ix<nx; ix++) {
 	stat[iy][ix].Clear(); 
 	image[iy*nx+ix]=0;
       }
@@ -306,17 +285,15 @@ template <class dataType> class analogDetector {
   };  
   
   /** resets the commonModeSubtraction and increases the frame index */
-  virtual void newFrame(){iframe++; if (cmSub) cmSub->newFrame(); det->newFrame();};
+  virtual void newFrame(){iframe++; if (cmSub) cmSub->newFrame();};
 
   /** resets the commonModeSubtraction and increases the frame index */
   virtual void newFrame(char *data){
     iframe++; 
     if (cmSub) cmSub->newFrame(); 
-    det->newFrame();
-    // det->getData(data);
     calcGhost(data); 
     //    cout << getId() << " Calc ghost " <<  getGhost(15,15) << endl;
-  };
+      };
   
 
     /** sets the commonModeSubtraction algorithm to be used 
@@ -382,8 +359,8 @@ template <class dataType> class analogDetector {
       // cout << "+"<< getId() << endl;
       if (cmSub) {
 	//cout << "*" << endl;
-	for (iy=ymin; iy<ymax; ++iy) { 
-	  for (ix=xmin; ix<xmax; ++ix) {
+	  for (int iy=ymin; iy<ymax; iy++) { 
+	for (int ix=xmin; ix<xmax; ix++) {
 	    // if (getNumpedestals(ix,iy)>0) 
 	  //  if (det->isGood(ix,iy)) {
 	      addToCommonMode(data, ix, iy);
@@ -426,10 +403,8 @@ template <class dataType> class analogDetector {
       if (ix>=0 && ix<nx && iy>=0 && iy<ny) {
 	if (cmSub && cm>0) {
 	  return stat[iy][ix].getPedestal()+getCommonMode(ix,iy); 
-	  //return pedMean[iy][ix]+getCommonMode(ix,iy); 
-	} 
-	//return pedMean[iy][ix];
-	return stat[iy][ix].getPedestal(); 
+	  
+	}     	else return stat[iy][ix].getPedestal(); 
       } else return -1;
     };
 
@@ -447,7 +422,7 @@ template <class dataType> class analogDetector {
 	  g=gmap[iy*nx+ix];
 	  if (g==0) g=-1.;
 	}
-	//	return sqrt(pedVariance[iy][ix])/g;
+      
 	return stat[iy][ix].getPedestalRMS()/g;//divide by gain?
       }
       return -1;
@@ -466,11 +441,10 @@ template <class dataType> class analogDetector {
        \returns pedestal value
     */
     virtual double* getPedestal(double *ped){
-      if (ped==NULL) {
+      if (ped==NULL)
 	ped=new double[nx*ny];
-      }
-      for (iy=0; iy<ny; ++iy) {
-	for (ix=0; ix<nx; ++ix) {
+      for (int iy=0; iy<ny; iy++) {
+	for (int ix=0; ix<nx; ix++) {
 	  ped[iy*nx+ix]=stat[iy][ix].getPedestal();
 	    //cout << ped[iy*nx+ix] << " " ;
 	}
@@ -485,11 +459,10 @@ template <class dataType> class analogDetector {
        \returns pedestal rms
     */
     virtual double* getPedestalRMS(double *ped=NULL){
-      if (ped==NULL) {
+      if (ped==NULL)
 	ped=new double[nx*ny];
-      }
-      for (iy=0; iy<ny; ++iy) {
-	for (ix=0; ix<nx; ++ix) {
+	for (int iy=0; iy<ny; iy++) {
+      for (int ix=0; ix<nx; ix++) {
 	  ped[iy*nx+ix]=stat[iy][ix].getPedestalRMS();
 	}
       }
@@ -528,8 +501,8 @@ template <class dataType> class analogDetector {
     */
     virtual void setPedestal(double *ped, double *rms=NULL, int m=-1){
       double rr=0;
-      for (iy=ymin; iy<ymax; ++iy) {
-	for (ix=xmin; ix<xmax; ++ix) {
+      for (int iy=ymin; iy<ymax; iy++) {
+	for (int ix=xmin; ix<xmax; ix++) {
 	  if (rms) rr=rms[iy*nx+ix];
 	  stat[iy][ix].setPedestal(ped[iy*nx+ix],rr, m);
 	  //  cout << ix << " " << iy << " " << ped[iy*nx+ix] << " " << stat[iy][ix].getPedestal() << endl;
@@ -558,8 +531,8 @@ template <class dataType> class analogDetector {
        \param rms pointer to array of pedestal rms
     */
  virtual void setPedestalRMS(double *rms){
-   for (iy=ymin; iy<ymax; ++iy) {
-     for (ix=xmin; ix<xmax; ++ix) {
+	for (int iy=ymin; iy<ymax; iy++) {
+      for (int ix=xmin; ix<xmax; ix++) {
 	  stat[iy][ix].setPedestalRMS(rms[iy*nx+ix]);
 	};
       };
@@ -599,8 +572,8 @@ template <class dataType> class analogDetector {
 
 #endif
       gm=new float[nx*ny];
-      for (iy=0; iy<ny; ++iy) {
-	for (ix=0; ix<nx; ++ix) {
+	for (int iy=0; iy<ny; iy++) {
+      for (int ix=0; ix<nx; ix++) {
 	    gm[iy*nx+ix]=image[iy*nx+ix];
 #ifdef ROOTSPECTRUM
 	    hmap->SetBinContent(ix+1, iy+1,image[iy*nx+ix]);
@@ -647,8 +620,8 @@ template <class dataType> class analogDetector {
       TH2F *hmap=new TH2F("hmap","hmap",nx, -0.5,nx-0.5, ny, -0.5, ny-0.5);
 
 #endif
-      for (iy=0; iy<ny; ++iy) {
-	for (ix=0; ix<nx; ++ix) {
+      for (int iy=0; iy<ny; iy++) {
+    for (int ix=0; ix<nx; ix++) {
 	/* if (cmSub)  */
 	/*     gm[iy*nx+ix]=stat[iy][ix].getPedestal()-cmSub->getCommonMode(); */
 	/* else */
@@ -694,15 +667,15 @@ template <class dataType> class analogDetector {
 
 
     if (gm) {
-      for (iy=0; iy<nny; ++iy) {
-	for (ix=0; ix<nnx; ++ix) {
+	for (int iy=0; iy<nny; iy++) {
+      for (int ix=0; ix<nnx; ix++) {
 	  stat[iy][ix].setPedestal(gm[iy*nx+ix],-1,-1);
 	}
       }
       delete [] gm;
       return 1;
     }
-    return 0;
+    return NULL;
   }
   
  /**
@@ -719,15 +692,15 @@ template <class dataType> class analogDetector {
 
 
     if (gm) {
-      for (iy=0; iy<nny; ++iy) {
-	for (ix=0; ix<nnx; ++ix) {
+	for (int iy=0; iy<nny; iy++) {
+      for (int ix=0; ix<nnx; ix++) {
 	  image[iy*nx+ix]=gm[iy*nx+ix];
 	}
       }
       delete [] gm;
       return 1;
     }
-    return 0;
+    return NULL;
   }
   
    
@@ -745,9 +718,9 @@ template <class dataType> class analogDetector {
     float *gm=NULL;
     void *ret;
       gm=new float[nx*ny];
-      for (iy=0; iy<ny; ++iy) {
-	for (ix=0; ix<nx; ++ix) {
-	  gm[iy*nx+ix]=stat[iy][ix].getPedestalRMS();
+	for (int iy=0; iy<ny; iy++) {
+      for (int ix=0; ix<nx; ix++) {
+	    gm[iy*nx+ix]=stat[iy][ix].getPedestalRMS();
 	}
       }
       ret=WriteToTiff(gm, imgname, ny, nx);  
@@ -767,8 +740,8 @@ template <class dataType> class analogDetector {
     if (nnx>nx) nnx=nx;
     if (nny>ny) nny=ny;
     if (gm) {
-      for (iy=0; iy<nny; ++iy) {
-	for (ix=0; ix<nnx; ++ix) {
+	for (int iy=0; iy<nny; iy++) {
+      for (int ix=0; ix<nnx; ix++) {
 	  stat[iy][ix].setPedestalRMS(gm[iy*nx+ix]);
 	}
       }
@@ -804,13 +777,11 @@ template <class dataType> class analogDetector {
             
       //cout << xmin << " " << xmax << endl;
       // cout << ymin << " " << ymax << endl;
-      for (iy=ymin; iy<ymax; ++iy) {
-	for (ix=xmin; ix<xmax; ++ix) {
+      for (int iy=ymin; iy<ymax; iy++) {
+	for (int ix=xmin; ix<xmax; ix++) {
 	  if (det->isGood(ix,iy)) {
 	    // addToPedestal(data,ix,iy,1);
 	    addToPedestal(data,ix,iy,cm);
-	/* if (ix==50 && iy==50) */
-	/*   cout<< "*ped* " << id << " " << ix << " " << iy << " " << det->getChannel(data,ix,iy) << " " << stat[iy][ix].getPedestal() << " " <<  stat[iy][ix].getPedestalRMS() <<" " << stat[iy][ix]. GetNPedestals() << endl; */
 	  //if (ix==10 && iy==10) 
 	  // cout <<ix << " " << iy << " " << getPedestal(ix,iy)<< endl;
 #ifdef ROOTSPECTRUM 
@@ -934,8 +905,8 @@ template <class dataType> class analogDetector {
       
       //calcGhost(data);
 
-      for (iy=ymin; iy<ymax; ++iy) {
-	for (ix=xmin; ix<xmax; ++ix) {
+      for (int iy=ymin; iy<ymax; iy++) {
+	for (int ix=xmin; ix<xmax; ix++) {
 	  if (det->isGood(ix,iy))
 	    val[iy*nx+ix]+=subtractPedestal(data, ix, iy,cm);
 	}
@@ -981,8 +952,8 @@ template <class dataType> class analogDetector {
 	hs->Fill(val,(iy-ymin)*(xmax-xmin)+(ix-xmin));
 #ifdef ROOTCLUST
 	double v3=0,v5=0,v7=0,v9=0;
-	for (int iix=-4; iix<5; i++ix)
-	  for (int iiy=-4; iiy<5; i++iy) {
+	for (int iix=-4; iix<5; iix++)
+	  for (int iiy=-4; iiy<5; iiy++) {
 	    if (det)
 	      val= (dataSign*det->getValue(data, ix+iix, iy+iiy)-getPedestal(ix+iix,iy+iiy,cm))/g;
 	    else
@@ -1076,8 +1047,8 @@ template <class dataType> class analogDetector {
 
        //calcGhost(data);
        addToCommonMode(data);
-       for (iy=ymin; iy<ymax; ++iy) {
-	 for (ix=xmin; ix<xmax; ++ix) {
+       for (int iy=ymin; iy<ymax; iy++) {
+	 for (int ix=xmin; ix<xmax; ix++) {
 	   if (det->isGood(ix,iy))
 	     nph[iy*nx+ix]+=getNPhotons(data, ix, iy);
 	 }
@@ -1091,8 +1062,8 @@ template <class dataType> class analogDetector {
      
     */
    virtual void clearImage(){  
-       for (iy=0; iy<ny; ++iy) { 
-     for (ix=0; ix<nx; ++ix) {
+       for (int iy=0; iy<ny; iy++) { 
+     for (int ix=0; ix<nx; ix++) {
 	 image[iy*nx+ix]=0;
        }
      }
@@ -1122,8 +1093,8 @@ template <class dataType> class analogDetector {
     int SetNPedestals(int i=-1) {
       int ix=0, iy=0; 
       if (i>0) 
-	  for (iy=0; iy<ny; ++iy) 
-	for (ix=0; ix<nx; ++ix) 
+	  for (iy=0; iy<ny; iy++) 
+	for (ix=0; ix<nx; ix++) 
 	    stat[iy][ix].SetNPedestals(i); 
       return stat[0][0].SetNPedestals();
     };
@@ -1158,8 +1129,8 @@ template <class dataType> class analogDetector {
       newFrame(data);
       //calcGhost(data);
       addToCommonMode(data);
-      for (iy=ymi; iy<yma; ++iy)
-	for (ix=xmi; ix<xma; ++ix)
+      for (int iy=ymi; iy<yma; iy++)
+	for (int ix=xmi; ix<xma; ix++)
 	  if (det->isGood(ix,iy)) {
 	    if (ix>=0 && ix<nx && iy>=0 && iy<ny) 
 	      val+=getNPhotons(data, ix, iy);
@@ -1262,8 +1233,6 @@ FILE *getFilePointer(){return myFile;};
     int nx; /**< Size of the detector in x direction */
     int ny; /**< Size of the detector in y direction */
     pedestalSubtraction **stat; /**< pedestalSubtraction class */
-    /* double **pedMean; /\**< pedestalSubtraction class *\/ */
-    /* double **pedVariance; /\**< pedestalSubtraction class *\/ */
     commonModeSubtraction *cmSub;/**< commonModeSubtraction class */
     int dataSign; /**< sign of the data i.e. 1 if photon is positive, -1 if negative */
     int iframe;  /**< frame number (not from file but incremented within the dataset every time newFrame is called */
@@ -1281,7 +1250,6 @@ FILE *getFilePointer(){return myFile;};
     frameMode fMode; /**< current detector frame mode */
     detectorMode dMode; /**< current detector frame mode */
     FILE *myFile; /**< file pointer to write to */
-    int ix, iy;
 #ifdef ROOTSPECTRUM
     TH2F *hs;
 #ifdef ROOTCLUST

slsDetectorCalibration/dataStructures/deserializer.h

@@ -1,7 +1,6 @@
 #ifndef DESERIALIZER_H
 #define DESERIALIZER_H
 #include <vector>
-#include "slsDetectorData.h"
 
 class deserializer : public slsDetectorData<int> {
 
@@ -53,13 +52,7 @@ class deserializer : public slsDetectorData<int> {
  static int* deserializeAll(char *ptr, std::vector <int> dbl, int dr=24,  int nch=64*3, int off=5) {
    // off=0;
    //int iarg;
-
-
-    cout <<"** deserializer: " << endl;
-    cout << "** Number of chans:\t" << nch << endl;
-    cout << "** Serial Offset:\t" << off << endl;
-    cout << "** Dynamic range:\t" << dr << endl;
-    int64_t word, *wp, ww,one=1, bit ;
+   int64_t word, *wp;
    int* val=new int[nch];
    int ioff=0;
    int idr=0;
@@ -73,62 +66,39 @@ class deserializer : public slsDetectorData<int> {
      val[ib]=0;
    }
    wp=(int64_t*)ptr;
-
-   int nw=nch/nb;
-
-   cout << "** Number of bits:\t" << nb << endl;
-   cout << "** Samples:\t" << nw << endl;
-    
-  for (ib=0; ib<nb; ib++) {
-    cout << dbl[ib] << " " ;
-  }
-  cout << endl;
    
-  for (ib=0; ib<nch; ib++) {
-    val[ib]=0;
-  }
-   
-   for (iw=0; iw<nw; iw) {
+   for (iw=0; iw<nch/nb; iw) {
      word=*wp;;
      if (ioff<off) {
        ioff++;
        // cout <<"*";
      }  else {
        //if (idr<16) {
-       //ib=0; 
-       // cout << hex << "*************" << word << endl;
-      for (ib=0; ib<nb; ib++) {
-	//	for (const auto &bit : dbl) {
-	  ich=iw+nch*ib/nb;
-	  /* if (ich>1060) */
-	  /* cout << iw << " " << idr << " " << ib << " " << bit << " " << ich << " " << val[ich] << " **  " ; */ 
-	  bit=dbl[ib];
-	  ww=one<<bit;
-	  if (word&(ww) && ich<nch)  {
+       ib=0;
+	for (const auto &bit : dbl) {
+	  ich=iw+nch/nb*(ib);
+	  if (word&(1<<bit) && ich<nch)  {
 	    //cout << "+" ;
 	    val[ich]|=(1<<idr);
-	  }
-	  /* if (ich>1060) */
-	  /*   cout << val[ich]  << " " << hex << word << " " << ww << " " << (word&(ww)) << dec <<endl; */
-	  /* //else {  */
+	  }  //else { 
 	  //cout << "-" ; 
 	  //}
-	  //ib++;
+	  ib++;
 	}
 	
-      idr++; 
      }
      
+     idr++; 
      if (idr==dr) {
        idr=0;
 	//  cout << dec << " " << iw << " " << val[iw] << " " << val[iw+nch/2] << endl;
-       // cout <<dec << iw<<endl;
+       cout <<dec << iw<<endl;
        iw++;
      }//end if()
      
       //end else()
      wp+=1;
-     // ii++;
+     ii++;
    }//end for
    
     
@@ -147,7 +117,7 @@ class deserializer : public slsDetectorData<int> {
    int ii=0;
    int ich;
    int nb=dbl.size();
-   int bit;
+
    char *dval;
 
    idr=0;
@@ -157,13 +127,8 @@ class deserializer : public slsDetectorData<int> {
    dval=ptr;
    
    ib=0;
-   ich=0; 
-     for (ib=0; ib<nb; ib++) {
-       //	for (const auto &bit : dbl) {
-
-       /* if (ich>1060) */
-       /* cout << iw << " " << idr << " " << ib << " " << bit << " " << ich << " " << val[ich] << " **  " ; */ 
-       bit=dbl[ib];
+   ich=0;
+   for (const auto &bit : dbl) {
      //ioff=off;
      idr=0;
      for (iw=0; iw<(nch*dr/nb)/8; iw++) {
@@ -176,7 +141,7 @@ class deserializer : public slsDetectorData<int> {
        }	
      }
      ii++;
-     // ib++;
+     ib++;
    }//end for
    
     

slsDetectorCalibration/dataStructures/imageZmq16bit.h

@@ -1,125 +0,0 @@
-#ifndef IMAGEZMQ16BIT_H
-#define  IMAGEZMQ16BIT_H
-#include "slsDetectorData.h"
-
-
-class imageZmq16bit : public slsDetectorData<uint16_t> {
- 
- private:
-  
-  // int iframe;
- public:
-
-
-
-
-  /**
-     Implements the slsReceiverData structure for the moench02 prototype read out by a module i.e. using the slsReceiver
-     (160x160 pixels, 40 packets 1286 large etc.)
-     \param c crosstalk parameter for the output buffer
-
-  */
-  // moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
- imageZmq16bit(int nnx=400, int nny=400): slsDetectorData<uint16_t>(nnx, nny, 2*nnx*nny) {
-    cout << "* " << nx << " " << ny << endl;
-    int is=0;
-    for (int row=0; row<ny; row++){
-      for(int col=0;col<nx;col++){
-	dataMap[row][col]=is*2;
-	is++;  
-      }
-    }
- 
-
-  };
-
-  virtual double getValue(char *data, int ix, int iy=0) {
-   
-    cout << ix << " " << ix <<  dataMap[iy][ix] << 2*nx*ny << " "<< endl;
-    uint16_t val=getChannel(data, ix, iy)&0x3fff;
-    return val;
-  };
-
-
-  int getFrameNumber(char *buff){return *((int*)buff);};//*((int*)(buff+5))&0xffffff;};   
-
- 
-  int getPacketNumber(char *buff){return 0;}//((*(((int*)(buff+4))))&0xff)+1;};   
-
-  virtual char *readNextFrame(ifstream &filebin) {
-    int ff=-1, np=-1;
-    return readNextFrame(filebin, ff, np);
-  };
-
-  virtual char *readNextFrame(ifstream &filebin, int &ff) {
-    int np=-1;
-    return readNextFrame(filebin, ff, np);
-  };
-
-  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np) {
-	  char *data=new char[2*nx*ny];
-	  char *d=readNextFrame(filebin, ff, np, data);
-	  if (d==NULL) {delete [] data; data=NULL;}
-	  return data;
-  }
-
-
-
-
-  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np, char *data) {
-    //char *retval=0;
-    //	  int  nd;
-    //int fnum = -1;
-	  np=0;
-	  //	  int  pn;
-	  
-
-	  //  if (ff>=0)
-	  //  fnum=ff;
-
-	  if (filebin.is_open()) {
-	    if (filebin.read(data, 2*nx*ny) ){
-	      // iframe++;
-	      //ff=iframe;
-	      return data;
-	    }
-	  }
-	    return NULL;
-	    
-	    
-	  
-  };
-
-
-
-  virtual  char *findNextFrame(char *data, int &ndata, int dsize){
-    if (dsize<2*nx*ny) ndata=dsize;
-    else ndata=2*nx*ny;
-    return data;
-
-  }
-  
-
-
-
-
-
-  // virtual int setFrameNumber(int ff){iframe=ff};
-
-
-
-
-
-
-
-
-
-
-int getPacketNumber(int x, int y) {return 0;};
-
-};
-
-
-
-
-#endif

slsDetectorCalibration/dataStructures/imageZmq32bit.h

@@ -1,125 +0,0 @@
-#ifndef IMAGEZMQ32BIT_H
-#define  IMAGEZMQ32BIT_H
-#include "slsDetectorData.h"
-
-
-class imageZmq32bit : public slsDetectorData<uint16_t> {
- 
- private:
-  
-  // int iframe;
- public:
-
-
-
-
-  /**
-     Implements the slsReceiverData structure for the moench02 prototype read out by a module i.e. using the slsReceiver
-     (160x160 pixels, 40 packets 1286 large etc.)
-     \param c crosstalk parameter for the output buffer
-
-  */
-  // moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
- imageZmq32bit(int nnx=400, int nny=400): slsDetectorData<uint16_t>(nnx, nny, sizeof(uint32_t)*nnx*nny) {
-    cout << "* " << nx << " " << ny << endl;
-    int is=0;
-    for (int row=0; row<ny; row++){
-      for(int col=0;col<nx;col++){
-	dataMap[row][col]=is*sizeof(uint32_t);
-	is++;  
-      }
-    }
- 
-
-  };
-
-  /* virtual double getValue(char *data, int ix, int iy=0) { */
-   
-  /*   //cout << ix << " " << ix <<  dataMap[iy][ix] << 2*nx*ny << " "<< endl; */
-  /*   uint16_t val=getChannel(data, ix, iy); */
-  /*   return val; */
-  /* }; */
-
-
-  int getFrameNumber(char *buff){return *((int*)buff);};//*((int*)(buff+5))&0xffffff;};   
-
- 
-  int getPacketNumber(char *buff){return 0;}//((*(((int*)(buff+4))))&0xff)+1;};   
-
-  virtual char *readNextFrame(ifstream &filebin) {
-    int ff=-1, np=-1;
-    return readNextFrame(filebin, ff, np);
-  };
-
-  virtual char *readNextFrame(ifstream &filebin, int &ff) {
-    int np=-1;
-    return readNextFrame(filebin, ff, np);
-  };
-
-  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np) {
-	  char *data=new char[2*nx*ny];
-	  char *d=readNextFrame(filebin, ff, np, data);
-	  if (d==NULL) {delete [] data; data=NULL;}
-	  return data;
-  }
-
-
-
-
-  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np, char *data) {
-    //char *retval=0;
-    //	  int  nd;
-    //int fnum = -1;
-	  np=0;
-	  //	  int  pn;
-	  
-
-	  //  if (ff>=0)
-	  //  fnum=ff;
-
-	  if (filebin.is_open()) {
-	    if (filebin.read(data, 2*nx*ny) ){
-	      // iframe++;
-	      //ff=iframe;
-	      return data;
-	    }
-	  }
-	    return NULL;
-	    
-	    
-	  
-  };
-
-
-
-  virtual  char *findNextFrame(char *data, int &ndata, int dsize){
-    if (dsize<2*nx*ny) ndata=dsize;
-    else ndata=2*nx*ny;
-    return data;
-
-  }
-  
-
-
-
-
-
-  // virtual int setFrameNumber(int ff){iframe=ff};
-
-
-
-
-
-
-
-
-
-
-int getPacketNumber(int x, int y) {return 0;};
-
-};
-
-
-
-
-#endif

slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h

@@ -28,8 +28,7 @@ class moench03T1ZmqDataNew : public slsDetectorData<uint16_t> {
      \param c crosstalk parameter for the output buffer
 
   */
-  // moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
- moench03T1ZmqDataNew(int ns=5000, int oo=0): slsDetectorData<uint16_t>(400, 400, ns*32*2+oo), nSamples(ns), offset(oo), xtalk(0.00021) {
+ moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
 
     int nadc=32;
     int sc_width=25;
@@ -138,7 +137,6 @@ class moench03T1ZmqDataNew : public slsDetectorData<uint16_t> {
     /* vout+=0.0008*val-6224; */
     /* return vout; //(double)getChannel(data, ix, iy);
      */
-    // cout << ix << " "<< iy << " " << dataMap[iy][ix] << endl;
     return ((double)getChannel(data, ix, iy))+xtalk*getGhost(iy,iy);
   };
 

slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h

@@ -44,28 +44,6 @@ class moench04CtbZmq10GbData : public slsDetectorData<uint16_t> {
 
     int adc_nr[32]={9, 8,11,10,13,12,15,14,1,0,3,2,5,4,7,6,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24 };
 
-    /* 
-       iadc=ptr%32
-       isample=ptr/32
-
-       col=(adc_nr[iadc]%16)*25+isample%25
-       if (adc_nr[iadc]<16)
-       row=199-isample/25;
-       else
-       row=200+isample/25
-
-
-       adc0 col(9*25..10*25-1) row(199..0)
-       adc1 col(8*25..9*25-1)  row(199..0)
-       adc2 col(11*25..12*25-1) row(199..0)
-       adc3 col(10*25..11*25-1) row(199..0)
-       adc4 col(13*25..14*25-1) row(199..0)
-       adc5 col(12*25..13*25-1) row(199..0)
-       adc6 col(15*25..16*25-1) row(199..0)
-       adc7 col(14*25..15*25-1) row(199..0)
-       adc8 col(1*25..2*25-1) row(199..0)
-     */
-
     int row, col;
 
     //int isample;

slsDetectorCalibration/dataStructures/slsDetectorData.h

@@ -20,8 +20,6 @@ class slsDetectorData {
   int **dataROIMask; /**< Array of size nx*ny 1 if channel is good (or in the ROI), 0 if bad channel (or out of ROI)   */
   int *xmap;
   int *ymap;
-  dataType **orderedData; 
-  int isOrdered;
   
  public:
   
@@ -39,29 +37,35 @@ class slsDetectorData {
   \param dROI Array of size nx*ny. The elements are 1s if the channel is good or in the ROI, 0 is bad or out of the ROI. NULL (default) means all 1s. 
   
   */
- slsDetectorData(int npx, int npy, int dsize, int **dMap=NULL, dataType **dMask=NULL, int **dROI=NULL): nx(npx), ny(npy), dataSize(dsize), orderedData(NULL), isOrdered(0) {
+ slsDetectorData(int npx, int npy, int dsize, int **dMap=NULL, dataType **dMask=NULL, int **dROI=NULL): nx(npx), ny(npy), dataSize(dsize) {
     
-   int el=dsize/sizeof(dataType);
-    xmap=new int[el];
-    ymap=new int[el];
+    
+    xmap=new int[dsize/sizeof(dataType)];
+    ymap=new int[dsize/sizeof(dataType)];
     
 
-    
-    orderedData=new dataType*[ny];
-    dataMap=new int*[ny];
+    //  if (dataMask==NULL) {
     dataMask=new dataType*[ny];
-    dataROIMask=new int*[ny];
+    for(int i = 0; i < ny; i++) {
+      dataMask[i] = new dataType[nx];
+    }
+    // }
+    
+    // if (dataMap==NULL) {
+    dataMap=new int*[ny];
     for(int i = 0; i < ny; i++) {
       dataMap[i] = new int[nx];
-      orderedData[i]=new dataType[nx];
-      dataMask[i] = new dataType[nx];
+      }
+    // }
+    // if (dataROIMask==NULL) {
+    dataROIMask=new int*[ny];
+    for(int i = 0; i < ny; i++) {
       dataROIMask[i] = new int[nx];
       for (int j=0; j<nx; j++)
 	dataROIMask[i][j]=1;
-    
-    }    
-  
-    for (int ip=0; ip<el; ip++){
+    }
+    // }
+    for (int ip=0; ip<dsize/sizeof(dataType); ip++){
       xmap[ip]=-1;
       ymap[ip]=-1;
       }
@@ -70,24 +74,22 @@ class slsDetectorData {
     setDataMask(dMask);
     setDataROIMask(dROI);
     
-  }
+  };
   
   virtual ~slsDetectorData() {
     for(int i = 0; i < ny; i++) {
       delete [] dataMap[i];
       delete [] dataMask[i];
       delete [] dataROIMask[i];
-      delete [] orderedData[i];
     }
     delete [] dataMap;
     delete [] dataMask;
     delete [] dataROIMask;
-    delete [] orderedData;
     delete [] xmap;
     delete [] ymap;
   };
   
-  virtual int getPointer(int ix,int iy) {return dataMap[iy][ix];};
+  
   /**
      defines the data map (as offset) - no error checking if datasize and offsets are compatible!
      \param dMap array of size nx*ny storing the pointers to the data in the dataset (as offset). If NULL (default),the data are arranged as if read out row by row (dataMap[iy][ix]=(iy*nx+ix)*sizeof(dataType);)
@@ -200,32 +202,27 @@ class slsDetectorData {
   int setDataSize(int d) {dataSize=d; return dataSize;};
 
   
-virtual void getPixel(int ip, int &x, int &y) {x=xmap[ip]; y=ymap[ip];};
+  virtual void getPixel(int ip, int &x, int &y) {x=xmap[ip]; y=ymap[ip];};
   
-virtual dataType **getData(char *ptr, int dsize=-1) {
-    int el=dsize/sizeof(dataType);
-    //dataType **data;
+  virtual dataType **getData(char *ptr, int dsize=-1) {
+    
+    dataType **data;
     int ix,iy;
-    //data=new dataType*[ny];
-    //for(int i = 0; i < ny; i++) {
-    //  data[i]=new dataType[nx];
-    //}
-     isOrdered=0;
+    data=new dataType*[ny];
+    for(int i = 0; i < ny; i++) {
+      data[i]=new dataType[nx];
+    }
     if (dsize<=0 || dsize>dataSize) dsize=dataSize;
-
-    for (int ip=0; ip<(el); ip++) {
+    for (int ip=0; ip<(dsize/sizeof(dataType)); ip++) {
       getPixel(ip,ix,iy);
       if (ix>=0 && ix<nx && iy>=0 && iy<ny) {
-	//data[iy][ix]=getChannel(ptr,ix,iy);
-	orderedData[iy][ix]=*(ptr+ip);//getChannel(ptr,ix,iy);
+	data[iy][ix]=getChannel(ptr,ix,iy);
       }
     }
-    isOrdered=1;
-    return orderedData;
-}
-
- void newFrame(){isOrdered=0;};
-
+    return data;
+    
+  };
+  
   virtual double **getImage(char *ptr, int dsize=-1) {
     
     double **data;
@@ -234,15 +231,15 @@ virtual dataType **getData(char *ptr, int dsize=-1) {
     for(int i = 0; i < ny; i++) {
       data[i]=new double[nx];
     }
-    int el=dsize/sizeof(dataType);
     if (dsize<=0 || dsize>dataSize) dsize=dataSize;
-    for (int ip=0; ip<el; ip++) {
+    for (int ip=0; ip<(dsize/sizeof(dataType)); ip++) {
       getPixel(ip,ix,iy);
       if (ix>=0 && ix<nx && iy>=0 && iy<ny) {
 	data[iy][ix]=getValue(ptr,ix,iy);
       }
     }
-    return data;   
+    return data;
+    
   };
   
   /** 
@@ -259,10 +256,7 @@ virtual dataType **getData(char *ptr, int dsize=-1) {
       // cout << ix << " " << iy << " " ;
       //cout << dataMap[ix][iy] << " " << (void*)data << " " << dataSize<< endl;
       m=dataMask[iy][ix];
-        if (isOrdered==0)
-	  d=*((dataType*)(data+getPointer(ix,iy)));
-      else
-	d=orderedData[iy][ix];
+      d=*((dataType*)(data+dataMap[iy][ix]));
     }  
     return d^m;
   };

slsDetectorCalibration/ghostSummation.h

@@ -13,7 +13,7 @@ template <class dataType> class ghostSummation {
   /** constructor
       \param xt crosstalk
   */
-  ghostSummation(slsDetectorData<dataType> *d, double xt) : xtalk(xt),det(d), nx(1), ny(1)  {
+ ghostSummation(slsDetectorData<dataType> *d, double xt) : xtalk(xt),det(d)  {
     if (det)
       det->getDetectorSize(nx,ny);
     ghost=new double[nx*ny];
@@ -22,9 +22,6 @@ template <class dataType> class ghostSummation {
   ghostSummation(ghostSummation *orig) {
     xtalk=orig->xtalk; 
     det=orig->det;
-    nx=1;
-    ny=1;
-    det->getDetectorSize(nx,ny);
     ghost=new double[nx*ny];
     
   }

slsDetectorCalibration/interpolatingDetector.h

@@ -107,11 +107,11 @@ class interpolatingDetector : public singlePhotonDetector {
       singlePhotonDetector::clearImage();
   };
 
-  int getImageSize(int &nnx, int &nny, int &nsx, int &nsy) {
+  int getImageSize(int &nnx, int &nny, int &ns) {
     if (interp) 
-      return interp->getImageSize(nnx, nny, nsx, nsy); 
+      return interp->getImageSize(nnx, nny, ns); 
     else 
-      return analogDetector<uint16_t>::getImageSize(nnx, nny, nsx, nsy);
+      return analogDetector<uint16_t>::getImageSize(nnx, nny, ns);
   };
 
 
@@ -251,7 +251,6 @@ int addFrame(char *data,  int *ph=NULL, int ff=0) {
     }
 
     virtual int getNSubPixels(){ if (interp) return interp->getNSubPixels(); else return 1;}
-
     virtual int setNSubPixels(int ns)  { 
       if (interp) {
 	pthread_mutex_lock(fi); 

slsDetectorCalibration/interpolations/eta2InterpolationBase.h

@@ -13,7 +13,7 @@
 class eta2InterpolationBase : public virtual etaInterpolationBase {
   
  public:
- eta2InterpolationBase(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) :  etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax) {
+ eta2InterpolationBase(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) :  etaInterpolationBase(nx,ny, ns, nb, emin, emax) {
     
     /* if (etamin>=etamax) { */
     /*   etamin=-1; */
@@ -37,7 +37,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
     
     int corner;
     corner=calcQuad(data, tot, totquad, sDum); 
-    if (nSubPixelsX>2 || nSubPixelsY>2) 
+    if (nSubPixels>2) 
       calcEta(totquad, sDum, etax, etay); 
     getInterpolatedPosition(x,y,etax,etay,corner,int_x,int_y);
 
@@ -53,7 +53,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
     
     int corner;
     corner=calcQuad(data, tot, totquad, sDum); 
-    if (nSubPixelsX>2 || nSubPixelsY>2  ) 
+    if (nSubPixels>2) 
       calcEta(totquad, sDum, etax, etay); 
     getInterpolatedPosition(x,y,etax,etay,corner,int_x,int_y);
 
@@ -93,7 +93,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
        ;
      } 
      double etax=0, etay=0;
-     if (nSubPixelsX>2 || nSubPixelsY>2) { 
+     if (nSubPixels>2) { 
        cc[0][0]=cl[xoff+3*yoff];
        cc[1][0]=cl[xoff+3*(yoff+1)];
        cc[0][1]=cl[xoff+1+3*yoff];
@@ -133,7 +133,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
        ;
      } 
      double etax=0, etay=0;
-     if (nSubPixelsX>2 || nSubPixelsY>2) { 
+     if (nSubPixels>2) { 
        cc[0][0]=cl[xoff+3*yoff];
        cc[1][0]=cl[xoff+3*(yoff+1)];
        cc[0][1]=cl[xoff+1+3*yoff];
@@ -182,31 +182,31 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
       }
     
 
-     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
+     if (nSubPixels>2) { 
 
-       ex=(etax-etamin)/etastepX;
-       ey=(etay-etamin)/etastepY;
+       ex=(etax-etamin)/etastep;
+       ey=(etay-etamin)/etastep;
        if (ex<0) {
 	 cout << "x*"<< ex << endl;
 	 ex=0;
        } 
-       if (ex>=nbetaX) {
+       if (ex>=nbeta) {
 	 cout << "x?"<< ex << endl;
-	 ex=nbetaX-1;
+	 ex=nbeta-1;
        }
        if (ey<0) {
-	 cout << "y*"<< ey << " " << nbetaY << endl;
+	 cout << "y*"<< ey << endl;
 	 ey=0;
        } 
-       if (ey>=nbetaY) {
-	 cout << "y?"<< ey << " " << nbetaY << endl;
-	 ey=nbetaY-1;
+       if (ey>=nbeta) {
+	 cout << "y?"<< ey << endl;
+	 ey=nbeta-1;
        }
     
     
    
-       xpos_eta=(((double)hhx[(ey*nbetaX+ex)]))+dX ;///((double)nSubPixels);
-       ypos_eta=(((double)hhy[(ey*nbetaX+ex)]))+dY ;///((double)nSubPixels);
+       xpos_eta=(((double)hhx[(ey*nbeta+ex)]))+dX ;///((double)nSubPixels);
+       ypos_eta=(((double)hhy[(ey*nbeta+ex)]))+dY ;///((double)nSubPixels);
        
      } else {
        xpos_eta=0.5*dX+0.25;
@@ -347,10 +347,10 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
 #endif
 #ifndef MYROOT1
     int ex,ey; 
-    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastepY;
-    if (ey<nbetaY && ex<nbetaX && ex>=0 && ey>=0)
-      heta[ey*nbetaX+ex]++; 
+    ex=(etax-etamin)/etastep;
+    ey=(etay-etamin)/etastep;
+    if (ey<nbeta && ex<nbeta && ex>=0 && ey>=0)
+      heta[ey*nbeta+ex]++; 
 #endif
     return 0;    
   };
@@ -360,22 +360,22 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
    // cout << "ff" << endl;
    calcDiff(1, hhx, hhy); //get flat
    double avg=0;
-   for (ipx=0; ipx<nSubPixelsX; ipx++)
-     for (ipy=0; ipy<nSubPixelsY; ipy++)
-       avg+=flat[ipx+ipy*nSubPixelsX];
-   avg/=nSubPixelsY*nSubPixelsX;
+   for (ipx=0; ipx<nSubPixels; ipx++)
+     for (ipy=0; ipy<nSubPixels; ipy++)
+       avg+=flat[ipx+ipy*nSubPixels];
+   avg/=nSubPixels*nSubPixels;
 
-   for (int ibx=0 ; ibx<nSubPixelsX*nPixelsX; ibx++) {
-     ipx=ibx%nSubPixelsX-nSubPixelsX/2;
-       if (ipx<0) ipx=nSubPixelsX+ipx;
-     for (int iby=0 ; iby<nSubPixelsY*nPixelsY; iby++) {
-       ipy=iby%nSubPixelsY-nSubPixelsY/2;
-     if (ipy<0) ipy=nSubPixelsY+ipy;
+   for (int ibx=0 ; ibx<nSubPixels*nPixelsX; ibx++) {
+     ipx=ibx%nSubPixels-nSubPixels/2;
+       if (ipx<0) ipx=nSubPixels+ipx;
+     for (int iby=0 ; iby<nSubPixels*nPixelsY; iby++) {
+       ipy=iby%nSubPixels-nSubPixels/2;
+     if (ipy<0) ipy=nSubPixels+ipy;
      // cout << ipx << " " << ipy << " " << ibx << " " << iby << endl;
-     if (flat[ipx+ipy*nSubPixelsX]>0)
-       hintcorr[ibx+iby*nSubPixelsX*nPixelsX]=hint[ibx+iby*nSubPixelsX*nPixelsX]*(avg/flat[ipx+ipy*nSubPixelsX]);
+     if (flat[ipx+ipy*nSubPixels]>0)
+       hintcorr[ibx+iby*nSubPixels*nPixelsX]=hint[ibx+iby*nSubPixels*nPixelsX]*(avg/flat[ipx+ipy*nSubPixels]);
      else
-       hintcorr[ibx+iby*nSubPixelsX*nPixelsX]=hint[ibx+iby*nSubPixelsX*nPixelsX];
+       hintcorr[ibx+iby*nSubPixels*nPixelsX]=hint[ibx+iby*nSubPixels*nPixelsX];
 
 
      }

slsDetectorCalibration/interpolations/eta3InterpolationBase.h

@@ -13,12 +13,35 @@
 class eta3InterpolationBase : public virtual etaInterpolationBase  {
   
  public:
- eta3InterpolationBase(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax) {
+ eta3InterpolationBase(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx, ny, ns, nb, emin, emax) {
     //  cout << "e3ib " << nb << " " << emin << " " << emax << endl; 
     /* if (nbeta<=0) { */
     /*   nbeta=nSubPixels*10;    */
     /* } */
-  
+    if (etamin>=etamax) {
+      etamin=-1;
+      etamax=1; 
+    }
+    
+    etastep=(etamax-etamin)/nbeta;
+#ifdef MYROOT1
+    delete heta;
+    delete hhx;
+    delete hhy;
+    heta=new TH2D("heta","heta",nbeta,etamin,etamax,nbeta,etamin,etamax);
+    hhx=new TH2D("hhx","hhx",nbeta,etamin,etamax,nbeta,etamin,etamax);
+    hhy=new TH2D("hhy","hhy",nbeta,etamin,etamax,nbeta,etamin,etamax);
+#endif
+#ifndef MYROOT1
+    /* delete [] heta; */
+    /* delete [] hhx; */
+    /* delete [] hhy; */
+
+    /* heta=new int[nbeta*nbeta]; */
+    /* hhx=new float[nbeta*nbeta]; */
+    /* hhy=new float[nbeta*nbeta]; */
+    
+#endif
     //   cout << nbeta << " " << etamin << " " << etamax << endl;
 };
   
@@ -65,7 +88,7 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
     
   
     double etax, etay;
-     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
+     if (nSubPixels>2) { 
        calcEta3(cl,etax,etay, totquad);
      } 
      return getInterpolatedPosition(x,y,etax, etay,quad,int_x,int_y);
@@ -78,7 +101,7 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
     
     
      double etax, etay;
-     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
+     if (nSubPixels>2) { 
        calcEta3(cl,etax,etay, totquad);
      }
      return getInterpolatedPosition(x,y,etax, etay,quad,int_x,int_y);
@@ -94,38 +117,38 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
     double xpos_eta=0,ypos_eta=0;
     int ex,ey;
 
-     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
+     if (nSubPixels>2) { 
 
 #ifdef MYROOT1
-    xpos_eta=(hhx->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixelsX);
-    ypos_eta=(hhy->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixelsY);
+    xpos_eta=(hhx->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixels);
+    ypos_eta=(hhy->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixels);
 #endif
 #ifndef MYROOT1
-    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastepY;
+    ex=(etax-etamin)/etastep;
+    ey=(etay-etamin)/etastep;
     if (ex<0) {
       /* cout << etax << " " << etamin << " "; */
       /*  cout << "3x*"<< ex << endl; */
       ex=0;
 	} 
-    if (ex>=nbetaX) {
+    if (ex>=nbeta) {
       /* cout << etax << " " << etamin << " "; */
       /* cout << "3x?"<< ex << endl; */
-      ex=nbetaX-1;
+      ex=nbeta-1;
     }
     if (ey<0) {
       /* cout << etay << " " << etamin << " "; */
       /* cout << "3y*"<< ey << endl; */
       ey=0;
 	} 
-    if (ey>=nbetaY) {
+    if (ey>=nbeta) {
       /* cout << etay << " " << etamin << " "; */
       /* cout << "3y?"<< ey << endl; */
-      ey=nbetaY-1;
+      ey=nbeta-1;
       
     }
-    xpos_eta=(((double)hhx[(ey*nbetaX+ex)]));///((double)nSubPixels);
-    ypos_eta=(((double)hhy[(ey*nbetaX+ex)]));///((double)nSubPixels);
+    xpos_eta=(((double)hhx[(ey*nbeta+ex)]));///((double)nSubPixels);
+    ypos_eta=(((double)hhy[(ey*nbeta+ex)]));///((double)nSubPixels);
 
 #endif
    
@@ -242,10 +265,10 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
 #endif
 #ifndef MYROOT1
     int ex,ey; 
-    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastepY;
-    if (ey<nbetaY && ex<nbetaX && ex>=0 && ey>=0)
-      heta[ey*nbetaX+ex]++; 
+    ex=(etax-etamin)/etastep;
+    ey=(etay-etamin)/etastep;
+    if (ey<nbeta && ex<nbeta && ex>=0 && ey>=0)
+      heta[ey*nbeta+ex]++; 
 #endif
     return 0;    
   };

slsDetectorCalibration/interpolations/etaInterpolationBase.h

@@ -7,7 +7,7 @@
 #include <TH2D.h>
 #include <TH2F.h>
 #endif
-#include <cmath> 
+
 #include "slsInterpolation.h"
 #include "tiffIO.h"
 
@@ -15,51 +15,44 @@ class etaInterpolationBase : public slsInterpolation {
   
  public:
  
- etaInterpolationBase(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : slsInterpolation(nx,ny,ns,nsy), hhx(NULL), hhy(NULL), heta(NULL), nbetaX(nb), nbetaY(nby), etamin(emin), etamax(emax) {
+ etaInterpolationBase(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : slsInterpolation(nx,ny,ns), hhx(NULL), hhy(NULL), heta(NULL), nbeta(nb), etamin(emin), etamax(emax) {
     // cout << "eb " << nb << " " << emin << " " << emax << endl;  
     // cout << nb << " " << etamin << " " << etamax << endl;
-    if (nbetaX<=0) {
+    if (nbeta<=0) {
       //cout << "aaa:" <<endl;
-      nbetaX=nSubPixelsX*10;
-    } 
-    if (nbetaY<=0) {
-      //cout << "aaa:" <<endl;
-      nbetaY=nSubPixelsY*10;
+      nbeta=nSubPixels*10;
     }
     if (etamin>=etamax) {
       etamin=-1;
       etamax=2;
     }
-    etastepX=(etamax-etamin)/nbetaX;
-    etastepY=(etamax-etamin)/nbetaY;
-    heta=new int[nbetaX*nbetaY];
-    hhx=new float[nbetaX*nbetaY];
-    hhy=new float[nbetaX*nbetaY];
+    etastep=(etamax-etamin)/nbeta;
+    heta=new int[nbeta*nbeta];
+    hhx=new float[nbeta*nbeta];
+    hhy=new float[nbeta*nbeta];
     rangeMin=etamin;
     rangeMax=etamax;
-    flat= new double[nSubPixelsX*nSubPixelsY];
-    hintcorr=new int [nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY];
+    flat= new double[nSubPixels*nSubPixels];
+    hintcorr=new int [nSubPixels*nSubPixels*nPixelsX*nPixelsY];
     
   };
   
  etaInterpolationBase(etaInterpolationBase *orig): slsInterpolation(orig){
-   nbetaX=orig->nbetaX;
-   nbetaY=orig->nbetaY;
+   nbeta=orig->nbeta;
    etamin=orig->etamin;
    etamax=orig->etamax;
    rangeMin=orig->rangeMin;
    rangeMax=orig->rangeMax;
 
 
-    etastepX=(etamax-etamin)/nbetaX;
-    etastepY=(etamax-etamin)/nbetaY;
-    heta=new int[nbetaX*nbetaY];
-    memcpy(heta,orig->heta,nbetaX*nbetaY*sizeof(int));
-    hhx=new float[nbetaX*nbetaY];
-    memcpy(hhx,orig->hhx,nbetaX*nbetaY*sizeof(float));
-    hhy=new float[nbetaX*nbetaY];
-    memcpy(hhy,orig->hhy,nbetaX*nbetaY*sizeof(float));
-    hintcorr=new int [nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY];
+    etastep=(etamax-etamin)/nbeta;
+    heta=new int[nbeta*nbeta];
+    memcpy(heta,orig->heta,nbeta*nbeta*sizeof(int));
+    hhx=new float[nbeta*nbeta];
+    memcpy(hhx,orig->hhx,nbeta*nbeta*sizeof(float));
+    hhy=new float[nbeta*nbeta];
+    memcpy(hhy,orig->hhy,nbeta*nbeta*sizeof(float));
+    hintcorr=new int [nSubPixels*nSubPixels*nPixelsX*nPixelsY];
 
  };
 
@@ -68,7 +61,7 @@ class etaInterpolationBase : public slsInterpolation {
 
 
   virtual void resetFlatField() {
-    for (int ibx=0; ibx<nbetaX*nbetaY; ibx++) {
+    for (int ibx=0; ibx<nbeta*nbeta; ibx++) {
       heta[ibx]=0;
       hhx[ibx]=0;
       hhy[ibx]=0;
@@ -77,16 +70,13 @@ class etaInterpolationBase : public slsInterpolation {
 
   };
     
-  int *setEta(int *h, int nb=-1, int nby=-1, double emin=1, double emax=0)
+  int *setEta(int *h, int nb=-1, double emin=1, double emax=0)
   {  
     if (h) {
       if (heta) delete [] heta;
       heta=h;
-      nbetaX=nb;
-      nbetaY=nby;
-      if (nbetaX<=0) nbetaX=nSubPixelsX*10;
-      if (nbetaY<=0) nbetaY=nSubPixelsY*10;
-      
+      nbeta=nb;
+      if (nb<=0) nbeta=nSubPixels*10;
       etamin=emin;
       etamax=emax;
       if (etamin>=etamax) {
@@ -95,24 +85,22 @@ class etaInterpolationBase : public slsInterpolation {
       }
       rangeMin=etamin;
       rangeMax=etamax;
-      etastepX=(etamax-etamin)/nbetaX;
-      etastepY=(etamax-etamin)/nbetaY;
+      etastep=(etamax-etamin)/nbeta;
     }
     return heta;
   };
   
-   int *setFlatField(int *h, int nb=-1, int nby=-1, double emin=1, double emax=0)
+   int *setFlatField(int *h, int nb=-1, double emin=1, double emax=0)
   {  
-    return setEta(h, nb, nby, emin, emax);
+    return setEta(h, nb, emin, emax);
   };
 
 
 
   int *getFlatField(){return setEta(NULL);};
   
-  int *getFlatField(int &nb, int &nby, double &emin, double &emax){
-    nb=nbetaX; 
-    nby=nbetaY; 
+  int *getFlatField(int &nb, double &emin, double &emax){
+    nb=nbeta; 
     emin=etamin; 
     emax=etamax; 
     return getFlatField();
@@ -121,13 +109,13 @@ class etaInterpolationBase : public slsInterpolation {
   
   void *writeFlatField(const char * imgname) {
     float *gm=NULL;
-    gm=new float[nbetaX*nbetaY];
-    for (int ix=0; ix<nbetaX; ix++) {
-      for (int iy=0; iy<nbetaY; iy++) {
-	gm[iy*nbetaX+ix]=heta[iy*nbetaX+ix];
+    gm=new float[nbeta*nbeta];
+    for (int ix=0; ix<nbeta; ix++) {
+      for (int iy=0; iy<nbeta; iy++) {
+	gm[iy*nbeta+ix]=heta[iy*nbeta+ix];
       }
     } 
-    WriteToTiff(gm, imgname, nbetaX, nbetaY);   
+    WriteToTiff(gm, imgname, nbeta, nbeta);   
     delete [] gm;
     return NULL; 
   };
@@ -141,18 +129,16 @@ class etaInterpolationBase : public slsInterpolation {
       etamax=2;
     }
     
-    etastepX=(etamax-etamin)/nbetaX;
-    etastepY=(etamax-etamin)/nbetaY;
+    etastep=(etamax-etamin)/nbeta;
     uint32 nnx;
     uint32 nny;
     float *gm=ReadFromTiff(imgname, nnx, nny);
-    /* if (nnx!=nny) { */
-    /*   cout << "different number of bins in x " << nnx << "  and y " << nny<< " !"<< endl; */
-    /*   cout << "Aborting read"<< endl; */
-    /*   return 0; */
-    /* } */
-    nbetaX=nnx;
-    nbetaY=nny;
+    if (nnx!=nny) {
+      cout << "different number of bins in x " << nnx << "  and y " << nny<< " !"<< endl;
+      cout << "Aborting read"<< endl;
+      return 0;
+    }
+    nbeta=nnx;
     if (gm) {
       if (heta) {
 	delete [] heta;
@@ -160,13 +146,13 @@ class etaInterpolationBase : public slsInterpolation {
 	delete [] hhy;
       }
       
-      heta=new int[nbetaX*nbetaY];
-      hhx=new float[nbetaX*nbetaY];
-      hhy=new float[nbetaX*nbetaY];
+      heta=new int[nbeta*nbeta];
+      hhx=new float[nbeta*nbeta];
+      hhy=new float[nbeta*nbeta];
       
-      for (int ix=0; ix<nbetaX; ix++) {
-	for (int iy=0; iy<nbetaY; iy++) {
-	  heta[iy*nbetaX+ix]=gm[iy*nbetaX+ix];
+      for (int ix=0; ix<nbeta; ix++) {
+	for (int iy=0; iy<nbeta; iy++) {
+	  heta[iy*nbeta+ix]=gm[iy*nbeta+ix];
 	}
       }
       delete [] gm;
@@ -192,10 +178,10 @@ float *gethhx()
     };
   virtual int addToFlatField(double etax, double etay){
     int ex,ey; 
-    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastepY;
-    if (ey<nbetaY && ex<nbetaX && ex>=0 && ey>=0)
-      heta[ey*nbetaX+ex]++; 
+    ex=(etax-etamin)/etastep;
+    ey=(etay-etamin)/etastep;
+    if (ey<nbeta && ex<nbeta && ex>=0 && ey>=0)
+      heta[ey*nbeta+ex]++; 
     return 0;    
   };
   
@@ -209,80 +195,80 @@ float *gethhx()
    
    float tot_eta=0;
 
-  float *etah=new float[nbetaX*nbetaY];
-  // int etabins=nbeta;
+  float *etah=new float[nbeta*nbeta];
+  int etabins=nbeta;
   int ibb=0;
 
-  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
+  for (int ii=0; ii<etabins*etabins; ii++) {
    
       etah[ii]=heta[ii];
       tot_eta+=heta[ii];
   }
   sprintf(tit,"/scratch/eta_%d.tiff",ind);
-  WriteToTiff(etah, tit, nbetaX, nbetaY);
+  WriteToTiff(etah, tit, etabins, etabins);
 
 
-  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
-    ibb=(hhx[ii]*nSubPixelsX);
+  for (int ii=0; ii<etabins*etabins; ii++) {
+    ibb=(hhx[ii]*nSubPixels);
     etah[ii]=ibb;
   }
   sprintf(tit,"/scratch/eta_hhx_%d.tiff",ind);
-  WriteToTiff(etah, tit, nbetaX, nbetaY);
+  WriteToTiff(etah, tit, etabins, etabins);
 	  
-  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
-    ibb=hhy[ii]*nSubPixelsY;
+  for (int ii=0; ii<etabins*etabins; ii++) {
+    ibb=hhy[ii]*nSubPixels;
     etah[ii]=ibb;
   }
   sprintf(tit,"/scratch/eta_hhy_%d.tiff",ind);
-  WriteToTiff(etah, tit, nbetaX, nbetaY);
+  WriteToTiff(etah, tit, etabins, etabins);
 	  
   
-  float *ftest=new float[nSubPixelsX*nSubPixelsY];
+  float *ftest=new float[nSubPixels*nSubPixels];
 
-  for (int ib=0; ib<nSubPixelsX*nSubPixelsY; ib++) ftest[ib]=0;
+  for (int ib=0; ib<nSubPixels*nSubPixels; ib++) ftest[ib]=0;
   
 
   //int ibx=0, iby=0;
   
-  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
+  for (int ii=0; ii<nbeta*nbeta; ii++) {
     
-    ibx=nSubPixelsX*hhx[ii];
-    iby=nSubPixelsY*hhy[ii];
+    ibx=nSubPixels*hhx[ii];
+    iby=nSubPixels*hhy[ii];
     if (ibx<0) ibx=0;
     if (iby<0) iby=0;
-    if (ibx>=nSubPixelsX) ibx=nSubPixelsX-1;
-    if (iby>=nSubPixelsY) iby=nSubPixelsY-1;
+    if (ibx>=nSubPixels) ibx=nSubPixels-1;
+    if (iby>=nSubPixels) iby=nSubPixels-1;
     
 
-    if (ibx>=0 && ibx<nSubPixelsX && iby>=0 && iby<nSubPixelsY) {
+    if (ibx>=0 && ibx<nSubPixels && iby>=0 && iby<nSubPixels) {
       //
       // if (ibx>0 && iby>0) cout << ibx << " " << iby << " " << ii << endl;
-      ftest[ibx+iby*nSubPixelsX]+=heta[ii];
+      ftest[ibx+iby*nSubPixels]+=heta[ii];
     } else
       cout << "Bad interpolation "<< ii << " " << ibx << " " << iby<< endl; 
-    
+
   }
 
   sprintf(tit,"/scratch/ftest_%d.tiff",ind);
-  WriteToTiff(ftest, tit, nSubPixelsX, nSubPixelsY);
+  WriteToTiff(ftest, tit, nSubPixels, nSubPixels);
 
   //int ibx=0, iby=0;
-  tot_eta/=nSubPixelsX*nSubPixelsY;
+  tot_eta/=nSubPixels*nSubPixels;
   int nbad=0;
-  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
-    ibx=nSubPixelsX*hhx[ii];
-    iby=nSubPixelsY*hhy[ii];
-    if (ftest[ibx+iby*nSubPixelsX]<tot_eta*0.5) {
+  for (int ii=0; ii<etabins*etabins; ii++) {
+    ibx=nSubPixels*hhx[ii];
+    iby=nSubPixels*hhy[ii];
+    if (ftest[ibx+iby*nSubPixels]<tot_eta*0.5) {
       etah[ii]=1;
       nbad++;
-    } else if(ftest[ibx+iby*nSubPixelsX]>tot_eta*2.){
+    } else if(ftest[ibx+iby*nSubPixels]>tot_eta*2.){
       etah[ii]=2;
       nbad++;
     } else
       etah[ii]=0;
   }
   sprintf(tit,"/scratch/eta_bad_%d.tiff",ind);
-  WriteToTiff(etah, tit, nbetaX, nbetaY);
+  WriteToTiff(etah, tit, etabins, etabins);
   // cout << "Index: " << ind << "\t Bad bins: "<< nbad << endl;
   //int ibx=0, iby=0;
 
@@ -300,44 +286,46 @@ float *gethhx()
     double diff=0, d;
     //double bsize=1./nSubPixels;
     int nbad=0;
-    double p_tot_x[nSubPixelsX], p_tot_y[nSubPixelsY], p_tot[nSubPixelsX*nSubPixelsY];
-    double maxdiff=0, mindiff=avg*nSubPixelsX*nSubPixelsY;
+    double p_tot_x[nSubPixels], p_tot_y[nSubPixels], p_tot[nSubPixels*nSubPixels];
+    double maxdiff=0, mindiff=avg*nSubPixels*nSubPixels;
    
     int ipx, ipy;
-    for (ipy=0; ipy<nSubPixelsY; ipy++) {
-      for (ipx=0; ipx<nSubPixelsX; ipx++) {
-	p_tot[ipx+ipy*nSubPixelsX]=0;
+    for (ipy=0; ipy<nSubPixels; ipy++) {
+      for (ipx=0; ipx<nSubPixels; ipx++) {
+	p_tot[ipx+ipy*nSubPixels]=0;
       }
       p_tot_y[ipy]=0;
       p_tot_x[ipy]=0;
     }
    
-    for (int ibx=0; ibx<nbetaX; ibx++) {
-      for (int iby=0; iby<nbetaY; iby++) {
-	ipx=hx[ibx+iby*nbetaX]*nSubPixelsX;
+    for (int ibx=0; ibx<nbeta; ibx++) {
+      for (int iby=0; iby<nbeta; iby++) {
+	ipx=hx[ibx+iby*nbeta]*nSubPixels;
 	if (ipx<0) ipx=0;
-	if (ipx>=nSubPixelsX) ipx=nSubPixelsX-1;
+	if (ipx>=nSubPixels) ipx=nSubPixels-1;
 	
-	ipy=hy[ibx+iby*nbetaX]*nSubPixelsY;
+	ipy=hy[ibx+iby*nbeta]*nSubPixels;
 	if (ipy<0) ipy=0;
-	if (ipy>=nSubPixelsY) ipy=nSubPixelsY-1;
+	if (ipy>=nSubPixels) ipy=nSubPixels-1;
 	
-	p_tot[ipx+ipy*nSubPixelsX]+=heta[ibx+iby*nbetaX];
-	p_tot_y[ipy]+=heta[ibx+iby*nbetaX];
-	p_tot_x[ipx]+=heta[ibx+iby*nbetaX];
+	p_tot[ipx+ipy*nSubPixels]+=heta[ibx+iby*nbeta];
+	p_tot_y[ipy]+=heta[ibx+iby*nbeta];
+	p_tot_x[ipx]+=heta[ibx+iby*nbeta];
+	
+
       }
     }
     
     
     //  cout << endl << endl;
-    for (ipy=0; ipy<nSubPixelsY; ipy++) { 
+    for (ipy=0; ipy<nSubPixels; ipy++) { 
      cout.width(5);
      //flat_y[ipy]=p_tot_y[ipy];//avg/nSubPixels;
-      for (ipx=0; ipx<nSubPixelsX; ipx++) {
+      for (ipx=0; ipx<nSubPixels; ipx++) {
 
 	//	flat_x[ipx]=p_tot_x[ipx];///avg/nSubPixels;
-	flat[ipx+nSubPixelsX*ipy]=p_tot[ipx+nSubPixelsX*ipy];///avg;
-	d=p_tot[ipx+nSubPixelsX*ipy]-avg;
+	flat[ipx+nSubPixels*ipy]=p_tot[ipx+nSubPixels*ipy];///avg;
+	d=p_tot[ipx+nSubPixels*ipy]-avg;
 	if (d<0) d*=-1.;
 	if (d>5*sqrt(avg) )
 	  nbad++;
@@ -366,8 +354,8 @@ float *gethhx()
   float *hhx;
   float *hhy;
   int *heta;
-  int nbetaX, nbetaY;
-  double etamin, etamax, etastepX, etastepY;
+  int nbeta;
+  double etamin, etamax, etastep;
   double rangeMin, rangeMax;
 
 

slsDetectorCalibration/interpolations/etaInterpolationPosXY.h

@@ -9,7 +9,7 @@
 
 class etaInterpolationPosXY : public virtual etaInterpolationBase{
  public:
- etaInterpolationPosXY(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax){
+ etaInterpolationPosXY(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny,ns, nb, emin,emax){
     //  cout << "epxy " << nb << " " << emin << " " << emax << endl; cout << nbeta << " " << etamin << " " << etamax << endl; 
   };
 
@@ -24,6 +24,14 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
   virtual void prepareInterpolation(int &ok)
   {
    ok=1;  
+#ifdef MYROOT1   
+   if (hhx) delete hhx;
+   if (hhy) delete hhy;
+
+   hhx=new TH2D("hhx","hhx",heta->GetNbinsX(),heta->GetXaxis()->GetXmin(),heta->GetXaxis()->GetXmax(), heta->GetNbinsY(),heta->GetYaxis()->GetXmin(),heta->GetYaxis()->GetXmax()); 
+   hhy=new TH2D("hhy","hhy",heta->GetNbinsX(),heta->GetXaxis()->GetXmin(),heta->GetXaxis()->GetXmax(), heta->GetNbinsY(),heta->GetYaxis()->GetXmin(),heta->GetYaxis()->GetXmax()); 
+   
+#endif
 
 
    ///*Eta Distribution Rebinning*///
@@ -32,128 +40,106 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
    double tot_eta=0;
    double tot_eta_x=0;
    double tot_eta_y=0;
-   for (int ip=0; ip<nbetaX*nbetaY; ip++)
+   for (int ip=0; ip<nbeta*nbeta; ip++)
      tot_eta+=heta[ip];
    cout << "total eta entries is :"<< tot_eta << endl;   
    if (tot_eta<=0) {ok=0; return;};
 
 
-   double hx[nbetaX]; //profile x
-   double hy[nbetaY]; //profile y
-   double hix[nbetaX]; //integral of projection x
-   double hiy[nbetaY]; //integral of projection y
+   double hx[nbeta]; //profile x
+   double hy[nbeta]; //profile y
+   double hix[nbeta]; //integral of projection x
+   double hiy[nbeta]; //integral of projection y
    //  int ii=0;
-   double etax, etay;
-   for (int ib=0; ib<nbetaX; ib++) {
+   double etax;//, etay;
+   for (int ib=0; ib<nbeta; ib++) {
 
-   
-     //tot_eta_y=0;
+     tot_eta_x=0;
+     tot_eta_y=0;
 
-     for (int iby=0; iby<nbetaY; iby++) {
-       etay=etamin+iby*etastepY;
+     for (int iby=0; iby<nbeta; iby++) {
+       etax=etamin+iby*etastep;
        //cout << etax << endl;
-     
+       if (etax>=0 && etax<=1)
+	 hx[iby]=heta[iby+ib*nbeta];
+       else {
+	 hx[iby]=0;
+       }
        // tot_eta_x+=hx[iby];
-       if (etay>=0 && etay<=1)
-	 hy[iby]=heta[ib+iby*nbetaX];
+       if (etax>=0 && etax<=1)
+	 hy[iby]=heta[ib+iby*nbeta];
        else
 	 hy[iby]=0;
        // tot_eta_y+=hy[iby];
      }
 
-   
+     hix[0]=hx[0];
      hiy[0]=hy[0];
 
-     for (int iby=1; iby<nbetaY; iby++) {
+     for (int iby=1; iby<nbeta; iby++) {
+       hix[iby]=hix[iby-1]+hx[iby];
        hiy[iby]=hiy[iby-1]+hy[iby];
      }
 
-     tot_eta_y=hiy[nbetaY-1]+1;
+     // ii=0;
+     tot_eta_x=hix[nbeta-1]+1;
+     tot_eta_y=hiy[nbeta-1]+1;
      
-     for (int iby=0; iby<nbetaY; iby++) {
+     for (int ibx=0; ibx<nbeta; ibx++) {
+       if (tot_eta_x<=0) {
+	 hhx[ibx+ib*nbeta]=-1;
+	 //ii=(ibx)/nbeta;
+       } else //if (hix[ibx]>(ii+1)*tot_eta_x*bsize) 
+	 { 
+	   //if (hix[ibx]>tot_eta_x*(ii+1)/nSubPixels) ii++;
+	   hhx[ibx+ib*nbeta]=hix[ibx]/tot_eta_x;
+	 }
+     }
+     /* if (ii!=(nSubPixels-1)) */
+     /*   cout << ib << " x " <<  tot_eta_x << " " << (ii+1)*tot_eta_x*bsize << " " << ii << " " << hix[nbeta-1]<< endl; */
+     
+     //ii=0;
+     
+     for (int ibx=0; ibx<nbeta; ibx++) {
        if (tot_eta_y<=0) {
-	 hhy[ib+iby*nbetaX]=-1;
+	 hhy[ib+ibx*nbeta]=-1;
 	 //ii=(ibx*nSubPixels)/nbeta;
        } else {   
 	 //if (hiy[ibx]>tot_eta_y*(ii+1)/nSubPixels) ii++;
-	 hhy[ib+iby*nbetaX]=hiy[iby]/tot_eta_y;
+	 hhy[ib+ibx*nbeta]=hiy[ibx]/tot_eta_y;
        }
      }
    }
 
 
-
-   for (int ib=0; ib<nbetaY; ib++) {
-
-     for (int ibx=0; ibx<nbetaX; ibx++) {
-       etax=etamin+ibx*etastepX;
-       //cout << etax << endl;
-       if (etax>=0 && etax<=1)
-	 hx[ibx]=heta[ibx+ib*nbetaX];
-       else {
-	 hx[ibx]=0;
-       }
-     }
-     hix[0]=hx[0];
-       
-     for (int ibx=1; ibx<nbetaX; ibx++) {
-       hix[ibx]=hix[ibx-1]+hx[ibx];
-     }
-
-  
-     tot_eta_x=hix[nbetaX-1]+1;
-     
-     for (int ibx=0; ibx<nbetaX; ibx++) {
-       if (tot_eta_x<=0) {
-	 hhx[ibx+ib*nbetaX]=-1;
-       } 
-       else { 
-	 hhx[ibx+ib*nbetaX]=hix[ibx]/tot_eta_x;
-       }
-     }
-     
-
-     
-     for (int ibx=0; ibx<nbetaX; ibx++) {
-       if (tot_eta_x<=0) {
-	 hhx[ibx+ib*nbetaX]=-1;
-       } else	 { 
-	 //if (hix[ibx]>tot_eta_x*(ii+1)/nSubPixels) ii++;
-	 hhx[ibx+ib*nbetaX]=hix[ibx]/tot_eta_x;
-       }
-     }
-     
-   }
-
-     
    int ibx, iby, ib; 
    
    iby=0;
-   while (hhx[iby*nbetaY+nbetaY/2]<0) iby++;
+   while (hhx[iby*nbeta+nbeta/2]<0) iby++;
    for (ib=0; ib<iby;ib++) {
-     for (ibx=0; ibx<nbetaX;ibx++)
-       hhx[ibx+nbetaX*ib]=hhx[ibx+nbetaX*iby];
+     for (ibx=0; ibx<nbeta;ibx++)
+       hhx[ibx+nbeta*ib]=hhx[ibx+nbeta*iby];
    }
-   iby=nbetaY-1;
+   iby=nbeta-1;
    
-   while (hhx[iby*nbetaY+nbetaY/2]<0) iby--;
-   for (ib=iby+1; ib<nbetaY;ib++) {
-     for (ibx=0; ibx<nbetaX;ibx++)
-       hhx[ibx+nbetaX*ib]=hhx[ibx+nbetaX*iby];
+   while (hhx[iby*nbeta+nbeta/2]<0) iby--;
+   for (ib=iby+1; ib<nbeta;ib++) {
+     for (ibx=0; ibx<nbeta;ibx++)
+       hhx[ibx+nbeta*ib]=hhx[ibx+nbeta*iby];
    }
    
    iby=0;
-   while (hhy[nbetaX/2*nbetaX+iby]<0) iby++;
+   while (hhy[nbeta/2*nbeta+iby]<0) iby++;
    for (ib=0; ib<iby;ib++) {
-     for (ibx=0; ibx<nbetaY;ibx++)
-       hhy[ib+nbetaX*ibx]=hhy[iby+nbetaX*ibx];
+     for (ibx=0; ibx<nbeta;ibx++)
+       hhy[ib+nbeta*ibx]=hhy[iby+nbeta*ibx];
    }
-   iby=nbetaX-1;
+   iby=nbeta-1;
    
-   while (hhy[nbetaX/2*nbetaX+iby]<0) iby--;
-   for (ib=iby+1; ib<nbetaX;ib++) {
-     for (ibx=0; ibx<nbetaY;ibx++)
-       hhy[ib+nbetaX*ibx]=hhy[iby+nbetaX*ibx];
+   while (hhy[nbeta/2*nbeta+iby]<0) iby--;
+   for (ib=iby+1; ib<nbeta;ib++) {
+     for (ibx=0; ibx<nbeta;ibx++)
+       hhy[ib+nbeta*ibx]=hhy[iby+nbeta*ibx];
    }
 
 
@@ -170,16 +156,9 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
 
 };
 
-
-
-
-
-
-
-
 class eta2InterpolationPosXY : public virtual eta2InterpolationBase, public virtual etaInterpolationPosXY {
  public:
- eta2InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax),eta2InterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax),etaInterpolationPosXY(nx,ny, ns, nsy, nb, nby, emin, emax){
+ eta2InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny,ns, nb, emin,emax),eta2InterpolationBase(nx,ny,ns, nb, emin,emax),etaInterpolationPosXY(nx,ny,ns, nb, emin,emax){
     //  cout << "e2pxy " << nb << " " << emin << " " << emax << endl; 
   };
  
@@ -193,8 +172,8 @@ class eta2InterpolationPosXY : public virtual eta2InterpolationBase, public virt
 
 class eta3InterpolationPosXY : public virtual eta3InterpolationBase, public virtual etaInterpolationPosXY {
  public:
- eta3InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax),eta3InterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax), etaInterpolationPosXY(nx,ny, ns, nsy, nb, nby, emin, emax){
-    //   cout << "e3pxy " << nbeta << " " << etamin << " " << etamax << " " << nSubPixels<< endl;  
+ eta3InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny,ns, nb, emin,emax),eta3InterpolationBase(nx,ny,ns, nb, emin,emax), etaInterpolationPosXY(nx,ny,ns, nb, emin,emax){
+      cout << "e3pxy " << nbeta << " " << etamin << " " << etamax << " " << nSubPixels<< endl;  
   };
 
  eta3InterpolationPosXY(eta3InterpolationPosXY *orig): etaInterpolationBase(orig), etaInterpolationPosXY(orig)  {};

slsDetectorCalibration/interpolations/slsInterpolation.h

@@ -29,21 +29,19 @@ class slsInterpolation
 {
 
  public:
- slsInterpolation(int nx=400, int ny=400, int ns=25, int nsy=-1) :nPixelsX(nx), nPixelsY(ny),  nSubPixelsX(ns), nSubPixelsY(nsy),id(0) {
+ slsInterpolation(int nx=400, int ny=400, int ns=25) :nPixelsX(nx), nPixelsY(ny),  nSubPixels(ns), id(0) {
    
-    if (nSubPixelsY<=0) nSubPixelsY=nSubPixelsX;
-    hint=new int[nSubPixelsX*nx*nSubPixelsY*ny];
+ hint=new int[ns*nx*ns*ny];
 
 };
   
  slsInterpolation(slsInterpolation *orig){
    nPixelsX=orig->nPixelsX;
    nPixelsY=orig->nPixelsY;
-   nSubPixelsX=orig->nSubPixelsX;
-   nSubPixelsY=orig->nSubPixelsY;
+   nSubPixels=orig->nSubPixels;
    
-   hint=new int[nSubPixelsX*nPixelsX*nSubPixelsY*nPixelsY];
-   memcpy(hint, orig->hint,nSubPixelsX*nPixelsX*nSubPixelsY*nPixelsY*sizeof(int));
+   hint=new int[nSubPixels*nPixelsX*nSubPixels*nPixelsY];
+   memcpy(hint, orig->hint,nSubPixels*nPixelsX*nSubPixels*nPixelsY*sizeof(int));
  
  };
 
@@ -53,37 +51,23 @@ class slsInterpolation
    return new slsInterpolation(this);
    }*/
 
-  int getNSubPixelsX() {return nSubPixelsX;};
-  int getNSubPixelsY() {return nSubPixelsY;};
-  int getNSubPixels() {if (nSubPixelsX==nSubPixelsY) return nSubPixelsX; else return 0;};
-  void getNSubPixels(int &nsx, int &nsy) {nsx=nSubPixelsX; nsy=nsx=nSubPixelsY;}
+  int getNSubPixels() {return nSubPixels;};
 
-  void setNSubPixels(int ns, int nsy=-1)   {
-   
+
+  int setNSubPixels(int ns)   {
+    if (ns>0 && ns!=nSubPixels) {
       delete [] hint;
-      nSubPixelsX=ns;
-      if (nsy>0)  nSubPixelsY=nsy;
-      else nSubPixelsY=ns;
-      
-      hint=new int[nSubPixelsX*nPixelsX*nSubPixelsY*nPixelsY];
-      
-      //return nSubPixels;
+      nSubPixels=ns;
+      hint=new int[nSubPixels*nPixelsX*nSubPixels*nPixelsY];
+    }
+    return nSubPixels;
   }
 
-  
-
-
-  int getImageSize(int &nnx, int &nny, int &nsx, int &nsy) {
-    nnx=nSubPixelsX*nPixelsX;
-    nny=nSubPixelsY*nPixelsY;
-    nsx=nSubPixelsX;
-    nsy=nSubPixelsY;
-    return nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY;
-  };
-  
-
-  int getImageSize() {
-    return nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY;
+  int getImageSize(int &nnx, int &nny, int &ns) {
+    nnx=nSubPixels*nPixelsX;
+    nny=nSubPixels*nPixelsY;
+    ns=nSubPixels;
+    return nSubPixels*nSubPixels*nPixelsX*nPixelsY;
   };
   
   
@@ -108,14 +92,14 @@ class slsInterpolation
     //cout << "!" <<endl;
     float *gm=NULL;
     int *dummy=getInterpolatedImage();
-    gm=new float[ nSubPixelsX*  nSubPixelsY* nPixelsX*nPixelsY];
+    gm=new float[ nSubPixels*  nSubPixels* nPixelsX*nPixelsY];
     if (gm) {
-      for (int ix=0; ix<nPixelsX*nSubPixelsX; ix++) {
-	for (int iy=0; iy<nPixelsY*nSubPixelsY; iy++) {
-	  gm[iy*nPixelsX*nSubPixelsX+ix]=dummy[iy*nPixelsX*nSubPixelsX+ix];
+      for (int ix=0; ix<nPixelsX*nSubPixels; ix++) {
+	for (int iy=0; iy<nPixelsY*nSubPixels; iy++) {
+	  gm[iy*nPixelsX*nSubPixels+ix]=dummy[iy*nPixelsX*nSubPixels+ix];
 	}
       }
-      WriteToTiff(gm, imgname,nSubPixelsY* nPixelsX ,nSubPixelsY* nPixelsY); 
+      WriteToTiff(gm, imgname,nSubPixels* nPixelsX ,nSubPixels* nPixelsY); 
       delete [] gm;
     } else cout << "Could not allocate float image " << endl;
     return NULL;    
@@ -136,9 +120,9 @@ class slsInterpolation
   virtual void clearInterpolatedImage() {
 
 
-      for (int ix=0; ix<nPixelsX*nSubPixelsX; ix++) {
-	for (int iy=0; iy<nPixelsY*nSubPixelsY; iy++) {
-	  hint[iy*nPixelsX*nSubPixelsX+ix]=0;
+      for (int ix=0; ix<nPixelsX*nSubPixels; ix++) {
+	for (int iy=0; iy<nPixelsY*nSubPixels; iy++) {
+	  hint[iy*nPixelsX*nSubPixels+ix]=0;
 	}
       }
 
@@ -149,11 +133,11 @@ class slsInterpolation
 
 
   virtual int *addToImage(double int_x, double int_y){ 
-    int iy=((double)nSubPixelsY)*int_y; 
-    int ix=((double)nSubPixelsX)*int_x; 
-     if (ix>=0 && ix<(nPixelsX*nSubPixelsX) && iy<(nSubPixelsY*nPixelsY) && iy>=0 ){
+    int iy=((double)nSubPixels)*int_y; 
+    int ix=((double)nSubPixels)*int_x; 
+     if (ix>=0 && ix<(nPixelsX*nSubPixels) && iy<(nSubPixels*nPixelsY) && iy>=0 ){
        // cout << int_x << " " << int_y << " " << "  " << ix << " " << iy << " " << ix+iy*nPixelsX*nSubPixels << " " << hint[ix+iy*nPixelsX*nSubPixels];
-       (*(hint+ix+iy*nPixelsX*nSubPixelsX))+=1; 
+       (*(hint+ix+iy*nPixelsX*nSubPixels))+=1; 
        // cout << " " << hint[ix+iy*nPixelsX*nSubPixels] << endl;
      }// else
       // cout << "bad! "<< int_x << " " << int_y << " " << "  " << ix << " " << iy << " " << ix+iy*nPixelsX*nSubPixels << endl;
@@ -196,12 +180,11 @@ class slsInterpolation
     /* cluster[2]=cl+6; */
     
     sum=0;
-    int xoff=0, yoff=0;
-#ifndef WRITE_QUAD 
     double sumBL=0;
     double sumTL=0;
     double sumBR=0;
     double sumTR=0;
+    int xoff=0, yoff=0;
     for (int ix=0; ix<3; ix++) {
       for (int iy=0; iy<3; iy++) {
 	sum+=cl[ix+3*iy];
@@ -221,95 +204,34 @@ class slsInterpolation
 
     
     if(sumTL  >= totquad){
-/* #ifdef WRITE_QUAD */
-/*       /\* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; *\/ */
-/*       /\* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; *\/ */
-/*       if (sumTL  ==sum) { */
-/* #endif */
+      /* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; */
+      /* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; */
+      
       corner = TOP_LEFT;
       totquad=sumTL;
       xoff=0;
       yoff=1;
-/* #ifdef WRITE_QUAD */
-/*       } */
-/* #endif */
     } 
 
     if(sumBR  >= totquad){
       /* sDum[0][0] = cluster[0][1]; sDum[1][0] = cluster[1][1]; */
       /* sDum[0][1] = cluster[0][2]; sDum[1][1] = cluster[1][2]; */
       
-/* #ifdef WRITE_QUAD */
-/*       /\* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; *\/ */
-/*       /\* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; *\/ */
-/*       if (sumBR   ==sum) { */
-/* #endif */
-      corner = BOTTOM_RIGHT;
       xoff=1;
       yoff=0;
+      corner = BOTTOM_RIGHT;
       totquad=sumBR;
-/* #ifdef WRITE_QUAD */
-/*       } */
-/* #endif */
     }
     
     if(sumTR  >= totquad){
-/* #ifdef WRITE_QUAD */
-/*       /\* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; *\/ */
-/*       /\* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; *\/ */
-/*       if (sumTR ==sum) { */
-/* #endif */
       xoff=1;
       yoff=1;
       /* sDum[0][0] = cluster[1][1]; sDum[1][0] = cluster[2][1]; */
       /* sDum[0][1] = cluster[1][2]; sDum[1][1] = cluster[2][2]; */
       corner = TOP_RIGHT;
       totquad=sumTR;
-/* #ifdef WRITE_QUAD */
-/*       } */
-/* #endif */
     }
- 
-#endif    
-#ifdef WRITE_QUAD    
-   
-    double sumB=0;
-    double sumT=0;
-    double sumR=0;
-    double sumL=0;
-
-    for (int ix=0; ix<3; ix++) {
-      for (int iy=0; iy<3; iy++) {
-	sum+=cl[ix+3*iy];
-	if (ix<1 ) sumL+=cl[ix+iy*3];
-	if (ix>1) sumR+=cl[ix+iy*3];
-	if (iy<1) sumB=cl[ix+iy*3];
-	if (iy>1) sumT+=cl[ix+iy*3];
-      }
-    } 
     
-    totquad=sum;
-    if ( sumT==0 && sumR==0) {
-        corner = BOTTOM_LEFT;
-	xoff=0;
-	yoff=0;
-    } else if ( sumB==0 && sumR==0 ) {
-        corner = TOP_LEFT;
-      xoff=0;
-      yoff=1;
-    } else if ( sumT==0 && sumL==0) {
-      corner = BOTTOM_RIGHT;
-      xoff=1;
-      yoff=0;
-    } else if ( sumB==0 && sumL==0) {
-      xoff=1;
-      yoff=1;
-      corner = TOP_RIGHT;
-    } else
-      printf("** bad 2x2 cluster!\n");
-
-#endif
-
 
     for (int ix=0; ix<2; ix++) {
       for (int iy=0; iy<2; iy++) {
@@ -573,7 +495,7 @@ class slsInterpolation
 
  protected:
   int nPixelsX, nPixelsY;
-  int nSubPixelsX, nSubPixelsY;
+  int nSubPixels;
   int id;
   int *hint;
 };

slsDetectorCalibration/moenchExecutables/Makefile.zmq

@@ -1,18 +1,14 @@
 
-INCDIR=   -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../../libs/rapidjson/
-LDFLAG= -L/usr/lib64/ -lpthread -lm  -lstdc++  -lzmq -pthread -lrt -ltiff   -O3  -std=c++11 -Wall -L../../build/bin/ -lSlsSupport
+INCDIR=   -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/
+LDFLAG= -L/usr/lib64/ -lpthread -lm  -lstdc++  -lzmq -pthread -lrt -ltiff   -O3 -g -std=c++11 -Wall
 #-L../../bin -lhdf5  -L.
 
 #DESTDIR?=../bin
 
-all:  moenchZmqProcess 
- #moenchZmqProcessCtbGui
+all:  moenchZmqProcess
 
 moenchZmqProcess:  moenchZmqProcess.cpp   clean
-		      g++ -o moenchZmqProcess  moenchZmqProcess.cpp  $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF)  -DNEWZMQ -DINTERP 
-
-#moenchZmqProcessCtbGui:  moenchZmqProcess.cpp   clean
-#		      g++ -o moenchZmqProcessCtbGui  moenchZmqProcess.cpp  $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF)  -DNEWZMQ -DINTERP -DCTBGUI
+		      g++ -o moenchZmqProcess  moenchZmqProcess.cpp  $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF)  -DNEWZMQ -DINTERP
 
 clean: 	
 	rm -f  moenchZmqProcess  

slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp

@@ -16,8 +16,7 @@
 
 //#include "etaInterpolationPosXY.h"
 #include "noInterpolation.h"
-#include "etaInterpolationPosXY.h"
-//#include "etaInterpolationCleverAdaptiveBins.h"
+#include "etaInterpolationCleverAdaptiveBins.h"
 //#include "etaInterpolationRandomBins.h"
 using namespace std;
 #define NC 400

slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp

@@ -149,7 +149,6 @@ int main(int argc, char *argv[]) {
   if (argc>=9) {
     nframes=atoi(argv[8]);
   }
-
   int xmin=0, xmax=nx, ymin=0, ymax=ny;
   if (argc>=13) {
     xmin=atoi(argv[9]);
@@ -186,7 +185,6 @@ int main(int argc, char *argv[]) {
     cout << "pedestal file is " << pedfile << endl;
  if (thr>0) 
     cout << "threshold is " << thr << endl;
- cout << "Nframes is " << nframes << endl;
  
  uint32 nnx, nny;
  double *gmap;

slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp

@@ -1,18 +1,13 @@
-//#define WRITE_QUAD
+#define WRITE_QUAD
 #define DEVELOPER
-#undef CORR
+
 #define C_GHOST 0.0004
 
 #define CM_ROWS 20
 
 #include "sls_detector_defs.h"
 #include "ZmqSocket.h"
-#ifndef RECT
 #include "moench03T1ZmqDataNew.h"
-#endif
-#ifdef RECT
-#include "moench03T1ZmqDataNewRect.h"
-#endif
 #include "moench03GhostSummation.h"
 #include "moench03CommonMode.h"
 #include <vector> 
@@ -36,12 +31,12 @@
 #include "ansi.h"
 #include <iostream>
 
-#include <chrono>
+//#include <chrono>
 #include <ctime> // time_t
 #include <cstdio>
 
 using namespace std;
-using namespace std::chrono;
+//using namespace std::chrono;
 
 //#define SLS_DETECTOR_JSON_HEADER_VERSION 0x2
 
@@ -54,11 +49,10 @@ int main(int argc, char *argv[]) {
  */
   FILE *of=NULL;
   int fifosize=5000;
-  int etabins=1000, etabinsy=1000;//nsubpix*2*100;
+  int etabins=1000;//nsubpix*2*100;
   double etamin=-1, etamax=2;
-  int nSubPixelsX=2;
+  int nSubPixels=2;
   //	int emin, emax;
-  int nSubPixelsY=2;
 	// help
   if (argc < 3 ) {
     cprintf(RED, "Help: ./trial [receive socket ip] [receive starting port number] [send_socket ip] [send starting port number] [nthreads] [nsubpix] [gainmap]  [etafile]\n");
@@ -77,12 +71,9 @@ int main(int argc, char *argv[]) {
 
   int ok;
 
-  high_resolution_clock::time_point t1;
-  high_resolution_clock::time_point t2 ;
-    std::chrono::steady_clock::time_point begin,end,finished;
-      //time_t begin,end,finished;
-  int rms=0;
-  
+  // high_resolution_clock::time_point t1;
+  // high_resolution_clock::time_point t2 ;
+  time_t begin,end,finished;
 
 
   if (argc > 4) {
@@ -102,14 +93,10 @@ int main(int argc, char *argv[]) {
     nthreads=atoi(argv[5]);
 
   cout << "Number of threads is: " << nthreads << endl;
-  if (argc>6) {
-    nSubPixelsX=atoi(argv[6]);
-    nSubPixelsY=nSubPixelsX;
-#ifdef RECT
-    nSubPixelsX=2;
-#endif
-  }
-  cout << "Number of subpixels is: " << nSubPixelsX << " " <<  nSubPixelsY << endl;
+  if (argc>6)
+    nSubPixels=atoi(argv[6]);
+  cout << "Number of subpixels is: " << nSubPixels << endl;
+  
 
   char *gainfname=NULL;
   if (argc>7) {
@@ -129,7 +116,7 @@ int main(int argc, char *argv[]) {
   int npx, npy;
   det->getDetectorSize(npx, npy);
 
-  int send_something=0;
+
 
 
   int maxSize = npx*npy*2;//32*2*8192;//5000;//atoi(argv[3]);
@@ -142,12 +129,8 @@ int main(int argc, char *argv[]) {
 
   int ncol_cm=CM_ROWS;
   double xt_ghost=C_GHOST;
-  moench03CommonMode *cm=NULL;
-  moench03GhostSummation *gs=NULL;
-#ifdef CORR
-  cm=new moench03CommonMode(ncol_cm);
-  gs=new moench03GhostSummation(det, xt_ghost);
-#endif
+  moench03CommonMode *cm=new moench03CommonMode(ncol_cm);
+  moench03GhostSummation *gs=new moench03GhostSummation(det, xt_ghost);
   double *gainmap=NULL;
   float *gm;
   double *gmap=NULL;
@@ -175,14 +158,14 @@ int main(int argc, char *argv[]) {
 
   //analogDetector<uint16_t> *filter=new analogDetector<uint16_t>(det,1,NULL,1000);
 #ifndef INTERP
-  singlePhotonDetector *filter=new singlePhotonDetector(det,3, nSigma, 1, cm, 1000, 100, -1, -1, gainmap, gs);
+  singlePhotonDetector *filter=new singlePhotonDetector(det,3, nSigma, 1, cm, 1000, 10, -1, -1, gainmap, gs);
 
     multiThreadedCountingDetector *mt=new multiThreadedCountingDetector(filter,nthreads,fifosize);
 
     // multiThreadedAnalogDetector *mt=new multiThreadedAnalogDetector(filter,nthreads,fifosize);
 #endif
 #ifdef INTERP
-    eta2InterpolationPosXY *interp=new eta2InterpolationPosXY(npx, npy, nSubPixelsX,nSubPixelsY, etabins,  etabinsy, etamin, etamax);
+  eta2InterpolationPosXY *interp=new eta2InterpolationPosXY(npx, npy, nSubPixels, etabins, etamin, etamax);
 
   if (etafname) interp->readFlatField(etafname);
 
@@ -277,17 +260,7 @@ int main(int argc, char *argv[]) {
 	// header variables
 	uint64_t acqIndex = -1;
 	uint64_t frameIndex = -1;
-#ifdef MOENCH_BRANCH
- 	uint32_t subFrameIndex = -1;
-	int* flippedData = 0;
-#endif
-	
-	uint64_t subframes=0;
-	//uint64_t  isubframe=0;
-	uint64_t  insubframe=0;
-	double subnorm=1;
-	uint64_t  f0=-1, nsubframes=0, nnsubframe=0;
-
+	//uint32_t subFrameIndex = -1;
 	uint64_t fileindex = -1;
 	string filename = "";
 	//	char* image = new char[size];
@@ -297,10 +270,10 @@ int main(int argc, char *argv[]) {
 	int iframe=0;
 	char ofname[10000];
 		    
-	string fname;
+	char fname[10000];
 	//	int length;
-	int *detimage=NULL;
-	int nnx, nny,nnsx, nnsy;
+	int *detimage;
+	int nnx, nny,nns;
 	//uint32_t imageSize = 0, nPixelsX = 0, nPixelsY = 0, 
 	//uint32_t  dynamicRange = 0;
 	// infinite loop
@@ -316,11 +289,11 @@ int main(int argc, char *argv[]) {
 	//int16_t *dout;//=new int16_t [nnx*nny];
 	uint32_t dr = 32;
 	int32_t *dout=NULL;//=new int32_t [nnx*nny];
-	float *doutf=NULL;//=new int32_t [nnx*nny];
 	uint16_t roundRNumber = 0;
 	uint8_t detType = 0;
 	uint8_t version = 0;
-	string additionalJsonHeader="" ;
+	//	int* flippedData = 0;
+	char* additionalJsonHeader = 0;
 
 	int32_t threshold=0;
 	
@@ -338,7 +311,7 @@ int main(int argc, char *argv[]) {
 	frameMode fMode=eFrame;
 	double *ped;
 
-	filter->getImageSize(nnx, nny,nnsx, nnsy);
+	filter->getImageSize(nnx, nny,nns);
 
 	
 
@@ -361,13 +334,10 @@ int main(int argc, char *argv[]) {
 
 #endif
 	    //	  if (!zmqsocket->ReceiveHeader(0, acqIndex, frameIndex, subframeIndex, filename, fileindex)) {
-	       cprintf(RED, "Got Dummy\n");
+	      //  cprintf(RED, "Got Dummy\n");
 	      //   t1=high_resolution_clock::now();
-	       //time(&end);
-	       //cout << "Measurement lasted " << difftime(end,begin) << endl;
+	      time(&end);
 
-	       end = std::chrono::steady_clock::now();
-	       cout << "Measurement lasted " << (end-begin).count()*0.000001 << " ms" << endl;
 
 	    while (mt->isBusy()) {;}//wait until all data are processed from the queues
 	    
@@ -382,75 +352,35 @@ int main(int argc, char *argv[]) {
 	      cprintf(RED, "Sent Dummy\n");
 	    }
 	    } else {
-	      send_something=0;
-	      if (fMode==ePedestal) {
-		sprintf(ofname,"%s_%ld_ped.tiff",fname.c_str(),fileindex);
-		mt->writePedestal(ofname);
-		cout << "Writing pedestal to " << ofname << endl;
-		if (rms){
-		  sprintf(ofname,"%s_%ld_var.tiff",fname.c_str(),fileindex);
-		  mt->writePedestalRMS(ofname);
-		  
-		} 
-		send_something=1;
-	      }
+	    if (fMode==ePedestal) {
+	      sprintf(ofname,"%s_%ld_ped.tiff",fname,fileindex);
+	      mt->writePedestal(ofname);
+	       cout << "Writing pedestal to " << ofname << endl;
+	    }
 #ifdef INTERP
-	      else if  (fMode==eFlat) {
-		mt->prepareInterpolation(ok);
-		sprintf(ofname,"%s_%ld_eta.tiff",fname.c_str(),fileindex);
-		mt->writeFlatField(ofname);
-		cout << "Writing eta to " << ofname << endl;
-		send_something=1;
-	      }
+	    else if  (fMode==eFlat) {
+	      mt->prepareInterpolation(ok);
+	      sprintf(ofname,"%s_%ld_eta.tiff",fname,fileindex);
+	      mt->writeFlatField(ofname);
+	       cout << "Writing eta to " << ofname << endl;
+	    }
 #endif
-	      else {
-		if (subframes>0 ) { 
-		  if (insubframe>0) {
-		    sprintf(ofname,"%s_sf%ld_%ld.tiff",fname.c_str(),nnsubframe,fileindex);
-		    //		  mt->writeImage(ofname);
-		    doutf= new float[nnx*nny];
-		    if (subframes>0 && insubframe!=subframes && insubframe>0)
-		      subnorm=((double)subframes)/((double)insubframe);
-		    else
-		      subnorm=1.;
-		    for (int ix=0; ix<nnx*nny; ix++) {
-		    doutf[ix]=detimage[ix]*subnorm;
-		    if (doutf[ix]<0) doutf[ix]=0;
-		    }
-	    
-		    cout << "Writing image to " << ofname << endl;
-		    
-		    WriteToTiff(doutf,ofname ,nnx, nny); 
-		    
-		    if (doutf)
-		      delete [] doutf;
-		    doutf=NULL;
-		    
-		    nsubframes++;
-		    insubframe=0;
-		    send_something=1;
-		  }
-		} else {
-		  sprintf(ofname,"%s_%ld.tiff",fname.c_str(),fileindex);
-		  mt->writeImage(ofname);
-		  send_something=1;
-		}
-		
-		cout << "Writing image to " << ofname << endl;
-	      }
-	      //  cout << nns*nnx*nny*nns*dr/8 << " " << length << endl;
+	    else {
+	      sprintf(ofname,"%s_%ld.tiff",fname,fileindex);
+	      mt->writeImage(ofname);
+	       cout << "Writing image to " << ofname << endl;
+	    }
+	    //  cout << nns*nnx*nny*nns*dr/8 << " " << length << endl;
 
 	    if (send) {
-	      
+
 	    if (fMode==ePedestal) {   
 	      cprintf(MAGENTA,"Get pedestal!\n");
-	      nnsx=1;
-	      nnsy=1;
-	      
+	      nns=1;
 	      nnx=npx;
 	      nny=npy;
 	      //dout= new int16_t[nnx*nny*nns*nns];
-	      dout= new int32_t[nnx*nny*nnsx*nnsy];
+	      dout= new int32_t[nnx*nny*nns*nns];
 	      // cout << "get pedestal " << endl;
 	      ped=mt->getPedestal();
 	      // cout << "got pedestal " << endl;
@@ -476,19 +406,15 @@ int main(int argc, char *argv[]) {
 	     }
 #endif
 	    else {
-	      detimage=mt->getImage(nnx,nny,nnsx, nnsy);
+	      detimage=mt->getImage(nnx,nny,nns);
 	      cprintf(MAGENTA,"Get image!\n");
-	      cout << nnx << " " << nny << " " << nnsx << " " << nnsy << endl;
+	      cout << nnx << " " << nny << " " << nns << endl;
 	      // nns=1;
 	      // nnx=npx;
 	      // nny=npy;
 	      // nnx=nnx*nns;
 	      //nny=nny*nns;
 	      dout= new int32_t[nnx*nny];
-	      if (subframes>0 && insubframe!=subframes && insubframe>0)
-		subnorm=((double)subframes)/((double)insubframe);
-	      else
-		subnorm=1.;
 	      for (int ix=0; ix<nnx*nny; ix++) {
 		// for (int iy=0; iy<nny*nns; iy++) {
 		 //  for (int isx=0; isx<nns; isx++) {
@@ -500,45 +426,90 @@ int main(int argc, char *argv[]) {
 		    
 		//   }
 		// }
-		  dout[ix]=detimage[ix]*subnorm;
+		  dout[ix]=detimage[ix];
 		  if (dout[ix]<0) dout[ix]=0;
 		  //   cout << ix << " " << dout[ix] << endl;
 		  // }
 	      }
 	    }
-	    //if ((insubframe>0 && subframes>0) || (subframes<=0) ){
 
-	    if(send_something) {
-	   
- 	    zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 1,1,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,&additionalJsonHeader);   
+
+	    //// int SendHeaderData ( int index, bool dummy, uint32_t jsonversion, uint32_t dynamicrange = 0, uint64_t fileIndex = 0,
+	      // 		uint32_t ndetx = 0, uint32_t ndety = 0, uint32_t npixelsx = 0, uint32_t npixelsy = 0, uint32_t imageSize = 0,
+	      // 		uint64_t acqIndex = 0, uint64_t fIndex = 0, const char* fname = NULL,
+	      // 		uint64_t frameNumber = 0, uint32_t expLength = 0, uint32_t packetNumber = 0,
+	      // 		uint64_t bunchId = 0, uint64_t timestamp = 0,
+	      // 		uint16_t modId = 0, uint16_t row = 0, uint16_t column = 0, uint16_t reserved = 0,
+	      // 		uint32_t debug = 0, uint16_t roundRNumber = 0,
+	      // 		uint8_t detType = 0, uint8_t version = 0, int gapPixelsEnable = 0, int flippedDataX = 0,
+	      // 		char* additionalJsonHeader = 0) {
+
+
+
+	    //  cout << "Sending image size " << nnx << " " << nny << endl;
+
+#ifndef DEVELOPER
+#ifndef MOENCH_BRANCH
+	    zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, 0,0, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex,0 , packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, additionalJsonHeader);
+#endif
+#endif
+
+#ifdef DEVELOPER
+	    zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader);
+#endif	
+#ifdef MOENCH_BRANCH
+	    /*
+ int SendHeaderData ( int index, bool dummy, uint32_t jsonversion, uint32_t dynamicrange = 0, uint64_t fileIndex = 0,
+                        uint32_t npixelsx = 0, uint32_t npixelsy = 0, uint32_t imageSize = 0,
+                        uint64_t acqIndex = 0, uint64_t fIndex = 0, char* fname = NULL,
+                        uint64_t frameNumber = 0, uint32_t expLength = 0, uint32_t packetNumber = 0,
+                        uint64_t bunchId = 0, uint64_t timestamp = 0,
+                        uint16_t modId = 0, uint16_t row = 0, uint16_t column = 0, uint16_t reserved = 0,
+                        uint32_t debug = 0, uint16_t roundRNumber = 0,
+                        uint8_t detType = 0, uint8_t version = 0, int* flippedData = 0,
+                        char* additionalJsonHeader = 0) {
+int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEADER_VERSION , uint32_t dr, uint64_t fileindex, uint32_t 0, uint32_t 0, uint32_t, uint64_t, uint64_t, char*, uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, int*, char*)
+
+	     */
+	    //zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version);//, 0,additionalJsonHeader);
+	    zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex, subFrameIndex, packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, flippedData, additionalJsonHeader);
+
+	    /* old 
+	       zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex, subFrameIndex, packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, flippedData, additionalJsonHeader);
+	    */
+	    /*
+
+
+	      new
+	      zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,additionalJsonHeader);
+	     */
+#endif		
+	       
 			
-	      
-	      zmqsocket2->SendData((char*)dout,nnx*nny*dr/8);
-	      cprintf(GREEN, "Sent Data\n");
-	    }
-	    
-	    zmqsocket2->SendHeaderData(0, true, SLS_DETECTOR_JSON_HEADER_VERSION);
-	    cprintf(RED, "Sent Dummy\n");
-	    if (dout)
-	      delete [] dout;
-	    dout=NULL;
-	    
+
+		zmqsocket2->SendData((char*)dout,nnx*nny*dr/8);
+		cprintf(GREEN, "Sent Data\n");
+		
+		zmqsocket2->SendHeaderData(0, true, SLS_DETECTOR_JSON_HEADER_VERSION);
+		cprintf(RED, "Sent Dummy\n");
+		if (dout)
+		  delete [] dout;
+		dout=NULL;
+
 	    }
 	    }
 
 	    mt->clearImage();
 	    
 	    newFrame=1;
+	    //t2 = high_resolution_clock::now();
 	    
+	      time(&finished);
+	      //   auto meas_duration = duration_cast<microseconds>( t2 - t0 ).count();
+	      //   auto real_duration = duration_cast<microseconds>( t2 - t1 ).count();
 	    
-	    //time(&finished);
-	    //cout << "Processing lasted " << difftime(finished,begin) << endl;
-	    
-	       finished = std::chrono::steady_clock::now();
-	       cout << "Processing lasted " << (finished-begin).count()*0.000001 << " ms" << endl;
-#ifdef OPTIMIZE
-	    return 0;
-#endif
+	    cout << "Measurement lasted " << difftime(end,begin) << endl;
+	    cout << "Processing lasted " << difftime(finished,begin) << endl;
 	    continue; //continue to not get out
 
 
@@ -546,8 +517,7 @@ int main(int argc, char *argv[]) {
 
 #ifdef NEWZMQ
 	    if (newFrame) {
-    begin = std::chrono::steady_clock::now();
-    //time(&begin);
+	      time(&begin);
 	      // t0 = high_resolution_clock::now();
 	      //cout <<"new frame" << endl;
 
@@ -573,8 +543,8 @@ int main(int argc, char *argv[]) {
 
 	      //dataSize=size;
 
-	      //strcpy(fname,filename.c_str());
-	      fname=filename;
+	      strcpy(fname,filename.c_str());
+
 	      // cprintf(BLUE, "Header Info:\n"
 	      // 	      "size: %u\n"
 	      // 	      "multisize: %u\n"
@@ -607,7 +577,6 @@ int main(int argc, char *argv[]) {
 	      /* Analog detector commands */
 	      //isPedestal=0;
 	      //isFlat=0;
-	      rms=0;
 	      fMode=eFrame;
 	      frameMode_s="frame";
 	      cprintf(MAGENTA, "Frame mode: ");
@@ -622,12 +591,6 @@ int main(int argc, char *argv[]) {
 		    // cprintf(MAGENTA, "Resetting pedestal\n");
 		    fMode=ePedestal;
 		    //isPedestal=1;
-		  } else if (frameMode_s == "variance"){
-		    mt->newDataSet(); //resets pedestal  
-		    // cprintf(MAGENTA, "Resetting pedestal\n");
-		    fMode=ePedestal;
-		    //isPedestal=1;
-		    rms=1;
 		  }
 #ifdef INTERP 
 		  else if (frameMode_s == "flatfield") {
@@ -766,21 +729,6 @@ int main(int argc, char *argv[]) {
 	      // 	mt->setNSubPixels(nSubPixels);
 	      // }
 	      
-	      // threshold=0;
-	      cprintf(MAGENTA, "Subframes: ");
-	      subframes=0;
-	      //isubframe=0;
-	      insubframe=0;
-	      subnorm=1;
-	      f0=0;
-	      nnsubframe=0;
-	      if (doc.HasMember("subframes")) {	
-		if (doc["subframes"].IsInt()) {
-		  subframes=doc["subframes"].GetInt();
-		}
-	      }	
-	      cprintf(MAGENTA, "%ld\n", subframes);
-
 	      
 	      newFrame=0;
 	      /* zmqsocket->CloseHeaderMessage();*/
@@ -804,97 +752,33 @@ int main(int argc, char *argv[]) {
 	      mt->setFilePointer(NULL);
 	    }
 	  }
-
 	  
 
 	  // cout << "data" << endl;
 	  // get data
 	  // acqIndex = doc["acqIndex"].GetUint64();
-
 	  frameIndex       = doc["fIndex"].GetUint64();
-
 	  // subFrameIndex    = doc["expLength"].GetUint();
 
 	  //  bunchId=doc["bunchId"].GetUint();
 	  //  timestamp=doc["timestamp"].GetUint();
-	  packetNumber=doc["packetNumber"].GetUint();
-	  // cout << acqIndex << " " << frameIndex << " " << subFrameIndex << " "<< bunchId << " " << timestamp << " " << packetNumber << endl;
-	  //cprintf(GREEN, "frame\n");
-	  if (packetNumber>=40) {
-	    //*((int*)buff)=frameIndex;
-	    if (insubframe==0) f0=frameIndex;
-	    memcpy(buff,&frameIndex,sizeof(int));
-	    //length = 
-	    zmqsocket->ReceiveData(0, buff+sizeof(int), size);
-	    mt->pushData(buff);
-	    mt->nextThread();
-	    mt->popFree(buff);
-	    insubframe++;
-	    nsubframes=frameIndex+1-f0;
-	  } else {
-	    cprintf(RED, "Incomplete frame: received only %d packet\n", packetNumber);
-	    //length = 
-	    zmqsocket->ReceiveData(0, dummybuff, size);
-	  }
-	  
-
-
-
-	  if (subframes>0 && insubframe>=subframes && fMode==eFrame) {
-	    while (mt->isBusy()) {;}//wait until all data are processed from the queues
-	    detimage=mt->getImage(nnx,nny,nnsx, nnsy);
-	    cprintf(MAGENTA,"Get image!\n");
-	    dout= new int32_t[nnx*nny];
-	    doutf= new float[nnx*nny];
-	    if (subframes>0 && insubframe!=subframes && insubframe>0)
-	      subnorm=((double)subframes)/((double)insubframe);
-	    else
-	      subnorm=1.;
-	    for (int ix=0; ix<nnx*nny; ix++) {
-	      dout[ix]=detimage[ix]*subnorm;
-	      if (dout[ix]<0) dout[ix]=0;
-	      doutf[ix]=dout[ix];
-	    }
-	    sprintf(ofname,"%s_sf%ld_%ld.tiff",fname.c_str(),nnsubframe,fileindex);
-	    
-	    cout << "Writing image to " << ofname << endl;
-
-	    WriteToTiff(doutf,ofname ,nnx, nny); 
-	    nsubframes++;
-	    insubframe=0;
-	    nnsubframe++;
-
-
-	    
- 	    zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 1,1,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,&additionalJsonHeader);
-
-	    zmqsocket2->SendData((char*)dout,nnx*nny*dr/8);
-	    cprintf(GREEN, "Sent subdata\n");
-		
-
-	    if (dout)
-	      delete [] dout;
-	    dout=NULL;
-
-	    if (doutf)
-	      delete [] doutf;
-	    doutf=NULL;
-	    
-	    mt->clearImage();
-	    
-	  }
-
-		 
-
-
-
-
-
+	      packetNumber=doc["packetNumber"].GetUint();
+	      // cout << acqIndex << " " << frameIndex << " " << subFrameIndex << " "<< bunchId << " " << timestamp << " " << packetNumber << endl;
+	      if (packetNumber>=40) {
+		//*((int*)buff)=frameIndex;
+		memcpy(buff,&frameIndex,sizeof(int));
+		//length = 
+		zmqsocket->ReceiveData(0, buff+sizeof(int), size);
+		mt->pushData(buff);
+		mt->nextThread();
+		mt->popFree(buff);
+	      } else {
+		cprintf(RED, "Incomplete frame: received only %d packet\n", packetNumber);
+		//length = 
+		  zmqsocket->ReceiveData(0, dummybuff, size);
 
+	      }
 	
-	      
-
-
 	  
 	  
 	  iframe++;

slsDetectorCalibration/multiThreadedAnalogDetector.h

@@ -95,7 +95,7 @@ public:
   virtual int *getImage() {
     return det->getImage();
   }
-  virtual int getImageSize(int &nnx, int &nny, int &ns, int &nsy) {return det->getImageSize(nnx, nny, ns, nsy);};
+  virtual int getImageSize(int &nnx, int &nny, int &ns) {return det->getImageSize(nnx, nny, ns);};
   virtual int getDetectorSize(int &nnx, int &nny) {return det->getDetectorSize(nnx, nny);};
 
   virtual ~threadedAnalogDetector() {StopThread();  delete fifoFree; delete fifoData;}
@@ -123,7 +123,7 @@ public:
      return fifoFree->pop(ptr);
    }
 
-   virtual int isBusy() {if (fifoData->isEmpty() && busy==0) return 0; else return 1;}
+   virtual int isBusy() {return busy;}
    
    //protected:
    /** Implement this method in your subclass with the code you want your thread to run. */
@@ -221,10 +221,10 @@ FILE *getFilePointer(){return det->getFilePointer();};
    }
 
 
-  virtual int setNSubPixels(int ns, int nsy)  { 
+   virtual int setNSubPixels(int ns)  { 
      slsInterpolation *interp=(det)->getInterpolation();
-     if (interp)  interp->setNSubPixels(ns, nsy);
-     return 1;};
+     if (interp)  return interp->setNSubPixels(ns);
+     else return 1;};
 
 
    virtual slsInterpolation *setInterpolation(slsInterpolation *f){
@@ -249,7 +249,7 @@ protected:
    }
 
    void * processData() {
-     //  busy=1;
+     busy=1;
      while (!stop) {
        if (fifoData->isEmpty()) {
 	 busy=0;
@@ -259,7 +259,6 @@ protected:
 	 fifoData->pop(data); //blocking!
 	 det->processData(data);
 	 fifoFree->push(data); 
-	 //busy=0;
        }
      }
      return NULL;
@@ -314,13 +313,13 @@ public:
    
   virtual void newDataSet(){for (int i=0; i<nThreads; i++) dets[i]->newDataSet();};
   
-  virtual int *getImage(int &nnx, int &nny, int &ns, int &nsy) {
+  virtual int *getImage(int &nnx, int &nny, int &ns) {
     int *img;
     // int nnx, nny, ns; 
     // int nnx, nny, ns;
-    int nn=dets[0]->getImageSize(nnx, nny,ns, nsy);
+    int nn=dets[0]->getImageSize(nnx, nny,ns);
     if (image) {
-      delete [] image;
+      delete image;
       image=NULL;
     }
     image=new int[nn];
@@ -363,10 +362,10 @@ public:
 /*        dets[ii]->writeImage(tit); */
 /*      } */
 /* #endif */
-    int nnx, nny, ns, nsy;
-    getImage(nnx, nny, ns,nsy);
+     int nnx, nny, ns;
+     getImage(nnx, nny, ns);
      //int nnx, nny, ns;
-    int nn=dets[0]->getImageSize(nnx, nny, ns, nsy);
+     int nn=dets[0]->getImageSize(nnx, nny, ns);
      float *gm=new float[nn];
      if (gm) {
        for (int ix=0; ix<nn; ix++) {
@@ -462,50 +461,6 @@ public:
     return ped;
   };
    
-  
-  virtual double *getPedestalRMS(){
-    int nx, ny;
-    dets[0]->getDetectorSize(nx,ny);
-    // if (ped) delete [] ped;
-    double *rms=new double[nx*ny];
-    double *p0=new double[nx*ny];
-    
-    for (int i=0; i<nThreads; i++) {
-      //inte=(slsInterpolation*)dets[i]->getInterpolation(nb,emi,ema);
-      //  cout << i << endl;
-      p0=dets[i]->getPedestalRMS(p0);
-      if (p0) {
-	if (i==0) {
-	  
-	  for (int ib=0; ib<nx*ny; ib++) {
-	    rms[ib]=p0[ib]*p0[ib]/((double)nThreads);
-	  //  cout << p0[ib] << " ";
-	}
-	} else {
-	for (int ib=0; ib<nx*ny; ib++) {
-	  rms[ib]+=p0[ib]*p0[ib]/((double)nThreads);
-	  //  cout << p0[ib] << " ";
-	}
-	}
-      }
-	
-    }
-    delete [] p0;
-    
-    /* for (int ib=0; ib<nx*ny; ib++) { */
-    /*   if (rms[ib]>0) */
-    /* 	rms[ib]=sqrt(ped[ib]); */
-    /*   else */
-    /* 	rms[ib]=0; */
-    /* } */
-
-
-    return rms;
-  };
-   
-  
-
-
    
    virtual double *setPedestal(double *h=NULL){
      //int nb=0;
@@ -543,27 +498,6 @@ public:
    };
 
 
-   virtual void *writePedestalRMS(const char * imgname){     
-    
-     int nx, ny;
-     dets[0]->getDetectorSize(nx,ny);
-   
-      double *rms=getPedestalRMS();
-      float *gm=new float[nx*ny];
-      if (gm) {
-       for (int ix=0; ix<nx*ny; ix++) {
-	 gm[ix]=rms[ix];
-       }    
-       WriteToTiff(gm,imgname ,nx, ny); 
-       delete [] gm;
-       delete [] rms;
-     } else cout << "Could not allocate float image " << endl;
-    
-    return NULL;
-
-   };
-
-
   virtual void *readPedestal(const char * imgname, int nb=-1, double emin=1, double emax=0){
     
     int nx, ny;

slsDetectorCalibration/multiThreadedInterpolatingDetector.h

@@ -46,7 +46,7 @@ public:
   };
   
 
-   /* virtual int setNSubPixels(int ns)  { return (dets[0])->setNSubPixels(ns);}; */
+   virtual int setNSubPixels(int ns)  { return (dets[0])->setNSubPixels(ns);};
 
    virtual void resetFlatField() {(dets[0])->resetFlatField();};
    
@@ -69,13 +69,13 @@ public:
 
 
 
-   virtual int *getImage(int &nnx, int &nny, int &nsx, int &nsy) {
-     if (getInterpolation()==NULL) return multiThreadedAnalogDetector::getImage(nnx,nny,nsx, nsy);
+  virtual int *getImage(int &nnx, int &nny, int &ns) {
+    if (getInterpolation()==NULL) return multiThreadedAnalogDetector::getImage(nnx,nny,ns);
     //if one interpolates, the whole image is stored in detector 0;
     int *img;
     // int nnx, nny, ns; 
     // int nnx, nny, ns;
-    int nn=dets[0]->getImageSize(nnx, nny,nsx, nsy);
+    int nn=dets[0]->getImageSize(nnx, nny,ns);
     if (image) {
       delete image;
       image=NULL;

slsDetectorCalibration/pedestalSubtraction.h

@@ -10,7 +10,7 @@ class pedestalSubtraction  {
       \param nn number of samples to calculate the moving average (defaults to 1000)
   */
   pedestalSubtraction (int nn=1000) : stat(nn) {};
-  /* void setPointers(double *me, double *va) {mean=me; var=va; stat.setPointers(mean, var);}; */
+    
     /** virtual destructorr 
      */
     virtual ~pedestalSubtraction() {};

slsDetectorCalibration/singlePhotonDetector.h

@@ -50,6 +50,7 @@ public analogDetector<uint16_t> {
 
 
   */
+  
 
  singlePhotonDetector(slsDetectorData<uint16_t> *d,
 		      int csize=3,
@@ -57,7 +58,7 @@ public analogDetector<uint16_t> {
 		      int sign=1,
 		      commonModeSubtraction *cm=NULL,
 		      int nped=1000,
-		      int nd=100, int nnx=-1, int nny=-1, double *gm=NULL, ghostSummation<uint16_t> *gs=NULL) : analogDetector<uint16_t>(d, sign, cm, nped, nnx, nny, gm, gs),   nDark(nd), eventMask(NULL),nSigma (nsigma), eMin(-1), eMax(-1), clusterSize(csize), clusterSizeY(csize), c2(1),c3(1), clusters(NULL),   quad(UNDEFINED_QUADRANT), tot(0), quadTot(0)  {
+		      int nd=100, int nnx=-1, int nny=-1, double *gm=NULL, ghostSummation<uint16_t> *gs=NULL) : analogDetector<uint16_t>(d, sign, cm, nped, nnx, nny, gm, gs),   nDark(nd), eventMask(NULL),nSigma (nsigma), eMin(-1), eMax(-1), clusterSize(csize), clusterSizeY(csize), clusters(NULL),   quad(UNDEFINED_QUADRANT), tot(0), quadTot(0)  {
     
     
     
@@ -65,18 +66,13 @@ public analogDetector<uint16_t> {
     fm=new pthread_mutex_t ;
 
     eventMask=new eventType*[ny];
-    //  val=new double*[ny];
     for (int i=0; i<ny; i++) {
       eventMask[i]=new eventType[nx];
-      // val[i]=new double[nx];
     }
     
     if (ny==1)
       clusterSizeY=1;
 
-  
-    c2=sqrt((clusterSizeY+1)/2* (clusterSize+1)/2);
-    c3=sqrt(clusterSizeY*clusterSize);
     // cluster=new single_photon_hit(clusterSize,clusterSizeY);
     clusters=new single_photon_hit[nx*ny];
    
@@ -104,10 +100,8 @@ public analogDetector<uint16_t> {
     myFile=orig->myFile;
     
     eventMask=new eventType*[ny];
-    // val=new double*[ny];
     for (int i=0; i<ny; i++) {
       eventMask[i]=new eventType[nx];
-      // val[i]=new double[nx];
     }
     eMin=orig->eMin;
     eMax=orig->eMax;
@@ -117,10 +111,6 @@ public analogDetector<uint16_t> {
     clusterSize=orig->clusterSize;
     clusterSizeY=orig->clusterSizeY;
     // cluster=new single_photon_hit(clusterSize,clusterSizeY);
-
-    c2=sqrt((clusterSizeY+1)/2* (clusterSize+1)/2);
-    c3=sqrt(clusterSizeY*clusterSize);
-
     clusters=new single_photon_hit[nx*ny];
 
     // cluster=clusters;
@@ -134,9 +124,7 @@ public analogDetector<uint16_t> {
     gmap=orig->gmap;
     nphTot=0;
     nphFrame=0;
-    nphTot=0;
-    nphFrame=0;
-    
+
   }
   
 
@@ -208,6 +196,7 @@ public analogDetector<uint16_t> {
       int nn=0;
       double max=0, tl=0, tr=0, bl=0,br=0, v;
       double rms=0;
+      
       int cm=0;
       if (cmSub) cm=1;
 
@@ -229,8 +218,8 @@ public analogDetector<uint16_t> {
 	    cout << "add to common mode?"<< endl;
 	    addToCommonMode(data);
 	  }
-	    for (iy=ymin; iy<ymax; ++iy) {
-	  for (ix=xmin; ix<xmax; ++ix) {
+	    for (int iy=ymin; iy<ymax; iy++) {
+	  for (int ix=xmin; ix<xmax; ix++) {
 	      if (det->isGood(ix,iy)) {
 		val=subtractPedestal(data,ix,iy, cm);
 		
@@ -247,8 +236,8 @@ public analogDetector<uint16_t> {
 	    }
 	  }
 	  
-	  for (iy=ymin; iy<ymax; ++iy) {
-	for (ix=xmin; ix<xmax; ++ix) {
+	  for (int iy=ymin; iy<ymax; iy++) {
+	for (int ix=xmin; ix<xmax; ix++) {
 	    
 	    if (det->isGood(ix,iy)) {
 	      eventMask[iy][ix]=PEDESTAL;
@@ -357,23 +346,18 @@ int *getClusters(char *data,  int *ph=NULL) {
 
  
   int nph=0;
-  // const int cy=(clusterSizeY+1)/2;
-  //const int cs=(clusterSize+1)/2;
-
+  double val[ny][nx];
+  int cy=(clusterSizeY+1)/2;
+  int cs=(clusterSize+1)/2;
   //int ir, ic;
-  eventType ee;
+  
   double max=0, tl=0, tr=0, bl=0,br=0, *v;
   int cm=0;
   int good=1;
-  int ir, ic;
-  // double quadTot;
-  //quadrant quad;
-  double rms;
-  //if (cmSub) cm=1;
-      double val[ny][nx];
+  if (cmSub) cm=1;
   if (ph==NULL)
     ph=image;
-  
+
   if (iframe<nDark) {
     addToPedestal(data);
     return 0;
@@ -382,15 +366,13 @@ int *getClusters(char *data,  int *ph=NULL) {
 
 
   
-  if (cmSub) {
+  if (cm)
     addToCommonMode(data);
-    cm=1;
-  }
 
-  for (iy=ymin; iy<ymax; ++iy) {
-    for (ix=xmin; ix<xmax; ++ix) {
-      if (det->isGood(ix,iy)==0) continue; 
 
+    for (int iy=ymin; iy<ymax; iy++) {
+  for (int ix=xmin; ix<xmax; ix++) {
+      if (det->isGood(ix,iy)) {
 	max=0;
 	tl=0;
 	tr=0;
@@ -402,120 +384,97 @@ int *getClusters(char *data,  int *ph=NULL) {
 	
       
 	
-	//eventMask[iy][ix]
-	  ee=PEDESTAL;
+	eventMask[iy][ix]=PEDESTAL;
 	
 	
-	  rms=getPedestalRMS(ix,iy);
+	(clusters+nph)->rms=getPedestalRMS(ix,iy);
 	// cluster=clusters+nph;
 	
-	  // cout << ix << " " << iy << endl;
-	for (ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
-	  for (ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
+      
+	for (int ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
+	  for (int ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
 	    
 	    if ((iy+ir)>=iy && (iy+ir)<ny && (ix+ic)>=ix && (ix+ic)<nx) {
 	      val[iy+ir][ix+ic]=subtractPedestal(data,ix+ic,iy+ir, cm);
-	      v=&(val[iy+ir][ix+ic]);
-	      tot+=*v;
-	      if (ir<=0 && ic<=0)
-		bl+=*v;
-	      if (ir<=0 && ic>=0)
-		br+=*v;
-	      if (ir>=0 && ic<=0)
-		tl+=*v;
-	      if (ir>=0 && ic>=0)
-		tr+=*v;
-	      if (*v>max) {
-		max=*v;
-	      }
-	   
 	    }
 	    
+	    v=&(val[iy+ir][ix+ic]);
+	    tot+=*v;
+	    if (ir<=0 && ic<=0)
+	      bl+=*v;
+	    if (ir<=0 && ic>=0)
+	      br+=*v;
+	    if (ir>=0 && ic<=0)
+	      tl+=*v;
+	    if (ir>=0 && ic>=0)
+	      tr+=*v;
+	    if (*v>max) {
+	      max=*v;
+	    }
+	    
+	    
+	    if (ir==0 && ic==0) {
+	      if (*v<-nSigma*(clusters+nph)->rms)
+		eventMask[iy][ix]=NEGATIVE_PEDESTAL;
+	      else if (*v>nSigma*(clusters+nph)->rms)
+		eventMask[iy][ix]=PHOTON;
+	    }
 	    
 	  }
 	}
-	/* if (ix==50 && iy==50) */
-	/*   cout << id << " " << ix << " " << iy << " " << det->getValue(data,ix,iy)<< " "  << val[iy][ix] << " " << getPedestal(ix,iy) << " " << rms << endl;  */
-	if (val[iy][ix]<-nSigma*rms){
-	  ee=NEGATIVE_PEDESTAL;
-	  continue;    
-	} 
-	if (max>nSigma*rms){
-	  //	  cout << "ph1 " << max << " " << nSigma*rms << endl;
-	  ee=PHOTON;
-	  if (val[iy][ix]<max)
-	    continue;
+	if (eventMask[iy][ix]==PHOTON && val[iy][ix]<max) 
+	  continue;
+	
+	if (bl>=br && bl>=tl && bl>=tr) {
+	  (clusters+nph)->quad=BOTTOM_LEFT;
+	  (clusters+nph)->quadTot=bl;
+	} else if (br>=bl && br>=tl && br>=tr) {
+	  (clusters+nph)->quad=BOTTOM_RIGHT;
+	(clusters+nph)->quadTot=br;
+	} else if (tl>=br && tl>=bl && tl>=tr) {
+	  (clusters+nph)->quad=TOP_LEFT;
+	  (clusters+nph)->quadTot=tl;
+	} else if   (tr>=bl && tr>=tl && tr>=br) {
+	  (clusters+nph)->quad=TOP_RIGHT;
+	  (clusters+nph)->quadTot=tr;
 	}
-	else if (tot>c3*nSigma*rms) {
-	  //	  cout << "ph3 " << tot << " " << c3*nSigma*rms << endl;
-	  ee=PHOTON;
-	}
-#ifndef WRITE_QUAD
-	else {
-#endif
-	    quad=BOTTOM_RIGHT;
-	    quadTot=br;
-	    if (bl>=quadTot) {
-	      quad=BOTTOM_LEFT;
-	      quadTot=bl;
-	    }
-	    if (tl>=quadTot) {
-	      quad=TOP_LEFT;
-	      quadTot=tl;
-	    }
-	    if (tr>=quadTot) {
-	      quad=TOP_RIGHT;
-	      quadTot=tr;
-	    }
-	    
-	    if (quadTot>c2*nSigma*rms) {
-	      //   cout << "ph2 " << quadTot << " " << c2*nSigma*rms << endl;
-	      ee=PHOTON;
+      
+	if (max>nSigma*(clusters+nph)->rms || tot>sqrt(clusterSizeY*clusterSize)*nSigma*(clusters+nph)->rms || ((clusters+nph)->quadTot)>sqrt(cy*cs)*nSigma*(clusters+nph)->rms) {
+	  if (val[iy][ix]>=max) {
+	  eventMask[iy][ix]=PHOTON_MAX;
+	  (clusters+nph)->tot=tot;
+	  (clusters+nph)->x=ix;
+	  (clusters+nph)->y=iy;
+	  //	  (clusters+nph)->iframe=det->getFrameNumber(data);
+	  // cout << det->getFrameNumber(data) << " " << (clusters+nph)->iframe << endl;
+	  (clusters+nph)->ped=getPedestal(ix,iy,0);
+	  for (int ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
+	    for (int ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
+	      (clusters+nph)->set_data(val[iy+ir][ix+ic],ic,ir);
 	    }
+	  }
+	  good=1;
+	  if (eMin>0 && tot<eMin) good=0;
+	  if (eMax>0 && tot>eMax) good=0;
+	  if (good) {
+	    nph++;
+	    image[iy*nx+ix]++;
+	  }
 	  
-#ifndef WRITE_QUAD
-	}
-#endif
-	if (ee==PHOTON && val[iy][ix]==max) {
-	  ee=PHOTON_MAX;
-	  // cout << "**" <<id<< " " << iframe << " "  << nDark << " "   << ix << " " << iy << " " << rms << " " << max << " " << quadTot << " " << tot << endl;
-      	  (clusters+nph)->tot=tot;
-      	  (clusters+nph)->x=ix;
-      	  (clusters+nph)->y=iy;
-      	  (clusters+nph)->quad=quad;
-      	  (clusters+nph)->quadTot=quadTot;
-      	  //(clusters+nph)->rms=rms;
-      	  //	  (clusters+nph)->iframe=det->getFrameNumber(data);
-      	  // cout << det->getFrameNumber(data) << " " << (clusters+nph)->iframe << endl;
-      	  //  (clusters+nph)->ped=getPedestal(ix,iy,0);
-	  for (ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
-	    for (ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
-	      if ((iy+ir)>=iy && (iy+ir)<ny && (ix+ic)>=ix && (ix+ic)<nx) 
-		(clusters+nph)->set_data(val[iy+ir][ix+ic],ic,ir);
-	    }
-      }
-      good=1;
-      if (eMin>0 && tot<eMin) good=0;
-      if (eMax>0 && tot>eMax) good=0;
-      if (good) {
-	nph++;
-	image[iy*nx+ix]++;
-      }
-      
-      
-	} else if (ee==PEDESTAL) {
-	  addToPedestal(data,ix,iy,cm);
-	} /*else {
+
+	  } else {
 	    eventMask[iy][ix]=PHOTON;
-	    }*/
-	//eventMask[iy][ix]=ee;
+	  }
+	} else if (eventMask[iy][ix]==PEDESTAL) {
+	  addToPedestal(data,ix,iy,cm);
+	}
+      }
+    }
   }
-}
-  
   nphFrame=nph;
   nphTot+=nph;
   //cout << nphFrame << endl;
-  //cout <<id << " **********************************"<< iframe << " " << det->getFrameNumber(data) << " " << nphFrame << endl;
+  //  cout <<"**********************************"<< det->getFrameNumber(data) << " " << nphFrame << endl;
   writeClusters(det->getFrameNumber(data));
   return  image;
   
@@ -602,20 +561,13 @@ int *getClusters(char *data,  int *ph=NULL) {
 */
 
     static void writeClusters(FILE *f, single_photon_hit *cl, int nph, int fn=0){
-      if (nph>0) {
-#ifndef OLDFORMAT   
-	if (fwrite((void*)&fn, 1,  sizeof(int), f))  
-	  if (fwrite((void*)&nph, 1,  sizeof(int), f))  
-#endif    
-	    for (int i=0; i<nph; i++) (cl+i)->write(f);
-      }
-    };
-      
-
-
-
-
-
+  
+/* #ifndef OLDFORMAT   */
+/*       if (fwrite((void*)&fn, 1,  sizeof(int), f))  */
+/* 	if (fwrite((void*)&nph, 1,  sizeof(int), f))  */
+/* #endif    */
+	  for (int i=0; i<nph; i++) (cl+i)->write(f);
+};
  void writeClusters(FILE *f, int fn=0){
    writeClusters(f,clusters,nphFrame, fn);
   //for (int i=0; i<nphFrame; i++) 
@@ -671,7 +623,6 @@ int *getClusters(char *data,  int *ph=NULL) {
     double eMin, eMax;
     int clusterSize; /**< cluster size in the x direction */
     int clusterSizeY; /**< cluster size in the y direction i.e. 1 for strips, clusterSize for pixels */
-    double c2, c3;
     //  single_photon_hit *cluster; /**< single photon hit data structure */
     single_photon_hit *clusters; /**< single photon hit data structure */
     quadrant quad; /**< quadrant where the photon is located */
@@ -680,7 +631,6 @@ int *getClusters(char *data,  int *ph=NULL) {
     int nphTot;
     int nphFrame;
 
-    //    double **val;
     pthread_mutex_t *fm;
 
     };

slsDetectorCalibration/single_photon_hit.h

@@ -39,13 +39,13 @@ class single_photon_hit {
     //fwrite((void*)this, 1, 3*sizeof(int)+4*sizeof(double)+sizeof(quad), myFile); 
     
     // if (fwrite((void*)this, 1, sizeof(int)+2*sizeof(int16_t), myFile))
-#ifdef OLDFORMAT 
+    //#ifdef OLDFORMAT 
     if (fwrite((void*)&iframe, 1,  sizeof(int), myFile)) {};
-#endif  
+      //#endif  
 #ifndef WRITE_QUAD
       //printf("no quad ");
-    //if (fwrite((void*)&x, 2,  sizeof(int16_t), myFile)) 
-      return fwrite((void*)&x, 1, dx*dy*sizeof(int)+2*sizeof(int16_t), myFile);
+    if (fwrite((void*)&x, 2,  sizeof(int16_t), myFile)) 
+      return fwrite((void*)data, 1, dx*dy*sizeof(int), myFile);
 #endif 
 #ifdef WRITE_QUAD
     // printf("quad ");
@@ -91,7 +91,7 @@ class single_photon_hit {
     default:
       ;
     }
-     if (fwrite((void*)&x, 2,  sizeof(int16_t), myFile)) 
+    if (fwrite((void*)&x, 2,  sizeof(int16_t), myFile)) 
       return fwrite((void*)qq, 1, 4*sizeof(int), myFile);
 #endif
     return 0;
@@ -104,9 +104,9 @@ class single_photon_hit {
   size_t read(FILE *myFile) {
     //fread((void*)this, 1,  3*sizeof(int)+4*sizeof(double)+sizeof(quad), myFile); 
     
-#ifdef OLDFORMAT 
+    //#ifdef OLDFORMAT 
     if (fread((void*)&iframe, 1,  sizeof(int), myFile))  {}
-#endif   
+      //#endif   
 #ifndef WRITE_QUAD
       // printf( "no quad \n");
     if (fread((void*)&x, 2,  sizeof(int16_t), myFile))  
@@ -246,15 +246,15 @@ class single_photon_hit {
   int *get_cluster() {return data;};
 
   int	iframe; 	        /**< frame number */
+  int16_t 	x; 			/**< x-coordinate of the center of hit */
+  int16_t	y; 			/**< x-coordinate of the center of hit */
   double	rms; 		/**< noise of central pixel l -- at some point it can be removed*/
   double 	ped; 		/**< pedestal of the central pixel -- at some point it can be removed*/
    double tot; /**< sum of the 3x3 cluster */
    quadrant quad; /**< quadrant where the photon is located */
    double quadTot; /**< sum of the maximum 2x2cluster */ 
   int dx;	                /**< size of data cluster in x */
-  int dy;                 /**< size of data cluster in y */ 
-  int16_t 	x; 			/**< x-coordinate of the center of hit */
-  int16_t	y; 			/**< x-coordinate of the center of hit */ 
+  int dy;                 /**< size of data cluster in y */  
   int *data;		        /**< pointer to data */
 };
 

slsDetectorGui/CMakeLists.txt

@@ -4,10 +4,10 @@ find_package(PNG REQUIRED)
 find_package(ZLIB REQUIRED)
 
 set(SOURCES
-    slsDetectorPlotting/src/SlsQt1DPlot.cpp
-    slsDetectorPlotting/src/SlsQt1DZoomer.cpp
-    slsDetectorPlotting/src/SlsQt2DHist.cpp
-    slsDetectorPlotting/src/SlsQt2DPlot.cpp
+    slsDetectorPlotting/src/SlsQt1DPlot.cxx
+    slsDetectorPlotting/src/SlsQt1DZoomer.cxx
+    slsDetectorPlotting/src/SlsQt2DHist.cxx
+    slsDetectorPlotting/src/SlsQt2DPlot.cxx
     src/qDetectorMain.cpp
     src/qDrawPlot.cpp
     src/qCloneWidget.cpp
@@ -103,10 +103,10 @@ set_target_properties(slsDetectorGui PROPERTIES
 )
 
 install(TARGETS slsDetectorGui
-    # EXPORT "${TARGETS_EXPORT_NAME}"
+    EXPORT "${TARGETS_EXPORT_NAME}"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    # LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    # ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    # PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 

slsDetectorGui/forms/form_cloneplot.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>376</width>
-    <height>425</height>
+    <width>500</width>
+    <height>350</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -55,149 +55,6 @@
      </widget>
     </item>
     <item row="1" column="0">
-     <widget class="QLabel" name="lblCompleteImage">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>40</width>
-        <height>0</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>150</green>
-            <blue>110</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </active>
-        <inactive>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>0</red>
-            <green>150</green>
-            <blue>110</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </inactive>
-        <disabled>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>139</red>
-            <green>142</green>
-            <blue>142</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </disabled>
-       </palette>
-      </property>
-      <property name="text">
-       <string>Complete Image</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QLabel" name="lblInCompleteImage">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>40</width>
-        <height>0</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>255</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </active>
-        <inactive>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </inactive>
-        <disabled>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>139</red>
-            <green>142</green>
-            <blue>142</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </disabled>
-       </palette>
-      </property>
-      <property name="text">
-       <string>Missing Packets</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="2">
-     <spacer name="horizontalSpacer_3">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>117</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="2" column="0" colspan="3">
      <widget class="QWidget" name="widgetStatistics" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -383,8 +240,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>376</width>
-     <height>27</height>
+     <width>500</width>
+     <height>28</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSave">

slsDetectorGui/forms/form_detectormain.ui

@@ -145,10 +145,6 @@
   <property name="windowTitle">
    <string>SLS Detector GUI</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../include/icons.qrc">
-    <normaloff>:/icons/images/mountain.png</normaloff>:/icons/images/mountain.png</iconset>
-  </property>
   <property name="inputMethodHints">
    <set>Qt::ImhNone</set>
   </property>
@@ -375,6 +371,101 @@ p, li { white-space: pre-wrap; }
     </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="actionLoadConfiguration">
    <property name="text">
     <string>Load Configuration</string>
@@ -385,11 +476,6 @@ p, li { white-space: pre-wrap; }
     <string>Load Trimbits</string>
    </property>
   </action>
-  <action name="actionLoadParameters">
-   <property name="text">
-    <string>Load Parameters</string>
-   </property>
-  </action>
   <action name="actionDebug">
    <property name="checkable">
     <bool>true</bool>
@@ -414,14 +500,12 @@ p, li { white-space: pre-wrap; }
     <string>Dockable Windows</string>
    </property>
   </action>
-  <action name="actionAbout">
+  <action name="actionLoadParameters">
    <property name="text">
-    <string>&amp;About</string>
+    <string>Load Parameters</string>
    </property>
   </action>
  </widget>
- <resources>
-  <include location="../include/icons.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

slsDetectorGui/forms/form_plot.ui

@@ -19,8 +19,47 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0" colspan="4">
+  <layout class="QGridLayout" name="layout">
+   <property name="margin">
+    <number>6</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="boxPlot">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <family>Sans Serif</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="title">
+      <string>Sample Plot</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="plotLayout">
+      <property name="margin">
+       <number>9</number>
+      </property>
+      <property name="spacing">
+       <number>0</number>
+      </property>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
     <widget class="QWidget" name="widgetStatistics" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -47,6 +86,73 @@
       <property name="spacing">
        <number>0</number>
       </property>
+      <item row="0" column="6">
+       <widget class="QLabel" name="lblSum">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>40</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>40</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Sum: </string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="lblMinDisp">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QLabel" name="lblMaxDisp">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="3">
        <widget class="QLabel" name="lblMax">
         <property name="sizePolicy">
@@ -75,8 +181,8 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="lblMinDisp">
+      <item row="0" column="7">
+       <widget class="QLabel" name="lblSumDisp">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -88,19 +194,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</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="QLabel" name="lblMin">
         <property name="sizePolicy">
@@ -129,32 +222,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="4">
-       <widget class="QLabel" name="lblMaxDisp">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>-</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="7">
-       <widget class="QLabel" name="lblSumDisp">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>-</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="5">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
@@ -168,213 +235,9 @@
         </property>
        </spacer>
       </item>
-      <item row="0" column="6">
-       <widget class="QLabel" name="lblSum">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>40</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>40</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Sum: </string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="1" column="3">
-    <spacer name="horizontalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>419</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0" colspan="4">
-    <widget class="QGroupBox" name="boxPlot">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <family>Sans Serif</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="title">
-      <string>Sample Plot</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="flat">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="plotLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>0</number>
-      </property>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QLabel" name="lblInCompleteImage">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>40</width>
-       <height>0</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>255</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>255</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>139</red>
-           <green>142</green>
-           <blue>142</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
-     </property>
-     <property name="text">
-      <string>Missing Packets</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="lblCompleteImage">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>40</width>
-       <height>0</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>150</green>
-           <blue>110</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>0</red>
-           <green>150</green>
-           <blue>110</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>139</red>
-           <green>142</green>
-           <blue>142</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
-     </property>
-     <property name="text">
-      <string>Complete Image</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

slsDetectorGui/forms/form_tab_measurement.ui

@@ -432,6 +432,19 @@
       <property name="verticalSpacing">
        <number>4</number>
       </property>
+      <item row="5" column="0">
+       <widget class="QLabel" name="lblNumTriggers">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Number of Triggers:</string>
+        </property>
+       </widget>
+      </item>
       <item row="4" column="3">
        <widget class="QComboBox" name="comboPeriodUnit">
         <property name="enabled">
@@ -653,6 +666,108 @@ Frame period between exposures.
         </item>
        </widget>
       </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="lblDelay">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="toolTip">
+         <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
+#delay#</string>
+        </property>
+        <property name="text">
+         <string>Delay After Trigger:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2" colspan="2">
+       <widget class="QSpinBox" name="spinNumTriggers">
+        <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="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Number of Triggers to be expected.
+ #triggers#</string>
+        </property>
+        <property name="statusTip">
+         <string/>
+        </property>
+        <property name="whatsThis">
+         <string/>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+        <property name="keyboardTracking">
+         <bool>false</bool>
+        </property>
+        <property name="suffix">
+         <string/>
+        </property>
+        <property name="minimum">
+         <number>-1</number>
+        </property>
+        <property name="maximum">
+         <number>2000000000</number>
+        </property>
+        <property name="value">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="2">
+       <widget class="QDoubleSpinBox" name="spinDelay">
+        <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="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
+#delay#</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+        <property name="keyboardTracking">
+         <bool>false</bool>
+        </property>
+        <property name="decimals">
+         <number>9</number>
+        </property>
+        <property name="minimum">
+         <double>-1.000000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>2000000000.000000000000000</double>
+        </property>
+        <property name="value">
+         <double>0.000000000000000</double>
+        </property>
+       </widget>
+      </item>
       <item row="3" column="2">
        <widget class="QDoubleSpinBox" name="spinExpTime">
         <property name="enabled">
@@ -788,6 +903,65 @@ Exposure Time of a frame.
         </property>
        </widget>
       </item>
+      <item row="6" column="3">
+       <widget class="QComboBox" name="comboDelayUnit">
+        <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="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
+#delay#</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="currentIndex">
+         <number>2</number>
+        </property>
+        <item>
+         <property name="text">
+          <string>hr</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>min</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>s</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>ms</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>us</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>ns</string>
+         </property>
+        </item>
+       </widget>
+      </item>
       <item row="3" column="3">
        <widget class="QComboBox" name="comboExpUnit">
         <property name="enabled">
@@ -910,577 +1084,6 @@ Frame period between exposures.
         </property>
        </spacer>
       </item>
-      <item row="5" column="0">
-       <widget class="QStackedWidget" name="stackedLblTriggerBurst">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>171</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>171</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <widget class="QWidget" name="pageLblTrigger">
-         <layout class="QGridLayout" name="gridLblTrigger">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="lblNumTriggers">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Number of Triggers:</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="pageLblBurst">
-         <layout class="QGridLayout" name="gridLblBurst">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="lblNumBursts">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Number of Bursts:</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item row="5" column="2">
-       <widget class="QStackedWidget" name="stackedSpinTriggerBurst">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>208</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>208</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <widget class="QWidget" name="pageSpinTrigger">
-         <layout class="QGridLayout" name="gridSpinTrigger">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QSpinBox" name="spinNumTriggers">
-            <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="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Number of Triggers to be expected.
- #triggers#</string>
-            </property>
-            <property name="statusTip">
-             <string/>
-            </property>
-            <property name="whatsThis">
-             <string/>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
-            <property name="keyboardTracking">
-             <bool>false</bool>
-            </property>
-            <property name="suffix">
-             <string/>
-            </property>
-            <property name="minimum">
-             <number>-1</number>
-            </property>
-            <property name="maximum">
-             <number>2000000000</number>
-            </property>
-            <property name="value">
-             <number>1</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="pageSpinBurst">
-         <layout class="QGridLayout" name="gridSpinBurst">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QSpinBox" name="spinNumBursts">
-            <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="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Number of Triggers to be expected.
- #triggers#</string>
-            </property>
-            <property name="statusTip">
-             <string/>
-            </property>
-            <property name="whatsThis">
-             <string/>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
-            <property name="keyboardTracking">
-             <bool>false</bool>
-            </property>
-            <property name="suffix">
-             <string/>
-            </property>
-            <property name="minimum">
-             <number>-1</number>
-            </property>
-            <property name="maximum">
-             <number>2000000000</number>
-            </property>
-            <property name="value">
-             <number>1</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QStackedWidget" name="stackedLblDelayBurstPeriod">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>171</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>171</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <widget class="QWidget" name="pageLblDelay">
-         <layout class="QGridLayout" name="gridLblDelay">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="lblDelay">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Delay After Trigger:</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="pageLblBurstPeriod">
-         <layout class="QGridLayout" name="gridLblBurstPeriod">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="1">
-           <widget class="QLabel" name="lblBurstPeriod">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Burst Period:</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item row="6" column="2">
-       <widget class="QStackedWidget" name="stackedSpinDelayBurstPeriod">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>152</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>152</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <widget class="QWidget" name="pageSpinDelay">
-         <layout class="QGridLayout" name="gridSpinDelay">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QDoubleSpinBox" name="spinDelay">
-            <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="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
-#delay#</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
-            <property name="keyboardTracking">
-             <bool>false</bool>
-            </property>
-            <property name="decimals">
-             <number>9</number>
-            </property>
-            <property name="minimum">
-             <double>-1.000000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>2000000000.000000000000000</double>
-            </property>
-            <property name="value">
-             <double>0.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="pageSpinBurstPeriod">
-         <layout class="QGridLayout" name="gridSpinBurstPeriod">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QDoubleSpinBox" name="spinBurstPeriod">
-            <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="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
-#delay#</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
-            <property name="keyboardTracking">
-             <bool>false</bool>
-            </property>
-            <property name="decimals">
-             <number>9</number>
-            </property>
-            <property name="minimum">
-             <double>-1.000000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>2000000000.000000000000000</double>
-            </property>
-            <property name="value">
-             <double>0.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item row="6" column="3">
-       <widget class="QStackedWidget" name="stackedComboDelayBurstPeriod">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>50</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>50</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <widget class="QWidget" name="pageComboDelay">
-         <layout class="QGridLayout" name="gridComboDelay">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QComboBox" name="comboDelayUnit">
-            <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="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
-#delay#</string>
-            </property>
-            <property name="layoutDirection">
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="currentIndex">
-             <number>2</number>
-            </property>
-            <item>
-             <property name="text">
-              <string>hr</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>min</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>s</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ms</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>us</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ns</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="pageComboBurstPeriod">
-         <layout class="QGridLayout" name="gridComboBurstPeriod">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QComboBox" name="comboBurstPeriodUnit">
-            <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="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
-#delay#</string>
-            </property>
-            <property name="layoutDirection">
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="currentIndex">
-             <number>2</number>
-            </property>
-            <item>
-             <property name="text">
-              <string>hr</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>min</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>s</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ms</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>us</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ns</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -1513,6 +1116,9 @@ Frame period between exposures.
   <tabstop>comboExpUnit</tabstop>
   <tabstop>spinPeriod</tabstop>
   <tabstop>comboPeriodUnit</tabstop>
+  <tabstop>spinNumTriggers</tabstop>
+  <tabstop>spinDelay</tabstop>
+  <tabstop>comboDelayUnit</tabstop>
   <tabstop>spinNumSamples</tabstop>
  </tabstops>
  <resources>

slsDetectorGui/forms/form_tab_plot.ui

@@ -822,7 +822,7 @@ Displays minimum, maximum and sum of values for each plot.
       <item row="0" column="1">
        <widget class="QStackedWidget" name="stackedWidget1D">
         <property name="currentIndex">
-         <number>5</number>
+         <number>3</number>
         </property>
         <widget class="QWidget" name="pageSuperImpose">
          <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -1360,27 +1360,6 @@ Displays minimum, maximum and sum of values for each plot.
             </property>
            </spacer>
           </item>
-          <item>
-           <widget class="QCheckBox" name="chkGainPlot1D">
-            <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>&lt;nobr&gt;
-Displays minimum, maximum and sum of values for each plot.
-&lt;nobr&gt;</string>
-            </property>
-            <property name="text">
-             <string>Gain Plot</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </widget>
@@ -2368,6 +2347,7 @@ Displays minimum, maximum and sum of values for each plot.
   <zorder>box1D</zorder>
   <zorder>boxFrequency</zorder>
   <zorder>box2D</zorder>
+  <zorder>horizontalSpacer_6</zorder>
   <zorder>boxPlotAxis</zorder>
   <zorder>boxSave</zorder>
  </widget>

slsDetectorGui/forms/form_tab_settings.ui

@@ -214,46 +214,6 @@
        <string>Very Low Gain</string>
       </property>
      </item>
-     <item>
-      <property name="text">
-       <string>G1_HG</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>G1_LG</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>G2_HC_HG</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>G2_HC_LG</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>G2_LC_HG</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>G2_LC_LG</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>G4_HG</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>G4_LG</string>
-      </property>
-     </item>
      <item>
       <property name="text">
        <string>Undefined</string>

slsDetectorGui/include/qCloneWidget.h

@@ -1,20 +1,25 @@
 #pragma once
+
 #include "ui_form_cloneplot.h"
-#include <QMainWindow>
-#include <QString>
 
 class SlsQtH1D;
 class SlsQt1DPlot;
 class SlsQt2DPlot;
 
+#include <QMainWindow>
+#include <QString>
+
+#include <iostream>
+#include <string>
+
 class qCloneWidget : public QMainWindow, private Ui::ClonePlotObject {
     Q_OBJECT
 
   public:
-    qCloneWidget(QWidget *parent, SlsQt1DPlot *p1, SlsQt2DPlot *p2,
-                 SlsQt1DPlot *gp1, SlsQt2DPlot *gp, QString title,
-                 QString filePath, QString fileName, int64_t aIndex,
-                 bool displayStats, QString min, QString max, QString sum, bool completeImage);
+    qCloneWidget(QWidget *parent, SlsQt1DPlot *p1, SlsQt2DPlot *p2, SlsQt2DPlot *gp,
+                 QString title, QString filePath, QString fileName,
+                 int64_t aIndex, bool displayStats, QString min, QString max,
+                 QString sum);
 
     ~qCloneWidget();
 
@@ -23,7 +28,7 @@ class qCloneWidget : public QMainWindow, private Ui::ClonePlotObject {
 
   protected:
     void resizeEvent(QResizeEvent *event);
-
+    
   private:
     void SetupWidgetWindow(QString title);
     void DisplayStats(bool enable, QString min, QString max, QString sum);
@@ -32,7 +37,6 @@ class qCloneWidget : public QMainWindow, private Ui::ClonePlotObject {
     int id;
     SlsQt1DPlot *plot1d{nullptr};
     SlsQt2DPlot *plot2d{nullptr};
-    SlsQt1DPlot *gainplot1d{nullptr};
     SlsQt2DPlot *gainplot2d{nullptr};
     QString filePath{"/"};
     QString fileName{"run"};

slsDetectorGui/include/qDacWidget.h

@@ -1,30 +1,33 @@
 #pragma once
+
 #include "ui_form_dac.h"
+
 #include "Detector.h"
 #include "sls_detector_defs.h"
+
 #include <string>
 
-class qDacWidget : public QWidget, private Ui::WidgetDacObject {
-    Q_OBJECT
+class qDacWidget:public QWidget, private Ui::WidgetDacObject {
+	Q_OBJECT
 
-  public:
-    qDacWidget(QWidget *parent, sls::Detector *detector, bool d, std::string n,
-               slsDetectorDefs::dacIndex i);
-    ~qDacWidget();
-    void SetDetectorIndex(int id);
+public:
+	qDacWidget(QWidget *parent, sls::Detector* detector, bool d, std::string n, slsDetectorDefs::dacIndex i);
+	~qDacWidget();
+	void SetDetectorIndex(int id);
 
-  private slots:
-    void SetDac();
+private slots:
+	void SetDac();
 
-  private:
-    void SetupWidgetWindow(std::string name);
-    void Initialization();
-    void GetDac();
-    void GetAdc();
-    void Refresh();
+private:
+	void SetupWidgetWindow(std::string name);
+	void Initialization();
+	void GetDac();
+	void GetAdc();
+	void Refresh();
 
-    sls::Detector *det;
-    bool isDac{true};
-    slsDetectorDefs::dacIndex index;
-    int detectorIndex{-1};
+	sls::Detector *det;
+	bool isDac{true};
+	slsDetectorDefs::dacIndex index;
+	int detectorIndex{-1};
 };
+

slsDetectorGui/include/qDefs.h

@@ -5,29 +5,22 @@
 #include <QAbstractButton>
 #include <QMessageBox>
 
-#include <chrono>
 #include <iostream>
 #include <ostream>
-#include <cstdint>
+#include <stdint.h>
 #include <string>
-
+#include <chrono>
 using std::chrono::duration;
 using std::chrono::duration_cast;
-using std::chrono::hours;
+using std::chrono::nanoseconds;
 using std::chrono::microseconds;
 using std::chrono::milliseconds;
-using std::chrono::minutes;
-using std::chrono::nanoseconds;
 using std::chrono::seconds;
+using std::chrono::minutes;
+using std::chrono::hours; 
 
-#define CATCH_DISPLAY(m, s)                                                    \
-    catch (...) {                                                              \
-        qDefs::DisplayExceptions(m, s);                                        \
-    }
-#define CATCH_HANDLE(...)                                                      \
-    catch (...) {                                                              \
-        qDefs::HandleExceptions(__VA_ARGS__);                                  \
-    }
+#define CATCH_DISPLAY(m, s) catch(...) { qDefs::DisplayExceptions(m, s); }
+#define CATCH_HANDLE(...) catch(...) { qDefs::HandleExceptions(__VA_ARGS__); }
 
 class qDefs : public QWidget {
   public:
@@ -36,9 +29,8 @@ class qDefs : public QWidget {
      */
     qDefs(){};
 
-    static const int Q_FONT_SIZE = 9;
-    static const int DATA_GAIN_PLOT_RATIO = 5;
-    static const int MIN_HEIGHT_GAIN_PLOT_1D = 75;
+    static const int Q_FONT_SIZE=9;
+    static const int DATA_GAIN_PLOT_RATIO=5;
 
     static void DisplayExceptions(std::string emsg, std::string src) {
         try {
@@ -54,8 +46,8 @@ class qDefs : public QWidget {
 
     template <class CT> struct NonDeduced { using type = CT; };
     template <class S, typename RT, typename... CT>
-    static void HandleExceptions(const std::string emsg, const std::string src,
-                                 S *s, RT (S::*somefunc)(CT...),
+    static void HandleExceptions(const std::string emsg, const std::string src, S* s,
+                                 RT (S::*somefunc)(CT...),
                                  typename NonDeduced<CT>::type... Args) {
         try {
             throw;
@@ -79,22 +71,15 @@ class qDefs : public QWidget {
         QF_NUM_FUNCTIONS
     };
 
-    static const char *getQFunctionNameFromEnum(enum qFuncNames func) {
+    static const char* getQFunctionNameFromEnum(enum qFuncNames func) {
         switch (func) {
-        case QF_GET_DETECTOR_STATUS:
-            return "QF_GET_DETECTOR_STATUS";
-        case QF_START_ACQUISITION:
-            return "QF_START_ACQUISITION";
-        case QF_STOP_ACQUISITION:
-            return "QF_STOP_ACQUISITION";
-        case QF_START_AND_READ_ALL:
-            return "QF_START_AND_READ_ALL";
-        case QF_EXIT_SERVER:
-            return "QF_EXIT_SERVER";
-        case QF_NUM_FUNCTIONS:
-            return "QF_NUM_FUNCTIONS";
-        default:
-            return "Unknown Function";
+        case QF_GET_DETECTOR_STATUS:	return "QF_GET_DETECTOR_STATUS";
+        case QF_START_ACQUISITION:		return "QF_START_ACQUISITION";
+        case QF_STOP_ACQUISITION:		return "QF_STOP_ACQUISITION";
+        case QF_START_AND_READ_ALL:	    return "QF_START_AND_READ_ALL";
+        case QF_EXIT_SERVER:			return "QF_EXIT_SERVER";
+        case QF_NUM_FUNCTIONS:			return "QF_NUM_FUNCTIONS";
+        default:						return "Unknown Function";
         }
     };
 
@@ -125,16 +110,11 @@ class qDefs : public QWidget {
 
     static std::string getRangeAsString(enum range r) {
         switch (r) {
-        case XMIN:
-            return "XMIN";
-        case XMAX:
-            return "XMAX";
-        case YMIN:
-            return "YMIN";
-        case YMAX:
-            return "YMAX";
-        default:
-            return "Unknown";
+        case XMIN:	return "XMIN";
+        case XMAX:	return "XMAX";
+        case YMIN:	return "YMIN";
+        case YMAX:	return "YMAX";
+        default:	return "Unknown";
         }
     };
 
@@ -209,8 +189,7 @@ class qDefs : public QWidget {
                 MINUTES);
         }
         return std::make_pair(
-            duration_cast<duration<double, std::ratio<3600>>>(tns).count(),
-            HOURS);
+            duration_cast<duration<double, std::ratio<3600>>>(tns).count(), HOURS);
     }
 
     /** returns the value in ns */
@@ -316,12 +295,10 @@ class qDefs : public QWidget {
     /**
      * Wrap exception message
      */
-    static int ExceptionMessage(std::string message,
-                                std::string exceptionMessage,
-                                std::string source) {
-        return Message(qDefs::WARNING,
-                       message + std::string("\nCaught exception:\n") +
-                           exceptionMessage,
-                       source);
-    }
+    static int ExceptionMessage(std::string message, 
+                        std::string exceptionMessage,
+                       std::string source) {
+        return Message(qDefs::WARNING, message + std::string("\nCaught exception:\n") + exceptionMessage, source);
+    } 
+
 };

slsDetectorGui/include/qDetectorMain.h

@@ -1,9 +1,8 @@
 #pragma once
-#include "ui_form_detectormain.h"
-#include "qDefs.h"
-#include "Detector.h"
-#include <QTabWidget>
 
+#include "ui_form_detectormain.h"
+
+#include "qDefs.h"
 class qDrawPlot;
 class qTabMeasurement;
 class qTabDataOutput;
@@ -13,15 +12,17 @@ class qTabSettings;
 class qTabDebugging;
 class qTabDeveloper;
 class qTabMessages;
-class QScrollArea;
+
+#include "Detector.h"
+
+#include <QTabWidget>
 class QResizeEvent;
 
-/** To Over-ride the QTabWidget class to get the tabBar protected
- * methodTabWidget */
+/** To Over-ride the QTabWidget class to get the tabBar */
 class MyTabWidget : public QTabWidget {
   public:
     MyTabWidget(QWidget *parent = 0) { setParent(parent); }
-    /** Overridden protected method from QTabWidget */
+    /** Overridden method from QTabWidget */
     QTabBar *tabBar() { return QTabWidget::tabBar(); }
 };
 
@@ -29,7 +30,8 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
     Q_OBJECT
 
   public:
-    qDetectorMain(int multiId, const std::string& fname, bool isDevel);
+    qDetectorMain(int argc, char **argv, QApplication *app,
+                  QWidget *parent = 0);
     ~qDetectorMain();
 
   private slots:
@@ -51,9 +53,9 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
 
   private:
     void SetUpWidgetWindow();
-    void SetUpDetector(const std::string& config_file, int multiID);
+    void SetUpDetector(const std::string fName, int multiID);
     void Initialization();
-    void LoadConfigFile(const std::string& config_file);
+    void LoadConfigFile(const std::string fName);
 
     /** enumeration of the tabs */
     enum {
@@ -69,17 +71,16 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
     };
     slsDetectorDefs::detectorType detType;
     std::unique_ptr<sls::Detector> det;
-    qDrawPlot *plot;
-    MyTabWidget* tabs;
-    std::unique_ptr<QScrollArea> scroll[NumberOfTabs];
-    qTabMeasurement *tabMeasurement;
-    qTabDataOutput *tabDataOutput;
-    qTabPlot *tabPlot;
-    qTabSettings *tabSettings;
-    qTabAdvanced *tabAdvanced;
-    qTabDebugging *tabDebugging;
-    qTabDeveloper *tabDeveloper;
-    qTabMessages *tabMessages;
+    std::unique_ptr<qDrawPlot> plot;
+    std::unique_ptr<MyTabWidget> tabs;
+    std::unique_ptr<qTabMeasurement> tabMeasurement;
+    std::unique_ptr<qTabDataOutput> tabDataOutput;
+    std::unique_ptr<qTabPlot> tabPlot;
+    std::unique_ptr<qTabSettings> tabSettings;
+    std::unique_ptr<qTabAdvanced> tabAdvanced;
+    std::unique_ptr<qTabDebugging> tabDebugging;
+    std::unique_ptr<qTabDeveloper> tabDeveloper;
+    std::unique_ptr<qTabMessages> tabMessages;
     int isDeveloper;
     int heightPlotWindow;
     int heightCentralWidget;

slsDetectorGui/include/qDrawPlot.h

@@ -1,21 +1,26 @@
 #pragma once
-#include "ui_form_plot.h"
-#include "qDefs.h"
-#include "Detector.h"
-#include <mutex>
 
+#include "ui_form_plot.h"
+
+#include "qDefs.h"
 class SlsQt1DPlot;
 class SlsQtH1D;
 class SlsQt2DPlot;
 class qCloneWidget;
+
 class detectorData;
+#include "Detector.h"
+
 class QResizeEvent;
+#include <QFutureWatcher>
+
+#include <mutex>
 
 class qDrawPlot : public QWidget, private Ui::PlotObject {
     Q_OBJECT
 
   public:
-    qDrawPlot(QWidget *parent, sls::Detector *detector);
+     qDrawPlot(QWidget *parent, sls::Detector *detector);
     ~qDrawPlot();
     bool GetIsRunning();
     void SetRunning(bool enable);
@@ -26,8 +31,8 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
     void SetXAxisTitle(QString title);
     void SetYAxisTitle(QString title);
     void SetZAxisTitle(QString title);
-    void SetXYRangeChanged(bool disable, double *xy, bool *isXY);
-    void SetZRange(double *z, bool *isZ);
+    void SetXYRangeChanged(bool disable, double* xy, bool* isXY);
+    void SetZRange(double* z, bool* isZ);
     double GetXMinimum();
     double GetXMaximum();
     double GetYMinimum();
@@ -52,14 +57,16 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
     void SetNumDiscardBits(int value);
     void EnableGainPlot(bool enable);
     void ClonePlot();
-    void SavePlot();
+	  void SavePlot();
 
   protected:
     void resizeEvent(QResizeEvent *event);
 
   private slots:
     void SetSaveFileName(QString val);
+    void AcquireFinished();
     void UpdatePlot();
+  
 
   signals:
     void AcquireFinishedSignal();
@@ -69,68 +76,60 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
   private:
     void SetupWidgetWindow();
     void Initialization();
-    void SetupPlots();
+	  void SetupPlots();
     void GetStatistics(double &min, double &max, double &sum);
     void DetachHists();
-    void AcquireThread();
-    static void GetAcquisitionFinishedCallBack(double currentProgress,
-                                               int detectorStatus,
-                                               void *this_pointer);
-    static void GetDataCallBack(detectorData *data, uint64_t frameIndex,
-                                uint32_t subFrameIndex, void *this_pointer);
+    static void GetAcquisitionFinishedCallBack(double currentProgress, int detectorStatus, void *this_pointer);
+    static void GetDataCallBack(detectorData *data, uint64_t frameIndex, uint32_t subFrameIndex, void *this_pointer);
+    std::string AcquireThread();
     void AcquisitionFinished(double currentProgress, int detectorStatus);
-    void GetData(detectorData *data, uint64_t frameIndex,
-                 uint32_t subFrameIndex);
-    void toDoublePixelData(double *dest, char *source, int size, int databytes,
-                           int dr, double *gaindest = NULL);
-    void Get1dData(double *rawData);
-    void Get2dData(double *rawData);
+    void GetData(detectorData *data, uint64_t frameIndex, uint32_t subFrameIndex);
+    void toDoublePixelData(double *dest, char *source, int size, int databytes, int dr, double *gaindest = NULL);
+    void Get1dData(double* rawData);
+    void Get2dData(double* rawData);
     void Update1dPlot();
     void Update2dPlot();
     void Update1dXYRange();
     void Update2dXYRange();
-
-    static const int NUM_PEDESTAL_FRAMES = 20;
+    
+  	static const int NUM_PEDESTAL_FRAMES = 20;
     sls::Detector *det;
     slsDetectorDefs::detectorType detType;
 
     SlsQt1DPlot *plot1d{nullptr};
-    QVector<SlsQtH1D *> hists1d;
-    SlsQt1DPlot *gainplot1d{nullptr};
-    SlsQtH1D *gainhist1d{nullptr};
+	  QVector<SlsQtH1D *> hists1d;
     SlsQt2DPlot *plot2d{nullptr};
     SlsQt2DPlot *gainplot2d{nullptr};
+    QFutureWatcher<std::string> *acqResultWatcher;
 
     bool is1d{true};
     bool isRunning{false};
-
-    // titles
+   
+	// titles
     QString plotTitlePrefix{""};
     QString xTitle1d{"Channel Number"};
     QString yTitle1d{"Counts"};
-    QString xTitle2d{"Pixel"};
+	  QString xTitle2d{"Pixel"};
     QString yTitle2d{"Pixel"};
     QString zTitle2d{"Intensity"};
     QString plotTitle{""};
     QString indexTitle{""};
-    bool completeImage{false};
     bool xyRangeChanged{false};
     double xyRange[4]{0, 0, 0, 0};
     bool isXYRange[4]{false, false, false, false};
     double zRange[2]{0, 1};
     bool isZRange[2]{false, false};
 
-    // data
+	// data
     int nHists{1};
     double *datax1d{nullptr};
     std::vector<double *> datay1d;
-    double *gainDatay1d{nullptr};
     double *data2d{nullptr};
     double *gainData{nullptr};
 
-    // options
+	//options
     bool isPlot{true};
-    bool isBinary{false};
+	  bool isBinary{false};
     int binaryFrom{0};
     int binaryTo{0};
     int persistency{0};
@@ -159,7 +158,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
 
     unsigned int nPixelsX{0};
     unsigned int nPixelsY{0};
+    const static int npixelsx_jctb = 400;
+    int npixelsy_jctb{0};
     uint32_t pixelMask{0};
-    uint32_t gainMask{0};
-    int gainOffset{0};
 };

slsDetectorGui/include/qTabAdvanced.h

@@ -1,65 +1,69 @@
 #pragma once
+
 #include "ui_form_tab_advanced.h"
-#include "Detector.h"
 
 class qDrawPlot;
 
-class qTabAdvanced : public QWidget, private Ui::TabAdvancedObject {
-    Q_OBJECT
+#include "Detector.h"
 
-  public:
-    qTabAdvanced(QWidget *parent, sls::Detector *detector, qDrawPlot *p);
-    ~qTabAdvanced();
+class qTabAdvanced:public QWidget, private Ui::TabAdvancedObject{
+	Q_OBJECT
 
-  public slots:
-    void Refresh();
+public:
+	qTabAdvanced(QWidget *parent, sls::Detector* detector, qDrawPlot* p);
+	~qTabAdvanced();
 
-  private slots:
-    void SetDetector();
-    void SetControlPort(int port);
-    void SetStopPort(int port);
-    void SetDetectorUDPIP();
-    void SetDetectorUDPMAC();
-    void SetCltZMQPort(int port);
-    void SetCltZMQIP();
-    void SetRxrHostname();
-    void SetRxrTCPPort(int port);
-    void SetRxrUDPPort(int port);
-    void SetRxrUDPIP();
-    void SetRxrUDPMAC();
-    void SetRxrZMQPort(int port);
-    void SetRxrZMQIP();
-    void GetROI();
-    void ClearROI();
-    void SetROI();
-    void SetAllTrimbits();
-    void SetNumStoragecells(int value);
-    void SetSubExposureTime();
-    void SetSubDeadTime();
+public slots:
+	void Refresh();
 
-  private:
-    void SetupWidgetWindow();
-    void Initialization();
-    void PopulateDetectors();
+private slots:
+	void SetDetector();
+	void SetControlPort(int port);
+	void SetStopPort(int port);
+	void SetDetectorUDPIP();
+	void SetDetectorUDPMAC();
+	void SetCltZMQPort(int port);
+	void SetCltZMQIP();
+	void SetRxrHostname();
+	void SetRxrTCPPort(int port);
+	void SetRxrUDPPort(int port);
+	void SetRxrUDPIP();
+	void SetRxrUDPMAC();
+	void SetRxrZMQPort(int port);
+	void SetRxrZMQIP();
+	void GetROI();
+	void ClearROI();
+	void SetROI();
+	void SetAllTrimbits();
+	void SetNumStoragecells(int value);
+	void SetSubExposureTime();
+	void SetSubDeadTime();
 
-    void GetControlPort();
-    void GetStopPort();
-    void GetDetectorUDPIP();
-    void GetDetectorUDPMAC();
-    void GetCltZMQPort();
-    void GetCltZMQIP();
-    void GetRxrHostname();
-    void GetRxrTCPPort();
-    void GetRxrUDPPort();
-    void GetRxrUDPIP();
-    void GetRxrUDPMAC();
-    void GetRxrZMQPort();
-    void GetRxrZMQIP();
-    void GetAllTrimbits();
-    void GetNumStoragecells();
-    void GetSubExposureTime();
-    void GetSubDeadTime();
+private:
+	void SetupWidgetWindow();
+	void Initialization();
+	void PopulateDetectors();
 
-    sls::Detector *det;
-    qDrawPlot *plot;
+	void GetControlPort();
+	void GetStopPort();
+	void GetDetectorUDPIP();
+	void GetDetectorUDPMAC();
+	void GetCltZMQPort();
+	void GetCltZMQIP();
+	void GetRxrHostname();
+	void GetRxrTCPPort();
+	void GetRxrUDPPort();
+	void GetRxrUDPIP();
+	void GetRxrUDPMAC();
+	void GetRxrZMQPort();
+	void GetRxrZMQIP();
+	void GetAllTrimbits();
+	void GetNumStoragecells();
+	void GetSubExposureTime();
+	void GetSubDeadTime();
+
+	sls::Detector *det;
+	qDrawPlot *plot;
 };
+
+

slsDetectorGui/include/qTabDataOutput.h

@@ -1,44 +1,50 @@
 #pragma once
+
 #include "ui_form_tab_dataoutput.h"
+
 #include "Detector.h"
 
-class qTabDataOutput : public QWidget, private Ui::TabDataOutputObject {
-    Q_OBJECT
+class qTabDataOutput:public QWidget, private Ui::TabDataOutputObject{
+	Q_OBJECT
 
-  public:
-    qTabDataOutput(QWidget *parent, sls::Detector *detector);
-    ~qTabDataOutput();
-    void Refresh();
+public:
+	qTabDataOutput(QWidget *parent, sls::Detector* detector);
+	~qTabDataOutput();
+	void Refresh();
 
-  private slots:
-    void GetOutputDir();
-    void BrowseOutputDir();
-    void SetOutputDir();
-    void SetFileFormat(int format);
-    void SetOverwriteEnable(bool enable);
-    void SetTenGigaEnable(bool enable);
-    void EnableRateCorrection();
-    void SetRateCorrection();
-    void SetSpeed(int speed);
-    void SetFlags();
+	private slots:
+	void GetOutputDir();
+	void BrowseOutputDir();
+	void SetOutputDir();
+	void SetFileFormat(int format);
+	void SetOverwriteEnable(bool enable);
+	void SetTenGigaEnable(bool enable);
+	void EnableRateCorrection();
+	void SetRateCorrection();
+	void SetSpeed(int speed);
+	void SetFlags();
 
-  private:
-    void SetupWidgetWindow();
-    void Initialization();
-    void PopulateDetectors();
-    void EnableBrowse();
-    void GetFileWrite();
-    void GetFileName();
-    void GetFileFormat();
-    void GetFileOverwrite();
-    void GetTenGigaEnable();
-    void GetRateCorrection();
-    void GetSpeed();
-    void GetFlags();
+	private:
+	void SetupWidgetWindow();
+	void Initialization();
+	void PopulateDetectors();
+	void EnableBrowse();
+	void GetFileWrite();
+	void GetFileName();
+	void GetFileFormat();
+	void GetFileOverwrite();
+	void GetTenGigaEnable();
+	void GetRateCorrection();
+	void GetSpeed();
+	void GetFlags();
 
-    sls::Detector *det;
-    // Button group for radiobuttons for rate
-    QButtonGroup *btnGroupRate;
-    // enum for the Eiger Parallel flag
-    enum { PARALLEL, NONPARALLEL };
+	sls::Detector *det;
+	// Button group for radiobuttons for rate
+	QButtonGroup *btnGroupRate;
+	// enum for the Eiger Parallel flag
+	enum { 
+		PARALLEL, 
+		NONPARALLEL
+	};
 };
+

slsDetectorGui/include/qTabDebugging.h

@@ -1,33 +1,36 @@
 #pragma once
+
 #include "ui_form_tab_debugging.h"
+
 #include "Detector.h"
 
 class QTreeWidget;
 class QTreeWidgetItem;
 
-class qTabDebugging : public QWidget, private Ui::TabDebuggingObject {
-    Q_OBJECT
+class qTabDebugging:public QWidget, private Ui::TabDebuggingObject{
+	Q_OBJECT
 
-  public:
-    qTabDebugging(QWidget *parent, sls::Detector *detector);
-    ~qTabDebugging();
-    void Refresh();
+public:
+	qTabDebugging(QWidget *parent, sls::Detector* detector);
+	~qTabDebugging();
+	void Refresh();
 
-  private slots:
-    void GetDetectorStatus();
-    void GetInfo();
-    void SetParameters(QTreeWidgetItem *item);
-    void TestDetector();
+private slots:
+		void GetDetectorStatus();
+		void GetInfo();
+		void SetParameters(QTreeWidgetItem *item);
+		void TestDetector();
 
-  private:
-    void SetupWidgetWindow();
-    void Initialization();
-    void PopulateDetectors();
+private:
+	void SetupWidgetWindow();
+	void Initialization();
+	void PopulateDetectors();
 
-    sls::Detector *det;
-    /** Tree Widget displaying the detectors, modules */
-    QTreeWidget *treeDet;
-    QLabel *lblDetectorHostname;
-    QLabel *lblDetectorFirmware;
-    QLabel *lblDetectorSoftware;
+	sls::Detector *det;
+	/** Tree Widget displaying the detectors, modules */
+	QTreeWidget *treeDet;
+	QLabel *lblDetectorHostname;
+	QLabel *lblDetectorFirmware;
+	QLabel *lblDetectorSoftware;
 };
+

slsDetectorGui/include/qTabDeveloper.h

@@ -1,38 +1,49 @@
 #pragma once
-#include "ui_form_tab_developer.h"
-#include "Detector.h"
-#include "sls_detector_defs.h"
-#include <vector>
 
+#include "ui_form_tab_developer.h"
 class qDacWidget;
 
-class qTabDeveloper : public QWidget, private Ui::TabDeveloperObject {
-    Q_OBJECT
+#include "Detector.h"
+#include "sls_detector_defs.h"
 
-  public:
-    qTabDeveloper(QWidget *parent, sls::Detector *detector);
-    ~qTabDeveloper();
+#include <string>
+#include <vector>
 
-  public slots:
-    void Refresh();
+class qTabDeveloper:public QWidget, private Ui::TabDeveloperObject {
+	Q_OBJECT
 
-  private slots:
-    void SetHighVoltage();
+public:
+	qTabDeveloper(QWidget *parent, sls::Detector* detector);
+	~qTabDeveloper();
 
-  private:
-    void SetupWidgetWindow();
-    void Initialization();
-    void PopulateDetectors();
-    void GetHighVoltage();
-    slsDetectorDefs::dacIndex getSLSIndex(slsDetectorDefs::detectorType detType,
-                                          int index);
+public slots:
+	void Refresh();
 
-    sls::Detector *det;
-    std::vector<qDacWidget *> dacWidgets;
-    std::vector<qDacWidget *> adcWidgets;
+private slots:
+	void SetHighVoltage();
 
-    enum hvVals { HV_0, HV_90, HV_110, HV_120, HV_150, HV_180, HV_200 };
-    int hvmin;
-    static const int HV_MIN = 60;
-    static const int HV_MAX = 200;
+private:
+	void SetupWidgetWindow();
+	void Initialization();
+	void PopulateDetectors();
+	void GetHighVoltage();
+	slsDetectorDefs::dacIndex getSLSIndex(slsDetectorDefs::detectorType detType, int index);
+
+	sls::Detector *det;
+	std::vector<qDacWidget*> dacWidgets;
+	std::vector<qDacWidget*> adcWidgets;
+	
+	enum hvVals {
+		HV_0,
+		HV_90,
+		HV_110,
+		HV_120,
+		HV_150,
+		HV_180,
+		HV_200
+	};
+	int hvmin;
+	static const int HV_MIN = 60;
+	static const int HV_MAX = 200;
 };
+

slsDetectorGui/include/qTabMeasurement.h

@@ -1,91 +1,90 @@
 #pragma once
+
 #include "ui_form_tab_measurement.h"
-#include "Detector.h"
 
 class qDrawPlot;
+
+#include "Detector.h"
+
 class QStandardItemModel;
 
-class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
-    Q_OBJECT
+class qTabMeasurement:public QWidget, private Ui::TabMeasurementObject{
+	Q_OBJECT
 
-  public:
-    qTabMeasurement(QWidget *parent, sls::Detector *detector, qDrawPlot *p);
-    ~qTabMeasurement();
+public:
+	qTabMeasurement(QWidget *parent, sls::Detector* detector, qDrawPlot* p);
+	~qTabMeasurement();
 
-    void Refresh();
+	void Refresh();
 
-  public slots:
-    void AcquireFinished();
-    void AbortAcquire();
+public slots:
+	void AcquireFinished();
+	void AbortAcquire();
 
-  private slots:
-    void SetTimingMode(int val);
-    void SetNumMeasurements(int val);
-    void SetNumFrames(int val);
-    void SetNumTriggers(int val);
-    void SetNumBursts(int val);
-    void SetNumSamples(int val);
-    void SetExposureTime();
-    void SetAcquisitionPeriod();
-    void SetDelay();
-    void SetBurstPeriod();
-    void SetFileWrite(bool val);
-    void SetFileName();
-    void SetRunIndex(int val);
-    void SetStartingFrameNumber(int val);
-    void UpdateProgress();
-    void StartAcquisition();
-    void StopAcquisition();
+private slots:
+	void SetTimingMode(int val);
+	void SetNumMeasurements(int val);
+	void SetNumFrames(int val);
+	void SetNumTriggers(int val);
+	void SetNumSamples(int val);
+	void SetExposureTime();
+	void SetAcquisitionPeriod();
+	void SetDelay();
+	void SetFileWrite(bool val);
+	void SetFileName();
+	void SetRunIndex(int val);
+	void SetStartingFrameNumber(int val);
+	void UpdateProgress();
+	void StartAcquisition();
+	void StopAcquisition();
 
-  private:
-    void SetupWidgetWindow();
-    void Initialization();
-    /** default, show trigger and delay,
-     * otherwise for gotthard2 in auto timing mode and burst mode,
-     * show bursts and burst period
-     */
-    void ShowTriggerDelay();
-    void SetupTimingMode();
-    void EnableWidgetsforTimingMode();
+private:
+	void SetupWidgetWindow();
+	void Initialization();
+	void SetupTimingMode();
+	void EnableWidgetsforTimingMode();
 
-    void GetTimingMode();
-    void GetNumFrames();
-    void GetNumTriggers();
-    void GetNumBursts();
-    void GetNumSamples();
-    void GetExposureTime();
-    void GetAcquisitionPeriod();
-    void CheckAcqPeriodGreaterThanExp();
-    void GetDelay();
-    void GetBurstPeriod();
-    void GetFileWrite();
-    void GetFileName();
-    void GetRunIndex();
-    void GetStartingFrameNumber();
+	void GetTimingMode();
+	void GetNumFrames();
+	void GetNumTriggers();
+	void GetNumSamples();
+	void GetExposureTime();
+	void GetAcquisitionPeriod();
+	void CheckAcqPeriodGreaterThanExp();
+	void GetDelay();
+	void GetFileWrite();
+	void GetFileName();
+	void GetRunIndex();
+	void GetStartingFrameNumber();
 
-    void ResetProgress();
+	void ResetProgress();
 
-    void Enable(bool enable);
-    int VerifyOutputDirectoryError();
+	void Enable(bool enable);
+	int VerifyOutputDirectoryError();
 
-  signals:
-    void EnableTabsSignal(bool);
-    void FileNameChangedSignal(QString);
-
-  private:
-    sls::Detector *det;
-    qDrawPlot *plot;
-    // enum for the timing mode
-    enum { AUTO, TRIGGER, GATED, BURST_TRIGGER, NUMTIMINGMODES };
-    QTimer *progressTimer;
-    // tool tip variables
-    QString acqPeriodTip;
-    QString errPeriodTip;
-    QPalette red;
-    bool delayImplemented;
-    bool sampleImplemented;
-    bool startingFnumImplemented;
-    bool isAcquisitionStopped{false};
-    int numMeasurements{1};
-    int currentMeasurement{0};
+signals:
+	void EnableTabsSignal(bool);
+	void FileNameChangedSignal(QString);
+private:
+	sls::Detector *det;
+	qDrawPlot *plot;
+	// enum for the timing mode
+	enum{
+		AUTO, 
+		TRIGGER, 
+		GATED, 
+		BURST_TRIGGER, 
+		NUMTIMINGMODES
+	};
+	QTimer *progressTimer;
+	//tool tip variables
+	QString 	acqPeriodTip;
+	QString 	errPeriodTip;
+	QPalette	red;
+	bool delayImplemented;
+	bool sampleImplemented;
+	bool startingFnumImplemented;
+	bool isAcquisitionStopped{false};
+	int numMeasurements{1};
+	int currentMeasurement{0};
 };

slsDetectorGui/include/qTabMessages.h

@@ -1,34 +1,36 @@
 #pragma once
+
 #include "ui_form_tab_messages.h"
 
 class QProcess;
 class QKeyEvent;
 
-class qTabMessages : public QWidget, private Ui::TabMessagesObject {
-    Q_OBJECT
+class qTabMessages:public QWidget, private Ui::TabMessagesObject {
+	Q_OBJECT
 
-  public:
-    qTabMessages(QWidget *parent);
-    ~qTabMessages();
-    void Refresh();
+public:
+	qTabMessages(QWidget* parent);
+	~qTabMessages();
+	void Refresh();
 
-  protected:
-    void keyPressEvent(QKeyEvent *event);
+protected:
+	void keyPressEvent(QKeyEvent* event);
 
-  private slots:
-    void ExecuteCommand();
-    void SaveLog();
-    void ClearLog();
+private slots:
+	void ExecuteCommand();
+	void SaveLog();
+	void ClearLog();
 
-  private:
-    void SetupWidgetWindow();
-    void Initialization();
-    void PrintNextLine();
-    void GetLastCommand();
-    void ClearCommand();
-    void AppendOutput();
-    void AppendError();
+private:
+	void SetupWidgetWindow();
+	void Initialization();
+	void PrintNextLine();
+	void GetLastCommand();
+	void ClearCommand();
+	void AppendOutput();
+	void AppendError();
 
-    QProcess *process;
-    QStringList lastCommand;
+	QProcess* process;
+	QStringList lastCommand;
 };
+

slsDetectorGui/include/qTabPlot.h

@@ -1,58 +1,63 @@
 #pragma once
+
 #include "ui_form_tab_plot.h"
-#include "Detector.h"
 
 class qDrawPlot;
+
+#include "Detector.h"
+
 class QButtonGroup;
 
-class qTabPlot : public QWidget, private Ui::TabPlotObject {
-    Q_OBJECT
+class qTabPlot:public QWidget, private Ui::TabPlotObject{
+	Q_OBJECT
 
-  public:
-    qTabPlot(QWidget *parent, sls::Detector *detector, qDrawPlot *p);
-    ~qTabPlot();
-    void SetScanArgument();
-    void Refresh();
+public:
+	qTabPlot(QWidget *parent, sls::Detector* detector, qDrawPlot* p);
+	~qTabPlot();
+	void SetScanArgument();
+	void Refresh();
 
-  private slots:
-    void SetPlot();
-    void Set1DPlotOptionsRight();
-    void Set1DPlotOptionsLeft();
-    void Set2DPlotOptionsRight();
-    void Set2DPlotOptionsLeft();
-    void EnablePersistency(bool enable);
-    void SetBinary();
-    void SetGapPixels(bool enable);
-    void SetTitles();
-    void SetXRange();
-    void SetYRange();
-    void CheckAspectRatio();
-    void SetZRange();
-    void SetStreamingFrequency();
+private slots:
+	void SetPlot();
+	void Set1DPlotOptionsRight();
+	void Set1DPlotOptionsLeft();
+	void Set2DPlotOptionsRight();
+	void Set2DPlotOptionsLeft();
+	void EnablePersistency(bool enable);
+	void SetBinary();
+	void SetGapPixels(bool enable);
+	void SetTitles();
+	void SetXRange();
+	void SetYRange();
+	void CheckAspectRatio();
+	void SetZRange();
+	void SetStreamingFrequency();
 
-  signals:
-    void DisableZoomSignal(bool);
+signals:
+	void DisableZoomSignal(bool);
 
-  private:
-    void SetupWidgetWindow();
-    void Initialization();
-    void Select1DPlot(bool enable);
-    void GetGapPixels();
-    void GetStreamingFrequency();
-    void SetXYRange();
-    void MaintainAspectRatio(int dimension);
+private:
+	void SetupWidgetWindow();
+	void Initialization();
+	void Select1DPlot(bool enable);
+	void GetGapPixels();
+	void GetStreamingFrequency();
+	void SetXYRange();
+	void MaintainAspectRatio(int dimension);
 
-    sls::Detector *det;
-    qDrawPlot *plot;
-    bool is1d;
+	sls::Detector *det;
+	qDrawPlot *plot;
+	bool is1d;
 
-    QButtonGroup *btnGroupPlotType{nullptr};
+	QButtonGroup	*btnGroupPlotType{nullptr};
 
-    /** default plot and axis titles */
-    static QString defaultPlotTitle;
-    static QString defaultHistXAxisTitle;
-    static QString defaultHistYAxisTitle;
-    static QString defaultImageXAxisTitle;
-    static QString defaultImageYAxisTitle;
-    static QString defaultImageZAxisTitle;
+	/** default plot and axis titles */
+	static QString defaultPlotTitle;
+	static QString defaultHistXAxisTitle;
+	static QString defaultHistYAxisTitle;
+	static QString defaultImageXAxisTitle;
+	static QString defaultImageYAxisTitle;
+	static QString defaultImageZAxisTitle;
 };
+
+

slsDetectorGui/include/qTabSettings.h

@@ -1,55 +1,54 @@
 #pragma once
+
 #include "ui_form_tab_settings.h"
+
 #include "Detector.h"
 
-class qTabSettings : public QWidget, private Ui::TabSettingsObject {
-    Q_OBJECT
+class qTabSettings: public QWidget, private Ui::TabSettingsObject{
+	Q_OBJECT
 
-  public:
-    qTabSettings(QWidget *parent, sls::Detector *detector);
-    ~qTabSettings();
-    void Refresh();
+public:
+	qTabSettings(QWidget *parent, sls::Detector* detector);
+	~qTabSettings();
+	void Refresh();
 
-  private slots:
-    void SetSettings(int index);
-    void SetDynamicRange(int index);
-    void SetThresholdEnergy(int index);
+private slots:
+	void SetSettings(int index);
+	void SetDynamicRange(int index);
+	void SetThresholdEnergy(int index);
 
-  private:
-    void SetupWidgetWindow();
-    void SetupDetectorSettings();
-    void Initialization();
+private:
+	void SetupWidgetWindow();
+	void SetupDetectorSettings();
+	void Initialization();
 
-    void GetSettings();
-    void GetDynamicRange();
-    void GetThresholdEnergy();
+	void GetSettings();
+	void GetDynamicRange();
+	void GetThresholdEnergy();
 
-    sls::Detector *det;
-    enum {
-        STANDARD,
-        FAST,
-        HIGHGAIN,
-        DYNAMICGAIN,
-        LOWGAIN,
-        MEDIUMGAIN,
-        VERYHIGHGAIN,
-        DYNAMICHG0,
-        FIXGAIN1,
-        FIXGAIN2,
-        FORCESWITCHG1,
-        FORCESWITCHG2,
-        VERLOWGAIN,
-        G1_HIGHGAIN,
-        G1_LOWGAIN,
-        G2_HIGHCAP_HIGHGAIN,
-        G2_HIGHCAP_LOWGAIN,
-        G2_LOWCAP_HIGHGAIN,
-        G2_LOWCAP_LOWGAIN,
-        G4_HIGHGAIN,
-        G4_LOWGAIN,
-        UNDEFINED,
-        UNINITIALIZED,
-        NUMSETTINGS
-    };
-    enum { DYNAMICRANGE_32, DYNAMICRANGE_16, DYNAMICRANGE_8, DYNAMICRANGE_4 };
+	sls::Detector *det;
+	enum {
+		STANDARD, 
+		FAST, 
+		HIGHGAIN, 
+		DYNAMICGAIN, 
+		LOWGAIN, 
+		MEDIUMGAIN, 
+		VERYHIGHGAIN, 
+		DYNAMICHG0, 
+		FIXGAIN1, 
+		FIXGAIN2, 
+		FORCESWITCHG1, 
+		FORCESWITCHG2, 
+		VERLOWGAIN,
+		UNDEFINED, 
+		UNINITIALIZED, 
+		NUMSETTINGS
+	};
+	enum {
+		DYNAMICRANGE_32,
+		DYNAMICRANGE_16,
+		DYNAMICRANGE_8,
+		DYNAMICRANGE_4
+	};
 };

slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h

@@ -1,165 +1,181 @@
+
+/**
+ * @author Ian Johnson
+ * @version 1.0
+ * Modifications:
+ * 19.06.2012: {Some functions have been added by Dhanya to enable zooming in and out
+ * without using mouse control:
+ * DisableZoom,
+ * SetXMinMax,SetYMinMax,
+ * GetXMinimum,GetXMaximum,GetYMinimum,GetYMaximum}
+ *  */
+
 #ifndef SLSQT1DPLOT_H
 #define SLSQT1DPLOT_H
 
+
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+
 #include "ansi.h"
-#include "SlsQt1DZoomer.h"
+
+
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_marker.h>
 #include <qwt_scale_div.h>
+#include  "SlsQt1DZoomer.h"
+#include <iostream>
+
 
 class QPen;
 class SlsQt1DPlot;
 class QwtSymbol;
 
-class SlsQtH1D : public QwtPlotCurve {
+class SlsQtH1D:public QwtPlotCurve{
 
-  public:
-    SlsQtH1D(QString title, int n, double xmin, double xmax, double *data = 0);
-    SlsQtH1D(QString title, int n, double *data_x, double *data_y);
-    ~SlsQtH1D();
+ public:
+  SlsQtH1D(QString title, int n, double xmin, double xmax, double* data=0);
+  SlsQtH1D(QString title, int n, double* data_x, double* data_y);
+  ~SlsQtH1D();
 
-    void Attach(SlsQt1DPlot *p);
-    void Detach(SlsQt1DPlot *p);
+  void Attach(SlsQt1DPlot* p);
+  void Detach(SlsQt1DPlot* p);
 
-    int SetLineColor(int c = -1);
-    int SetLineWidth(int w = 1);
-    void SetLineStyle(int s = 0);
-    void setStyleLinesorDots(bool isLines);
-    void setSymbolMarkers(bool isMarker);
+  int   SetLineColor(int c=-1);
+  int   SetLineWidth(int w=1);
+  void  SetLineStyle(int s=0);
+  void  setStyleLinesorDots(bool isLines);
+  void  setSymbolMarkers(bool isMarker);
 
-    void SetData(int n, double xmin, double xmax, double *d = 0);
-    void SetData(int n, double *dx, double *dy);
+  void SetData(int n, double xmin, double xmax, double* d=0);
+  void SetData(int n, double* dx, double* dy);
 
-    double *GetX() { return x; }
-    double *GetY() { return y; }
-    int GetNBinsX() { return ndata; }
+  double*  GetX()      {return x;}
+  double*  GetY()      {return y;}
+  int      GetNBinsX() {return ndata;}
 
-    double FillBin(int bx, double v = 1);
-    double Fill(double x, double v = 1);
-    double SetBinContent(int bx, double v);
-    double SetContent(double x, double v);
-    int FindBinIndex(double px);
+  double   FillBin(int bx, double v=1);
+  double   Fill(double x, double v=1);
+  double   SetBinContent(int bx,double v);
+  double   SetContent(double x,double v);
+  int      FindBinIndex(double px);
 
-    double GetXMin() { return x[0]; }
-    double GetFirstXgtZero() { return firstXgt0; }
-    double GetXMax() { return x[ndata - 1]; }
-    double GetYMin() { return ymin; }
-    double GetFirstYgtZero() { return firstYgt0; }
-    double GetYMax() { return ymax; }
+  double   GetXMin()         {return x[0];}
+  double   GetFirstXgtZero() {return firstXgt0;}
+  double   GetXMax()         {return x[ndata-1];}
+  double   GetYMin()         {return ymin;}
+  double   GetFirstYgtZero() {return firstYgt0;}
+  double   GetYMax()         {return ymax;}
 
-    SlsQtH1D *Add(double v);
+  SlsQtH1D*   Add(double v);
 
-  private:
-    int ndata;
-    int n_array;
-    double dx;
-    double *x{nullptr}, *y{nullptr};
-    double ymin, ymax;
-    double firstXgt0, firstYgt0;
-    void Initailize();
-    int SetUpArrays(int n);
-    int CheckIndex(int bx);
 
-    QPen *pen_ptr{nullptr};
+
+ private:
+  int    ndata;
+  int    n_array;
+  double dx;
+  double *x,*y;
+  double ymin,ymax;
+  double firstXgt0,firstYgt0;
+  void Initailize();
+  int  SetUpArrays(int n);
+  int  CheckIndex(int bx);
+
+  QPen* pen_ptr;
 };
 
-class SlsQtH1DList {
-  public:
-    SlsQtH1DList(SlsQtH1D *hist = 0);
-    ~SlsQtH1DList();
 
-    SlsQtH1D *Add(SlsQtH1D *h);
-    void Remove(SlsQtH1D *h);
-    void Print();
+class SlsQtH1DList{
+ public:
+  SlsQtH1DList(SlsQtH1D* hist=0);
+  ~SlsQtH1DList();
 
-    SlsQtH1D *Hist() { return the_hist; } // if no hist returns 0
-    SlsQtH1DList *Next() { return the_next; }
+  SlsQtH1D*     Add(SlsQtH1D* h); 
+  void       Remove(SlsQtH1D* h); 
+  void       Print();
 
-  private:
-    SlsQtH1DList *the_next;
-    SlsQtH1D *the_hist;
+  SlsQtH1D*     Hist() {return the_hist;} //if no hist returns 0
+  SlsQtH1DList* Next() {return the_next;}
+
+
+private:
+   SlsQtH1DList*  the_next;
+   SlsQtH1D*      the_hist;
 };
+ 
 
-class SlsQt1DPlot : public QwtPlot {
-    Q_OBJECT
+class SlsQt1DPlot:public QwtPlot{
+  Q_OBJECT
 
-  public:
-    SlsQt1DPlot(QWidget * = NULL);
-    ~SlsQt1DPlot();
+ public:
+  SlsQt1DPlot(QWidget* = NULL);
+  ~SlsQt1DPlot();
+    
+  void SetTitle(QString title);
+  void SetXTitle(QString title);
+  void SetYTitle(QString title);
+  void SetTitleFont(const QFont& f);
+  void SetXFont(const QFont& f);
+  void SetYFont(const QFont& f);
+  
+  void InsertHLine(double y);
+  void RemoveHLine();
+  void InsertVLine(double v);
+  void RemoveVLine();
 
-    void SetTitle(QString title);
-    void SetXTitle(QString title);
-    void SetYTitle(QString title);
-    void SetTitleFont(const QFont &f);
-    void SetXFont(const QFont &f);
-    void SetYFont(const QFont &f);
 
-    void InsertHLine(double y);
-    void RemoveHLine();
-    void InsertVLine(double v);
-    void RemoveVLine();
+  /**	This group of functions have been added by Dhanya on 19.06.2012 to be able to
+  	use zooming functionality without mouse control*/
+  void DisableZoom(bool disable);
+  void EnableXAutoScaling() {setAxisAutoScale(QwtPlot::xBottom, true);Update();};
+  void EnableYAutoScaling() {setAxisAutoScale(QwtPlot::yLeft, true);Update();};
+  void SetXMinMax(double min,double max){setAxisScale(QwtPlot::xBottom,min,max);};
+  void SetYMinMax(double min,double max){setAxisScale(QwtPlot::yLeft,min,max);};
+  double GetXMinimum(){return hist_list->Hist()->GetXMin();};
+  double GetXMaximum(){return hist_list->Hist()->GetXMax();};
+  double GetYMinimum(){return hist_list->Hist()->GetYMin();};
+  double GetYMaximum(){return hist_list->Hist()->GetYMax();};
+  /**---*/
 
-    /**	This group of functions have been added by Dhanya on 19.06.2012 to be
-       able to use zooming functionality without mouse control*/
-    void DisableZoom(bool disable);
-    void EnableXAutoScaling() {
-        setAxisAutoScale(QwtPlot::xBottom, true);
-        Update();
-    };
-    void EnableYAutoScaling() {
-        setAxisAutoScale(QwtPlot::yLeft, true);
-        Update();
-    };
-    void SetYStep(int step) { ystep = step; };
-    void SetXMinMax(double min, double max) {
-        setAxisScale(QwtPlot::xBottom, min, max);
-    };
-    void SetYMinMax(double min, double max) {
-        setAxisScale(QwtPlot::yLeft, min, max);
-    };
-    double GetXMinimum() { return hist_list->Hist()->GetXMin(); };
-    double GetXMaximum() { return hist_list->Hist()->GetXMax(); };
-    double GetYMinimum() { return hist_list->Hist()->GetYMin(); };
-    double GetYMaximum() { return hist_list->Hist()->GetYMax(); };
-    /**---*/
 
-    void SetZoom(double xmin, double ymin, double x_width, double y_width);
-    void SetZoomBase(double xmin, double ymin, double x_width, double y_width) {
-        zoomer->SetZoomBase(xmin, ymin, x_width, y_width);
-    }
+  void SetZoom(double xmin,double ymin,double x_width,double y_width);
+  void SetZoomBase(double xmin,double ymin,double x_width, double y_width){ zoomer->SetZoomBase(xmin,ymin,x_width,y_width);}
 
-    void alignScales();
+  void alignScales();
 
-    void SetLogX(bool yes = 1);
-    void SetLogY(bool yes = 1);
+  void SetLogX(bool yes=1);  
+  void SetLogY(bool yes=1);
+ private:
+  
+  SlsQtH1DList*     hist_list;
+  SlsQt1DZoomer*    zoomer;
+  QwtPlotPanner* panner;
 
-  private:
-    SlsQtH1DList *hist_list{nullptr};
-    SlsQt1DZoomer *zoomer{nullptr};
-    QwtPlotPanner *panner{nullptr};
+  QwtPlotMarker *hline;
+  QwtPlotMarker *vline;
+  bool disableZoom{false};
+  
+  void SetupZoom();
+  void UnknownStuff();
+  //void alignScales();
+  
+  void CalculateNResetZoomBase();
+  void NewHistogramAttached(SlsQtH1D* h);
+  void HistogramDetached(SlsQtH1D* h);
 
-    QwtPlotMarker *hline{nullptr};
-    QwtPlotMarker *vline{nullptr};
-    bool disableZoom{false};
-    int ystep{0};
+  void SetLog(int axisId, bool yes);
+  
+  friend void SlsQtH1D::Attach(SlsQt1DPlot* p);
+  friend void SlsQtH1D::Detach(SlsQt1DPlot* p);
+  
+  
+ public slots:
+  void UnZoom();
+  void Update();
 
-    void SetupZoom();
-    void UnknownStuff();
-    // void alignScales();
-
-    void CalculateNResetZoomBase();
-    void NewHistogramAttached(SlsQtH1D *h);
-    void HistogramDetached(SlsQtH1D *h);
-
-    void SetLog(int axisId, bool yes);
-
-    friend void SlsQtH1D::Attach(SlsQt1DPlot *p);
-    friend void SlsQtH1D::Detach(SlsQt1DPlot *p);
-
-  public slots:
-    void UnZoom();
-    void Update();
 };
 
 #endif

slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h

@@ -1,52 +1,74 @@
 
+/**
+ * @author Ian Johnson
+ * @version 1.0
+ */
+
 #ifndef SLSQT1DZOOMER_H
 #define SLSQT1DZOOMER_H
 
-#include <qwt_global.h>
-#include <qwt_plot_panner.h>
 #include <qwt_plot_zoomer.h>
+#include <qwt_plot_panner.h>
+#include <qwt_global.h>
 
 class SlsQtH1D;
 
-class SlsQt1DZoomer : public QwtPlotZoomer {
-  private:
-    double x0, x1, y0, y1;
-    double firstXgt0, firstYgt0;
-    bool xIsLog, yIsLog;
+class SlsQt1DZoomer:public QwtPlotZoomer{
+ private:
+  double x0,x1,y0,y1;
+  double firstXgt0,firstYgt0;
+  bool xIsLog,yIsLog;
 
-  public:
-    SlsQt1DZoomer(QWidget *canvas) : QwtPlotZoomer(canvas) {
-        setTrackerMode(AlwaysOn);
-        xIsLog = yIsLog = 0;
-    }
+ public:
+#if QWT_VERSION < 0x060100
+  SlsQt1DZoomer(QwtPlotCanvas *canvas):QwtPlotZoomer(canvas){
+#else
+  SlsQt1DZoomer(QWidget *canvas):QwtPlotZoomer(canvas){
+#endif
+    setTrackerMode(AlwaysOn);
+    xIsLog=yIsLog=0;
+  }
 
-    double x() { return x0; }
-    double x_firstGreaterThan0() { return firstXgt0; }
-    double w() { return x1 - x0; }
+  double x() {return x0;}
+  double x_firstGreaterThan0() {return firstXgt0;}
+  double w() {return x1-x0;}
 
-    double y() { return y0; }
-    double y_firstGreaterThan0() { return firstYgt0; }
-    double h() { return y1 - y0; }
+  double y() {return y0;}
+  double y_firstGreaterThan0() {return firstYgt0;}
+  double h() {return y1-y0;}
 
-    void SetZoomBase(double xmin, double ymin, double x_width, double y_width);
-    void SetZoomBase(SlsQtH1D *h);
-    void ExtendZoomBase(SlsQtH1D *h);
-    void ResetZoomBase();
+  void SetZoomBase(double xmin,double ymin,double x_width, double y_width);
+  void SetZoomBase(SlsQtH1D* h);
+  void ExtendZoomBase(SlsQtH1D* h);
+  void ResetZoomBase();
 
-    bool IsLogX() { return xIsLog; }
-    bool IsLogY() { return yIsLog; }
-    bool SetLogX(bool yes) { return xIsLog = yes; }
-    bool SetLogY(bool yes) { return yIsLog = yes; }
+  bool IsLogX(){ return xIsLog;}
+  bool IsLogY(){ return yIsLog;}
+  bool SetLogX(bool yes) { return xIsLog=yes;}
+  bool SetLogY(bool yes) { return yIsLog=yes;}
 
-    using QwtPlotPicker::trackerText;
-    virtual QwtText trackerText(const QPoint &pos) const {
+ 
+#if QWT_VERSION<0x060000
+    virtual QwtText trackerText(const QwtDoublePoint &pos) const{
+#else
+using QwtPlotPicker::trackerText;
+  virtual QwtText trackerText(const QPoint &pos) const{
+#endif
+    QColor bg(Qt::white);
+
+#if QT_VERSION >= 0x040300
+    bg.setAlpha(200);
+#endif
+
+#if QWT_VERSION<0x060000
+    QwtText text = QwtPlotZoomer::trackerText(pos);
+#else
+    QwtText text = QwtPlotPicker::trackerText(pos);
+#endif
+    text.setBackgroundBrush( QBrush( bg ));
+    return text;
+  }
 
-        QColor bg(Qt::white);
-        bg.setAlpha(200);
-        QwtText text = QwtPlotPicker::trackerText(pos);
-        text.setBackgroundBrush(QBrush(bg));
-        return text;
-    }
 };
 
 #endif

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h

@@ -1,126 +1,137 @@
 
+/**
+ * @author Ian Johnson
+ * @version 1.0
+ */
+
+
 #ifndef SLSQT2DHIST_H
 #define SLSQT2DHIST_H
 
+
+#if QT_VERSION >= 0x040000
+#include <qprintdialog.h>
+#endif
 #include <qwt_color_map.h>
 #include <qwt_plot_spectrogram.h>
-#include <qwt_scale_draw.h>
 #include <qwt_scale_widget.h>
+#include <qwt_scale_draw.h>
 
-class SlsQt2DHist : public QwtRasterData {
 
-  private:
-    double x_min, x_max, y_min, y_max;
-    double x_width, y_width;
+class SlsQt2DHist: public QwtRasterData{
+  
+ private:
 
-    int nx, ny, nb;
-    double *data{nullptr};
-    double z_min, z_mean, z_max;
-    bool z_mean_has_been_calculated;
+  double  x_min,x_max,y_min,y_max;
+  double  x_width,y_width;
 
-    int nx_array, ny_array;
+  int     nx,ny,nb;
+  double  *data;
+  double  z_min,z_mean,z_max;
+  bool    z_mean_has_been_calculated;
+  
+  int     nx_array,ny_array;
 
-    bool interp;
+  bool interp;
 
-    static double value_between_points(double p1, double v1, double p2,
-                                       double v2, double p) { // linear extrap
-        return (v2 - v1) / (p2 - p1) * (p - p1) + v1;
-    }
+  static double value_between_points(double p1,double v1,double p2,double v2,double p){ //linear extrap
+    return (v2-v1)/(p2-p1)*(p-p1)+v1;
+  }
+  
+ public:
+  SlsQt2DHist(int nbinsx=10, double xmin=0, double xmax=10, int nbinsy=10, double ymin=0, double ymax=10, double* d=0,double zmin=0,double zmax=-1);
+  virtual ~SlsQt2DHist();
 
-  public:
-    SlsQt2DHist(int nbinsx = 10, double xmin = 0, double xmax = 10,
-                int nbinsy = 10, double ymin = 0, double ymax = 10,
-                double *d = 0, double zmin = 0, double zmax = -1);
-    virtual ~SlsQt2DHist();
+  double  GetXMin()      {return x_min;}
+  double  GetXMax()      {return x_max;}
+  double  GetXBinWidth() {return x_width;}
+  double  GetYMin()      {return y_min;}
+  double  GetYMax()      {return y_max;}
+  double  GetYBinWidth() {return y_width;}
+  double  GetMinimum()   {return z_min;}
+  double  GetMaximum()   {return z_max;}
+  double  GetMean();
 
-    double GetXMin() { return x_min; }
-    double GetXMax() { return x_max; }
-    double GetXBinWidth() { return x_width; }
-    double GetYMin() { return y_min; }
-    double GetYMax() { return y_max; }
-    double GetYBinWidth() { return y_width; }
-    double GetMinimum() { return z_min; }
-    double GetMaximum() { return z_max; }
-    double GetMean();
+  int     GetNBinsX(){return nx;}
+  int     GetNBinsY(){return ny;}
+  double  GetBinValue(int bx,int by);
+  int     GetBinIndex(int bx,int by);
+  double* GetDataPtr(){return data;}
 
-    int GetNBinsX() { return nx; }
-    int GetNBinsY() { return ny; }
-    double GetBinValue(int bx, int by);
-    int GetBinIndex(int bx, int by);
-    double *GetDataPtr() { return data; }
+  void    Interpolate(bool on=1) {interp=on;}
+  void    SetBinValue(int bx,int by,double v);
+  void    SetData(int nbinsx, double xmin, double xmax, int nbinsy,double ymin, double ymax,double *d,double zmin=0, double zmax=-1);
+  
+  double  SetMinimumToFirstGreaterThanZero();
+  void    SetMinimum(double zmin) {z_min=zmin;}
+  void    SetMaximum(double zmax) {z_max=zmax;}
+  void    SetMinMax(double zmin=0,double zmax=-1);
 
-    void Interpolate(bool on = 1) { interp = on; }
-    void SetBinValue(int bx, int by, double v);
-    void SetData(int nbinsx, double xmin, double xmax, int nbinsy, double ymin,
-                 double ymax, double *d, double zmin = 0, double zmax = -1);
+  int     FindBinIndex(double x, double y);
 
-    double SetMinimumToFirstGreaterThanZero();
-    void SetMinimum(double zmin) { z_min = zmin; }
-    void SetMaximum(double zmax) { z_max = zmax; }
-    void SetMinMax(double zmin = 0, double zmax = -1);
 
-    int FindBinIndex(double x, double y);
 
-    virtual QwtRasterData *copy() const {
-        // this function does not create a new SlsQt2DHistData instance,
-        // just passes a pointer so that data is common to both the copy and the
-        // original instance
-        return (QwtRasterData *)this;
-    }
+  virtual QwtRasterData *copy() const{ 
+    //this function does not create a new SlsQt2DHistData instance,
+    //just passes a pointer so that data is common to both the copy and the original instance
+    return (QwtRasterData*) this;
+  }
 
-    virtual QwtInterval range() const { return QwtInterval(z_min, z_max); }
-    virtual QwtInterval interval(Qt::Axis axis) const {
-        switch (axis) {
-        case Qt::ZAxis:
-            return QwtInterval(z_min, z_max);
-        case Qt::XAxis:
-            return QwtInterval(x_min, x_max);
-        case Qt::YAxis:
-            return QwtInterval(y_min, y_max);
-        default:
-            return QwtInterval(z_min, z_max);
-        };
+#if QWT_VERSION<0x060000
+   virtual QwtDoubleInterval range() const{ return QwtDoubleInterval(z_min,z_max);}
+#else
+  virtual QwtInterval range() const{ return QwtInterval(z_min,z_max);}
+  virtual QwtInterval interval(Qt::Axis axis) const { 
+    switch (axis){
+    case Qt::ZAxis:
+      return QwtInterval(z_min,z_max);
+    case Qt::XAxis:
+      return QwtInterval(x_min,x_max);
+    case Qt::YAxis:
+      return QwtInterval(y_min,y_max);
+    default:
+      return QwtInterval(z_min,z_max);
     };
+  };
+#endif
 
-    virtual double value(double x, double y) const {
-        // if(!interp){ //default is box like plot
-        int index =
-            int((x - x_min) / x_width) + int((y - y_min) / y_width) * nx;
-        if (index < 0 || index > nb)
-            index = nb;
-        if (!interp)
-            return data[index];
-        //}
 
-        int x_int = int((x - x_min) / x_width - 0.5);
-        if (x_int < 0)
-            x_int = 0;
-        else if (x_int > nx - 2)
-            x_int = nx - 2;
-        int y_int = int((y - y_min) / y_width - 0.5);
-        if (y_int < 0)
-            y_int = 0;
-        else if (y_int > ny - 2)
-            y_int = ny - 2;
 
-        int b00 = x_int * ny + y_int;
-        int b01 = x_int * ny + y_int + 1;
-        int b10 = (x_int + 1) * ny + y_int;
-        int b11 = (x_int + 1) * ny + y_int + 1;
+  virtual double value(double x, double y) const{
+    //if(!interp){ //default is box like plot
+      int index = int((x-x_min)/x_width) + int((y-y_min)/y_width)*nx;
+      if(index<0||index>nb) index = nb;
+      if(!interp) return data[index];
+      //}
 
-        // vertical extrap
-        double y0 = y_min + (y_int + 0.5) * y_width;
-        double y1 = y_min + (y_int + 1.5) * y_width;
-        double left_v = value_between_points(y0, data[b00], y1, data[b01], y);
-        double right_v = value_between_points(y0, data[b10], y1, data[b11], y);
-        // horazontal extrap
+    
+    int x_int  = int((x-x_min)/x_width-0.5);
+      if(x_int<0) x_int = 0; else if(x_int>nx-2) x_int = nx-2;
+    int y_int  = int((y-y_min)/y_width-0.5);
+      if(y_int<0) y_int = 0; else if(y_int>ny-2) y_int = ny-2;
 
-        return 0.5;
+    int b00 =  x_int*ny    + y_int;
+    int b01 =  x_int*ny    + y_int+1;
+    int b10 = (x_int+1)*ny + y_int;
+    int b11 = (x_int+1)*ny + y_int+1;
 
-        return value_between_points(x_min + (x_int + 0.5) * x_width, left_v,
-                                    x_min + (x_int + 1.5) * x_width, right_v,
-                                    x);
-    }
+    //vertical extrap
+      double y0 = y_min+(y_int+0.5)*y_width;
+      double y1 = y_min+(y_int+1.5)*y_width;
+      double left_v   = value_between_points(y0,data[b00],y1,data[b01],y);
+      double right_v  = value_between_points(y0,data[b10],y1,data[b11],y);
+    //horazontal extrap
+
+
+
+      return 0.5;
+
+
+	return value_between_points(x_min+(x_int+0.5)*x_width,left_v,
+				    x_min+(x_int+1.5)*x_width,right_v,x);
+  }
+  
 };
 
+
 #endif

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h

@@ -1,87 +1,98 @@
 #pragma once
-#include "SlsQt2DHist.h"
-#include "SlsQt2DZoomer.h"
-#include <qlist.h>
+
+
+
 #include <qwt_plot.h>
+#include <qlist.h>
 #include <qwt_plot_spectrogram.h>
 
-class QwtPlotPanner;
-class QwtScaleWidget;
-class QwtLinearColorMap;
+#include  "SlsQt2DZoomer.h"
+#include  "SlsQt2DHist.h"
 
-class SlsQt2DPlot : public QwtPlot {
+
+class  QwtPlotPanner;
+class  QwtScaleWidget;
+class  QwtLinearColorMap;
+
+
+class SlsQt2DPlot: public QwtPlot{
     Q_OBJECT
 
-  public:
+public:
     SlsQt2DPlot(QWidget * = NULL);
-    ~SlsQt2DPlot();
+
     void SetTitle(QString title);
     void SetXTitle(QString title);
     void SetYTitle(QString title);
     void SetZTitle(QString title);
-    void SetTitleFont(const QFont &f);
-    void SetXFont(const QFont &f);
-    void SetYFont(const QFont &f);
-    void SetZFont(const QFont &f);
+    void SetTitleFont(const QFont& f);
+    void SetXFont(const QFont& f);
+    void SetYFont(const QFont& f);
+    void SetZFont(const QFont& f);
 
-    void UnZoom(bool replot = true);
-    void SetZoom(double xmin, double ymin, double x_width, double y_width);
+    void UnZoom(bool replot=true);
+    void SetZoom(double xmin,double ymin,double x_width,double y_width);
     void DisableZoom(bool disable);
-    void EnableXAutoScaling() { setAxisAutoScale(QwtPlot::xBottom, true); };
-    void EnableYAutoScaling() { setAxisAutoScale(QwtPlot::yLeft, true); };
-    void SetXMinMax(double min, double max) {
-        setAxisScale(QwtPlot::xBottom, min, max);
-    };
-    void SetYMinMax(double min, double max) {
-        setAxisScale(QwtPlot::yLeft, min, max);
-    };
-    double GetXMinimum() { return hist->GetXMin(); };
-    double GetXMaximum() { return hist->GetXMax(); };
-    double GetYMinimum() { return hist->GetYMin(); };
-    double GetYMaximum() { return hist->GetYMax(); };
-    double GetZMinimum() { return hist->GetMinimum(); }
-    double GetZMaximum() { return hist->GetMaximum(); }
-    void SetZMinMax(double zmin = 0, double zmax = -1);
-    void SetZMinimumToFirstGreaterThanZero() {
-        hist->SetMinimumToFirstGreaterThanZero();
-    }
-    double GetZMean() { return hist->GetMean(); }
+    void EnableXAutoScaling() {setAxisAutoScale(QwtPlot::xBottom, true);};
+    void EnableYAutoScaling() {setAxisAutoScale(QwtPlot::yLeft, true);};
+    void SetXMinMax(double min,double max){setAxisScale(QwtPlot::xBottom,min,max);};
+    void SetYMinMax(double min,double max){setAxisScale(QwtPlot::yLeft,min,max);};
+    double GetXMinimum(){return hist->GetXMin();};
+    double GetXMaximum(){return hist->GetXMax();};
+    double GetYMinimum(){return hist->GetYMin();};
+    double GetYMaximum(){return hist->GetYMax();};
+    double GetZMinimum(){ return hist->GetMinimum();}
+    double GetZMaximum(){ return hist->GetMaximum();}
+    void SetZMinMax(double zmin=0,double zmax=-1);
+    void SetZMinimumToFirstGreaterThanZero(){hist->SetMinimumToFirstGreaterThanZero();}
+    double GetZMean()   { return hist->GetMean();}
 
-    void SetData(int nbinsx, double xmin, double xmax, int nbinsy, double ymin,
-                 double ymax, double *d, double zmin = 0, double zmax = -1) {
-        hist->SetData(nbinsx, xmin, xmax, nbinsy, ymin, ymax, d, zmin, zmax);
+    void   SetData(int nbinsx, double xmin, double xmax, int nbinsy,double ymin, double ymax,double *d,double zmin=0, double zmax=-1){
+      hist->SetData(nbinsx,xmin,xmax,nbinsy,ymin,ymax,d,zmin,zmax);
     }
 
-    double *GetDataPtr() { return hist->GetDataPtr(); }
-    int GetBinIndex(int bx, int by) { return hist->GetBinIndex(bx, by); }
-    int FindBinIndex(double x, double y) { return hist->FindBinIndex(x, y); }
-    void SetBinValue(int bx, int by, double v) { hist->SetBinValue(bx, by, v); }
-    double GetBinValue(int bx, int by) { return hist->GetBinValue(bx, by); }
-    void FillTestPlot(int i = 0);
+    double* GetDataPtr()                        {return hist->GetDataPtr();}
+    int GetBinIndex(int bx,int by)          {return hist->GetBinIndex(bx,by);}
+    int FindBinIndex(double x,double y)     {return hist->FindBinIndex(x,y);}
+    void SetBinValue(int bx,int by,double v) { hist->SetBinValue(bx,by,v);}
+    double GetBinValue(int bx,int by)          {return hist->GetBinValue(bx,by);} 
+    void FillTestPlot(int i=0);
     void Update();
 
     void SetInterpolate(bool enable);
     void SetContour(bool enable);
     void SetLogz(bool enable, bool isMin, bool isMax, double min, double max);
     void SetZRange(bool isMin, bool isMax, double min, double max);
-    void LogZ(bool on = 1);
+    void LogZ(bool on=1);
+  
+   
 
-  public slots:
+public slots:
     void showSpectrogram(bool on);
 
-  private:
+
+private:
     void SetupZoom();
     void SetupColorMap();
-    QwtLinearColorMap *myColourMap(QVector<double> colourStops);
-    QwtLinearColorMap *myColourMap(int log = 0);
+    QwtLinearColorMap* myColourMap(QVector<double> colourStops);
+    QwtLinearColorMap* myColourMap(int log=0);
 
-    QwtPlotSpectrogram *d_spectrogram{nullptr};
-    SlsQt2DHist *hist{nullptr};
-    SlsQt2DZoomer *zoomer{nullptr};
-    QwtPlotPanner *panner{nullptr};
-    QwtScaleWidget *rightAxis{nullptr};
+    QwtPlotSpectrogram *d_spectrogram;
+    SlsQt2DHist* hist;
+    SlsQt2DZoomer* zoomer;
+    QwtPlotPanner* panner;
+    QwtScaleWidget *rightAxis;
+
+    QwtLinearColorMap* colorMapLinearScale;
+    QwtLinearColorMap* colorMapLogScale;
+#if QWT_VERSION<0x060000
+    QwtValueList* contourLevelsLinear;
+    QwtValueList* contourLevelsLog;
+#else 
     QList<double> contourLevelsLinear;
     QList<double> contourLevelsLog;
+#endif
     bool disableZoom{false};
     int isLog;
 };
+

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h

@@ -1,41 +1,73 @@
+
+/**
+ * @author Ian Johnson
+ * @version 1.0
+ * Dhanya-05.12.2012- included an additional header
+ */
+
+
 #ifndef SLSQT2DZOOMER_H
 #define SLSQT2DZOOMER_H
-#include "SlsQt2DHist.h"
-#include <qwt_plot_panner.h>
-#include <qwt_plot_zoomer.h>
+
+
+
+/**included by Dhanya on 05.12.2012 to avoid compile time errors with the latest gcc*/
 #include <cstdio>
+/**end of Change by Dhanya*/
 
-class SlsQt2DZoomer : public QwtPlotZoomer {
-  private:
-    SlsQt2DHist *hist;
+#include <qwt_plot_zoomer.h>
+#include <qwt_plot_panner.h>
+
+#include "SlsQt2DHist.h"
+
+class SlsQt2DZoomer:public QwtPlotZoomer{
+ private:
+  SlsQt2DHist* hist;
+
+ public:
+#if QWT_VERSION < 0x060100
+  SlsQt2DZoomer(QwtPlotCanvas *canvas):QwtPlotZoomer(canvas){
+#else
+  SlsQt2DZoomer(QWidget *canvas):QwtPlotZoomer(canvas){
+#endif
+    setTrackerMode(AlwaysOn);
+  }
+
+  void SetHist(SlsQt2DHist* h){
+    hist=h;
+  }
+  
+ 
+#if QWT_VERSION<0x060000
+    virtual QwtText trackerText(const QwtDoublePoint &pos) const{
+#else
+  virtual QwtText trackerTextF(const QPointF &pos) const{
+#endif
+    QColor bg(Qt::white);
+#if QT_VERSION >= 0x040300
+    bg.setAlpha(200);
+#endif
+
+    
+    //QwtText text = QwtPlotZoomer::trackerText(pos);
+
+    static QwtText text; 
+    if(hist){
+      static char t[200];
+      sprintf(t,"%3.2f, %3.2f, %3.2f",pos.x(),pos.y(),hist->value(pos.x(),pos.y()));
+      text.setText(t);
+    }else {
+#if QWT_VERSION<0x060000
+    QwtText text = QwtPlotZoomer::trackerText(pos);
+#else
+    QPoint p=pos.toPoint();
+    QwtText text = QwtPlotZoomer::trackerText(p);
+#endif
 
-  public:
-    SlsQt2DZoomer(QWidget *canvas) : QwtPlotZoomer(canvas) {
-        setTrackerMode(AlwaysOn);
-    }
-
-    void SetHist(SlsQt2DHist *h) { hist = h; }
-
-    virtual QwtText trackerTextF(const QPointF &pos) const {
-        QColor bg(Qt::white);
-        bg.setAlpha(200);
-
-        // QwtText text = QwtPlotZoomer::trackerText(pos);
-
-        static QwtText text;
-        if (hist) {
-            static char t[200];
-            sprintf(t, "%3.2f, %3.2f, %3.2f", pos.x(), pos.y(),
-                    hist->value(pos.x(), pos.y()));
-            text.setText(t);
-        } else {
-
-            QPoint p = pos.toPoint();
-            QwtText text = QwtPlotZoomer::trackerText(p);
-        }
-        text.setBackgroundBrush(QBrush(bg));
-        return text;
     }
+    text.setBackgroundBrush( QBrush( bg ));
+    return text;
+  }
 };
 
 #endif

slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cxx

@@ -1,7 +1,11 @@
 
-/* TODO! short description */
+/**
+ * @author Ian Johnson
+ * @version 1.0
+ */
+
 #include "SlsQt1DPlot.h"
-#include <qwt_symbol.h>
+#include <iostream>
 #include <qwt_legend.h>
 #include <qwt_math.h>
 #include <qwt_painter.h>
@@ -10,36 +14,33 @@
 #include <qwt_scale_draw.h>
 #include <qwt_scale_engine.h>
 #include <qwt_scale_widget.h>
+#include "qwt_symbol.h"
 #include <stdlib.h>
-#include <iostream>
 
-#define QwtLog10ScaleEngine QwtLogScaleEngine // hmm
+#if QWT_VERSION >= 0x060100
+#define QwtLog10ScaleEngine QwtLogScaleEngine
+#endif
 
-SlsQtH1D::SlsQtH1D(QString title, int n, double min, double max, double *data)
-    : QwtPlotCurve(title), x(nullptr), y(nullptr), pen_ptr(nullptr) {
+SlsQtH1D::SlsQtH1D(QString title, int n, double min, double max, double *data) : QwtPlotCurve(title) {
     Initailize();
     SetData(n, min, max, data);
 }
 
-SlsQtH1D::SlsQtH1D(QString title, int n, double *data_x, double *data_y)
-    : QwtPlotCurve(title) {
+SlsQtH1D::SlsQtH1D(QString title, int n, double *data_x, double *data_y) : QwtPlotCurve(title) {
     Initailize();
     SetData(n, data_x, data_y);
 }
 
 void SlsQtH1D::Initailize() {
     ndata = n_array = 0;
-    x = y = nullptr;
+    x = y = 0;
     pen_ptr = new QPen();
     SetLineColor();
 }
 
 SlsQtH1D::~SlsQtH1D() {
-
-    delete[] x;
-
-    delete[] y;
-
+    delete x;
+    delete y;
     delete pen_ptr;
 }
 
@@ -124,17 +125,21 @@ void SlsQtH1D::SetLineStyle(int s) {
     setPen(*pen_ptr);
 }
 
-void SlsQtH1D::setStyleLinesorDots(bool isLines) {
+void  SlsQtH1D::setStyleLinesorDots(bool isLines) {
     setStyle(isLines ? QwtPlotCurve::Lines : QwtPlotCurve::Dots);
 }
 
-void SlsQtH1D::setSymbolMarkers(bool isMarker) {
-    QwtSymbol *marker = new QwtSymbol();
+void  SlsQtH1D::setSymbolMarkers(bool isMarker) {
+    QwtSymbol* marker = new QwtSymbol();
     if (isMarker) {
         marker->setStyle(QwtSymbol::Cross);
         marker->setSize(5, 5);
     }
+#if QWT_VERSION < 0x060000
+    setSymbol(*marker);
+#else
     setSymbol(marker);
+#endif
 }
 
 void SlsQtH1D::SetData(int n, double xmin, double xmax, double *data) {
@@ -165,7 +170,11 @@ void SlsQtH1D::SetData(int n, double xmin, double xmax, double *data) {
             firstYgt0 = y[i];
     }
 
+#if QWT_VERSION < 0x060000
+    setRawData(x, y, ndata);
+#else
     setRawSamples(x, y, ndata);
+#endif
 }
 
 void SlsQtH1D::SetData(int n, double *data_x, double *data_y) {
@@ -174,7 +183,7 @@ void SlsQtH1D::SetData(int n, double *data_x, double *data_y) {
     n = SetUpArrays(n);
 
     ndata = n;
-    dx = -1; // signifies not regular intervals
+    dx = -1; //signifies not regular intervals
 
     ymin = ymax = data_y ? data_y[0] : 0;
 
@@ -194,18 +203,23 @@ void SlsQtH1D::SetData(int n, double *data_x, double *data_y) {
         if (y[b] > 0 && (firstYgt0 < 0 || firstYgt0 > y[b]))
             firstYgt0 = y[b];
     }
+
+    // #if QWT_VERSION<0x060000
+    //   setRawData(x,y,ndata);
+    // #else
     setRawSamples(x, y, ndata);
+    // #endif
 }
 
 int SlsQtH1D::SetUpArrays(int n) {
-    n = n < 1 ? 1 : n; // overflow bin
+    n = n < 1 ? 1 : n; //overflow bin
 
     if (n + 1 > n_array) {
         n_array = n + 1;
-
-        delete x;
-
-        delete y;
+        if (x)
+            delete x;
+        if (y)
+            delete y;
         x = new double[n_array];
         y = new double[n_array];
     }
@@ -217,9 +231,7 @@ double SlsQtH1D::FillBin(int bx, double v) {
     bx = CheckIndex(bx);
     return SetBinContent(bx, y[bx] + v);
 }
-double SlsQtH1D::Fill(double x, double v) {
-    return FillBin(FindBinIndex(x), v);
-}
+double SlsQtH1D::Fill(double x, double v) { return FillBin(FindBinIndex(x), v); }
 
 double SlsQtH1D::SetBinContent(int bx, double v) {
     bx = CheckIndex(bx);
@@ -235,15 +247,13 @@ double SlsQtH1D::SetBinContent(int bx, double v) {
     return y[bx];
 }
 
-double SlsQtH1D::SetContent(double x, double v) {
-    return SetBinContent(FindBinIndex(x), v);
-}
+double SlsQtH1D::SetContent(double x, double v) { return SetBinContent(FindBinIndex(x), v); }
 
 int SlsQtH1D::FindBinIndex(double px) {
     if (dx > 0)
         CheckIndex(int((px - x[0]) / dx));
 
-    // find closest bin
+    //find closest bin
     int b = 0;
     for (; b < ndata; b++)
         if (x[b] > px)
@@ -257,9 +267,7 @@ int SlsQtH1D::FindBinIndex(double px) {
     return b;
 }
 
-int SlsQtH1D::CheckIndex(int bx) {
-    return (bx < 0 || bx > ndata) ? ndata : bx;
-} // ndata is the overflow bin
+int SlsQtH1D::CheckIndex(int bx) { return (bx < 0 || bx > ndata) ? ndata : bx; } //ndata is the overflow bin
 
 SlsQtH1D *SlsQtH1D::Add(double v) {
     for (int bx = 0; bx < ndata; bx++)
@@ -267,20 +275,23 @@ SlsQtH1D *SlsQtH1D::Add(double v) {
     return this;
 }
 
-// 1d hist list stuff
+//1d hist list stuff
 SlsQtH1DList::SlsQtH1DList(SlsQtH1D *hist) {
     the_hist = hist;
-    the_next = nullptr;
+    the_next = 0;
 }
 
-SlsQtH1DList::~SlsQtH1DList() { delete the_next; }
+SlsQtH1DList::~SlsQtH1DList() {
+    if (the_next)
+        delete the_next;
+}
 
 SlsQtH1D *SlsQtH1DList::Add(SlsQtH1D *hist) {
     SlsQtH1DList *hl = this;
 
     while (hl) {
         if (hist == hl->the_hist)
-            return hist; // already added
+            return hist; //already added
         if (!hl->the_next)
             break;
         hl = hl->the_next;
@@ -299,8 +310,7 @@ void SlsQtH1DList::Print() {
     SlsQtH1DList *hl = this;
     int i = 0;
     while (hl) {
-        std::cout << "    " << i++ << ") " << hl << "  " << hl->the_hist << "  "
-                  << hl->the_next << '\n';
+        std::cout << "    " << i++ << ") " << hl << "  " << hl->the_hist << "  " << hl->the_next << '\n';
         hl = hl->the_next;
         if (i > 10)
             break;
@@ -309,27 +319,27 @@ void SlsQtH1DList::Print() {
 
 void SlsQtH1DList::Remove(SlsQtH1D *hist) {
     SlsQtH1DList *hl = this;
-    while (hl) { // every match will be removed
+    while (hl) { //every match will be removed
         if (hl->the_hist != hist)
             hl = hl->the_next;
-        else { // match
+        else { //match
             if (!hl->the_next)
-                hl->the_hist = nullptr; // first the_hist is zero when there's no next
+                hl->the_hist = 0; // first the_hist is zero when there's no next
             else {
                 SlsQtH1DList *t = hl->the_next;
                 hl->the_hist = t->the_hist;
                 hl->the_next = t->the_next;
-                t->the_next = nullptr;
+                t->the_next = 0;
                 delete t;
             }
         }
     }
 }
 
-// 1d plot stuff
+//1d plot stuff
 SlsQt1DPlot::SlsQt1DPlot(QWidget *parent) : QwtPlot(parent) {
     //  n_histograms_attached=0;
-    hline = vline = nullptr;
+    hline = vline = 0;
     hist_list = new SlsQtH1DList();
 
     UnknownStuff();
@@ -348,16 +358,12 @@ SlsQt1DPlot::SlsQt1DPlot(QWidget *parent) : QwtPlot(parent) {
 }
 
 SlsQt1DPlot::~SlsQt1DPlot() {
-
     delete hist_list;
 
-    delete hline;
-
-    delete vline;
-
-    delete zoomer;
-
-    delete panner;
+    if (hline)
+        delete hline;
+    if (vline)
+        delete vline;
 }
 
 void SlsQt1DPlot::CalculateNResetZoomBase() {
@@ -374,8 +380,8 @@ void SlsQt1DPlot::CalculateNResetZoomBase() {
 void SlsQt1DPlot::NewHistogramAttached(SlsQtH1D *h) {
     hist_list->Add(h);
     CalculateNResetZoomBase();
-    // commented out by dhanya to take off zooming every hist in 1d plots
-    // if(!hist_list->Next()) UnZoom();
+    //commented out by dhanya to take off zooming every hist in 1d plots
+    //if(!hist_list->Next()) UnZoom();
     Update();
 }
 
@@ -385,9 +391,13 @@ void SlsQt1DPlot::HistogramDetached(SlsQtH1D *h) {
     Update();
 }
 
-void SlsQt1DPlot::Update() { replot(); }
+void SlsQt1DPlot::Update() {
+    replot();
+}
 
-void SlsQt1DPlot::SetTitle(QString title) { setTitle(title); }
+void SlsQt1DPlot::SetTitle(QString title) {
+    setTitle(title);
+}
 
 void SlsQt1DPlot::SetXTitle(QString title) {
     setAxisTitle(QwtPlot::xBottom, title);
@@ -397,20 +407,20 @@ void SlsQt1DPlot::SetYTitle(QString title) {
     setAxisTitle(QwtPlot::yLeft, title);
 }
 
-void SlsQt1DPlot::SetTitleFont(const QFont &f) {
+void SlsQt1DPlot::SetTitleFont(const QFont& f) {
     QwtText t("");
     t.setFont(f);
-    t.setRenderFlags(Qt::AlignLeft | Qt::AlignVCenter);
+    t.setRenderFlags( Qt::AlignLeft | Qt::AlignVCenter);
     setTitle(t);
 }
 
-void SlsQt1DPlot::SetXFont(const QFont &f) {
+void SlsQt1DPlot::SetXFont(const QFont& f) {
     QwtText t("");
     t.setFont(f);
     setAxisTitle(QwtPlot::xBottom, t);
 }
 
-void SlsQt1DPlot::SetYFont(const QFont &f) {
+void SlsQt1DPlot::SetYFont(const QFont& f) {
     QwtText t("");
     t.setFont(f);
     setAxisTitle(QwtPlot::yLeft, t);
@@ -424,10 +434,9 @@ void SlsQt1DPlot::SetLog(int axisId, bool yes) {
     if (axisId == QwtPlot::yLeft)
         zoomer->SetLogY(yes);
 
-    zoomer->ResetZoomBase(); // needs to be done before setting Engine
+    zoomer->ResetZoomBase(); //needs to be done before setting Engine
 
-    // the old ones are deleted by in the setAxisScaleFunction() function see:
-    // 128 of file qwt_plot_axis.cpp
+    //the old ones are deleted by in the setAxisScaleFunction() function see: 128 of file qwt_plot_axis.cpp
     if (yes)
         setAxisScaleEngine(axisId, new QwtLog10ScaleEngine());
     else
@@ -443,13 +452,11 @@ void SlsQt1DPlot::UnZoom() {
     setAxisScale(QwtPlot::xBottom, zoomer->x(), zoomer->x() + zoomer->w());
     setAxisScale(QwtPlot::yLeft, zoomer->y(), zoomer->y() + zoomer->h());
 
-    zoomer->setZoomBase(); // Call replot for the attached plot before
-                           // initializing the zoomer with its scales.
+    zoomer->setZoomBase(); //Call replot for the attached plot before initializing the zoomer with its scales.
     Update();
 }
 
-void SlsQt1DPlot::SetZoom(double xmin, double ymin, double x_width,
-                          double y_width) {
+void SlsQt1DPlot::SetZoom(double xmin, double ymin, double x_width, double y_width) {
     setAxisScale(QwtPlot::xBottom, xmin, xmin + x_width);
     setAxisScale(QwtPlot::yLeft, ymin, ymin + y_width);
     Update();
@@ -459,7 +466,7 @@ void SlsQt1DPlot::RemoveHLine() {
     if (hline)
         hline->detach();
     delete hline;
-    hline = nullptr;
+    hline = 0;
 }
 
 void SlsQt1DPlot::InsertHLine(double y) {
@@ -476,7 +483,7 @@ void SlsQt1DPlot::RemoveVLine() {
     if (vline)
         vline->detach();
     delete vline;
-    vline = nullptr;
+    vline = 0;
 }
 
 void SlsQt1DPlot::InsertVLine(double x) {
@@ -496,9 +503,12 @@ void SlsQt1DPlot::SetupZoom() {
     // Ctrl+RighButton: zoom out to full size
 
     zoomer = new SlsQt1DZoomer(canvas());
-    zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton,
-                            Qt::ControlModifier);
 
+#if QT_VERSION < 0x040000
+    zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlButton);
+#else
+    zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier);
+#endif
     zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton);
 
     panner = new QwtPlotPanner((QwtPlotCanvas *)canvas());
@@ -537,40 +547,58 @@ void SlsQt1DPlot::alignScales() {
 }
 
 void SlsQt1DPlot::UnknownStuff() {
+#if QWT_VERSION < 0x060000
+    // Disable polygon clipping
+    //not supported for version 6
+    QwtPainter::setDeviceClipping(false);
+    canvas()->setPaintAttribute(QwtPlotCanvas::PaintCached, false);
+    canvas()->setPaintAttribute(QwtPlotCanvas::PaintPacked, false);
+#else
     // We don't need the cache here
-    ((QwtPlotCanvas *)canvas())
-        ->setPaintAttribute(QwtPlotCanvas::BackingStore, false);
+    ((QwtPlotCanvas *)canvas())->setPaintAttribute(QwtPlotCanvas::BackingStore, false);
+
+#endif
+
+#if QT_VERSION >= 0x040000
 #ifdef Q_WS_X11
     //  Qt::WA_PaintOnScreen is only supported for X11, but leads
     //  to substantial bugs with Qt 4.2.x/Windows
     canvas()->setAttribute(Qt::WA_PaintOnScreen, true);
 #endif
+#endif
 }
 
-// Added by Dhanya on 19.06.2012 to disable zooming when any of the axes range
-// has been set
+//Added by Dhanya on 19.06.2012 to disable zooming when any of the axes range has been set
 void SlsQt1DPlot::DisableZoom(bool disable) {
     if (disableZoom != disable) {
         disableZoom = disable;
+#ifdef VERBOSE
+        if (disable)
+            std::cout << "Disabling zoom\n";
+        else
+            std::cout << "Enabling zoom\n";
+#endif
         if (disable) {
             if (zoomer) {
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect1,
-                                        Qt::NoButton);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect2,
-                                        Qt::NoButton, Qt::ControlModifier);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect3,
-                                        Qt::NoButton);
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect1, Qt::NoButton);
+#if QT_VERSION < 0x040000
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::NoButton, Qt::ControlButton);
+#else
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::NoButton, Qt::ControlModifier);
+#endif
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::NoButton);
             }
             if (panner)
                 panner->setMouseButton(Qt::NoButton);
         } else {
             if (zoomer) {
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect1,
-                                        Qt::LeftButton);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect2,
-                                        Qt::RightButton, Qt::ControlModifier);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect3,
-                                        Qt::RightButton);
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect1, Qt::LeftButton);
+#if QT_VERSION < 0x040000
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlButton);
+#else
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier);
+#endif
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton);
             }
             if (panner)
                 panner->setMouseButton(Qt::MidButton);

slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp

@@ -1,93 +0,0 @@
-/* TODO! short description */
-#include "SlsQt1DZoomer.h"
-#include "SlsQt1DPlot.h"
-#include <qwt_plot.h>
-#include <qwt_scale_div.h>
-#include <iostream>
-
-void SlsQt1DZoomer::ResetZoomBase() {
-    SetZoomBase(x0, y0, x1 - x0,
-                y1 - y0); // for going between log and nonlog plots
-}
-
-void SlsQt1DZoomer::SetZoomBase(double xmin, double ymin, double x_width,
-                                double y_width) {
-    if (xIsLog && xmin <= 0) {
-        double xmax = xmin + x_width;
-        xmin = firstXgt0 * 0.98;
-        if (xmax <= xmin)
-            x_width = firstXgt0;
-        else
-            x_width = xmax - xmin;
-    }
-    if (yIsLog && ymin <= 0) {
-        double ymax = ymin + y_width;
-        ymin = firstYgt0 * 0.98;
-        if (ymax <= ymin)
-            y_width = firstYgt0;
-        else
-            y_width = ymax - ymin;
-    }
-
-    if (plot()) {
-        if (xIsLog) {
-            double xmin_curr =
-                plot()->axisScaleDiv(QwtPlot::xBottom).lowerBound();
-            double xmax_curr =
-                plot()->axisScaleDiv(QwtPlot::xBottom).upperBound();
-            if (xmin_curr < xmin)
-                xmin_curr = xmin;
-            if (xmax_curr > xmin + x_width)
-                xmax_curr = xmin + x_width;
-            plot()->setAxisScale(QwtPlot::xBottom, xmin_curr, xmax_curr);
-        }
-        if (yIsLog) {
-            double ymin_curr =
-                plot()->axisScaleDiv(QwtPlot::yLeft).lowerBound();
-            double ymax_curr =
-                plot()->axisScaleDiv(QwtPlot::yLeft).upperBound();
-            if (ymin_curr < ymin)
-                ymin_curr = ymin;
-            if (ymax_curr > ymin + y_width)
-                ymax_curr = ymin + y_width;
-            plot()->setAxisScale(QwtPlot::yLeft, ymin_curr, ymax_curr);
-        }
-        plot()->replot();
-    }
-    setZoomBase(QRectF(xmin, ymin, x_width, y_width));
-}
-
-void SlsQt1DZoomer::SetZoomBase(SlsQtH1D *h) {
-    x0 = h->GetXMin() < 0 ? h->GetXMin() * 1.02 : h->GetXMin() / 1.02;
-    x1 = h->GetXMax() < 0 ? h->GetXMax() / 1.02 : h->GetXMax() * 1.02;
-    y0 = h->GetYMin() < 0 ? h->GetYMin() * 1.02 : h->GetYMin() / 1.02;
-    y1 = h->GetYMax() < 0 ? h->GetYMax() / 1.02 : h->GetYMax() * 1.02;
-
-    firstXgt0 = h->GetFirstXgtZero(); // for log plots
-    firstYgt0 = h->GetFirstYgtZero(); // for log plots
-
-    ResetZoomBase();
-}
-
-void SlsQt1DZoomer::ExtendZoomBase(SlsQtH1D *h) {
-    double h_x0 = h->GetXMin() < 0 ? h->GetXMin() * 1.02 : h->GetXMin() / 1.02;
-    double h_x1 = h->GetXMax() < 0 ? h->GetXMax() / 1.02 : h->GetXMax() * 1.02;
-    double h_y0 = h->GetYMin() < 0 ? h->GetYMin() * 1.02 : h->GetYMin() / 1.02;
-    double h_y1 = h->GetYMax() < 0 ? h->GetYMax() / 1.02 : h->GetYMax() * 1.02;
-
-    if (h_x0 < x0)
-        x0 = h_x0;
-    if (h_x1 > x1)
-        x1 = h_x1;
-    if (h_y0 < y0)
-        y0 = h_y0;
-    if (h_y1 > y1)
-        y1 = h_y1;
-
-    if (h->GetFirstXgtZero() < firstXgt0)
-        firstXgt0 = h->GetFirstXgtZero();
-    if (h->GetFirstYgtZero() < firstYgt0)
-        firstYgt0 = h->GetFirstYgtZero();
-
-    ResetZoomBase();
-}

slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cxx

@@ -0,0 +1,106 @@
+
+/**
+ * @author Ian Johnson
+ * @version 1.0
+ */
+
+
+#include <iostream>
+
+#include <qwt_plot.h>
+#include <qwt_scale_div.h>
+
+#include "SlsQt1DPlot.h"
+#include "SlsQt1DZoomer.h"
+
+
+void SlsQt1DZoomer::ResetZoomBase(){
+  SetZoomBase(x0,y0,x1-x0,y1-y0); //for going between log and nonlog plots
+}
+
+void SlsQt1DZoomer::SetZoomBase(double xmin,double ymin,double x_width, double y_width){
+  if(xIsLog&&xmin<=0){
+    double xmax = xmin+x_width;
+    xmin = firstXgt0*0.98;
+    if(xmax<=xmin) x_width=firstXgt0;
+    else           x_width=xmax-xmin;
+  }
+  if(yIsLog&&ymin<=0){
+    double ymax = ymin+y_width;
+    ymin = firstYgt0*0.98;
+    if(ymax<=ymin) y_width=firstYgt0;
+    else           y_width=ymax-ymin;
+  }
+
+  if(plot()){
+    if(xIsLog){
+      #if QWT_VERSION < 0x50200
+        double xmin_curr = plot()->axisScaleDiv(QwtPlot::xBottom)->lBound();
+        double xmax_curr = plot()->axisScaleDiv(QwtPlot::xBottom)->hBound();
+      #elif QWT_VERSION < 0x060100
+        double xmin_curr = plot()->axisScaleDiv(QwtPlot::xBottom)->lowerBound();
+        double xmax_curr = plot()->axisScaleDiv(QwtPlot::xBottom)->upperBound();
+      #else
+        double xmin_curr = plot()->axisScaleDiv(QwtPlot::xBottom).lowerBound();
+        double xmax_curr = plot()->axisScaleDiv(QwtPlot::xBottom).upperBound();
+      #endif
+      if(xmin_curr<xmin)         xmin_curr=xmin;
+      if(xmax_curr>xmin+x_width) xmax_curr=xmin+x_width;
+      plot()->setAxisScale(QwtPlot::xBottom,xmin_curr,xmax_curr);
+    }
+    if(yIsLog){
+      #if QWT_VERSION < 0x50200
+        double ymin_curr = plot()->axisScaleDiv(QwtPlot::yLeft)->lBound();
+        double ymax_curr = plot()->axisScaleDiv(QwtPlot::yLeft)->hBound();
+      #elif QWT_VERSION < 0x060100
+        double ymin_curr = plot()->axisScaleDiv(QwtPlot::yLeft)->lowerBound();
+        double ymax_curr = plot()->axisScaleDiv(QwtPlot::yLeft)->upperBound();
+      #else
+        double ymin_curr = plot()->axisScaleDiv(QwtPlot::yLeft).lowerBound();
+        double ymax_curr = plot()->axisScaleDiv(QwtPlot::yLeft).upperBound();
+      #endif
+      if(ymin_curr<ymin)         ymin_curr=ymin;
+      if(ymax_curr>ymin+y_width) ymax_curr=ymin+y_width;
+      plot()->setAxisScale(QwtPlot::yLeft,ymin_curr,ymax_curr);
+    }
+    plot()->replot();
+  }
+
+#if QWT_VERSION<0x060000
+  setZoomBase(QwtDoubleRect(xmin,ymin,x_width,y_width));
+#else
+  setZoomBase(QRectF(xmin,ymin,x_width,y_width));
+#endif
+}
+
+void SlsQt1DZoomer::SetZoomBase(SlsQtH1D* h){
+  x0 = h->GetXMin()<0 ? h->GetXMin()*1.02 : h->GetXMin()/1.02;
+  x1 = h->GetXMax()<0 ? h->GetXMax()/1.02 : h->GetXMax()*1.02;
+  y0 = h->GetYMin()<0 ? h->GetYMin()*1.02 : h->GetYMin()/1.02;
+  y1 = h->GetYMax()<0 ? h->GetYMax()/1.02 : h->GetYMax()*1.02;
+
+  firstXgt0 = h->GetFirstXgtZero(); //for log plots
+  firstYgt0 = h->GetFirstYgtZero(); //for log plots
+
+  ResetZoomBase();
+}
+
+void SlsQt1DZoomer::ExtendZoomBase(SlsQtH1D* h){
+  double h_x0 = h->GetXMin()<0 ? h->GetXMin()*1.02 : h->GetXMin()/1.02;
+  double h_x1 = h->GetXMax()<0 ? h->GetXMax()/1.02 : h->GetXMax()*1.02;
+  double h_y0 = h->GetYMin()<0 ? h->GetYMin()*1.02 : h->GetYMin()/1.02;
+  double h_y1 = h->GetYMax()<0 ? h->GetYMax()/1.02 : h->GetYMax()*1.02;
+  
+  if(h_x0<x0) x0 = h_x0;
+  if(h_x1>x1) x1 = h_x1;
+  if(h_y0<y0) y0 = h_y0;
+  if(h_y1>y1) y1 = h_y1;
+
+  if(h->GetFirstXgtZero()<firstXgt0) firstXgt0 = h->GetFirstXgtZero(); 
+  if(h->GetFirstYgtZero()<firstYgt0) firstYgt0 = h->GetFirstYgtZero(); 
+  
+  ResetZoomBase();
+}
+
+
+

slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp

@@ -1,143 +0,0 @@
-/* TODO! short description */
-#include "SlsQt2DHist.h"
-#include "ansi.h"
-#include <cmath>
-#include <iostream>
-
-using std::cout;
-using std::endl;
-
-SlsQt2DHist::SlsQt2DHist(int nbinsx, double xmin, double xmax, int nbinsy,
-                         double ymin, double ymax, double *d, double zmin,
-                         double zmax)
-    : QwtRasterData() {
-    x_min = 0;
-    x_max = 0;
-    y_min = 0;
-    y_max = 0;
-    interp = 0;
-    nx_array = ny_array = 0;
-    data = nullptr;
-    SetData(nbinsx, xmin, xmax, nbinsy, ymin, ymax, d, zmin, zmax);
-}
-
-SlsQt2DHist::~SlsQt2DHist() { delete[] data; }
-
-int SlsQt2DHist::GetBinIndex(int bx, int by) {
-    int b = bx * ny + by;
-    if (b < 0 || b >= nb) {
-        cout << "GetBinIndex:: Incorrect indicies bx and by returning overflow "
-                "bin;"
-             << endl;
-        return nb;
-    }
-    return b;
-}
-
-int SlsQt2DHist::FindBinIndex(double x, double y) {
-    return GetBinIndex(int((x - x_min) / x_width), int((y - y_min) / y_width));
-}
-
-double SlsQt2DHist::GetBinValue(int bx, int by) {
-    return data[GetBinIndex(bx, by)];
-}
-
-void SlsQt2DHist::SetBinValue(int bx, int by, double v) {
-    z_mean_has_been_calculated = 0;
-    data[GetBinIndex(bx, by)] = v;
-}
-
-void SlsQt2DHist::SetData(int nbinsx, double xmin, double xmax, int nbinsy,
-                          double ymin, double ymax, double *d, double zmin,
-                          double zmax) {
-    z_mean_has_been_calculated = 0;
-    if (xmax < xmin || ymax < ymin)
-        cout << "Warning input range invalid." << endl;
-
-    x_width = (xmax - xmin) / nbinsx;
-    y_width = (ymax - ymin) / nbinsy;
-
-    if (x_min != xmin || x_max != xmax || y_min != ymin || y_max != ymax) {
-        x_min = xmin;
-        x_max = xmax;
-        y_min = ymin;
-        y_max = ymax;
-        setInterval(Qt::XAxis, QwtInterval(xmin, xmax));
-        setInterval(Qt::YAxis, QwtInterval(ymin, ymax));
-    }
-
-    if (nbinsx * nbinsy < 1) {
-        cout << "Exitting: SlsQt2DHist::SetData() number of bins must be "
-                "greater than zero."
-             << endl;
-        exit(1);
-    }
-
-    if (nbinsx * nbinsy > nx_array * ny_array) {
-        delete[] data;
-        data = new double[nbinsx * nbinsy + 1]; // one for under/overflow bin
-        nx_array = nbinsx;
-        ny_array = nbinsy;
-    }
-    nx = nbinsx;
-    ny = nbinsy;
-    nb = nx * ny;
-    data[nb] = 0; // set over flow to zero
-    if (d) {
-        memcpy(data, d, nb * sizeof(double));
-        SetMinMax(zmin, zmax);
-    }
-}
-
-void SlsQt2DHist::SetMinMax(double zmin, double zmax) {
-    /* if(zmin<zmax){ edited out to test*/
-    if (zmax != -1) {
-        z_min = zmin;
-        z_max = zmax;
-    } else {
-        z_mean_has_been_calculated = 1;
-        z_min = data[0];
-        z_mean = 0;
-        z_max = data[0];
-        for (int i = 0; i < nb; i++) {
-            if (data[i] < z_min)
-                z_min = data[i];
-            if (data[i] > z_max)
-                z_max = data[i];
-            z_mean += data[i];
-        }
-        z_mean /= nb;
-        if (z_min > 0)
-            z_min /= 1.02;
-        else
-            z_min *= 1.02;
-        if (z_max > 0)
-            z_max *= 1.02;
-        else
-            z_max /= 1.02;
-    }
-    setInterval(Qt::ZAxis, QwtInterval(z_min, z_max));
-}
-
-double SlsQt2DHist::GetMean() {
-    if (!z_mean_has_been_calculated) {
-        z_mean_has_been_calculated = 1;
-        z_mean = 0;
-        for (int i = 0; i < nb; i++)
-            z_mean += data[i];
-        z_mean /= nb;
-    }
-
-    return z_mean;
-}
-
-double SlsQt2DHist::SetMinimumToFirstGreaterThanZero() {
-    z_min = fabs(z_max) + 1;
-    for (int i = 0; i < nb; i++) {
-        if (data[i] > 0 && data[i] < z_min)
-            z_min = data[i];
-    }
-    setInterval(Qt::ZAxis, QwtInterval(z_min, z_max));
-
-    return z_min;
-}

slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cxx

@@ -0,0 +1,144 @@
+
+/**
+ * @author Ian Johnson
+ * @version 1.0
+ */
+
+#include "ansi.h"
+#include <iostream>
+#include <cmath>
+#include "SlsQt2DHist.h"
+  
+using std::cout;
+using std::endl;
+
+SlsQt2DHist::SlsQt2DHist(int nbinsx, double xmin, double xmax, int nbinsy, double ymin, double ymax, double* d,double zmin,double zmax):QwtRasterData(){    
+  x_min=0;x_max=0;y_min=0;y_max=0;
+  interp=0;
+  nx_array=ny_array=0;data=0;
+  SetData(nbinsx,xmin,xmax,nbinsy,ymin,ymax,d,zmin,zmax);
+}
+
+
+SlsQt2DHist::~SlsQt2DHist(){if(data) delete [] data;}
+
+int SlsQt2DHist::GetBinIndex(int bx, int by){
+  int b = bx*ny+by;
+  if(b<0 || b>=nb){
+    cout<<"GetBinIndex:: Incorrect indicies bx and by returning overflow bin;"<<endl;
+    return nb;
+  }
+  return b;
+}
+
+int SlsQt2DHist::FindBinIndex(double x, double y){
+  return GetBinIndex(int((x-x_min)/x_width),int((y-y_min)/y_width));
+}
+
+double SlsQt2DHist::GetBinValue(int bx,int by){
+  return data[GetBinIndex(bx,by)];
+}
+
+
+void SlsQt2DHist::SetBinValue(int bx,int by,double v){
+  z_mean_has_been_calculated = 0;
+  data[GetBinIndex(bx,by)] = v;
+}
+
+void SlsQt2DHist::SetData(int nbinsx, double xmin, double xmax, int nbinsy,double ymin, double ymax, double *d,double zmin,double zmax){
+  z_mean_has_been_calculated = 0;
+  if(xmax<xmin||ymax<ymin) cout<<"Warning input range invalid."<<endl;
+
+  x_width = (xmax - xmin)/nbinsx;
+  y_width = (ymax - ymin)/nbinsy;
+
+  if(x_min!=xmin||x_max!=xmax||y_min!=ymin||y_max!=ymax){
+    x_min=xmin;x_max=xmax;
+    y_min=ymin;y_max=ymax;
+   
+#if QWT_VERSION<0x060000	  
+    setBoundingRect(QRectF(xmin,ymin,x_max-x_min,y_max-y_min));
+#else
+    setInterval( Qt::XAxis,QwtInterval(xmin,xmax));
+    setInterval( Qt::YAxis,QwtInterval(ymin,ymax));
+    	//  setInterval( Qt::ZAxis,QwtInterval(zmin,zmax));
+    //setInterval( Qt::ZAxis,QwtInterval(0.,1.));
+#endif
+
+  }
+
+  if(nbinsx*nbinsy<1){
+    cout<<"Exitting: SlsQt2DHist::SetData() number of bins must be greater than zero."<<endl; 
+    exit(1);
+  }
+
+  if(nbinsx*nbinsy>nx_array*ny_array){
+    if(data) delete [] data;
+    data = new double [nbinsx*nbinsy+1];  //one for under/overflow bin
+    nx_array = nbinsx;
+    ny_array = nbinsy;
+  }
+  nx=nbinsx;
+  ny=nbinsy;
+  nb=nx*ny;
+  data[nb]=0;//set over flow to zero
+  if(d){
+    memcpy(data,d,nb*sizeof(double));
+    SetMinMax(zmin,zmax);
+  }
+}
+  
+void SlsQt2DHist::SetMinMax(double zmin,double zmax){
+ /* if(zmin<zmax){ edited out to test*/
+  if(zmax != -1){
+    z_min=zmin;
+    z_max=zmax;
+  }else{
+    z_mean_has_been_calculated = 1;
+    z_min=data[0];
+    z_mean=0;
+    z_max=data[0];
+    for(int i=0;i<nb;i++){
+      if(data[i]<z_min) z_min=data[i];
+      if(data[i]>z_max) z_max=data[i];
+      z_mean+=data[i];
+    }
+    z_mean/=nb;
+    if(z_min>0) z_min/=1.02; else z_min*=1.02;
+    if(z_max>0) z_max*=1.02; else z_max/=1.02;
+  }
+#if QWT_VERSION<0x060000	  
+    ;
+#else
+	setInterval( Qt::ZAxis,QwtInterval(z_min,z_max));
+#endif
+ 
+}
+
+double SlsQt2DHist::GetMean(){
+  if(!z_mean_has_been_calculated){
+    z_mean_has_been_calculated = 1;
+    z_mean=0;
+    for(int i=0;i<nb;i++) z_mean+=data[i];
+    z_mean/=nb;
+  }
+
+  return z_mean;
+}
+
+double SlsQt2DHist::SetMinimumToFirstGreaterThanZero(){
+  z_min=fabs(z_max)+1;
+  for(int i=0;i<nb;i++){
+    if(data[i]>0 && data[i]<z_min) z_min=data[i];
+  }
+#if QWT_VERSION<0x060000	  
+    ;
+#else
+	setInterval( Qt::ZAxis,QwtInterval(z_min,z_max));
+#endif
+ 
+  return z_min;
+}
+
+
+

slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cxx

@@ -1,9 +1,15 @@
 #include "SlsQt2DPlot.h"
-// #include "ansi.h"
 
+#include "ansi.h"
+#include <cmath>
+#include <iostream>
 #include <qlist.h>
 #include <qprinter.h>
 #include <qtoolbutton.h>
+
+#if QT_VERSION >= 0x040000
+#include <qprintdialog.h>
+#endif
 #include <qwt_color_map.h>
 #include <qwt_plot_layout.h>
 #include <qwt_plot_panner.h>
@@ -13,73 +19,115 @@
 #include <qwt_scale_engine.h>
 #include <qwt_scale_widget.h>
 
-#include <cmath>
-#include <iostream>
+
+
+#if QWT_VERSION >= 0x060100
+#define QwtLog10ScaleEngine QwtLogScaleEngine
+#endif
 
 SlsQt2DPlot::SlsQt2DPlot(QWidget *parent) : QwtPlot(parent) {
     isLog = 0;
+
     axisScaleEngine(QwtPlot::yLeft)->setAttribute(QwtScaleEngine::Floating);
     axisScaleEngine(QwtPlot::xBottom)->setAttribute(QwtScaleEngine::Floating);
+
     d_spectrogram = new QwtPlotSpectrogram();
+
     hist = new SlsQt2DHist();
     SetupZoom();
     SetupColorMap();
+
+#if QWT_VERSION < 0x060000
+    d_spectrogram->setData(*hist);
+#else
     d_spectrogram->setData(hist);
+#endif
+
     d_spectrogram->attach(this);
+
     plotLayout()->setAlignCanvasToScales(true);
+
     FillTestPlot();
     Update();
 }
 
-SlsQt2DPlot::~SlsQt2DPlot() = default;
 
-void SlsQt2DPlot::SetTitle(QString title) { setTitle(title); }
+void SlsQt2DPlot::SetTitle(QString title) {
+	setTitle(title);
+}
 
 void SlsQt2DPlot::SetXTitle(QString title) {
-    setAxisTitle(QwtPlot::xBottom, title);
+	setAxisTitle(QwtPlot::xBottom, title);
 }
 
 void SlsQt2DPlot::SetYTitle(QString title) {
-    setAxisTitle(QwtPlot::yLeft, title);
+	setAxisTitle(QwtPlot::yLeft, title);
 }
 
 void SlsQt2DPlot::SetZTitle(QString title) {
-    setAxisTitle(QwtPlot::yRight, title);
+	setAxisTitle(QwtPlot::yRight, title);
 }
 
-void SlsQt2DPlot::SetTitleFont(const QFont &f) {
+void SlsQt2DPlot::SetTitleFont(const QFont& f) {
     QwtText t("");
     t.setFont(f);
-    t.setRenderFlags(Qt::AlignLeft | Qt::AlignVCenter);
+    t.setRenderFlags( Qt::AlignLeft | Qt::AlignVCenter);
     setTitle(t);
 }
 
-void SlsQt2DPlot::SetXFont(const QFont &f) {
+void SlsQt2DPlot::SetXFont(const QFont& f) {
     QwtText t("");
     t.setFont(f);
     setAxisTitle(QwtPlot::xBottom, t);
 }
 
-void SlsQt2DPlot::SetYFont(const QFont &f) {
+void SlsQt2DPlot::SetYFont(const QFont& f) {
     QwtText t("");
     t.setFont(f);
     setAxisTitle(QwtPlot::yLeft, t);
 }
 
-void SlsQt2DPlot::SetZFont(const QFont &f) {
+void SlsQt2DPlot::SetZFont(const QFont& f) {
     QwtText t("");
     t.setFont(f);
     setAxisTitle(QwtPlot::yRight, t);
 }
 
 void SlsQt2DPlot::SetupColorMap() {
-    d_spectrogram->setColorMap(myColourMap(0));
+
+    colorMapLinearScale = myColourMap(0);
+#if QWT_VERSION < 0x060000
+    d_spectrogram->setColorMap(*colorMapLinearScale);
+#else
+    d_spectrogram->setColorMap(colorMapLinearScale);
+#endif
+
+    colorMapLogScale = myColourMap(1);
+#if QWT_VERSION < 0x060000
+    contourLevelsLinear = new QwtValueList();
+    for (double level = 0.5; level < 10.0; level += 1.0)
+        (*contourLevelsLinear) += level;
+    d_spectrogram->setContourLevels(*contourLevelsLinear);
+#else
+    ;
+
     for (double level = 0.5; level < 10.0; level += 1.0)
         (contourLevelsLinear) += level;
     d_spectrogram->setContourLevels(contourLevelsLinear);
+#endif
+
+    //
+#if QWT_VERSION < 0x060000
+    contourLevelsLog = new QwtValueList();
+    for (double level = 0.5; level < 10.0; level += 1.0)
+        (*contourLevelsLog) += (pow(10, 2 * level / 10.0) - 1) / 99.0 * 10;
+
+#else
+    ;
 
     for (double level = 0.5; level < 10.0; level += 1.0)
         (contourLevelsLog) += (pow(10, 2 * level / 10.0) - 1) / 99.0 * 10;
+#endif
 
     // A color bar on the right axis
     rightAxis = axisWidget(QwtPlot::yRight);
@@ -92,15 +140,14 @@ void SlsQt2DPlot::SetupColorMap() {
 void SlsQt2DPlot::FillTestPlot(int mode) {
     static int nx = 50;
     static int ny = 50;
-    static double *the_data = nullptr;
-    if (the_data == nullptr)
+    static double *the_data = 0;
+    if (the_data == 0)
         the_data = new double[nx * ny];
 
     double dmax = sqrt(pow(nx / 2.0 - 0.5, 2) + pow(ny / 2.0 - 0.5, 2));
     for (int i = 0; i < nx; i++) {
         for (int j = 0; j < ny; j++) {
-            double d = sqrt(pow(nx / 2.0 - (i + 0.5), 2) +
-                            pow(ny / 2.0 - (j + 0.5), 2));
+            double d = sqrt(pow(nx / 2.0 - (i + 0.5), 2) + pow(ny / 2.0 - (j + 0.5), 2));
 
             if (mode % 3)
                 the_data[i + j * nx] = 10 * d / dmax;
@@ -120,9 +167,14 @@ void SlsQt2DPlot::SetupZoom() {
 
     zoomer = new SlsQt2DZoomer(canvas());
     zoomer->SetHist(hist);
-    zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton,
-                            Qt::ControlModifier);
+
+#if QT_VERSION < 0x040000
+    zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlButton);
+#else
+    zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier);
+#endif
     zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton);
+
     panner = new QwtPlotPanner(canvas());
     panner->setAxisEnabled(QwtPlot::yRight, false);
     panner->setMouseButton(Qt::MidButton);
@@ -139,25 +191,37 @@ void SlsQt2DPlot::SetupZoom() {
     zoomer->setTrackerPen(c);
 }
 
-void SlsQt2DPlot::UnZoom(bool replot) {
+/*void SlsQt2DPlot::CompletelyUnZoom(){
+	  setAxisScale(QwtPlot::xBottom,hist->GetXMin(),hist->GetXMin()+(hist->GetXMax()-hist->GetXMin()));
+	  setAxisScale(QwtPlot::yLeft,hist->GetYMin(),hist->GetYMin()+(hist->GetYMax()-hist->GetYMin()));
+	  zoomer->setZoomBase();
+	  //replot();
+}*/
 
-    zoomer->setZoomBase(QRectF(hist->GetXMin(), hist->GetYMin(),
-                               hist->GetXMax() - hist->GetXMin(),
-                               hist->GetYMax() - hist->GetYMin()));
-    zoomer->setZoomBase(replot); // Call replot for the attached plot before
-                                 // initializing the zoomer with its scales.
+void SlsQt2DPlot::UnZoom(bool replot) {
+#if QWT_VERSION < 0x060000
+    zoomer->setZoomBase(QwtDoubleRect(hist->GetXMin(), hist->GetYMin(), hist->GetXMax() - hist->GetXMin(), hist->GetYMax() - hist->GetYMin()));
+#else
+    zoomer->setZoomBase(QRectF(hist->GetXMin(), hist->GetYMin(), hist->GetXMax() - hist->GetXMin(), hist->GetYMax() - hist->GetYMin()));
+#endif
+    zoomer->setZoomBase(replot); //Call replot for the attached plot before initializing the zoomer with its scales.
                                  // zoomer->zoom(0);
 }
 
-void SlsQt2DPlot::SetZoom(double xmin, double ymin, double x_width,
-                          double y_width) {
+void SlsQt2DPlot::SetZoom(double xmin, double ymin, double x_width, double y_width) {
+
+#if QWT_VERSION < 0x060000
+    zoomer->setZoomBase(QwtDoubleRect(xmin, ymin, x_width, y_width));
+
+#else
     zoomer->setZoomBase(QRectF(xmin, ymin, x_width, y_width));
+#endif
 }
 
 void SlsQt2DPlot::DisableZoom(bool disable) {
     if (disableZoom != disable) {
         disableZoom = disable;
-
+    
 #ifdef VERBOSE
         if (disable)
             std::cout << "Disabling zoom\n";
@@ -166,23 +230,25 @@ void SlsQt2DPlot::DisableZoom(bool disable) {
 #endif
         if (disable) {
             if (zoomer) {
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect1,
-                                        Qt::NoButton);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect2,
-                                        Qt::NoButton, Qt::ControlModifier);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect3,
-                                        Qt::NoButton);
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect1, Qt::NoButton);
+#if QT_VERSION < 0x040000
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::NoButton, Qt::ControlButton);
+#else
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::NoButton, Qt::ControlModifier);
+#endif
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::NoButton);
             }
             if (panner)
                 panner->setMouseButton(Qt::NoButton);
         } else {
             if (zoomer) {
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect1,
-                                        Qt::LeftButton);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect2,
-                                        Qt::RightButton, Qt::ControlModifier);
-                zoomer->setMousePattern(QwtEventPattern::MouseSelect3,
-                                        Qt::RightButton);
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect1, Qt::LeftButton);
+#if QT_VERSION < 0x040000
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlButton);
+#else
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier);
+#endif
+                zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton);
             }
             if (panner)
                 panner->setMouseButton(Qt::MidButton);
@@ -190,6 +256,7 @@ void SlsQt2DPlot::DisableZoom(bool disable) {
     }
 }
 
+
 void SlsQt2DPlot::SetZMinMax(double zmin, double zmax) {
     hist->SetMinMax(zmin, zmax);
 }
@@ -202,40 +269,63 @@ QwtLinearColorMap *SlsQt2DPlot::myColourMap(QVector<double> colourStops) {
     double g[] = {0.00, 0.81, 1.00, 0.20, 0.00};
     double b[] = {0.51, 1.00, 0.12, 0.00, 0.00};
 
-    // QColor c1, c2, c;
-    QColor c2, c;
+    QColor c1, c2, c;
+    c1.setRgbF(r[0], g[0], b[0], 0);
     c2.setRgbF(r[ns - 1], g[ns - 1], b[ns - 1]);
     QwtLinearColorMap *copyMap = new QwtLinearColorMap(Qt::lightGray, c2);
 
     for (int is = 0; is < ns - 1; is++) {
         c.setRgbF(r[is], g[is], b[is]);
-        copyMap->addColorStop(colourStops[is], c);
+        copyMap->addColorStop(colourStops.value(is), c);
     }
 
     return copyMap;
 }
-
 QwtLinearColorMap *SlsQt2DPlot::myColourMap(int log) {
-    QVector<double> cs{0.0, 0.34, 0.61 ,0.84, 1.0};
+
+    int ns = 5;
+
+    QVector<double> cs1(0);
+    QVector<double> lcs1(0);
+
+    cs1.append(0.);
+    cs1.append(0.34);
+    cs1.append(0.61);
+    cs1.append(0.84);
+    cs1.append(1.);
     if (log) {
-        for (int i = 0; i < cs.size(); ++i)
-            cs[i] = (pow(10, 2 * cs[i]) - 1) / 99.0;
+        for (int is = 0; is < ns; is++) {
+            lcs1.append((pow(10, 2 * cs1.value(is)) - 1) / 99.0);
+        }
+        return myColourMap(lcs1);
     }
-    return myColourMap(cs);
+
+    return myColourMap(cs1);
 }
 
-
 void SlsQt2DPlot::Update() {
+#if QWT_VERSION < 0x060000
+    rightAxis->setColorMap(d_spectrogram->data().range(), d_spectrogram->colorMap());
+#else
     if (isLog)
         hist->SetMinimumToFirstGreaterThanZero();
-    const QwtInterval zInterval = d_spectrogram->data()->interval(Qt::ZAxis);
-    rightAxis->setColorMap(zInterval, myColourMap(isLog));
 
+    const QwtInterval zInterval = d_spectrogram->data()->interval(Qt::ZAxis);
+
+    rightAxis->setColorMap(zInterval, myColourMap(isLog));
+#endif
     if (!zoomer->zoomRectIndex())
         UnZoom();
+#if QWT_VERSION < 0x060000
+    setAxisScale(QwtPlot::yRight, d_spectrogram->data().range().minValue(),
+                 d_spectrogram->data().range().maxValue());
+#else
+    //cprintf(MAGENTA, "zmin:%f zmax:%f\n", zInterval.minValue(), zInterval.maxValue());
     setAxisScale(QwtPlot::yRight, zInterval.minValue(), zInterval.maxValue());
     plotLayout()->setAlignCanvasToScales(true);
+#endif
     replot();
+
 }
 
 void SlsQt2DPlot::SetInterpolate(bool enable) {
@@ -248,44 +338,86 @@ void SlsQt2DPlot::SetContour(bool enable) {
     Update();
 }
 
-void SlsQt2DPlot::SetLogz(bool enable, bool isMin, bool isMax, double min,
-                          double max) {
-    LogZ(enable);
-    SetZRange(isMin, isMax, min, max);
+void SlsQt2DPlot::SetLogz(bool enable, bool isMin, bool isMax, double min, double max) {
+	LogZ(enable);
+	SetZRange(isMin, isMax, min, max);
 }
 
-void SlsQt2DPlot::SetZRange(bool isMin, bool isMax, double min, double max) {
-    if (isLog) {
-        SetZMinimumToFirstGreaterThanZero();
-    }
+void SlsQt2DPlot::SetZRange(bool isMin, bool isMax, double min, double max){
+	if(isLog) {
+		SetZMinimumToFirstGreaterThanZero();
+	}
 
-    // set zmin and zmax
-    if (isMin || isMax) {
-        double zmin = (isMin ? min : GetZMinimum());
-        double zmax = (isMax ? max : GetZMaximum());
-        SetZMinMax(zmin, zmax);
-    }
+	// set zmin and zmax
+	if (isMin || isMax) {
+		double zmin = (isMin ? min : GetZMinimum());
+		double zmax = (isMax ? max : GetZMaximum());
+		SetZMinMax(zmin, zmax);
+	} 
 
-    Update();
+	Update();
 }
 
 void SlsQt2DPlot::LogZ(bool on) {
     if (on) {
         isLog = 1;
+        //if(hist->GetMinimum()<=0) hist->SetMinimumToFirstGreaterThanZero();
+#if QWT_VERSION < 0x060000
+        d_spectrogram->setColorMap(*colorMapLogScale);
+#else
         d_spectrogram->setColorMap(myColourMap(isLog));
-        setAxisScaleEngine(QwtPlot::yRight, new QwtLogScaleEngine);
+#endif
+        setAxisScaleEngine(QwtPlot::yRight, new QwtLog10ScaleEngine);
+#if QWT_VERSION < 0x060000
+        d_spectrogram->setContourLevels(*contourLevelsLog);
+#else
         d_spectrogram->setContourLevels(contourLevelsLog);
+#endif
     } else {
         isLog = 0;
+
+#if QWT_VERSION < 0x060000
+        d_spectrogram->setColorMap(*colorMapLinearScale);
+#else
         d_spectrogram->setColorMap(myColourMap(isLog));
+#endif
+
         setAxisScaleEngine(QwtPlot::yRight, new QwtLinearScaleEngine);
+
+#if QWT_VERSION < 0x060000
+        d_spectrogram->setContourLevels(*contourLevelsLinear);
+#else
         d_spectrogram->setContourLevels(contourLevelsLinear);
+#endif
     }
     Update();
 }
 
 void SlsQt2DPlot::showSpectrogram(bool on) {
+    //  static int io=0;
+    //  FillTestPlot(io++);
     d_spectrogram->setDisplayMode(QwtPlotSpectrogram::ImageMode, on);
     d_spectrogram->setDefaultContourPen(on ? QPen() : QPen(Qt::NoPen));
     Update();
-}
+}
+
+
+/*
+void SlsQt2DPlot::printPlot(){
+  QPrinter printer;
+    printer.setOrientation(QPrinter::Landscape);
+#if QT_VERSION < 0x040000
+    printer.setColorMode(QPrinter::Color);
+    printer.setOutputFileName("spectrogram.ps");
+    if (printer.setup())
+#else
+    printer.setOutputFileName("spectrogram.pdf");
+    QPrintDialog dialog(&printer);
+    if ( dialog.exec() )
+#endif
+      {
+        print(printer);
+      }
+}
+
+*/

slsDetectorGui/src/qCloneWidget.cpp

@@ -1,7 +1,7 @@
 #include "qCloneWidget.h"
+#include "qDefs.h"
 #include "SlsQt1DPlot.h"
 #include "SlsQt2DPlot.h"
-#include "qDefs.h"
 
 #include <QCloseEvent>
 #include <QFileDialog>
@@ -11,82 +11,53 @@
 
 int qCloneWidget::NumClones{0};
 
-qCloneWidget::qCloneWidget(QWidget *parent, SlsQt1DPlot *p1, SlsQt2DPlot *p2,
-                           SlsQt1DPlot *gp1, SlsQt2DPlot *gp, QString title,
-                           QString fPath, QString fName, int64_t aIndex,
-                           bool displayStats, QString min, QString max,
-                           QString sum, bool completeImage)
-    : QMainWindow(parent), plot1d(p1), plot2d(p2), gainplot1d(gp1),
-      gainplot2d(gp), filePath(fPath), fileName(fName), acqIndex(aIndex) {
-    setupUi(this);
-    id = qCloneWidget::NumClones++;
+qCloneWidget::qCloneWidget(QWidget *parent, SlsQt1DPlot* p1, SlsQt2DPlot* p2, SlsQt2DPlot* gp, 
+                QString title, QString fPath, QString fName, int64_t aIndex, 
+                 bool displayStats, QString min, QString max, QString sum):
+                 QMainWindow(parent), plot1d(p1), plot2d(p2), gainplot2d(gp), filePath(fPath), fileName(fName), acqIndex(aIndex) {
+    setupUi(this);  
+    id = qCloneWidget::NumClones++;   
     SetupWidgetWindow(title);
     DisplayStats(displayStats, min, max, sum);
-    lblCompleteImage->hide();
-    lblInCompleteImage->hide();
-    if (completeImage) {
-        lblCompleteImage->show();
-    } else {
-        lblInCompleteImage->show();
-    }
 }
 
 qCloneWidget::~qCloneWidget() {
-
-    delete plot1d;
-    delete plot2d;
-    delete gainplot1d;
-    delete gainplot2d;
+    if (plot1d)
+        delete plot1d;
+    if (plot2d)
+        delete plot2d;
+    if (gainplot2d)
+        delete gainplot2d;      
 }
 
 void qCloneWidget::SetupWidgetWindow(QString title) {
 
-    std::string winTitle = std::string("Snapshot:") + std::to_string(id) +
-                           std::string("  -  ") + sls::Logger::Timestamp();
+    std::string winTitle = std::string("Snapshot:") + std::to_string(id) + std::string("  -  ") + NowTime();
     setWindowTitle(QString(winTitle.c_str()));
-
+    
     boxPlot->setFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
     boxPlot->setTitle(title);
-
+    
     // 1d
     if (plot1d != nullptr) {
-        if (gainplot1d == nullptr) {
-            plotLayout->addWidget(plot1d);
-        } else {
-            int ratio = qDefs::DATA_GAIN_PLOT_RATIO - 1;
-            plotLayout->addWidget(plot1d, 0, 0, ratio, ratio);
-            plotLayout->addWidget(gainplot1d, ratio, 0, 1, ratio, Qt::AlignTop);
-        }
-    }
+        plotLayout->addWidget(plot1d);
+    } 
     // 2d
     else {
         if (gainplot2d == nullptr) {
             plotLayout->addWidget(plot2d);
         } else {
+            gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO);
+            gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
             int ratio = qDefs::DATA_GAIN_PLOT_RATIO - 1;
             plotLayout->addWidget(plot2d, 0, 0, ratio, ratio);
-            plotLayout->addWidget(gainplot2d, 0, ratio, 1, 1,
-                                  Qt::AlignRight | Qt::AlignTop);
+            plotLayout->addWidget(gainplot2d, 0, ratio, 1, 1, Qt::AlignRight | Qt::AlignTop);
         }
     }
     connect(actionSaveClone, SIGNAL(triggered()), this, SLOT(SavePlot()));
-    this->show();
-    if (gainplot1d != nullptr) {
-        gainplot1d->setMinimumHeight(qDefs::MIN_HEIGHT_GAIN_PLOT_1D);
-        gainplot1d->setFixedWidth(plot1d->width());
-        // gainplot1d->setFixedHeight(plot1d->height() /
-        // qDefs::DATA_GAIN_PLOT_RATIO - 1);
-    }
-    if (gainplot2d != nullptr) {
-        gainplot2d->setFixedWidth(plot2d->width() /
-                                  qDefs::DATA_GAIN_PLOT_RATIO);
-        gainplot2d->setFixedHeight(plot2d->height() /
-                                   qDefs::DATA_GAIN_PLOT_RATIO);
-    }
 }
 
-void qCloneWidget::DisplayStats(bool enable, QString min, QString max,
-                                QString sum) {
+void qCloneWidget::DisplayStats(bool enable, QString min, QString max, QString sum) {
     if (enable) {
         lblMinDisp->setText(QString("%1").arg(min));
         lblMaxDisp->setText(QString("%1").arg(max));
@@ -100,48 +71,30 @@ void qCloneWidget::DisplayStats(bool enable, QString min, QString max,
 void qCloneWidget::SavePlot() {
     char cID[10];
     sprintf(cID, "%d", id);
-    // title
-    QString fName = filePath + QString('/') + fileName + QString("_clone") +
-                    QString("%1").arg(id) + QString("_acq") +
-                    QString("%1").arg(acqIndex) + QString(".png");
-    LOG(logINFO) << "Saving Clone:" << fName.toAscii().constData();
-    // save
-    QImage img(centralwidget->size().width(), centralwidget->size().height(),
-               QImage::Format_RGB32);
+    //title
+    QString fName = filePath + QString('/') + fileName + QString("_clone") + QString("%1").arg(id) + QString("_acq") + QString("%1").arg(acqIndex) + QString(".png");
+    FILE_LOG(logINFO) << "Saving Clone:" << fName.toAscii().constData();
+    //save
+    QImage img(centralwidget->size().width(), centralwidget->size().height(), QImage::Format_RGB32);
     QPainter painter(&img);
     centralwidget->render(&painter);
 
-    fName = QFileDialog::getSaveFileName(
-        this, tr("Save Snapshot "), fName,
-        tr("PNG Files (*.png);;XPM Files(*.xpm);;JPEG Files(*.jpg)"), nullptr,
-        QFileDialog::ShowDirsOnly);
+    fName = QFileDialog::getSaveFileName(this, tr("Save Snapshot "), fName, tr("PNG Files (*.png);;XPM Files(*.xpm);;JPEG Files(*.jpg)"), 0, QFileDialog::ShowDirsOnly);
     if (!fName.isEmpty()) {
         if ((img.save(fName))) {
-            qDefs::Message(qDefs::INFORMATION,
-                           "The SnapShot has been successfully saved",
-                           "qCloneWidget::SavePlot");
-            LOG(logINFO) << "The SnapShot has been successfully saved";
+            qDefs::Message(qDefs::INFORMATION, "The SnapShot has been successfully saved", "qCloneWidget::SavePlot");
+            FILE_LOG(logINFO) << "The SnapShot has been successfully saved";
         } else {
-            qDefs::Message(
-                qDefs::WARNING,
-                "Attempt to save snapshot failed.\n Formats: .png, .jpg, .xpm.",
-                "qCloneWidget::SavePlot");
-            LOG(logWARNING) << "Attempt to save snapshot failed";
+            qDefs::Message(qDefs::WARNING, "Attempt to save snapshot failed.\n Formats: .png, .jpg, .xpm.", "qCloneWidget::SavePlot");
+            FILE_LOG(logWARNING) << "Attempt to save snapshot failed";
         }
     }
 }
 
 void qCloneWidget::resizeEvent(QResizeEvent *event) {
-    if (gainplot1d != nullptr) {
-        gainplot1d->setFixedWidth(plot1d->width());
-        gainplot1d->setFixedHeight(plot1d->height() /
-                                   qDefs::DATA_GAIN_PLOT_RATIO);
-    }
     if (gainplot2d != nullptr) {
-        gainplot2d->setFixedWidth(plot2d->width() /
-                                  qDefs::DATA_GAIN_PLOT_RATIO);
-        gainplot2d->setFixedHeight(plot2d->height() /
-                                   qDefs::DATA_GAIN_PLOT_RATIO);
+        gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO);
+        gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
     }
     event->accept();
 }

slsDetectorGui/src/qDacWidget.cpp

@@ -1,93 +1,90 @@
 #include "qDacWidget.h"
 #include "qDefs.h"
 
+#include <iostream>
 
-qDacWidget::qDacWidget(QWidget *parent, sls::Detector *detector, bool d,
-                       std::string n, slsDetectorDefs::dacIndex i)
-    : QWidget(parent), det(detector), isDac(d), index(i) {
-    setupUi(this);
-    SetupWidgetWindow(n);
+qDacWidget::qDacWidget(QWidget *parent, sls::Detector *detector, bool d, std::string n, slsDetectorDefs::dacIndex i) : 
+	QWidget(parent), det(detector), isDac(d), index(i){
+	setupUi(this);
+	SetupWidgetWindow(n);
 }
 
 qDacWidget::~qDacWidget() {}
 
 void qDacWidget::SetupWidgetWindow(std::string name) {
-    lblDac->setText(name.c_str());
-    if (isDac) {
-        spinDac->setDecimals(0);
-    } else {
-        spinDac->setSuffix(0x00b0 + QString("C"));
-        spinDac->setReadOnly(true);
-        lblDacmV->setMinimumWidth(0);
-        lblDacmV->setMaximumWidth(0);
-    }
-    Initialization();
-    Refresh();
+	lblDac->setText(name.c_str());
+	if (isDac) {
+		spinDac->setDecimals(0);
+	} else {
+		spinDac->setSuffix(0x00b0 + QString("C"));
+		spinDac->setReadOnly(true);
+		lblDacmV->setMinimumWidth(0);
+		lblDacmV->setMaximumWidth(0);
+	}
+	Initialization();
+	Refresh();
 }
 
+
 void qDacWidget::Initialization() {
-    if (isDac) {
-        connect(spinDac, SIGNAL(editingFinished()), this, SLOT(SetDac()));
-    }
+	if (isDac) {
+		connect(spinDac, SIGNAL(editingFinished()), this, SLOT(SetDac()));
+	}
 }
 
 void qDacWidget::SetDetectorIndex(int id) {
-    detectorIndex = id;
-    Refresh();
+	detectorIndex = id;
+	Refresh();
 }
 
 void qDacWidget::GetDac() {
-    LOG(logDEBUG) << "Getting Dac " << index;
+	FILE_LOG(logDEBUG) << "Getting Dac " << index;
 
-    disconnect(spinDac, SIGNAL(editingFinished()), this, SLOT(SetDac()));
-    try {
-        // dac units
-        auto retval = det->getDAC(index, 0, {detectorIndex}).squash(-1);
-        spinDac->setValue(retval);
-        // mv
-        retval = det->getDAC(index, 1, {detectorIndex}).squash(-1);
-        lblDacmV->setText(QString("%1mV").arg(retval - 10));
-    }
-    CATCH_DISPLAY(std::string("Could not get dac ") + std::to_string(index),
-                  "qDacWidget::GetDac")
+	disconnect(spinDac, SIGNAL(editingFinished()), this, SLOT(SetDac()));
+	try {
+		// dac units
+		auto retval = det->getDAC(index, 0, {detectorIndex}).squash(-1);
+		spinDac->setValue(retval);
+		// mv
+		retval = det->getDAC(index, 1, {detectorIndex}).squash(-1);
+		lblDacmV->setText(QString("%1mV").arg(retval -10));
+    } CATCH_DISPLAY(std::string("Could not get dac ") + std::to_string(index), "qDacWidget::GetDac")
 
-    connect(spinDac, SIGNAL(editingFinished()), this, SLOT(SetDac()));
+	connect(spinDac, SIGNAL(editingFinished()), this, SLOT(SetDac()));
 }
 
+
 void qDacWidget::SetDac() {
-    int val = (int)spinDac->value();
-    LOG(logINFO) << "Setting dac:" << lblDac->text().toAscii().data()
-                      << " : " << val;
+	int val = (int)spinDac->value();
+	FILE_LOG(logINFO) << "Setting dac:" << lblDac->text().toAscii().data() << " : " << val;
 
-    try {
-        det->setDAC(index, val, 0, {detectorIndex});
-    }
-    CATCH_DISPLAY(std::string("Could not set dac ") + std::to_string(index),
-                  "qDacWidget::SetDac")
-
-    // update mV anyway
+	try {
+		det->setDAC(index, val, 0, {detectorIndex});
+    } CATCH_DISPLAY (std::string("Could not set dac ") + std::to_string(index), "qDacWidget::SetDac")
+	
+	// update mV anyway
     GetDac();
 }
 
 void qDacWidget::GetAdc() {
-    LOG(logDEBUG) << "Getting ADC " << index;
+	FILE_LOG(logDEBUG) << "Getting ADC " << index;
+
+	try {
+		auto retval = det->getTemperature(index, {detectorIndex}).squash(-1);
+		if (retval == -1 && detectorIndex == -1) {
+			spinDac->setValue(-1);
+		} else {
+			spinDac->setValue(retval);
+		}
+	} CATCH_DISPLAY (std::string("Could not get adc ") + std::to_string(index), "qDacWidget::GetAdc")
 
-    try {
-        auto retval = det->getTemperature(index, {detectorIndex}).squash(-1);
-        if (retval == -1 && detectorIndex == -1) {
-            spinDac->setValue(-1);
-        } else {
-            spinDac->setValue(retval);
-        }
-    }
-    CATCH_DISPLAY(std::string("Could not get adc ") + std::to_string(index),
-                  "qDacWidget::GetAdc")
 }
 
 void qDacWidget::Refresh() {
-    if (isDac) {
-        GetDac();
-    } else {
-        GetAdc();
-    }
+	if (isDac) {
+		GetDac();
+	} else {
+		GetAdc();
+	}
 }
+

slsDetectorGui/src/qDetectorMain.cpp

@@ -1,33 +1,52 @@
 #include "qDetectorMain.h"
 #include "qDefs.h"
 #include "qDrawPlot.h"
-#include "qTabAdvanced.h"
+#include "qTabMeasurement.h"
 #include "qTabDataOutput.h"
+#include "qTabPlot.h"
+#include "qTabAdvanced.h"
+#include "qTabSettings.h"
 #include "qTabDebugging.h"
 #include "qTabDeveloper.h"
-#include "qTabMeasurement.h"
 #include "qTabMessages.h"
-#include "qTabPlot.h"
-#include "qTabSettings.h"
 
-#include "ToString.h"
 #include "versionAPI.h"
+#include "ToString.h"
 
-#include <QFileDialog>
-#include <QPlastiqueStyle>
 #include <QResizeEvent>
 #include <QScrollArea>
+#include <QFileDialog>
+#include <QPlastiqueStyle>
 #include <QSizePolicy>
 
-#include <string>
+#include <iostream>
 #include <getopt.h>
+#include <iostream>
+#include <string>
 #include <sys/stat.h>
 
 int main(int argc, char **argv) {
+    QApplication *theApp = new QApplication(argc, argv);
+    theApp->setStyle(new QPlastiqueStyle);
+    theApp->setWindowIcon(QIcon(":/icons/images/mountain.png"));
+    try {
+        qDetectorMain *det = new qDetectorMain(argc, argv, theApp, 0);
+        det->show();
+        theApp->exec();
+    } catch (const std::exception &e) {
+        qDefs::Message(qDefs::CRITICAL,
+                       std::string(e.what()) + "\nExiting Gui :'( ", "main");
+    }
+    return 0;
+}
+
+qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app,
+                             QWidget *parent)
+    : QMainWindow(parent), detType(slsDetectorDefs::GENERIC), isDeveloper(0),
+      heightPlotWindow(0), heightCentralWidget(0) {
 
     // options
-    std::string fname;
-    bool isDeveloper = false;
+    std::string fname = "";
     int64_t tempval = 0;
     int multiId = 0;
 
@@ -36,12 +55,12 @@ int main(int argc, char **argv) {
         // These options set a flag.
         //{"verbose", no_argument,       &verbose_flag, 1},
         // These options don’t set a flag. We distinguish them by their indices.
-        {"developer", no_argument, nullptr, 'd'},
-        {"config", required_argument, nullptr, 'f'},
-        {"id", required_argument, nullptr, 'i'},
-        {"version", no_argument, nullptr, 'v'},
-        {"help", no_argument, nullptr, 'h'},
-        {nullptr, 0, nullptr, 0}};
+        {"developer", no_argument, 0, 'd'},
+        {"config", required_argument, 0, 'f'},
+        {"id", required_argument, 0, 'i'},
+        {"version", no_argument, 0, 'v'},
+        {"help", no_argument, 0, 'h'},
+        {0, 0, 0, 0}};
 
     // getopt_long stores the option index here
     optind = 1;
@@ -57,12 +76,12 @@ int main(int argc, char **argv) {
 
         case 'f':
             fname = optarg;
-            LOG(logDEBUG)
+            FILE_LOG(logDEBUG)
                 << long_options[option_index].name << " " << optarg;
             break;
 
         case 'd':
-            isDeveloper = true;
+            isDeveloper = 1;
             break;
 
         case 'i':
@@ -71,9 +90,9 @@ int main(int argc, char **argv) {
 
         case 'v':
             tempval = APIGUI;
-            LOG(logINFO) << "SLS Detector GUI " << GITBRANCH << " (0x"
+            FILE_LOG(logINFO) << "SLS Detector GUI " << GITBRANCH << " (0x"
                               << std::hex << tempval << ")";
-            return 0;
+            return;
 
         case 'h':
         default:
@@ -87,93 +106,73 @@ int main(int argc, char **argv) {
                 "i. Default: 0. Required \n" +
                 "\t                            only when more than one multi "
                 "detector object is needed.\n\n";
-            LOG(logERROR) << help_message;
-            return -1;
+            FILE_LOG(logERROR) << help_message;
+            exit(EXIT_FAILURE);
         }
     }
 
-    QApplication app(argc, argv);
-    app.setStyle(new QPlastiqueStyle); //style is deleted by QApplication
-    try {
-        qDetectorMain det(multiId, fname, isDeveloper);
-        det.show();
-        app.exec();
-    } catch (const std::exception &e) {
-        qDefs::Message(qDefs::CRITICAL,
-                       std::string(e.what()) + "\nExiting Gui :'( ", "main");
-    }
-    return 0;
-}
-
-qDetectorMain::qDetectorMain(int multiId, const std::string& fname, bool isDevel)
-    : QMainWindow(nullptr), detType(slsDetectorDefs::GENERIC), isDeveloper(isDevel),
-      heightPlotWindow(0), heightCentralWidget(0) {
-
     setupUi(this);
     SetUpDetector(fname, multiId);
     SetUpWidgetWindow();
 }
 
-qDetectorMain::~qDetectorMain(){
-    disconnect(tabs, SIGNAL(currentChanged(int)), this,
-            SLOT(Refresh(int)));
-}
+qDetectorMain::~qDetectorMain() {}
 
 void qDetectorMain::SetUpWidgetWindow() {
     setFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
 
     // plot setup
-    plot = new qDrawPlot(dockWidgetPlot, det.get());
-    LOG(logDEBUG) << "DockPlot ready";
-    dockWidgetPlot->setWidget(plot);
+    plot = sls::make_unique<qDrawPlot>(dockWidgetPlot, det.get());
+    FILE_LOG(logDEBUG) << "DockPlot ready";
+    dockWidgetPlot->setWidget(plot.get());
 
     // tabs setup
-    tabs = new MyTabWidget(this);
-    layoutTabs->addWidget(tabs);
+    tabs = sls::make_unique<MyTabWidget>(this);
+    layoutTabs->addWidget(tabs.get());
 
     // creating all the other tab widgets
-    tabMeasurement =
-        new qTabMeasurement(this, det.get(), plot);
-    tabDataOutput = new qTabDataOutput(this, det.get());
-    tabPlot = new qTabPlot(this, det.get(), plot);
-    tabSettings = new qTabSettings(this, det.get());
-    tabAdvanced = new qTabAdvanced(this, det.get(), plot);
-    tabDebugging = new qTabDebugging(this, det.get());
-    tabDeveloper = new qTabDeveloper(this, det.get());
+    tabMeasurement = sls::make_unique<qTabMeasurement>(this, det.get(), plot.get());
+    tabDataOutput = sls::make_unique<qTabDataOutput>(this, det.get());
+    tabPlot = sls::make_unique<qTabPlot>(this, det.get(), plot.get());
+    tabSettings = sls::make_unique<qTabSettings>(this, det.get());
+    tabAdvanced = sls::make_unique<qTabAdvanced>(this, det.get(), plot.get());
+    tabDebugging = sls::make_unique<qTabDebugging>(this, det.get());
+    tabDeveloper = sls::make_unique<qTabDeveloper>(this, det.get());
 
     //	creating the scroll area widgets for the tabs
+    QScrollArea *scroll[NumberOfTabs];
     for (int i = 0; i < NumberOfTabs; ++i) {
-        scroll[i] = sls::make_unique<QScrollArea>();
+        scroll[i] = new QScrollArea;
         scroll[i]->setFrameShape(QFrame::NoFrame);
     }
     // setting the tab widgets to the scrollareas
-    scroll[MEASUREMENT]->setWidget(tabMeasurement);
-    scroll[DATAOUTPUT]->setWidget(tabDataOutput);
-    scroll[PLOT]->setWidget(tabPlot);
-    scroll[SETTINGS]->setWidget(tabSettings);
-    scroll[ADVANCED]->setWidget(tabAdvanced);
-    scroll[DEBUGGING]->setWidget(tabDebugging);
-    scroll[DEVELOPER]->setWidget(tabDeveloper);
+    scroll[MEASUREMENT]->setWidget(tabMeasurement.get());
+    scroll[DATAOUTPUT]->setWidget(tabDataOutput.get());
+    scroll[PLOT]->setWidget(tabPlot.get());
+    scroll[SETTINGS]->setWidget(tabSettings.get());
+    scroll[ADVANCED]->setWidget(tabAdvanced.get());
+    scroll[DEBUGGING]->setWidget(tabDebugging.get());
+    scroll[DEVELOPER]->setWidget(tabDeveloper.get());
     // inserting all the tabs
-    tabs->insertTab(MEASUREMENT, scroll[MEASUREMENT].get(), "Measurement");
-    tabs->insertTab(DATAOUTPUT, scroll[DATAOUTPUT].get(), "Data Output");
-    tabs->insertTab(PLOT, scroll[PLOT].get(), "Plot");
-    tabs->insertTab(SETTINGS, scroll[SETTINGS].get(), "Settings");
-    tabs->insertTab(ADVANCED, scroll[ADVANCED].get(), "Advanced");
-    tabs->insertTab(DEBUGGING, scroll[DEBUGGING].get(), "Debugging");
-    tabs->insertTab(DEVELOPER, scroll[DEVELOPER].get(), "Developer");
+    tabs->insertTab(MEASUREMENT, scroll[MEASUREMENT], "Measurement");
+    tabs->insertTab(DATAOUTPUT, scroll[DATAOUTPUT], "Data Output");
+    tabs->insertTab(PLOT, scroll[PLOT], "Plot");
+    tabs->insertTab(SETTINGS, scroll[SETTINGS], "Settings");
+    tabs->insertTab(ADVANCED, scroll[ADVANCED], "Advanced");
+    tabs->insertTab(DEBUGGING, scroll[DEBUGGING], "Debugging");
+    tabs->insertTab(DEVELOPER, scroll[DEVELOPER], "Developer");
     // no scroll buttons this way
-    tabs->insertTab(MESSAGES, tabMessages, "Terminal");
+    tabs->insertTab(MESSAGES, tabMessages.get(), "Terminal");
 
     // swap tabs so that messages is last tab
-    tabs->tabBar()->moveTab(tabs->indexOf(tabMeasurement), MEASUREMENT);
-    tabs->tabBar()->moveTab(tabs->indexOf(tabSettings), SETTINGS);
-    tabs->tabBar()->moveTab(tabs->indexOf(tabDataOutput), DATAOUTPUT);
-    tabs->tabBar()->moveTab(tabs->indexOf(tabPlot), PLOT);
-    tabs->tabBar()->moveTab(tabs->indexOf(tabAdvanced), ADVANCED);
-    tabs->tabBar()->moveTab(tabs->indexOf(tabDebugging), DEBUGGING);
-    tabs->tabBar()->moveTab(tabs->indexOf(tabDeveloper), DEVELOPER);
-    tabs->tabBar()->moveTab(tabs->indexOf(tabMessages), MESSAGES);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabMeasurement.get()), MEASUREMENT);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabSettings.get()), SETTINGS);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabDataOutput.get()), DATAOUTPUT);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabPlot.get()), PLOT);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabAdvanced.get()), ADVANCED);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabDebugging.get()), DEBUGGING);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabDeveloper.get()), DEVELOPER);
+    tabs->tabBar()->moveTab(tabs->indexOf(tabMessages.get()), MESSAGES);
     tabs->setCurrentIndex(MEASUREMENT);
 
     // other tab properties
@@ -181,11 +180,12 @@ void qDetectorMain::SetUpWidgetWindow() {
     defaultTabColor = tabs->tabBar()->tabTextColor(DATAOUTPUT);
     // Set the current tab(measurement) to blue as it is the current one
     tabs->tabBar()->setTabTextColor(0, QColor(0, 0, 200, 255));
-    tabs->tabBar()->setExpanding(true);
+    // increase the width so it uses all the empty space for the tab titles
+    tabs->tabBar()->setFixedWidth(width() + 61);
 
     // mode setup - to set up the tabs initially as disabled, not in form so
     // done here
-    LOG(logINFO)
+    FILE_LOG(logINFO)
         << "Dockable Mode: 0, Debug Mode: 0, Expert Mode: 0, Developer Mode: "
         << isDeveloper;
     tabs->setTabEnabled(DEBUGGING, false);
@@ -206,21 +206,20 @@ void qDetectorMain::SetUpWidgetWindow() {
     Initialization();
 }
 
-void qDetectorMain::SetUpDetector(const std::string& config_file, int multiID) {
+void qDetectorMain::SetUpDetector(const std::string fName, int multiID) {
 
     // instantiate detector and set window title
     det = sls::make_unique<sls::Detector>(multiID);
 
     // create messages tab to capture config file loading logs
-    tabMessages = new qTabMessages(this);
+    tabMessages = sls::make_unique<qTabMessages>(this);
 
     // loads the config file at startup
-    if (!config_file.empty())
-        LoadConfigFile(config_file);
+    if (!fName.empty())
+        LoadConfigFile(fName);
 
     // validate detector type (for GUI) and update menu
-    detType = det->getDetectorType().tsquash(
-        "Different detector type for all modules.");
+    detType = det->getDetectorType().tsquash("Different detector type for all modules.");
     actionLoadTrimbits->setEnabled(false);
     switch (detType) {
     case slsDetectorDefs::EIGER:
@@ -231,75 +230,64 @@ void qDetectorMain::SetUpDetector(const std::string& config_file, int multiID) {
     case slsDetectorDefs::MOENCH:
     case slsDetectorDefs::MYTHEN3:
     case slsDetectorDefs::GOTTHARD2:
-        break;
+         break;
     default:
         std::ostringstream os;
-        os << det->getHostname() << " has "
-           << sls::ToString(det->getDetectorType().squash())
-           << " detector type (" << std::to_string(detType)
-           << "). Exiting GUI.";
+        os << det->getHostname() << " has " <<
+            sls::ToString(det->getDetectorType().squash()) << " detector type (" <<
+            std::to_string(detType) << "). Exiting GUI.";
         std::string errorMess = os.str();
         throw sls::RuntimeError(errorMess.c_str());
     }
     std::ostringstream os;
-    os << "SLS Detector GUI : "
-       << sls::ToString(det->getDetectorType().squash()) << " - "
-       << det->getHostname();
+    os << "SLS Detector GUI : " << sls::ToString(det->getDetectorType().squash()) 
+        << " - " << det->getHostname();
     std::string title = os.str();
-    LOG(logINFO) << title;
+    FILE_LOG(logINFO) << title;
     setWindowTitle(QString(title.c_str()));
 }
 
 void qDetectorMain::Initialization() {
     // Dockable Plot
-    connect(dockWidgetPlot, SIGNAL(topLevelChanged(bool)), this,
-            SLOT(ResizeMainWindow(bool)));
+	connect(dockWidgetPlot, SIGNAL(topLevelChanged(bool)), this, SLOT(ResizeMainWindow(bool)));
     // tabs
-    connect(tabs, SIGNAL(currentChanged(int)), this,
-            SLOT(Refresh(int))); //( QWidget*)));
+	connect(tabs.get(),SIGNAL(currentChanged(int)), this, SLOT(Refresh(int)));//( QWidget*)));
     //	Measurement tab
-    connect(tabMeasurement, SIGNAL(EnableTabsSignal(bool)), this,
-            SLOT(EnableTabs(bool)));
-    connect(tabMeasurement, SIGNAL(FileNameChangedSignal(QString)),
-            plot, SLOT(SetSaveFileName(QString)));
+    connect(tabMeasurement.get(), SIGNAL(EnableTabsSignal(bool)), this, SLOT(EnableTabs(bool)));
+    connect(tabMeasurement.get(), SIGNAL(FileNameChangedSignal(QString)), plot.get(), SLOT(SetSaveFileName(QString)));
     // Plot tab
-    connect(tabPlot, SIGNAL(DisableZoomSignal(bool)), this,
-            SLOT(SetZoomToolTip(bool)));
+    connect(tabPlot.get(), SIGNAL(DisableZoomSignal(bool)), this, SLOT(SetZoomToolTip(bool)));
 
     // Plotting
-    connect(plot, SIGNAL(AcquireFinishedSignal()), tabMeasurement,
-            SLOT(AcquireFinished()));
-    connect(plot, SIGNAL(AbortSignal()), tabMeasurement,
-            SLOT(AbortAcquire()));
+    connect(plot.get(), SIGNAL(AcquireFinishedSignal()), tabMeasurement.get(), SLOT(AcquireFinished()));
+    connect(plot.get(), SIGNAL(AbortSignal()), tabMeasurement.get(), SLOT(AbortAcquire()));
 
     // menubar
     // Modes Menu
-    connect(menuModes, SIGNAL(triggered(QAction *)), this,
-            SLOT(EnableModes(QAction *)));
+    connect(menuModes, SIGNAL(triggered(QAction *)), this, SLOT(EnableModes(QAction *)));
     // Utilities Menu
-    connect(menuUtilities, SIGNAL(triggered(QAction *)), this,
-            SLOT(ExecuteUtilities(QAction *)));
+    connect(menuUtilities, SIGNAL(triggered(QAction *)), this, SLOT(ExecuteUtilities(QAction *)));
     // Help Menu
-    connect(menuHelp, SIGNAL(triggered(QAction *)), this,
-            SLOT(ExecuteHelp(QAction *)));
+    connect(menuHelp, SIGNAL(triggered(QAction *)), this, SLOT(ExecuteHelp(QAction *)));
+
 }
 
-void qDetectorMain::LoadConfigFile(const std::string& config_file) {
+void qDetectorMain::LoadConfigFile(const std::string fName) {
 
-    LOG(logINFO) << "Loading config file at start up:" << config_file;
+    FILE_LOG(logINFO) << "Loading config file at start up:" << fName;
 
     struct stat st_buf;
-    QString file = QString(config_file.c_str());
+    QString file = QString(fName.c_str());
 
     // path doesnt exist
-    if (stat(config_file.c_str(), &st_buf)) {
+    if (stat(fName.c_str(), &st_buf)) {
         qDefs::Message(
             qDefs::WARNING,
             std::string("<nobr>Start up configuration failed to load. The "
                         "following file does not exist:</nobr><br><nobr>") +
-                config_file,
+                fName,
             "qDetectorMain::LoadConfigFile");
-        LOG(logWARNING) << "Config file does not exist";
+        FILE_LOG(logWARNING) << "Config file does not exist";
     }
     // not a file
     else if (!S_ISREG(st_buf.st_mode)) {
@@ -308,15 +296,13 @@ void qDetectorMain::LoadConfigFile(const std::string& config_file) {
             std::string(
                 "<nobr>Start up configuration failed to load. The following "
                 "file is not a recognized file format:</nobr><br><nobr>") +
-                config_file,
+                fName,
             "qDetectorMain::LoadConfigFile");
-        LOG(logWARNING) << "File not recognized";
+        FILE_LOG(logWARNING) << "File not recognized";
     } else {
         try {
-            det->loadConfig(config_file);
-        }
-        CATCH_DISPLAY("Could not load config file.",
-                      "qDetectorMain::LoadConfigFile")
+            det->loadConfig(fName);
+        } CATCH_DISPLAY ("Could not load config file.", "qDetectorMain::LoadConfigFile")
     }
 }
 
@@ -327,7 +313,8 @@ void qDetectorMain::EnableModes(QAction *action) {
     if (action == actionDebug) {
         enable = actionDebug->isChecked();
         tabs->setTabEnabled(DEBUGGING, enable);
-        LOG(logINFO) << "Debug Mode: " << qDefs::stringEnable(enable);
+        FILE_LOG(logINFO) << "Debug Mode: "
+                          << qDefs::stringEnable(enable);
 
     }
 
@@ -336,9 +323,9 @@ void qDetectorMain::EnableModes(QAction *action) {
         enable = actionExpert->isChecked();
 
         tabs->setTabEnabled(ADVANCED, enable);
-        actionLoadTrimbits->setVisible(enable &&
-                                       detType == slsDetectorDefs::EIGER);
-        LOG(logINFO) << "Expert Mode: " << qDefs::stringEnable(enable);
+        actionLoadTrimbits->setVisible(enable && detType == slsDetectorDefs::EIGER);
+        FILE_LOG(logINFO) << "Expert Mode: "
+                          << qDefs::stringEnable(enable);
     }
 
     // Set DockableMode
@@ -350,7 +337,8 @@ void qDetectorMain::EnableModes(QAction *action) {
             dockWidgetPlot->setFloating(false);
             dockWidgetPlot->setFeatures(QDockWidget::NoDockWidgetFeatures);
         }
-        LOG(logINFO) << "Dockable Mode: " << qDefs::stringEnable(enable);
+        FILE_LOG(logINFO) << "Dockable Mode: "
+                          << qDefs::stringEnable(enable);
     }
 }
 
@@ -359,7 +347,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
     try {
 
         if (action == actionLoadConfiguration) {
-            LOG(logDEBUG) << "Loading Configuration";
+            FILE_LOG(logDEBUG) << "Loading Configuration";
             QString fName = QString(det->getFilePath().squash("/tmp/").c_str());
             fName = QFileDialog::getOpenFileName(
                 this, tr("Load Detector Configuration"), fName,
@@ -367,18 +355,19 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
             // Gets called when cancelled as well
             if (!fName.isEmpty()) {
                 refreshTabs = true;
-                det->loadConfig(std::string(fName.toAscii().constData()));
+                det->loadConfig(
+                    std::string(fName.toAscii().constData()));
                 qDefs::Message(qDefs::INFORMATION,
                                "The Configuration Parameters have been "
                                "configured successfully.",
                                "qDetectorMain::ExecuteUtilities");
-                LOG(logINFO)
+                FILE_LOG(logINFO)
                     << "Configuration Parameters loaded successfully";
             }
         }
 
         else if (action == actionLoadParameters) {
-            LOG(logDEBUG) << "Loading Parameters";
+            FILE_LOG(logDEBUG) << "Loading Parameters";
             QString fName = QString(det->getFilePath().squash("/tmp/").c_str());
             fName = QFileDialog::getOpenFileName(
                 this, tr("Load Measurement Setup"), fName,
@@ -386,19 +375,20 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
             // Gets called when cancelled as well
             if (!fName.isEmpty()) {
                 refreshTabs = true;
-                det->loadParameters(std::string(fName.toAscii().constData()));
+                det->loadParameters(
+                    std::string(fName.toAscii().constData()));
                 qDefs::Message(qDefs::INFORMATION,
                                "The Detector Parameters have been "
                                "configured successfully.",
                                "qDetectorMain::ExecuteUtilities");
-                LOG(logINFO) << "Parameters loaded successfully";
+                FILE_LOG(logINFO)
+                    << "Parameters loaded successfully";
             }
         }
 
         else if (action == actionLoadTrimbits) {
-            QString fName =
-                QString((det->getSettingsPath().squash("/tmp/")).c_str());
-            LOG(logDEBUG) << "Loading Trimbits";
+            QString fName = QString((det->getSettingsPath().squash("/tmp/")).c_str());
+            FILE_LOG(logDEBUG) << "Loading Trimbits";
             // so that even nonexisting files can be selected
             QFileDialog *fileDialog = new QFileDialog(
                 this, tr("Load Detector Trimbits"), fName,
@@ -409,16 +399,18 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
 
             // Gets called when cancelled as well
             if (!fName.isEmpty()) {
-                det->loadTrimbits(std::string(fName.toAscii().constData()));
-                qDefs::Message(qDefs::INFORMATION,
-                               "The Trimbits have been loaded successfully.",
-                               "qDetectorMain::ExecuteUtilities");
-                LOG(logINFO) << "Trimbits loaded successfully";
+                det->loadTrimbits(
+                    std::string(fName.toAscii().constData()));
+                qDefs::Message(
+                    qDefs::INFORMATION,
+                    "The Trimbits have been loaded successfully.",
+                    "qDetectorMain::ExecuteUtilities");
+                FILE_LOG(logINFO) << "Trimbits loaded successfully";
             }
+            
         }
-    }
-    CATCH_DISPLAY("Could not execute utilities.",
-                  "qDetectorMain::ExecuteUtilities")
+
+    } CATCH_DISPLAY ("Could not execute utilities.", "qDetectorMain::ExecuteUtilities")
 
     Refresh(tabs->currentIndex());
     if (refreshTabs) {
@@ -437,16 +429,14 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
 
 void qDetectorMain::ExecuteHelp(QAction *action) {
     if (action == actionAbout) {
-        LOG(logINFO) << "About Common GUI for Jungfrau, Eiger, Mythen3, "
-                             "Gotthard, Gotthard2 and Moench detectors";
+        FILE_LOG(logINFO) << "About Common GUI for Eiger, Gotthard, Jungfrau "
+                             "and Moench detectors";
 
         std::string guiVersion = std::to_string(APIGUI);
         std::string clientVersion = "unknown";
         try {
             clientVersion = std::to_string(det->getClientVersion());
-        }
-        CATCH_DISPLAY("Could not get client version.",
-                      "qDetectorMain::ExecuteHelp")
+        } CATCH_DISPLAY ("Could not get client version.", "qDetectorMain::ExecuteHelp")
 
         qDefs::Message(qDefs::INFORMATION,
                        "<p style=\"font-family:verdana;\">"
@@ -457,8 +447,7 @@ void qDetectorMain::ExecuteHelp(QAction *action) {
                            clientVersion +
                            "<br><br>"
                            "Common GUI to control the SLS Detectors: "
-                           "Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and "
-                           "Moench.<br><br>"
+                           "Eiger, Jungfrau, Mythen3, Gotthard, Gotthard2 and Moench.<br><br>"
                            "It can be operated in parallel with the command "
                            "line interface:<br>"
                            "sls_detector_put,<br>sls_detector_get,<br>sls_"
@@ -472,7 +461,7 @@ void qDetectorMain::ExecuteHelp(QAction *action) {
 }
 
 void qDetectorMain::Refresh(int index) {
-    LOG(logDEBUG) << "Refresh Main Tab";
+    FILE_LOG(logDEBUG) << "Refresh Main Tab";
 
     if (!tabs->isTabEnabled(index))
         tabs->setCurrentIndex((index++) < (tabs->count() - 1) ? index
@@ -511,14 +500,14 @@ void qDetectorMain::Refresh(int index) {
 }
 
 void qDetectorMain::ResizeMainWindow(bool b) {
-    LOG(logDEBUG1) << "Resizing Main Window: height:" << height();
+    FILE_LOG(logDEBUG1) << "Resizing Main Window: height:" << height();
 
     // undocked from the main window
     if (b) {
         // sets the main window height to a smaller maximum to get rid of space
         setMaximumHeight(height() - heightPlotWindow - 9);
         dockWidgetPlot->setMinimumHeight(0);
-        LOG(logINFO) << "Undocking from main window";
+        FILE_LOG(logINFO) << "Undocking from main window";
     } else {
         setMaximumHeight(QWIDGETSIZE_MAX);
         // the minimum for plot will be set when the widget gets resized
@@ -546,7 +535,7 @@ void qDetectorMain::resizeEvent(QResizeEvent *event) {
 }
 
 void qDetectorMain::EnableTabs(bool enable) {
-    LOG(logDEBUG) << "qDetectorMain::EnableTabs";
+    FILE_LOG(logDEBUG) << "qDetectorMain::EnableTabs";
 
     // normal tabs
     tabs->setTabEnabled(DATAOUTPUT, enable);
@@ -565,8 +554,7 @@ void qDetectorMain::EnableTabs(bool enable) {
     // expert
     bool expertTab = enable && (actionExpert->isChecked());
     tabs->setTabEnabled(ADVANCED, expertTab);
-    actionLoadTrimbits->setVisible(expertTab &&
-                                   detType == slsDetectorDefs::EIGER);
+    actionLoadTrimbits->setVisible(expertTab && detType == slsDetectorDefs::EIGER);
 
     // moved to here, so that its all in order, instead of signals and different
     // threads

slsDetectorGui/src/qTabAdvanced.cpp

@@ -1,14 +1,15 @@
 #include "qTabAdvanced.h"
-#include "network_utils.h"
 #include "qDefs.h"
 #include "qDrawPlot.h"
+#include "network_utils.h"
 
-qTabAdvanced::qTabAdvanced(QWidget *parent, sls::Detector *detector,
-                           qDrawPlot *p)
+#include <iostream>
+
+qTabAdvanced::qTabAdvanced(QWidget *parent, sls::Detector *detector, qDrawPlot *p)
     : QWidget(parent), det(detector), plot(p) {
     setupUi(this);
     SetupWidgetWindow();
-    LOG(logDEBUG) << "Advanced ready";
+    FILE_LOG(logDEBUG) << "Advanced ready";
 }
 
 qTabAdvanced::~qTabAdvanced() {}
@@ -87,8 +88,7 @@ void qTabAdvanced::Initialization() {
 
     // roi
     if (tab_roi->isEnabled()) {
-        connect(comboReadout, SIGNAL(currentIndexChanged(int)), this,
-                SLOT(GetROI()));
+        connect(comboReadout, SIGNAL(currentIndexChanged(int)), this, SLOT(GetROI()));
         connect(btnSetRoi, SIGNAL(clicked()), this, SLOT(SetROI()));
         connect(btnClearRoi, SIGNAL(clicked()), this, SLOT(ClearROI()));
     }
@@ -114,16 +114,15 @@ void qTabAdvanced::Initialization() {
     // throw bits
     if (lblDiscardBits->isEnabled()) {
         connect(spinDiscardBits, SIGNAL(valueChanged(int)), plot,
-                SLOT(SetNumDiscardBits(int)));
+                SLOT(SetNumDiscardBits(int)));  
     }
 }
 
 void qTabAdvanced::PopulateDetectors() {
-    LOG(logDEBUG) << "Populating detectors";
+    FILE_LOG(logDEBUG) << "Populating detectors";
     disconnect(comboDetector, SIGNAL(currentIndexChanged(int)), this,
                SLOT(SetDetector()));
-    disconnect(comboReadout, SIGNAL(currentIndexChanged(int)), this,
-               SLOT(GetROI()));
+    disconnect(comboReadout, SIGNAL(currentIndexChanged(int)), this, SLOT(GetROI()));          
 
     comboDetector->clear();
     comboReadout->clear();
@@ -133,223 +132,197 @@ void qTabAdvanced::PopulateDetectors() {
         comboReadout->addItem(QString(it.c_str()));
     }
     comboDetector->setCurrentIndex(0);
-    comboReadout->setCurrentIndex(0);
+    comboReadout->setCurrentIndex(0);    
 
     connect(comboDetector, SIGNAL(currentIndexChanged(int)), this,
             SLOT(SetDetector()));
-    connect(comboReadout, SIGNAL(currentIndexChanged(int)), this,
-            SLOT(GetROI()));
+    connect(comboReadout, SIGNAL(currentIndexChanged(int)), this, SLOT(GetROI()));        
 }
 
 void qTabAdvanced::GetControlPort() {
-    LOG(logDEBUG) << "Getting control port ";
+    FILE_LOG(logDEBUG) << "Getting control port ";
     disconnect(spinControlPort, SIGNAL(valueChanged(int)), this,
                SLOT(SetControlPort(int)));
 
     try {
         int retval = det->getControlPort({comboDetector->currentIndex()})[0];
         spinControlPort->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get detector control port.",
-                  "qTabAdvanced::GetControlPort")
+    } CATCH_DISPLAY ("Could not get detector control port.", "qTabAdvanced::GetControlPort")
 
     connect(spinControlPort, SIGNAL(valueChanged(int)), this,
             SLOT(SetControlPort(int)));
 }
 
 void qTabAdvanced::GetStopPort() {
-    LOG(logDEBUG) << "Getting stop port";
+    FILE_LOG(logDEBUG) << "Getting stop port";
     disconnect(spinStopPort, SIGNAL(valueChanged(int)), this,
                SLOT(SetStopPort(int)));
 
     try {
         int retval = det->getStopPort({comboDetector->currentIndex()})[0];
         spinStopPort->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get detector stop port.",
-                  "qTabAdvanced::GetStopPort")
+    } CATCH_DISPLAY ("Could not get detector stop port.", "qTabAdvanced::GetStopPort")
 
     connect(spinStopPort, SIGNAL(valueChanged(int)), this,
             SLOT(SetStopPort(int)));
 }
 
 void qTabAdvanced::GetDetectorUDPIP() {
-    LOG(logDEBUG) << "Getting Detector UDP IP";
+    FILE_LOG(logDEBUG) << "Getting Detector UDP IP";
     disconnect(dispDetectorUDPIP, SIGNAL(editingFinished()), this,
                SLOT(SetDetectorUDPIP()));
 
     try {
-        auto retval =
-            det->getSourceUDPIP({comboDetector->currentIndex()})[0].str();
+        auto retval = det->getSourceUDPIP({comboDetector->currentIndex()})[0].str();
         dispDetectorUDPIP->setText(QString(retval.c_str()));
-    }
-    CATCH_DISPLAY("Could not get detector UDP IP.",
-                  "qTabAdvanced::GetDetectorUDPIP")
+    } CATCH_DISPLAY ("Could not get detector UDP IP.", "qTabAdvanced::GetDetectorUDPIP")
 
     connect(dispDetectorUDPIP, SIGNAL(editingFinished()), this,
             SLOT(SetDetectorUDPIP()));
 }
 
 void qTabAdvanced::GetDetectorUDPMAC() {
-    LOG(logDEBUG) << "Getting Detector UDP MAC";
+    FILE_LOG(logDEBUG) << "Getting Detector UDP MAC";
     disconnect(dispDetectorUDPMAC, SIGNAL(editingFinished()), this,
                SLOT(SetDetectorUDPMAC()));
 
     try {
-        auto retval =
-            det->getSourceUDPMAC({comboDetector->currentIndex()})[0].str();
+        auto retval = det->getSourceUDPMAC({comboDetector->currentIndex()})[0].str();
         dispDetectorUDPMAC->setText(QString(retval.c_str()));
-    }
-    CATCH_DISPLAY("Could not get detector UDP MAC.",
-                  "qTabAdvanced::GetDetectorUDPMAC")
+    } CATCH_DISPLAY ("Could not get detector UDP MAC.", "qTabAdvanced::GetDetectorUDPMAC")
 
     connect(dispDetectorUDPMAC, SIGNAL(editingFinished()), this,
             SLOT(SetDetectorUDPMAC()));
 }
 
 void qTabAdvanced::GetCltZMQPort() {
-    LOG(logDEBUG) << "Getting Client ZMQ port";
+    FILE_LOG(logDEBUG) << "Getting Client ZMQ port";
     disconnect(spinZMQPort, SIGNAL(valueChanged(int)), this,
                SLOT(SetCltZMQPort(int)));
 
     try {
-        int retval = det->getClientZmqPort({comboDetector->currentIndex()})[0];
+        int retval =
+            det->getClientZmqPort({comboDetector->currentIndex()})[0];
         spinZMQPort->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get client zmq port.",
-                  "qTabAdvanced::GetCltZMQPort")
+    } CATCH_DISPLAY ("Could not get client zmq port.", "qTabAdvanced::GetCltZMQPort")
 
     connect(spinZMQPort, SIGNAL(valueChanged(int)), this,
             SLOT(SetCltZMQPort(int)));
 }
 
 void qTabAdvanced::GetCltZMQIP() {
-    LOG(logDEBUG) << "Getting Client ZMQ IP";
+    FILE_LOG(logDEBUG) << "Getting Client ZMQ IP";
     disconnect(dispZMQIP, SIGNAL(editingFinished()), this, SLOT(SetCltZMQIP()));
 
     try {
         auto retval =
             det->getClientZmqIp({comboDetector->currentIndex()})[0].str();
         dispZMQIP->setText(QString(retval.c_str()));
-    }
-    CATCH_DISPLAY("Could not get client zmq ip.", "qTabAdvanced::GetCltZMQIP")
+    } CATCH_DISPLAY ("Could not get client zmq ip.", "qTabAdvanced::GetCltZMQIP")
 
     connect(dispZMQIP, SIGNAL(editingFinished()), this, SLOT(SetCltZMQIP()));
 }
 
 void qTabAdvanced::GetRxrHostname() {
-    LOG(logDEBUG) << "Getting Receiver Hostname";
+    FILE_LOG(logDEBUG) << "Getting Receiver Hostname";
     disconnect(dispRxrHostname, SIGNAL(editingFinished()), this,
                SLOT(SetRxrHostname()));
 
     try {
         auto retval = det->getRxHostname({comboDetector->currentIndex()})[0];
         dispRxrHostname->setText(QString(retval.c_str()));
-    }
-    CATCH_DISPLAY("Could not get receiver hostname.",
-                  "qTabAdvanced::GetRxrHostname")
+    } CATCH_DISPLAY ("Could not get receiver hostname.", "qTabAdvanced::GetRxrHostname")
 
     connect(dispRxrHostname, SIGNAL(editingFinished()), this,
             SLOT(SetRxrHostname()));
 }
 
 void qTabAdvanced::GetRxrTCPPort() {
-    LOG(logDEBUG) << "Getting Receiver TCP port";
+    FILE_LOG(logDEBUG) << "Getting Receiver TCP port";
     disconnect(spinRxrTCPPort, SIGNAL(valueChanged(int)), this,
                SLOT(SetRxrTCPPort(int)));
 
     try {
         int retval = det->getRxPort({comboDetector->currentIndex()})[0];
         spinRxrTCPPort->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get receiver tcp port.",
-                  "qTabAdvanced::GetRxrTCPPort")
+    } CATCH_DISPLAY ("Could not get receiver tcp port.", "qTabAdvanced::GetRxrTCPPort")
 
     connect(spinRxrTCPPort, SIGNAL(valueChanged(int)), this,
             SLOT(SetRxrTCPPort(int)));
 }
 
 void qTabAdvanced::GetRxrUDPPort() {
-    LOG(logDEBUG) << "Getting Receiver UDP port";
+    FILE_LOG(logDEBUG) << "Getting Receiver UDP port";
     disconnect(spinRxrUDPPort, SIGNAL(valueChanged(int)), this,
                SLOT(SetRxrUDPPort(int)));
 
     try {
-        int retval =
-            det->getDestinationUDPPort({comboDetector->currentIndex()})[0];
+        int retval = det->getDestinationUDPPort({comboDetector->currentIndex()})[0];
         spinRxrUDPPort->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get receiver udp port.",
-                  "qTabAdvanced::GetRxrUDPPort")
+    } CATCH_DISPLAY ("Could not get receiver udp port.", "qTabAdvanced::GetRxrUDPPort")
 
     connect(spinRxrUDPPort, SIGNAL(valueChanged(int)), this,
             SLOT(SetRxrUDPPort(int)));
 }
 
 void qTabAdvanced::GetRxrUDPIP() {
-    LOG(logDEBUG) << "Getting Receiver UDP IP";
+    FILE_LOG(logDEBUG) << "Getting Receiver UDP IP";
     disconnect(dispRxrUDPIP, SIGNAL(editingFinished()), this,
                SLOT(SetRxrUDPIP()));
 
     try {
-        auto retval =
-            det->getDestinationUDPIP({comboDetector->currentIndex()})[0].str();
+        auto retval = det->getDestinationUDPIP({comboDetector->currentIndex()})[0].str();
         dispRxrUDPIP->setText(QString(retval.c_str()));
-    }
-    CATCH_DISPLAY("Could not get receiver udp ip.", "qTabAdvanced::GetRxrUDPIP")
+    } CATCH_DISPLAY ("Could not get receiver udp ip.", "qTabAdvanced::GetRxrUDPIP")
 
     connect(dispRxrUDPIP, SIGNAL(editingFinished()), this, SLOT(SetRxrUDPIP()));
 }
 
 void qTabAdvanced::GetRxrUDPMAC() {
-    LOG(logDEBUG) << "Getting Receiver UDP MAC";
+    FILE_LOG(logDEBUG) << "Getting Receiver UDP MAC";
     disconnect(dispRxrUDPMAC, SIGNAL(editingFinished()), this,
                SLOT(SetRxrUDPMAC()));
 
     try {
-        auto retval =
-            det->getDestinationUDPMAC({comboDetector->currentIndex()})[0].str();
+        auto retval = det->getDestinationUDPMAC({comboDetector->currentIndex()})[0].str();
         dispRxrUDPMAC->setText(QString(retval.c_str()));
-    }
-    CATCH_DISPLAY("Could not get receiver udp mac.",
-                  "qTabAdvanced::GetRxrUDPMAC")
+    } CATCH_DISPLAY ("Could not get receiver udp mac.", "qTabAdvanced::GetRxrUDPMAC")
 
     connect(dispRxrUDPMAC, SIGNAL(editingFinished()), this,
             SLOT(SetRxrUDPMAC()));
 }
 
 void qTabAdvanced::GetRxrZMQPort() {
-    LOG(logDEBUG) << "Getting Receiver ZMQ port";
+    FILE_LOG(logDEBUG) << "Getting Receiver ZMQ port";
     disconnect(spinRxrZMQPort, SIGNAL(valueChanged(int)), this,
                SLOT(SetRxrZMQPort(int)));
 
     try {
-        int retval = det->getRxZmqPort({comboDetector->currentIndex()})[0];
+        int retval =
+            det->getRxZmqPort({comboDetector->currentIndex()})[0];
         spinRxrZMQPort->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get receiver zmq port.",
-                  "qTabAdvanced::GetRxrZMQPort")
+    } CATCH_DISPLAY ("Could not get receiver zmq port.", "qTabAdvanced::GetRxrZMQPort")
 
     connect(spinRxrZMQPort, SIGNAL(valueChanged(int)), this,
             SLOT(SetRxrZMQPort(int)));
 }
 
 void qTabAdvanced::GetRxrZMQIP() {
-    LOG(logDEBUG) << "Getting Receiver ZMQ IP";
+    FILE_LOG(logDEBUG) << "Getting Receiver ZMQ IP";
     disconnect(dispRxrZMQIP, SIGNAL(editingFinished()), this,
                SLOT(SetRxrZMQIP()));
 
     try {
-        auto retval = det->getRxZmqIP({comboDetector->currentIndex()})[0].str();
+        auto retval =
+            det->getRxZmqIP({comboDetector->currentIndex()})[0].str();
         dispRxrZMQIP->setText(QString(retval.c_str()));
-    }
-    CATCH_DISPLAY("Could not get receiver zmq ip.", "qTabAdvanced::GetRxrZMQIP")
+    } CATCH_DISPLAY ("Could not get receiver zmq ip.", "qTabAdvanced::GetRxrZMQIP")
 
     connect(dispRxrZMQIP, SIGNAL(editingFinished()), this, SLOT(SetRxrZMQIP()));
 }
 
 void qTabAdvanced::SetDetector() {
-    LOG(logDEBUG) << "Set Detector: "
+    FILE_LOG(logDEBUG) << "Set Detector: "
                        << comboDetector->currentText().toAscii().data();
 
     GetControlPort();
@@ -366,162 +339,149 @@ void qTabAdvanced::SetDetector() {
     GetRxrZMQPort();
     GetRxrZMQIP();
 
-    LOG(logDEBUG) << det->printRxConfiguration();
+    FILE_LOG(logDEBUG) << det->printRxConfiguration();
 }
 
 void qTabAdvanced::SetControlPort(int port) {
-    LOG(logINFO) << "Setting Control Port:" << port;
+    FILE_LOG(logINFO) << "Setting Control Port:" << port;
     try {
         det->setControlPort(port, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set control port.", "qTabAdvanced::SetControlPort",
+    } CATCH_HANDLE("Could not set control port.", "qTabAdvanced::SetControlPort",
                  this, &qTabAdvanced::GetControlPort)
 }
 
 void qTabAdvanced::SetStopPort(int port) {
-    LOG(logINFO) << "Setting Stop Port:" << port;
+    FILE_LOG(logINFO) << "Setting Stop Port:" << port;
     try {
         det->setStopPort(port, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set stop port.", "qTabAdvanced::SetStopPort", this,
-                 &qTabAdvanced::GetStopPort)
+    } CATCH_HANDLE ("Could not set stop port.", "qTabAdvanced::SetStopPort", this,
+                                &qTabAdvanced::GetStopPort)
 }
 
 void qTabAdvanced::SetDetectorUDPIP() {
     std::string s = dispDetectorUDPIP->text().toAscii().constData();
-    LOG(logINFO) << "Setting Detector UDP IP:" << s;
+    FILE_LOG(logINFO) << "Setting Detector UDP IP:" << s;
     try {
         det->setSourceUDPIP(sls::IpAddr{s}, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Detector UDP IP.",
-                 "qTabAdvanced::SetDetectorUDPIP", this,
-                 &qTabAdvanced::GetDetectorUDPIP)
+    } CATCH_HANDLE ("Could not set Detector UDP IP.",
+                                "qTabAdvanced::SetDetectorUDPIP", this,
+                                &qTabAdvanced::GetDetectorUDPIP)
 }
 
 void qTabAdvanced::SetDetectorUDPMAC() {
     std::string s = dispDetectorUDPMAC->text().toAscii().constData();
-    LOG(logINFO) << "Setting Detector UDP MAC:" << s;
+    FILE_LOG(logINFO) << "Setting Detector UDP MAC:" << s;
     try {
         det->setSourceUDPMAC(sls::MacAddr{s}, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Detector UDP MAC.",
-                 "qTabAdvanced::SetDetectorUDPMAC", this,
-                 &qTabAdvanced::GetDetectorUDPMAC)
+    } CATCH_HANDLE ("Could not set Detector UDP MAC.",
+                                "qTabAdvanced::SetDetectorUDPMAC", this,
+                                &qTabAdvanced::GetDetectorUDPMAC)
 }
 
 void qTabAdvanced::SetCltZMQPort(int port) {
-    LOG(logINFO) << "Setting Client ZMQ Port:" << port;
+    FILE_LOG(logINFO) << "Setting Client ZMQ Port:" << port;
     try {
         det->setClientZmqPort(port, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Client ZMQ port.",
-                 "qTabAdvanced::SetCltZMQPort", this,
-                 &qTabAdvanced::GetCltZMQPort)
+    } CATCH_HANDLE ("Could not set Client ZMQ port.",
+                                "qTabAdvanced::SetCltZMQPort", this,
+                                &qTabAdvanced::GetCltZMQPort)
 }
 
 void qTabAdvanced::SetCltZMQIP() {
     std::string s = dispZMQIP->text().toAscii().constData();
-    LOG(logINFO) << "Setting Client ZMQ IP:" << s;
+    FILE_LOG(logINFO) << "Setting Client ZMQ IP:" << s;
     try {
         det->setClientZmqIp(sls::IpAddr{s}, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Client ZMQ IP.", "qTabAdvanced::SetCltZMQIP",
-                 this, &qTabAdvanced::GetCltZMQIP)
+    } CATCH_HANDLE ("Could not set Client ZMQ IP.",
+                                "qTabAdvanced::SetCltZMQIP", this,
+                                &qTabAdvanced::GetCltZMQIP)
 }
 
 void qTabAdvanced::SetRxrHostname() {
     std::string s = dispZMQIP->text().toAscii().constData();
-    LOG(logINFO) << "Setting Receiver Hostname:" << s;
+    FILE_LOG(logINFO) << "Setting Receiver Hostname:" << s;
     try {
         det->setRxHostname(s, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Client ZMQ IP.", "qTabAdvanced::SetRxrHostname",
-                 this, &qTabAdvanced::GetRxrHostname)
+    } CATCH_HANDLE ("Could not set Client ZMQ IP.",
+                                "qTabAdvanced::SetRxrHostname", this,
+                                &qTabAdvanced::GetRxrHostname)
 
     // update all network widgets (receiver mainly)
     SetDetector();
 }
 
 void qTabAdvanced::SetRxrTCPPort(int port) {
-    LOG(logINFO) << "Setting Receiver TCP Port:" << port;
+    FILE_LOG(logINFO) << "Setting Receiver TCP Port:" << port;
     try {
         det->setRxPort(port, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Receiver TCP port.",
-                 "qTabAdvanced::SetRxrTCPPort", this,
-                 &qTabAdvanced::GetRxrTCPPort)
+    } CATCH_HANDLE ("Could not set Receiver TCP port.",
+                                "qTabAdvanced::SetRxrTCPPort", this,
+                                &qTabAdvanced::GetRxrTCPPort)
 }
 
 void qTabAdvanced::SetRxrUDPPort(int port) {
-    LOG(logINFO) << "Setting Receiver UDP Port:" << port;
+    FILE_LOG(logINFO) << "Setting Receiver UDP Port:" << port;
     try {
         det->setRxPort(port, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Receiver UDP port.",
-                 "qTabAdvanced::SetRxrUDPPort", this,
-                 &qTabAdvanced::GetRxrUDPPort)
+    } CATCH_HANDLE ("Could not set Receiver UDP port.",
+                                "qTabAdvanced::SetRxrUDPPort", this,
+                                &qTabAdvanced::GetRxrUDPPort)
 }
 
 void qTabAdvanced::SetRxrUDPIP() {
     std::string s = dispRxrUDPIP->text().toAscii().constData();
-    LOG(logINFO) << "Setting Receiver UDP IP:" << s;
+    FILE_LOG(logINFO) << "Setting Receiver UDP IP:" << s;
     try {
-        det->setDestinationUDPIP(sls::IpAddr{s},
-                                 {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Receiver UDP IP.", "qTabAdvanced::SetRxrUDPIP",
-                 this, &qTabAdvanced::GetRxrUDPIP)
+        det->setDestinationUDPIP(sls::IpAddr{s}, {comboDetector->currentIndex()});
+    } CATCH_HANDLE ("Could not set Receiver UDP IP.",
+                                "qTabAdvanced::SetRxrUDPIP", this,
+                                &qTabAdvanced::GetRxrUDPIP)
 }
 
 void qTabAdvanced::SetRxrUDPMAC() {
     std::string s = dispRxrUDPMAC->text().toAscii().constData();
-    LOG(logINFO) << "Setting Receiver UDP MAC:" << s;
+    FILE_LOG(logINFO) << "Setting Receiver UDP MAC:" << s;
     try {
-        det->setDestinationUDPMAC(sls::MacAddr{s},
-                                  {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Receiver UDP MAC.",
-                 "qTabAdvanced::SetRxrUDPMAC", this,
-                 &qTabAdvanced::GetRxrUDPMAC)
+        det->setDestinationUDPMAC(sls::MacAddr{s}, {comboDetector->currentIndex()});
+    } CATCH_HANDLE ("Could not set Receiver UDP MAC.",
+                                "qTabAdvanced::SetRxrUDPMAC", this,
+                                &qTabAdvanced::GetRxrUDPMAC)
 }
 
 void qTabAdvanced::SetRxrZMQPort(int port) {
-    LOG(logINFO) << "Setting Receiver ZMQ Port:" << port;
+    FILE_LOG(logINFO) << "Setting Receiver ZMQ Port:" << port;
     try {
         det->setRxZmqPort(port, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Receiver ZMQ port.",
-                 "qTabAdvanced::SetRxrZMQPort", this,
-                 &qTabAdvanced::GetRxrZMQPort)
+    } CATCH_HANDLE ("Could not set Receiver ZMQ port.",
+                                "qTabAdvanced::SetRxrZMQPort", this,
+                                &qTabAdvanced::GetRxrZMQPort)
 }
 
 void qTabAdvanced::SetRxrZMQIP() {
     std::string s = dispRxrZMQIP->text().toAscii().constData();
-    LOG(logINFO) << "Setting Receiver ZMQ IP:" << s;
+    FILE_LOG(logINFO) << "Setting Receiver ZMQ IP:" << s;
     try {
         det->setRxZmqIP(sls::IpAddr{s}, {comboDetector->currentIndex()});
-    }
-    CATCH_HANDLE("Could not set Receiver ZMQ IP.", "qTabAdvanced::SetRxrZMQIP",
-                 this, &qTabAdvanced::GetRxrZMQIP)
+    } CATCH_HANDLE ("Could not set Receiver ZMQ IP.",
+                                "qTabAdvanced::SetRxrZMQIP", this,
+                                &qTabAdvanced::GetRxrZMQIP)
 }
 
 void qTabAdvanced::GetROI() {
-    LOG(logDEBUG) << "Getting ROI";
+    FILE_LOG(logDEBUG) << "Getting ROI";
     try {
-        slsDetectorDefs::ROI roi =
-            det->getROI({comboReadout->currentIndex()})[0];
+        slsDetectorDefs::ROI roi = det->getROI({comboReadout->currentIndex()})[0];
         spinXmin->setValue(roi.xmin);
-        spinXmax->setValue(roi.xmax);
-    }
-    CATCH_DISPLAY("Could not get ROI.", "qTabAdvanced::GetROI")
+        spinXmax->setValue(roi.xmax);     
+    } CATCH_DISPLAY ("Could not get ROI.", "qTabAdvanced::GetROI")
 }
 
 void qTabAdvanced::ClearROI() {
-    LOG(logINFO) << "Clearing ROI";
+    FILE_LOG(logINFO) << "Clearing ROI";
     spinXmin->setValue(-1);
-    spinXmax->setValue(-1);
+    spinXmax->setValue(-1);  
     SetROI();
-    LOG(logDEBUG) << "ROIs cleared";
+    FILE_LOG(logDEBUG) << "ROIs cleared";
 }
 
 void qTabAdvanced::SetROI() {
@@ -531,27 +491,25 @@ void qTabAdvanced::SetROI() {
     roi.xmax = spinXmax->value();
 
     // set roi
-    LOG(logINFO) << "Setting ROI: [" << roi.xmin << ", " << roi.xmax
-                      << "]";
+    FILE_LOG(logINFO) << "Setting ROI: [" << roi.xmin << ", " << roi.xmax << "]";
     try {
         det->setROI(roi, {comboReadout->currentIndex()});
-    }
-    CATCH_DISPLAY("Could not set these ROIs.", "qTabAdvanced::SetROI")
+    } CATCH_DISPLAY ("Could not set these ROIs.",
+                                "qTabAdvanced::SetROI")
 
     // update corrected list
     GetROI();
 }
 
 void qTabAdvanced::GetAllTrimbits() {
-    LOG(logDEBUG) << "Getting all trimbits value";
+    FILE_LOG(logDEBUG) << "Getting all trimbits value";
     disconnect(spinSetAllTrimbits, SIGNAL(editingFinished()), this,
                SLOT(SetAllTrimbits()));
 
     try {
         int retval = det->getAllTrimbits().squash(-1);
         spinSetAllTrimbits->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get all trimbits.", "qTabAdvanced::GetAllTrimbits")
+    } CATCH_DISPLAY ("Could not get all trimbits.", "qTabAdvanced::GetAllTrimbits")
 
     connect(spinSetAllTrimbits, SIGNAL(editingFinished()), this,
             SLOT(SetAllTrimbits()));
@@ -559,58 +517,55 @@ void qTabAdvanced::GetAllTrimbits() {
 
 void qTabAdvanced::SetAllTrimbits() {
     int value = spinSetAllTrimbits->value();
-    LOG(logINFO) << "Setting all trimbits:" << value;
+    FILE_LOG(logINFO) << "Setting all trimbits:" << value;
 
     try {
         det->setAllTrimbits(value);
-    }
-    CATCH_HANDLE("Could not set all trimbits.", "qTabAdvanced::SetAllTrimbits",
+    } CATCH_HANDLE("Could not set all trimbits.", "qTabAdvanced::SetAllTrimbits",
                  this, &qTabAdvanced::GetAllTrimbits)
 }
 
 void qTabAdvanced::GetNumStoragecells() {
-    LOG(logDEBUG) << "Getting number of additional storage cells";
+    FILE_LOG(logDEBUG) << "Getting number of additional storage cells";
     disconnect(spinNumStoragecells, SIGNAL(valueChanged(int)), this,
                SLOT(SetNumStoragecells(int)));
 
     try {
-        auto retval = det->getNumberOfAdditionalStorageCells().tsquash(
-            "Inconsistent values for number of addditional storage cells.");
+        auto retval = det->getNumberOfAdditionalStorageCells().tsquash("Inconsistent values for number of addditional storage cells.");
         spinNumStoragecells->setValue(retval);
-    }
-    CATCH_DISPLAY("Could not get number of additional storage cells.",
-                  "qTabAdvanced::GetNumStoragecells")
+    } CATCH_DISPLAY (
+            "Could not get number of additional storage cells.",
+            "qTabAdvanced::GetNumStoragecells")
 
     connect(spinNumStoragecells, SIGNAL(valueChanged(int)), this,
             SLOT(SetNumStoragecells(int)));
 }
 
 void qTabAdvanced::SetNumStoragecells(int value) {
-    LOG(logINFO) << "Setting number of additional stoarge cells: "
+    FILE_LOG(logINFO) << "Setting number of additional stoarge cells: "
                       << value;
     try {
         det->setNumberOfAdditionalStorageCells(value);
-    }
-    CATCH_HANDLE("Could not set number of additional storage cells.",
-                 "qTabAdvanced::SetNumStoragecells", this,
-                 &qTabAdvanced::GetNumStoragecells)
+    } CATCH_HANDLE (
+            "Could not set number of additional storage cells.",
+            "qTabAdvanced::SetNumStoragecells", this,
+            &qTabAdvanced::GetNumStoragecells)
 }
 
 void qTabAdvanced::GetSubExposureTime() {
-    LOG(logDEBUG) << "Getting sub exposure time";
+    FILE_LOG(logDEBUG) << "Getting sub exposure time";
     disconnect(spinSubExpTime, SIGNAL(valueChanged(double)), this,
                SLOT(SetSubExposureTime()));
     disconnect(comboSubExpTimeUnit, SIGNAL(currentIndexChanged(int)), this,
                SLOT(SetSubExposureTime()));
     try {
-        auto retval = det->getSubExptime().tsquash(
-            "Subexptime is inconsistent for all detectors.");
+        auto retval =
+            det->getSubExptime().tsquash("Subexptime is inconsistent for all detectors.");
         auto time = qDefs::getUserFriendlyTime(retval);
         spinSubExpTime->setValue(time.first);
         comboSubExpTimeUnit->setCurrentIndex(static_cast<int>(time.second));
-    }
-    CATCH_DISPLAY("Could not get sub exposure time.",
-                  "qTabSettings::GetSubExposureTime")
+    } CATCH_DISPLAY ("Could not get sub exposure time.",
+                                "qTabSettings::GetSubExposureTime")
     connect(spinSubExpTime, SIGNAL(valueChanged(double)), this,
             SLOT(SetSubExposureTime()));
     connect(comboSubExpTimeUnit, SIGNAL(currentIndexChanged(int)), this,
@@ -618,38 +573,34 @@ void qTabAdvanced::GetSubExposureTime() {
 }
 
 void qTabAdvanced::SetSubExposureTime() {
-    auto timeNS = qDefs::getNSTime(std::make_pair(
-        spinSubExpTime->value(),
-        static_cast<qDefs::timeUnit>(comboSubExpTimeUnit->currentIndex())));
-    LOG(logINFO)
+    auto timeNS = qDefs::getNSTime(std::make_pair(spinSubExpTime->value(), static_cast<qDefs::timeUnit>(comboSubExpTimeUnit->currentIndex())));
+    FILE_LOG(logINFO)
         << "Setting sub frame acquisition time to " << timeNS.count() << " ns"
         << "/" << spinSubExpTime->value()
         << qDefs::getUnitString(
                (qDefs::timeUnit)comboSubExpTimeUnit->currentIndex());
     try {
         det->setSubExptime(timeNS);
-    }
-    CATCH_DISPLAY("Could not set sub exposure time.",
-                  "qTabAdvanced::SetSubExposureTime")
+    } CATCH_DISPLAY ("Could not set sub exposure time.",
+                                "qTabAdvanced::SetSubExposureTime")
 
     GetSubExposureTime();
 }
 
 void qTabAdvanced::GetSubDeadTime() {
-    LOG(logDEBUG) << "Getting sub dead time";
+    FILE_LOG(logDEBUG) << "Getting sub dead time";
     disconnect(spinSubDeadTime, SIGNAL(valueChanged(double)), this,
                SLOT(SetSubDeadTime()));
     disconnect(comboSubDeadTimeUnit, SIGNAL(currentIndexChanged(int)), this,
                SLOT(SetSubDeadTime()));
     try {
-        auto retval = det->getSubDeadTime().tsquash(
-            "Sub dead time is inconsistent for all detectors.");
+        auto retval = det->getSubDeadTime().tsquash("Sub dead time is inconsistent for all detectors.");
         auto time = qDefs::getUserFriendlyTime(retval);
         spinSubDeadTime->setValue(time.first);
-        comboSubDeadTimeUnit->setCurrentIndex(static_cast<int>(time.second));
-    }
-    CATCH_DISPLAY("Could not get sub dead time.",
-                  "qTabSettings::GetSubDeadTime")
+        comboSubDeadTimeUnit->setCurrentIndex(
+            static_cast<int>(time.second));
+    } CATCH_DISPLAY ("Could not get sub dead time.",
+                                "qTabSettings::GetSubDeadTime")
     connect(spinSubDeadTime, SIGNAL(valueChanged(double)), this,
             SLOT(SetSubDeadTime()));
     connect(comboSubDeadTimeUnit, SIGNAL(currentIndexChanged(int)), this,
@@ -657,25 +608,22 @@ void qTabAdvanced::GetSubDeadTime() {
 }
 
 void qTabAdvanced::SetSubDeadTime() {
-    auto timeNS = qDefs::getNSTime(std::make_pair(
-        spinSubDeadTime->value(),
-        static_cast<qDefs::timeUnit>(comboSubDeadTimeUnit->currentIndex())));
+    auto timeNS = qDefs::getNSTime(std::make_pair(spinSubDeadTime->value(), static_cast<qDefs::timeUnit>(comboSubDeadTimeUnit->currentIndex())));
 
-    LOG(logINFO)
+    FILE_LOG(logINFO)
         << "Setting sub frame dead time to " << timeNS.count() << " ns"
         << "/" << spinSubDeadTime->value()
         << qDefs::getUnitString(
                (qDefs::timeUnit)comboSubDeadTimeUnit->currentIndex());
     try {
         det->setSubDeadTime(timeNS);
-    }
-    CATCH_DISPLAY("Could not set sub dead time.",
-                  "qTabAdvanced::SetSubDeadTime")
+    } CATCH_DISPLAY ("Could not set sub dead time.",
+                                "qTabAdvanced::SetSubDeadTime")
     GetSubDeadTime();
 }
 
 void qTabAdvanced::Refresh() {
-    LOG(logDEBUG) << "**Updating Advanced Tab";
+    FILE_LOG(logDEBUG) << "**Updating Advanced Tab";
 
     // trimming
     if (tab_trimming->isEnabled()) {
@@ -701,5 +649,5 @@ void qTabAdvanced::Refresh() {
         GetSubDeadTime();
     }
 
-    LOG(logDEBUG) << "**Updated Advanced Tab";
+    FILE_LOG(logDEBUG) << "**Updated Advanced Tab";
 }