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

minor changes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@41 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2011-11-03 14:00:41 +00:00
parent cb0677c3ea
commit 93af09b71e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/MySocketTCP/MySocketTCP.cxx
View File

@ -225,12 +225,14 @@ int MySocketTCP::SendDataOnly(void* buf,int length){//length in characters
cout << "want to send "<< length << " Bytes" << endl; cout << "want to send "<< length << " Bytes" << endl;
#endif #endif
int nsending;
int nsent;
if (file_des<0) return -1; if (file_des<0) return -1;
int total_sent=0; int total_sent=0;
while(length>0){ while(length>0){
int nsending = (length>send_rec_max_size) ? send_rec_max_size:length; nsending = (length>send_rec_max_size) ? send_rec_max_size:length;
int nsent = write(file_des,(char*)buf+total_sent,nsending); nsent = write(file_des,(char*)buf+total_sent,nsending);
if(!nsent) break; if(!nsent) break;
length-=nsent; length-=nsent;
total_sent+=nsent; total_sent+=nsent;
@ -268,13 +270,14 @@ int MySocketTCP::ReceiveDataOnly(void* buf,int length){//length in characters
#ifdef VERY_VERBOSE #ifdef VERY_VERBOSE
cout << "want to receive "<< length << " Bytes" << endl; cout << "want to receive "<< length << " Bytes" << endl;
#endif #endif
int nreceiving;
int nreceived;
while(length>0){ while(length>0){
int nreceiving = (length>send_rec_max_size) ? send_rec_max_size:length; nreceiving = (length>send_rec_max_size) ? send_rec_max_size:length;
#ifdef VERY_VERBOSE #ifdef VERY_VERBOSE
cout << "start to receive "<< nreceiving << " Bytes" << endl; cout << "start to receive "<< nreceiving << " Bytes" << endl;
#endif #endif
int nreceived = read(file_des,(char*)buf+total_received,nreceiving); nreceived = read(file_des,(char*)buf+total_received,nreceiving);
#ifdef VERY_VERBOSE #ifdef VERY_VERBOSE
cout << "received "<< nreceived << " Bytes on fd " << file_des << endl; cout << "received "<< nreceived << " Bytes on fd " << file_des << endl;
#endif #endif

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -141,7 +141,7 @@ int multiSlsDetector::setTCPSocket(int i, string const name, int const control_p
char* multiSlsDetector::getHostname(int i) { char* multiSlsDetector::getHostname(int i) {
if (i<0) if (i<0)
return FAIL; return NULL;
if (detectors[i]) if (detectors[i])
return detectors[i]->getHostname(); return detectors[i]->getHostname();
else else
@ -175,9 +175,6 @@ int multiSlsDetector::getControlPort(int i) {
int multiSlsDetector::getDataPort(int i) { int multiSlsDetector::getDataPort(int i) {
int imin=0, imax=nDetectors; int imin=0, imax=nDetectors;
int ret=-1, err=0; int ret=-1, err=0;
if (i>=0) { if (i>=0) {

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -172,9 +172,9 @@ class multiSlsDetector : public slsDetector {
/* I/O */ /* I/O */
/** returns the detector trimbit directory \sa sharedSlsDetector */ /** returns the detector trimbit directory \sa sharedSlsDetector */
char* getTrimDir(int i=-1); char* getSettingsDir(int i=-1);
/** sets the detector trimbit directory \sa sharedSlsDetector */ /** sets the detector trimbit directory \sa sharedSlsDetector */
char* setTrimDir(string s, int i=-1); char* setSettingsDir(string s, int i=-1);
/** returns the number of trim energies and their value \sa sharedSlsDetector /** returns the number of trim energies and their value \sa sharedSlsDetector
\param point to the array that will contain the trim energies (in ev) \param point to the array that will contain the trim energies (in ev)
\returns number of trim energies \returns number of trim energies