detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 11:30:43 +02:00
Code Issues Actions Packages Releases Activity

fixed connect receiver problem from previous version

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@495 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-03-15 11:02:57 +00:00
parent a7dbfa91ce
commit 922bc929c8
5 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x482 //#define SVNREV 0x491
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x482 #define SVNREV 0x491
#define SVNDATE 0x20130306 #define SVNDATE 0x20130313
// //

4
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x482 //#define SVNREV 0x484
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x482 #define SVNREV 0x484
#define SVNDATE 0x20130306 #define SVNDATE 0x20130306
// //

25
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1605,7 +1605,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
retval=(retval<<32) | SVNDATELIB; retval=(retval<<32) | SVNDATELIB;
} else if (mode==RECEIVER_VERSION) { } else if (mode==RECEIVER_VERSION) {
if (setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) { if (setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) {
ret=thisReceiver->getInt(fnum,retval); if (connectData() == OK)
ret=thisReceiver->getInt(fnum,retval);
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
ret=updateReceiver(); ret=updateReceiver();
} }
@ -4745,8 +4746,8 @@ int slsDetector::setUDPConnection(){
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Setting up UDP Connection for Receiver " << args[0] << "\t" << args[1] << std::endl; std::cout << "Setting up UDP Connection for Receiver " << args[0] << "\t" << args[1] << std::endl;
#endif #endif
if (connectData() == OK)
ret=thisReceiver->sendUDPDetails(fnum,retval,args); ret=thisReceiver->sendUDPDetails(fnum,retval,args);
if(ret!=FAIL){ if(ret!=FAIL){
strcpy(thisDetector->receiverUDPMAC,retval); strcpy(thisDetector->receiverUDPMAC,retval);
@ -4902,7 +4903,8 @@ int slsDetector::configureMAC(){
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Sending adc val to receiver " << retval << std::endl; std::cout << "Sending adc val to receiver " << retval << std::endl;
#endif #endif
ret=thisReceiver->sendInt(fnum,retval,retval); if (connectData() == OK)
ret=thisReceiver->sendInt(fnum,retval,retval);
if(ret==FAIL) if(ret==FAIL)
setErrorMask((getErrorMask())|(COULD_NOT_CONFIGURE_MAC)); setErrorMask((getErrorMask())|(COULD_NOT_CONFIGURE_MAC));
} }
@ -5699,7 +5701,8 @@ string slsDetector::setFilePath(string s) {
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Sending file path to receiver " << arg << std::endl; std::cout << "Sending file path to receiver " << arg << std::endl;
#endif #endif
ret=thisReceiver->sendString(fnum,retval,arg); if (connectData() == OK)
ret=thisReceiver->sendString(fnum,retval,arg);
if(ret!=FAIL) if(ret!=FAIL)
fileIO::setFilePath(string(retval)); fileIO::setFilePath(string(retval));
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
@ -5729,7 +5732,8 @@ string slsDetector::setFileName(string s) {
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Sending file name to receiver " << arg << std::endl; std::cout << "Sending file name to receiver " << arg << std::endl;
#endif #endif
ret=thisReceiver->sendString(fnum,retval,arg); if (connectData() == OK)
ret=thisReceiver->sendString(fnum,retval,arg);
if(ret!=FAIL){ if(ret!=FAIL){
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Complete file prefix from receiver: " << retval << std::endl; std::cout << "Complete file prefix from receiver: " << retval << std::endl;
@ -5763,7 +5767,8 @@ int slsDetector::setFileIndex(int i) {
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Sending file index to receiver " << arg << std::endl; std::cout << "Sending file index to receiver " << arg << std::endl;
#endif #endif
ret=thisReceiver->sendInt(fnum,retval,arg); if (connectData() == OK)
ret=thisReceiver->sendInt(fnum,retval,arg);
if(ret!=FAIL) if(ret!=FAIL)
fileIO::setFileIndex(retval); fileIO::setFileIndex(retval);
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
@ -5784,7 +5789,8 @@ int slsDetector::startReceiver(){
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Starting Receiver " << std::endl; std::cout << "Starting Receiver " << std::endl;
#endif #endif
ret=thisReceiver->executeFunction(fnum); if (connectData() == OK)
ret=thisReceiver->executeFunction(fnum);
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
ret=updateReceiver(); ret=updateReceiver();
} }
@ -5807,7 +5813,8 @@ int slsDetector::stopReceiver(){
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Stopping Receiver " << std::endl; std::cout << "Stopping Receiver " << std::endl;
#endif #endif
ret=thisReceiver->executeFunction(fnum); if (connectData() == OK)
ret=thisReceiver->executeFunction(fnum);
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
ret=updateReceiver(); ret=updateReceiver();
} }

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x482 //#define SVNREV 0x494
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x482 #define SVNREVLIB 0x494
#define SVNDATELIB 0x20130306 #define SVNDATELIB 0x20130315
// //

6
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x482 //#define SVNREV 0x491
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x482 #define SVNREV 0x491
#define SVNDATE 0x20130306 #define SVNDATE 0x20130313
// //