after merging with developer

slsDetectorSoftware/commonFiles/sls_detector_defs.h

@@ -146,19 +146,6 @@ typedef struct {
 } sls_detector_module;
 
 
-/**
-    @short structure for a region of interest
-
-    xmin,xmax,ymin,ymax define the limits of the region
-*/
-typedef struct {
-  int xmin;  /**< is the roi xmin (in channel number) */
-  int xmax;  /**< is the roi xmax  (in channel number)*/
-  int ymin;  /**< is the roi ymin  (in channel number)*/
-  int ymax;   /**< is the roi ymax  (in channel number)*/
-} ROI ;
-
-
 /* /\*  */
 /*     @short structure for a generic integer array */
 /* *\/ */

slsDetectorSoftware/commonFiles/sls_detector_exceptions.h

@@ -1,25 +0,0 @@
-#pragma once
-/************************************************
- * @file sls_detector_exceptions.h
- * @short exceptions defined
- ***********************************************/
-/**
- *@short exceptions defined
- */
-
-#include <iostream>
-#include <exception>
-using namespace std;
-
-
-struct SharedMemoryException : public exception {
-public:
-    SharedMemoryException() {}
-    string GetMessage() const { return "Shared Memory Failed";};
-};
-
-struct ThreadpoolException : public exception {
-public:
-	ThreadpoolException() {}
-    string GetMessage() const { return "Threadpool Failed";};
-};

slsDetectorSoftware/commonFiles/sls_detector_funcs.h

@@ -121,6 +121,8 @@ enum detFuncs{
   F_STORAGE_CELL_START,     /** < storage cell start */
 
   F_CHECK_VERSION,			/** < check version compatibility */
+
+  F_SOFTWARE_TRIGGER,		/** < software trigger */
   /* Always append functions hereafter!!! */
 
   /* Always append functions before!!! */

slsDetectorSoftware/commonFiles/versionAPI.h

@@ -1,5 +1,6 @@
 /** API versions */
-#define APIRECEIVER 0x180517
-#define APIEIGER 0x180528
-#define APIJUNGFRAU 0x180628
-#define APIGOTTHARD 0x180529
+#define APIRECEIVER 0x180927
+#define APIEIGER 0x180820
+#define APIJUNGFRAU 0x180925
+#define APIGOTTHARD 0x180928
+