Merge branch 'developer' into dev/virtual_stop_server_start

python/slsdet/detector.py

@@ -1043,7 +1043,7 @@ def fpath(self):
         
         Note
         ----
-        If path does not exist, it will try to create it.
+        If path does not exist and fwrite enabled, it will try to create it at start of acquisition.
         
         Example
         --------
@@ -1059,7 +1059,7 @@ def fpath(self, path):
     @property
     @element
     def fwrite(self):
-        """Enable or disable receiver file write. Default is enabled. """
+        """Enable or disable receiver file write. Default is disabled. """
         return self.getFileWrite()
 
     @fwrite.setter

slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp

@@ -175,13 +175,12 @@ int main(int argc, char *argv[]) {
 
     int cf = 0;
     int numberOfPackets=nrows/8;
-
 #ifdef RECT
     cout << "Should be rectangular but now it will crash! No data structure defined!" << endl;
 #endif
 
 #ifndef MOENCH04
-    moench03v2Data *decoder = new moench03v2Data(100);
+    moench03v2Data *decoder = new moench03v2Data(nrows/2);
     cout << "MOENCH03!" << endl;
 #endif
 
@@ -299,6 +298,7 @@ int main(int argc, char *argv[]) {
     double *ped=new double[nx * ny];//, *ped1;
     int pos,pos1;
     //return  0;
+
     if (pedfile.find(".raw") != std::string::npos) {
       pos1=pedfile.rfind("/");
       strcpy(froot,pedfile.substr(pos1).c_str());
@@ -336,9 +336,8 @@ int main(int argc, char *argv[]) {
                 }
                 filebin.close();
                 while (mt->isBusy()) {
-		  ;
-
-                }
+		          ;
+		          }
 
 		sprintf(imgfname, "%s/%s_ped.tiff", outdir.c_str(),froot);
 		mt->writePedestal(imgfname);
@@ -463,7 +462,6 @@ int main(int argc, char *argv[]) {
                     }
 	      } else {
 		cout << "bp " << ifr << " " << ff << " " << np << endl;
-		//break;
 	      }
                 ff = -1;
             }

slsDetectorSoftware/generator/commands.yaml

@@ -556,7 +556,7 @@ settingspath:
       arg_types: [ special::path ]
 
 fpath:
-  help: "[path]\n\tDirectory where output data files are written in receiver. Default is '/'. \n\tIf path does not exist, it will try to create it."
+  help: "[path]\n\tDirectory where output data files are written in receiver. Default is '/'. \n\tIf path does not exist and fwrite enabled, it will try to create it at start of acquisition."
   inherit_actions: STRING_COMMAND
   actions:
     GET:
@@ -985,7 +985,7 @@ findex:
       input_types: [ uint64_t ]
 
 fwrite:
-  help: "[0, 1]\n\tEnable or disable receiver file write. Default is 1."
+  help: "[0, 1]\n\tEnable or disable receiver file write. Default is 0."
   inherit_actions: INTEGER_COMMAND_VEC_ID
   actions:
     GET:

slsDetectorSoftware/generator/extended_commands.yaml

@@ -3908,7 +3908,8 @@ fpath:
   command_name: fpath
   function_alias: fpath
   help: "[path]\n\tDirectory where output data files are written in receiver. Default\
-    \ is '/'. \n\tIf path does not exist, it will try to create it."
+    \ is '/'. \n\tIf path does not exist and fwrite enabled, it will try to create\
+    \ it at start of acquisition."
   infer_action: true
   template: true
 framecounter:
@@ -4101,7 +4102,7 @@ fwrite:
         store_result_in_t: false
   command_name: fwrite
   function_alias: fwrite
-  help: "[0, 1]\n\tEnable or disable receiver file write. Default is 1."
+  help: "[0, 1]\n\tEnable or disable receiver file write. Default is 0."
   infer_action: true
   template: true
 gaincaps:

slsDetectorSoftware/include/sls/Detector.h

