From 02a36a148f6a0113c7658befae9a96308f8ffa57 Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Thu, 7 Nov 2019 13:28:03 +0100
Subject: [PATCH] fixed process make file

---
 slsDetectorCalibration/analogDetector.h       |  4 ++--
 .../moench03ClusterFinder.cpp                 | 19 ++++++++++---------
 slsDetectorCalibration/single_photon_hit.h    |  4 ++--
 .../slsDetectorClient/CMakeLists.txt          |  1 -
 .../slsDetectorClient/sls_detector_client.cpp | 12 ++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/slsDetectorCalibration/analogDetector.h b/slsDetectorCalibration/analogDetector.h
index d8b0e141f..800bfed5c 100644
--- a/slsDetectorCalibration/analogDetector.h
+++ b/slsDetectorCalibration/analogDetector.h
@@ -675,7 +675,7 @@ template <class dataType> class analogDetector {
       delete [] gm;
       return 1;
     }
-    return NULL;
+    return 0;
   }
   
  /**
@@ -700,7 +700,7 @@ template <class dataType> class analogDetector {
       delete [] gm;
       return 1;
     }
-    return NULL;
+    return 0;
   }
   
    
diff --git a/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp b/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp
index e05f9d38b..57b73e0d5 100644
--- a/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp
+++ b/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp
@@ -59,7 +59,7 @@ int main(int argc, char *argv[]) {
   int csize=3;
   int nx=400, ny=400;
   int save=1;
-  int nsigma=5;
+  int nsigma=1;
   int nped=1000;
   int ndark=100;
   int ok;
@@ -201,14 +201,15 @@ int main(int argc, char *argv[]) {
 	//       cout <<  ifr << " " << ff << " " << ix << " " << iy << " " << decoder->getChannel(buff, ix, iy) << endl ;
 	//     }
 	//   }
-
-  	mt->pushData(buff);
-  // 	//         //pop
-  	mt->nextThread();
-  // // 		//	cout << " " << (void*)buff;
-  	mt->popFree(buff);
-	ifr++;
-	if (ifr%10000==0) cout << ifr << " " << ff << endl;
+	if (np==40) {
+	  mt->pushData(buff);
+	  // 	//         //pop
+	  mt->nextThread();
+	  // // 		//	cout << " " << (void*)buff;
+	  mt->popFree(buff);
+	  ifr++;
+	  if (ifr%10000==0) cout << ifr << " " << ff << endl;
+	}
 	ff=-1;
       }
         cout << "--" << endl;
diff --git a/slsDetectorCalibration/single_photon_hit.h b/slsDetectorCalibration/single_photon_hit.h
index 5c4c130e9..1a1a5e868 100644
--- a/slsDetectorCalibration/single_photon_hit.h
+++ b/slsDetectorCalibration/single_photon_hit.h
@@ -212,7 +212,7 @@ class single_photon_hit {
   void print() {
 
    // int ix, iy;
-    
+    printf("*** %d %d %d\n",iframe, x, y);
     for (int iy=0; iy<dy; iy++) {
       for (int ix=0; ix<dx; ix++) {
 	printf("%d \t",data[ix+iy*dx]);
@@ -220,7 +220,7 @@ class single_photon_hit {
       }
     printf("\n");
     }
-
+    printf("***\n");
   }
 
 
diff --git a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt
index f642b092b..222c86639 100644
--- a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt
+++ b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt
@@ -65,7 +65,6 @@ target_link_libraries(sls_detector_process
 )
 set_target_properties(sls_detector_process PROPERTIES 
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-    COMPILE_DEFINITIONS READOUT=1 
     COMPILE_DEFINITIONS PROCESS=1
 )
 
diff --git a/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp b/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
index ca13c68ba..aa8f2b5cd 100644
--- a/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
+++ b/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
@@ -19,27 +19,27 @@ int main(int argc, char *argv[])
 			return 0;
 		}
 	}
-
+	int action=slsDetectorDefs::HELP_ACTION;
 #ifdef PUT
-  int action=slsDetectorDefs::PUT_ACTION;
+  action=slsDetectorDefs::PUT_ACTION;
 #endif
     
 #ifdef GET
-  int action=slsDetectorDefs::GET_ACTION;
+  action=slsDetectorDefs::GET_ACTION;
 #endif
     
 
 #ifdef READOUT
-  int action=slsDetectorDefs::READOUT_ACTION;
+  action=slsDetectorDefs::READOUT_ACTION;
 #endif
   
 #ifdef PROCESS
-  int action=slsDetectorDefs::PROCESS_ACTION;
+ action=slsDetectorDefs::PROCESS_ACTION;
 #endif
     
 
 #ifdef HELP
-  int action=slsDetectorDefs::HELP_ACTION;
+ action=slsDetectorDefs::HELP_ACTION;
 #endif
 
   multiSlsDetectorClient *cl;