From a2ae2eea95347d3d03009bb7ed409ebe06e5946d Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 15 Jan 2013 18:05:56 +0000
Subject: [PATCH] changed receiver config to be rx_tcpport and not dataport,
 also -f

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@428 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsDetector/slsDetector.cpp       | 3 ++-
 slsDetectorSoftware/slsReceiver/slsReceiver.cpp       | 2 +-
 slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 8daf5a725..618e78a3f 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -4629,7 +4629,8 @@ int slsDetector::setUDPConnection(){
 	strcpy(args[0],thisDetector->receiverUDPIP);
 	sprintf(args[1],"%d",thisDetector->receiverUDPPort);
 #ifdef VERBOSE
-	std::cout << "Receiver ip address: " << thisDetector->receiverUDPIP << std::endl;
+	std::cout << "Receiver udp ip address: " << thisDetector->receiverUDPIP << std::endl;
+	std::cout << "Receiver udp port: " << thisDetector->receiverUDPPort << std::endl;
 #endif
 
 	//set up receiver for UDP Connection and get receivermac address
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver.cpp b/slsDetectorSoftware/slsReceiver/slsReceiver.cpp
index 6e3601f1a..0339c7671 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiver.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiver.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 
 	//parse command line for config
 	for(int iarg=1;iarg<argc;iarg++){
-		if(!strcasecmp(argv[iarg],"-config")){
+		if((!strcasecmp(argv[iarg],"-config"))||(!strcasecmp(argv[iarg],"-f"))){
 			if(iarg+1==argc){
 				cout << "no config file name given. Exiting." << endl;
 				return -1;
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
index 5b6d5b3e9..b99fd0110 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
@@ -60,10 +60,11 @@ slsReceiverFuncs::slsReceiverFuncs(MySocketTCP *&mySocket,string const fname,int
 						 sstr >> sargname;
 
 					 //value
-					 if(sargname=="dataport"){
+					 if(sargname=="rx_tcpport"){
 						 if(sstr.good()) {
 							 sstr >> sargname;
 							 sscanf(sargname.c_str(),"%d",&port_no);
+							 cout<<"dataport:"<<port_no<<endl;
 						 }
 					 }
 				 }
@@ -73,9 +74,9 @@ slsReceiverFuncs::slsReceiverFuncs(MySocketTCP *&mySocket,string const fname,int
 			cout << "Error opening configuration file " << fname << endl;
 			success = FAIL;
 		}
-//#ifdef VERBOSE
+#ifdef VERBOSE
 		cout << "Read configuration file of " << iline << " lines" << endl;
-//#endif
+#endif
 
 	}