From da2fd8369d3d32d1d148e88abb3068c41e0a77af Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 11 Jan 2013 07:55:02 +0000 Subject: [PATCH] not much change git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@421 951219d9-93cf-4727-9268-0efd64621fa3 --- .../multiSlsDetector/multiSlsDetector.cpp | 2 +- slsDetectorSoftware/slsDetector/slsDetector.cpp | 2 +- slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp | 9 ++++----- .../slsDetectorAnalysis/postProcessing.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index e501fdb97..8186ae21e 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1293,7 +1293,7 @@ int* multiSlsDetector::startAndReadAll(){ /** Thread for each detector?!?!?! */ #ifdef VERBOSE cout << "Start and read all " << endl; -#endif +#endif int* retval; diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index f2a959757..1c7f2df95 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3146,7 +3146,7 @@ int* slsDetector::getDataFromDetector(int *retval){ ; #ifdef VERBOSE std::cout<< "Detector successfully returned: " << mess << " " << n << std::endl; -#endif +#endif } if (r==NULL) { delete [] retval; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 025ac358c..30d8293a2 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -310,9 +310,10 @@ void slsDetectorUtils::acquire(int delflag){ usleep(100000); } - if (getDetectorsType()==GOTTHARD) + if (getDetectorsType()==GOTTHARD){ if((*correctionMask)&(1<0) { /** Pop data queue */ -#ifdef VERBOSE +//#ifdef VERBOSE cout << "data found"<< endl; -#endif +//#endif myData=dataQueueFront(); // get the data from the queue -#ifdef VERBOSE +//#ifdef VERBOSE cout << "got them"<< endl; -#endif +//#endif if (myData) { processFrame(myData,delflag);