From b1a13a601da7804a1068adea075fa42b5c0f2f42 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Thu, 30 Jan 2014 17:50:12 +0000
Subject: [PATCH] changed makefile back from epics, got rid of unnecessary
 print outs

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@728 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/Makefile                                | 6 +++---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp   | 6 +++---
 slsDetectorSoftware/slsDetector/slsDetector.cpp             | 2 +-
 slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h      | 4 ++--
 slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile
index 4ff13a524..dd8c7df1b 100644
--- a/slsDetectorSoftware/Makefile
+++ b/slsDetectorSoftware/Makefile
@@ -1,13 +1,13 @@
-CFLAGS= -DC_ONLY -fPIC
+CFLAGS= -g -DC_ONLY -fPIC
 #FLAGS+=  #-DVERBOSE -DVERYVERBOSE
 
-DFLAGS= -DDACS_INT -DTHIS_PATH='"$(shell pwd)"' -DSLS_RECEIVER_FUNCTION_LIST #$(shell root-config --cflags --glibs) -DMYROOT1  #-DMYROOT1 `root-config --cflags --glibs`
+DFLAGS= -g -DDACS_INT -DTHIS_PATH='"$(shell pwd)"' -DSLS_RECEIVER_FUNCTION_LIST $(shell root-config --cflags --glibs) -DMYROOT1  #-DMYROOT1 `root-config --cflags --glibs`
 
 #ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
 
 INCLUDES?= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -IslsReceiver -I../slsDetectorCalibration -I$(ASM)
 
-EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH)  -lca -lCom 
+#EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH)  -lca -lCom 
 
 CC=g++
 
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 753d0a3d7..5a632e2a8 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -353,7 +353,7 @@ void multiSlsDetector::updateOffsets(){
 	  int offsetX=0,offsetY=0,numX,numY;
 	  int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X];
 	  int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y];
-
+	  cout << "Updating detector offsets" << endl;
 		thisMultiDetector->numberOfChannel[X] = 0;
 		thisMultiDetector->maxNumberOfChannel[X] = 0;
 		thisMultiDetector->numberOfChannel[Y] = 0;
@@ -364,7 +364,7 @@ void multiSlsDetector::updateOffsets(){
 	    	thisMultiDetector->offsetX[i] = offsetX;
 	    	thisMultiDetector->offsetY[i] = offsetY;
 
-	    	cout << "Detector pos: " << i << " offset X:" << offsetX << " offset Y:" << offsetY << endl;
+	    	cout << "Detector at position: " << i << " at offset X:" << offsetX << "  and offset Y:" << offsetY << endl;
 
 	    	numX = detectors[i]->getMaxNumberOfChannels(X);
 	    	numY = detectors[i]->getMaxNumberOfChannels(Y);
@@ -1946,7 +1946,7 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 
 
 #ifdef VERBOSE
-	cout<<"Getting ROI :"<<endl;
+	cout<<"ROI :"<<endl;
 		for(int j=0;j<n;j++){
 			cout<<roiLimits[j].xmin<<"\t"<<roiLimits[j].xmax<<"\t"<<roiLimits[j].ymin<<"\t"<<roiLimits[j].ymax<<endl;
 		}
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index fb87499d1..dc404a0ed 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -3200,7 +3200,7 @@ slsDetectorDefs::runStatus slsDetector::getRunStatus(){
     if (stopSocket) {
       if  (stopSocket->Connect()>=0) {
 	stopSocket->SendDataOnly(&fnum,sizeof(fnum));
-	cout << stopSocket->ReceiveDataOnly(&ret,sizeof(ret)) ;
+	stopSocket->ReceiveDataOnly(&ret,sizeof(ret));
 
 	//	cout << "________:::____________" << ret << endl;
 	
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h b/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h
index 9bc8d7267..61ced8e9b 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h
+++ b/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h
@@ -128,7 +128,7 @@ class fileIOStatic  {
 		  index=i;																			\
 	  	  s=fname.substr(0,uscore);															\
 	  }																						\
-	  else      cout << "******************************** cannot parse file index" << endl; \
+	  /*else      cout << "******************************** cannot parse file index" << endl; \*/
 	  uscore=s.rfind("_");																	\
 	  if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)) 					\
 		  if(i==-1)return 0;																\
@@ -161,7 +161,7 @@ class fileIOStatic  {
       index=i;								\
       s=fname.substr(0,uscore);						\
     }									\
-    else      cout << "******************************** cannot parse file index" << endl; \
+    /*else      cout << "******************************** cannot parse file index" << endl; \*/
     uscore=s.rfind("_");						\
     if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i))   \
       s=fname.substr(0,uscore);			\
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
index 1b7c118b5..b5d32a709 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
@@ -1228,7 +1228,7 @@ int slsReceiverFunctionList::startWriting(){
 					if(dataCompression){
 						cout<<"Waiting for jobs to be done.. current mask:"<< hex << writerthreads_mask <<endl;
 						while(writerthreads_mask){
-							cout << "." << flush;
+							/*cout << "." << flush;*/
 							usleep(50000);
 						}
 						cout<<" Jobs Done!"<<endl;