From 9812021ef0a681e5f8382d945a62e902ad89fbdb Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 15 Nov 2011 14:41:04 +0000 Subject: [PATCH] gotthard:changed port git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@50 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/MySocketTCP/MySocketTCP.h | 1 - .../gotthardDetectorServer/communication_funcs.h | 2 +- slsDetectorSoftware/slsDetector/slsDetector.cpp | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/slsDetectorSoftware/MySocketTCP/MySocketTCP.h b/slsDetectorSoftware/MySocketTCP/MySocketTCP.h index 8e411b31c..0f16d6856 100644 --- a/slsDetectorSoftware/MySocketTCP/MySocketTCP.h +++ b/slsDetectorSoftware/MySocketTCP/MySocketTCP.h @@ -4,7 +4,6 @@ #define SEND_REC_MAX_SIZE 4096 #define DEFAULT_PORTNO 1952 -#define DEFAULT_PORTNO_GOTTHARD 1955 using namespace std; diff --git a/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.h index a1dee9b73..9f4faaadf 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.h +++ b/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.h @@ -2,7 +2,7 @@ #define COMMUNICATION_FUNCS_H #define SEND_REC_MAX_SIZE 4096 -#define DEFAULT_PORTNO 1955 +#define DEFAULT_PORTNO 1952 #include #include diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 4d1c34a11..dc401f537 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -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) {