detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 14:33:45 +02:00
Code Issues Actions Packages Releases Activity

changed receiver config to be rx_tcpport and not dataport, also -f

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@428 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-01-15 18:05:56 +00:00
parent f6a3254c2f
commit a2ae2eea95
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4629,7 +4629,8 @@ int slsDetector::setUDPConnection(){
strcpy(args[0],thisDetector->receiverUDPIP); strcpy(args[0],thisDetector->receiverUDPIP);
sprintf(args[1],"%d",thisDetector->receiverUDPPort); sprintf(args[1],"%d",thisDetector->receiverUDPPort);
#ifdef VERBOSE #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 #endif
//set up receiver for UDP Connection and get receivermac address //set up receiver for UDP Connection and get receivermac address

2
slsDetectorSoftware/slsReceiver/slsReceiver.cpp
View File

@ -30,7 +30,7 @@ int main(int argc, char *argv[])
//parse command line for config //parse command line for config
for(int iarg=1;iarg<argc;iarg++){ 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){ if(iarg+1==argc){
cout << "no config file name given. Exiting." << endl; cout << "no config file name given. Exiting." << endl;
return -1; return -1;

7
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -60,10 +60,11 @@ slsReceiverFuncs::slsReceiverFuncs(MySocketTCP *&mySocket,string const fname,int
sstr >> sargname; sstr >> sargname;
//value //value
if(sargname=="dataport"){ if(sargname=="rx_tcpport"){
if(sstr.good()) { if(sstr.good()) {
sstr >> sargname; sstr >> sargname;
sscanf(sargname.c_str(),"%d",&port_no); 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; cout << "Error opening configuration file " << fname << endl;
success = FAIL; success = FAIL;
} }
//#ifdef VERBOSE #ifdef VERBOSE
cout << "Read configuration file of " << iline << " lines" << endl; cout << "Read configuration file of " << iline << " lines" << endl;
//#endif #endif
} }