detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 11:13:44 +01:00
Code Issues Actions Packages Releases Activity

sorted receiver client interface, more consistent

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-07-03 13:31:17 +02:00
parent f8c04a6a51
commit b03e35a8d6
6 changed files with 384 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 670a57a1231e27ccdc01bcede88e3ae053b2a3f1
Revision: 598
Repsitory UUID: 55bce97b990e627682fc8dc7b38ed883fe155fde
Revision: 599
Branch: developer
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 603
Last Changed Date: 2017-06-30 12:19:27 +0200
Last Changed Rev: 604
Last Changed Date: 2017-06-30 18:17:33 +0200

13
slsReceiverSoftware/include/genericSocket.h
View File

@@ -586,7 +586,12 @@ enum communicationProtocol{
while(length>0){
nsending = (length>packet_size) ? packet_size:length;
nsent = read(file_des,(char*)buf+total_sent,nsending);
if(!nsent) break;
if(!nsent) {
if(!total_sent) {
return -1; //to handle it
}
break;
}
length-=nsent;
total_sent+=nsent;
}
@@ -668,6 +673,10 @@ enum communicationProtocol{
while(length>0){
nsending = (length>packet_size) ? packet_size:length;
nsent = write(file_des,(char*)buf+total_sent,nsending);
if(is_a_server && nsent < 0) {
cprintf(BG_RED, "Error writing to socket. Possible client socket crash\n");
break;
}
if(!nsent) break;
length-=nsent;
total_sent+=nsent;
@@ -691,8 +700,6 @@ enum communicationProtocol{
cout << "sent "<< total_sent << " Bytes" << endl;
#endif
return total_sent;
}

6
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "670a57a1231e27ccdc01bcede88e3ae053b2a3f1"
//#define SVNREV 0x603
#define SVNREPUUID "55bce97b990e627682fc8dc7b38ed883fe155fde"
//#define SVNREV 0x604
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x603
#define SVNREV 0x604
#define SVNDATE 0x20170630
//

3
slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
View File

@@ -294,9 +294,6 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
/** thread for TCP server */
pthread_t TCPServer_thread;
/** size of one frame*/
int tenGigaEnable;
/** port number */
int portNumber;

2
slsReceiverSoftware/src/UDPBaseImplementation.cpp
View File

@@ -278,7 +278,7 @@ void UDPBaseImplementation::setFilePath(const char c[]){
else
FILE_LOG(logWARNING) << "FilePath does not exist: " << filePath;
}
FILE_LOG(logDEBUG) << "Info: File path: " << filePath;
FILE_LOG(logINFO) << "Info: File path: " << filePath;
}
void UDPBaseImplementation::setFileIndex(const uint64_t i){

445
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@@ -34,7 +34,6 @@ slsReceiverTCPIPInterface::slsReceiverTCPIPInterface(int &success, UDPInterface*
fnum(-1),
lockStatus(0),
killTCPServerThread(0),
tenGigaEnable(0),
portNumber(DEFAULT_PORTNO+2),
mySock(NULL)
{
@@ -651,6 +650,22 @@ int slsReceiverTCPIPInterface::send_update() {
delete[] path;
}
// file path
// file name
// file index
// file format
// file write enable
// file overwrite enable
// activate
// fifo depth
// data stream enable
// receiver read frequency
// receiver read timer
if (!lockStatus)
strcpy(mySock->lastClientIP,mySock->thisClientIP);
@@ -692,8 +707,10 @@ int slsReceiverTCPIPInterface::set_detector_type(){
return printSocketReadError();
// execute action
if (dr == GET_DETECTOR_TYPE)
retval = myDetectorType;
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
else if (mySock->differentClients && lockStatus)
receiverlocked();
else if ((receiverBase) && (receiverBase->getStatus() != IDLE))
receiverNotIdle();
@@ -761,12 +778,13 @@ int slsReceiverTCPIPInterface::set_detector_hostname() {
return printSocketReadError();
// execute action
// only a set, not a get
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
receiverBase->initialize(hostname);
@@ -811,21 +829,21 @@ int slsReceiverTCPIPInterface::set_short_frame() {
functionNotImplemented();
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
// only a set, not a get
else {
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
receiverBase->setShortFrameEnable(index);
retval = receiverBase->getShortFrameEnable();
}
}
#endif
}
if (ret == OK && mySock->differentClients)
ret = FORCE_UPDATE;
@@ -854,12 +872,13 @@ int slsReceiverTCPIPInterface::setup_udp(){
return printSocketReadError();
// execute action
// only a set, not a get
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
//set up udp port
@@ -935,43 +954,63 @@ int slsReceiverTCPIPInterface::set_timer() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if (index[1] >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if (index[0] == ACQUISITION_TIME){
if (index[1]>=0){
switch (index[0]) {
case ACQUISITION_TIME:
ret = receiverBase->setAcquisitionTime(index[1]);
if (ret == FAIL) {
strcpy(mess,"Could not allocate memory for listening fifo\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
retval=receiverBase->getAcquisitionTime();
} else if(index[0] == FRAME_PERIOD){
if(index[1]>=0){
break;
case FRAME_PERIOD:
ret = receiverBase->setAcquisitionPeriod(index[1]);
if (ret == FAIL) {
strcpy(mess,"Could not allocate memory for listening fifo\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
retval=receiverBase->getAcquisitionPeriod();
} else {
if (index[1]>=0)
break;
case FRAME_NUMBER:
case CYCLES_NUMBER:
receiverBase->setNumberOfFrames(index[1]);
retval=receiverBase->getNumberOfFrames();
break;
default:
ret = FAIL;
sprintf(mess,"This timer mode (%lld) does not exist for receiver\n", (long long int)index[0]);
FILE_LOG(logERROR) << "Warning: " << mess;
}
if (index[1]>=0 && retval!=index[1]) {
}
}
// get
switch (index[0]) {
case ACQUISITION_TIME:
retval=receiverBase->getAcquisitionTime();
break;
case FRAME_PERIOD:
retval=receiverBase->getAcquisitionPeriod();
break;
case FRAME_NUMBER:
case CYCLES_NUMBER:
retval=receiverBase->getNumberOfFrames();
break;
}
// check
if (ret == OK && index[1] >= 0 && retval != index[1]) {
ret = FAIL;
strcpy(mess,"Could not set timer\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#endif
#ifdef VERYVERBOSE
if (index[0] == ACQUISITION_TIME)
FILE_LOG(logDEBUG1) << "acquisition time:" << retval;
@@ -979,7 +1018,6 @@ int slsReceiverTCPIPInterface::set_timer() {
FILE_LOG(logDEBUG1) << "acquisition period:" << retval
else
FILE_LOG(logDEBUG1) << "frame number:" << retval;
#endif
#endif
if (ret == OK && mySock->differentClients)
@@ -1008,36 +1046,47 @@ int slsReceiverTCPIPInterface::set_dynamic_range() {
return printSocketReadError();
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (dr > 0) {
switch(dr){
bool exists = false;
switch (dr) {
case -1:
case 16:
exists = true;
break;
case 4:
case 8:
case 16:
case 32:
if (myDetectorType == EIGER)
exists = true;
break;
default:
ret=FAIL;
sprintf(mess,"This dynamic range %d does not exist for this detector\n",dr);
FILE_LOG(logERROR) << "Warning: " << mess;
break;
}
if (!exists) {
ret = FAIL;
sprintf(mess,"This dynamic range %d does not exist for this detector\n",dr);
FILE_LOG(logERROR) << "Warning: " << mess;
}
if (ret!=FAIL){
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (ret == OK){
if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else {
// set
if (dr > 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(dr > 0){
ret = receiverBase->setDynamicRange(dr);
if(ret == FAIL) {
strcpy(mess, "Could not allocate memory for fifo or could not start listening/writing threads\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
}
//get
retval = receiverBase->getDynamicRange();
if(dr > 0 && retval != dr) {
ret = FAIL;
@@ -1046,9 +1095,7 @@ int slsReceiverTCPIPInterface::set_dynamic_range() {
}
}
}
#ifdef VERYVERBOSE
if(ret!=FAIL)
FILE_LOG(logDEBUG1) << "dynamic range" << dr;
#endif
#endif
@@ -1080,22 +1127,26 @@ int slsReceiverTCPIPInterface::set_read_frequency(){
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if (index >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(index >= 0 ){
ret = receiverBase->setFrameToGuiFrequency(index);
if(ret == FAIL){
if(ret == FAIL) {
strcpy(mess, "Could not allocate memory for listening fifo\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
}
//get
retval=receiverBase->getFrameToGuiFrequency();
if(index>=0 && retval!=index){
if(index >= 0 && retval != index){
ret = FAIL;
strcpy(mess,"Could not set frame to gui frequency");
FILE_LOG(logERROR) << "Warning: " << mess;
@@ -1147,8 +1198,11 @@ int slsReceiverTCPIPInterface::start_receiver(){
memset(mess, 0, sizeof(mess));
// execute action
// only a set, not a get
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
if (receiverBase == NULL)
invalidReceiverObject();
else if (mySock->differentClients && lockStatus)
receiverlocked();
/*
else if(!strlen(receiverBase->getFilePath())){
@@ -1156,17 +1210,19 @@ int slsReceiverTCPIPInterface::start_receiver(){
ret = FAIL;
}
*/
else if (receiverBase == NULL)
invalidReceiverObject();
else {
enum runStatus s = receiverBase->getStatus();
if (s == IDLE)
ret=receiverBase->startReceiver(mess);
else {
if (s != IDLE) {
ret=FAIL;
sprintf(mess,"Cannot start Receiver as it is in %s state\n",runStatusType(s).c_str());
FILE_LOG(logERROR) << "Warning: " << mess;
}
else {
ret=receiverBase->startReceiver(mess);
if (ret == FAIL) {
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
}
#endif
@@ -1192,15 +1248,15 @@ int slsReceiverTCPIPInterface::stop_receiver(){
enum runStatus s = ERROR;
// execute action
// only a set, not a get
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
if (receiverBase == NULL)
invalidReceiverObject();
else if (mySock->differentClients && lockStatus)
receiverlocked();
else {
if(receiverBase->getStatus()!= IDLE){
if(receiverBase->getStatus() != IDLE)
receiverBase->stopReceiver();
}
s = receiverBase->getStatus();
if (s == IDLE)
ret = OK;
@@ -1232,12 +1288,14 @@ int slsReceiverTCPIPInterface::start_readout(){
enum runStatus retval;
// execute action
// only a set, not a get
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
if (receiverBase == NULL)
invalidReceiverObject();
/*else if(receiverBase->getStatus()!= IDLE){
else if (mySock->differentClients && lockStatus)
receiverlocked();
/*else if(receiverBase->getStatus() != IDLE){
strcpy(mess,"Can not start receiver readout while receiver not idle\n");
ret = FAIL;
}*/
@@ -1306,14 +1364,20 @@ int slsReceiverTCPIPInterface::set_file_dir() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if (strlen(fPath)) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
receiverBase->setFilePath(fPath);
}
}
//get
retval = receiverBase->getFilePath();
if (retval == NULL || (strlen(fPath) && strcasecmp(fPath, retval))) {
ret = FAIL;
@@ -1321,10 +1385,9 @@ int slsReceiverTCPIPInterface::set_file_dir() {
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#ifdef VERYVERBOSE
if(ret!=FAIL)
FILE_LOG(logDEBUG1) << "file path:" << retval;
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "file path:" << retval;
#endif
if (ret == OK && mySock->differentClients)
@@ -1362,14 +1425,20 @@ int slsReceiverTCPIPInterface::set_file_name() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if (strlen(fName)) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else{
else {
receiverBase->setFileName(fName);
}
}
//get
retval = receiverBase->getFileName();
if(retval == NULL) {
ret = FAIL;
@@ -1377,10 +1446,9 @@ int slsReceiverTCPIPInterface::set_file_name() {
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#ifdef VERYVERBOSE
if(ret!=FAIL)
FILE_LOG(logDEBUG1) << "file name:" << retval;
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "file name:" << retval;
#endif
if (ret == OK && mySock->differentClients)
@@ -1415,26 +1483,30 @@ int slsReceiverTCPIPInterface::set_file_index() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(index >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else{
if(index >= 0)
else {
receiverBase->setFileIndex(index);
}
}
//get
retval=receiverBase->getFileIndex();
if(index>=0 && retval!=index) {
if(index >= 0 && retval != index) {
ret = FAIL;
strcpy(mess, "Could not set file index\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#ifdef VERYVERBOSE
if(ret!=FAIL)
FILE_LOG(logDEBUG1) << "file index:" << retval;
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "file index:" << retval;
#endif
if (ret == OK && mySock->differentClients)
@@ -1465,12 +1537,13 @@ int slsReceiverTCPIPInterface::set_frame_index() {
return printSocketReadError();
// execute action
// only a set, not a get
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else{
//client sets to 0, but for receiver it is just an enable
@@ -1564,12 +1637,13 @@ int slsReceiverTCPIPInterface::reset_frames_caught(){
memset(mess, 0, sizeof(mess));
// execute action
// only a set, not a get
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else
receiverBase->resetAcquisitionCount();
@@ -1601,23 +1675,31 @@ int slsReceiverTCPIPInterface::enable_file_write(){
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if (enable >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(enable >= 0)
receiverBase->setFileWriteEnable(enable);
}
}
//get
retval=receiverBase->getFileWriteEnable();
if(enable>=0 && enable!=retval) {
if(enable >= 0 && enable != retval) {
ret=FAIL;
strcpy(mess,"Could not set file write enable");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "file write enable:" << retval;
#endif
if (ret == OK && mySock->differentClients)
ret = FORCE_UPDATE;
@@ -1671,15 +1753,20 @@ int slsReceiverTCPIPInterface::enable_overwrite() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(index >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(index >= 0)
receiverBase->setOverwriteEnable(index);
}
}
//get
retval=receiverBase->getOverwriteEnable();
if(index >=0 && retval != index) {
ret = FAIL;
@@ -1687,9 +1774,9 @@ int slsReceiverTCPIPInterface::enable_overwrite() {
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "overwrite:" << retval;
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "file overwrite enable:" << retval;
#endif
if (ret == OK && mySock->differentClients)
@@ -1721,30 +1808,35 @@ int slsReceiverTCPIPInterface::enable_tengiga() {
functionNotImplemented();
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (ret == OK) {
else {
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if (val >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(val >= 0)
ret = receiverBase->setTenGigaEnable(val);
}
}
//get
retval=receiverBase->getTenGigaEnable();
if((val >= 0) && (val != retval)) {
ret = FAIL;
strcpy(mess,"Could not set ten giga enable");
FILE_LOG(logERROR) << "Warning: " << mess;
}
else
tenGigaEnable = retval;
}
}
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "10Gbe:" << val;
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "10Gbe:" << retval;
#endif
if (ret == OK && mySock->differentClients)
@@ -1778,13 +1870,13 @@ int slsReceiverTCPIPInterface::set_fifo_depth() {
if (receiverBase == NULL)
invalidReceiverObject();
else {
if(value >= 0){
// set
if(value >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(value >= 0){
ret = receiverBase->setFifoDepth(value);
if (ret == FAIL) {
strcpy(mess,"Could not set fifo depth");
@@ -1792,11 +1884,17 @@ int slsReceiverTCPIPInterface::set_fifo_depth() {
}
}
}
}
//get
retval = receiverBase->getFifoDepth();
if(value >= 0 && retval != value) {
ret = FAIL;
strcpy(mess, "Could not set fifo depth\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "fifo depth:" << retval;
#endif
if (ret == OK && mySock->differentClients)
@@ -1829,16 +1927,21 @@ int slsReceiverTCPIPInterface::set_activate() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (ret == OK) {
else {
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(enable >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(enable != -1)
receiverBase->setActivate(enable);
}
}
//get
retval = receiverBase->getActivate();
if(enable >= 0 && retval != enable){
ret = FAIL;
@@ -1879,15 +1982,20 @@ int slsReceiverTCPIPInterface::set_data_stream_enable(){
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(index >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(index >= 0 )
ret = receiverBase->setDataStreamEnable(index);
}
}
//get
retval = receiverBase->getDataStreamEnable();
if(index >= 0 && retval != index){
ret = FAIL;
@@ -1895,8 +2003,9 @@ int slsReceiverTCPIPInterface::set_data_stream_enable(){
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "data streaming enable:" << retval;
#endif
if (ret == OK && mySock->differentClients)
@@ -1926,23 +2035,31 @@ int slsReceiverTCPIPInterface::set_read_receiver_timer(){
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(index >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if(index >= 0 )
receiverBase->setFrameToGuiTimer(index);
}
}
//get
retval=receiverBase->getFrameToGuiTimer();
if(index>=0 && retval!=index){
if(index >= 0 && retval != index){
ret = FAIL;
strcpy(mess,"Could not set datastream timer");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "receiver read timer:" << retval;
#endif
if (ret == OK && mySock->differentClients)
ret = FORCE_UPDATE;
@@ -1974,16 +2091,21 @@ int slsReceiverTCPIPInterface::set_flipped_data(){
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (ret == OK) {
else {
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(args[1] >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if (args[1] > -1)
receiverBase->setFlippedData(args[0],args[1]);
}
}
//get
retval=receiverBase->getFlippedData(args[0]);
if (args[1] > -1 && retval != args[1]) {
ret = FAIL;
@@ -1992,9 +2114,9 @@ int slsReceiverTCPIPInterface::set_flipped_data(){
}
}
}
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "Flipped Data:" << retval;
#endif
#endif
if (ret == OK && mySock->differentClients)
@@ -2025,15 +2147,20 @@ int slsReceiverTCPIPInterface::set_file_format() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(f >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else{
if(f != -1)
else {
receiverBase->setFileFormat(f);
}
}
//get
retval = receiverBase->getFileFormat();
if(f >= 0 && retval != f){
ret = FAIL;
@@ -2073,15 +2200,20 @@ int slsReceiverTCPIPInterface::set_detector_posid() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if(arg >= 0) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if (arg >= 0)
receiverBase->setDetectorPositionId(arg);
}
}
//get
retval=receiverBase->getDetectorPositionId();
if (arg >= 0 && retval != arg) {
ret = FAIL;
@@ -2089,9 +2221,9 @@ int slsReceiverTCPIPInterface::set_detector_posid() {
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "Position Id:" << retval;
#endif
#endif
if (ret == OK && mySock->differentClients)
@@ -2124,16 +2256,20 @@ int slsReceiverTCPIPInterface::set_multi_detector_size() {
// execute action
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (receiverBase == NULL)
invalidReceiverObject();
else {
// set
if((arg[0] > 0) && (arg[1] > 0)) {
if (mySock->differentClients && lockStatus)
receiverlocked();
else if (receiverBase == NULL)
invalidReceiverObject();
else if (receiverBase->getStatus()!= IDLE)
else if (receiverBase->getStatus() != IDLE)
receiverNotIdle();
else {
if((arg[0] > 0) && (arg[1] > 0))
receiverBase->setMultiDetectorSize(arg);
{
}
}
//get
int* temp = receiverBase->getMultiDetectorSize();
for (int i = 0; i < MAX_DIMENSIONS; ++i) {
if (!i)
@@ -2142,10 +2278,9 @@ int slsReceiverTCPIPInterface::set_multi_detector_size() {
retval *= temp[i];
}
}
}
#endif
#ifdef VERYVERBOSE
FILE_LOG(logDEBUG1) << "Multi Detector Size:" << retval;
#endif
#endif
if (ret == OK && mySock->differentClients)