@@ -1004,7 +1004,8 @@ class Detector {
 
     Result<std::string> getFilePath(Positions pos = {}) const;
 
-    /** Default is "/"If path does not exist, it will try to create it */
+    /** Default is "/". If path does not exist and fwrite enabled, it will try
+     * to create it at start of acquisition. */
     void setFilePath(const std::string &fpath, Positions pos = {});
 
     Result<std::string> getFileNamePrefix(Positions pos = {}) const;
@@ -1025,7 +1026,7 @@ class Detector {
 
     Result<bool> getFileWrite(Positions pos = {}) const;
 
-    /** default enabled */
+    /** default disabled */
     void setFileWrite(bool value, Positions pos = {});
 
     bool getMasterFileWrite() const;

slsDetectorSoftware/src/Caller.cpp

@@ -5115,7 +5115,7 @@ std::string Caller::fpath(int action) {
         os << "Command: fpath" << std::endl;
         os << R"V0G0N([path]
 	Directory where output data files are written in receiver. Default is '/'. 
-	If path does not exist, it will try to create it. )V0G0N"
+	If path does not exist and fwrite enabled, it will try to create it at start of acquisition. )V0G0N"
            << std::endl;
         return os.str();
     }
@@ -5372,7 +5372,7 @@ std::string Caller::fwrite(int action) {
     if (action == slsDetectorDefs::HELP_ACTION) {
         os << "Command: fwrite" << std::endl;
         os << R"V0G0N([0, 1]
-	Enable or disable receiver file write. Default is 1. )V0G0N"
+	Enable or disable receiver file write. Default is 0. )V0G0N"
            << std::endl;
         return os.str();
     }

slsReceiverSoftware/src/Implementation.cpp

@@ -530,10 +530,7 @@ void Implementation::setFileFormat(const fileFormat f) {
 std::string Implementation::getFilePath() const { return filePath; }
 
 void Implementation::setFilePath(const std::string &c) {
-    if (!c.empty()) {
-        mkdir_p(c); // throws if it can't create
-        filePath = c;
-    }
+    filePath = c;
     LOG(logINFO) << "File path: " << filePath;
 }
 
@@ -901,6 +898,9 @@ void Implementation::CreateUDPSockets() {
 
 void Implementation::SetupWriter() {
     try {
+        // check if folder exists and throw if it cant create
+        mkdir_p(filePath);
+        // create first files
         for (unsigned int i = 0; i < dataProcessor.size(); ++i) {
             std::ostringstream os;
             os << filePath << "/" << fileName << "_d"

slsSupportLib/include/sls/ZmqSocket.h

@@ -109,6 +109,7 @@ class ZmqSocket {
     /**
      * Constructor for a server
      * Creates socket, context and connects to server
+     * socket option: keep alive added 
      * @param portnumber port number
      * @param ethip is the ip of the ethernet interface to stream zmq from
      */

slsSupportLib/src/ZmqSocket.cpp

@@ -76,6 +76,32 @@ ZmqSocket::ZmqSocket(const uint16_t portnumber, const char *ethip)
     sockfd.serverAddress = oss.str();
     LOG(logDEBUG) << "zmq address: " << sockfd.serverAddress;
 
+    // Socket Options for keepalive
+    // enable TCP keepalive
+    int keepalive = 1;
+    if (zmq_setsockopt(sockfd.socketDescriptor, ZMQ_TCP_KEEPALIVE, &keepalive, sizeof(keepalive))) {
+        PrintError();
+        throw ZmqSocketError("Could set socket opt ZMQ_TCP_KEEPALIVE");
+    }
+    // set the number of keepalives before death
+    keepalive = 10;
+    if (zmq_setsockopt(sockfd.socketDescriptor, ZMQ_TCP_KEEPALIVE_CNT, &keepalive, sizeof(keepalive))) {
+        PrintError();
+        throw ZmqSocketError("Could set socket opt ZMQ_TCP_KEEPALIVE_CNT");
+    }
+    // set the time before the first keepalive
+    keepalive = 60;
+    if (zmq_setsockopt(sockfd.socketDescriptor, ZMQ_TCP_KEEPALIVE_IDLE, &keepalive, sizeof(keepalive))) {
+        PrintError();
+        throw ZmqSocketError("Could set socket opt ZMQ_TCP_KEEPALIVE_IDLE");
+    }
+    // set the interval between keepalives
+    keepalive = 1;
+    if (zmq_setsockopt(sockfd.socketDescriptor, ZMQ_TCP_KEEPALIVE_INTVL, &keepalive, sizeof(keepalive))) {
+        PrintError();
+        throw ZmqSocketError("Could set socket opt ZMQ_TCP_KEEPALIVE_INTVL");
+    }
+
     // bind address
     if (zmq_bind(sockfd.socketDescriptor, sockfd.serverAddress.c_str())) {
         PrintError();