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

gotthard:changed port

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@50 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2011-11-15 14:41:04 +00:00
parent 5d687a1dee
commit 9812021ef0
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/MySocketTCP/MySocketTCP.h
View File

@ -4,7 +4,6 @@
#define SEND_REC_MAX_SIZE 4096
#define DEFAULT_PORTNO 1952
#define DEFAULT_PORTNO_GOTTHARD 1955
using namespace std;

2
slsDetectorSoftware/gotthardDetectorServer/communication_funcs.h
View File

@ -2,7 +2,7 @@
#define COMMUNICATION_FUNCS_H
#define SEND_REC_MAX_SIZE 4096
#define DEFAULT_PORTNO 1955
#define DEFAULT_PORTNO 1952
#include <sys/types.h>
#include <sys/socket.h>

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -325,17 +325,9 @@ int slsDetector::initializeDetectorSize(detectorType type) {
/** sets onlineFlag to OFFLINE_FLAG */
thisDetector->onlineFlag=OFFLINE_FLAG;
/** set ports to defaults */
switch(type){
case GOTTHARD:
thisDetector->controlPort=DEFAULT_PORTNO_GOTTHARD;
thisDetector->stopPort=DEFAULT_PORTNO_GOTTHARD+1;
thisDetector->dataPort=DEFAULT_PORTNO_GOTTHARD+2;
break;
default:
thisDetector->controlPort=DEFAULT_PORTNO;
thisDetector->stopPort=DEFAULT_PORTNO+1;
thisDetector->dataPort=DEFAULT_PORTNO+2;
}
/** set thisDetector->myDetectorType to type and according to this set nChans, nChips, nDacs, nAdcs, nModMax, dynamicRange, nMod*/
thisDetector->myDetectorType=type;
switch(thisDetector->myDetectorType) {