filepath, filename and index set from slsdet or multislsdet, moving all receiver coding from slsdetectorcommand to slsdetector

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@312 951219d9-93cf-4727-9268-0efd64621fa3

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h

@@ -105,15 +105,12 @@ class multiSlsDetector  : public slsDetectorUtils {
     /** total number of frames to be acquired */   
     int totalProgress;	   
  
-
-
-    /** current index of the output file */   
+    /** current index of the output file */
     int fileIndex;
-    /** path of the output files */  
-    char filePath[MAX_STR_LENGTH];
-    /** name root of the output files */  
+    /** name root of the output files */
     char fileName[MAX_STR_LENGTH];
-    
+    /** path of the output files */
+    char filePath[MAX_STR_LENGTH];
 
     /** corrections  to be applied to the data \see ::correctionFlags */
     int correctionMask;
@@ -186,10 +183,6 @@ class multiSlsDetector  : public slsDetectorUtils {
     int scanPrecision[MAX_SCAN_LEVELS];
     
     
-    //receiver
-    /** online receiver flag - is set if the receiver is connected, unset if socket connection is not possible  */
-    int receiverOnlineFlag;
-
   };
 
 
@@ -1027,29 +1020,45 @@ class multiSlsDetector  : public slsDetectorUtils {
   */
   string checkReceiverOnline();
 
-  /**
-     Sets up the receiver file name
-     @param fileName file name
-     \returns file name
-  */
-  string setReceiverFileName(string fileName="");
 
   /**
-     Sets up the receiver file directory
-     @param fileName fileDir file directory
+     Sets up the file directory
+     @param s file directory
      \returns file dir
   */
-  string setReceiverFileDir(string fileDir="");
+  string setFilePath(string s="");
 
   /**
-     Sets up the receiver file index
-     @param fileIndex file index
+     Sets up the file name
+     @param s file name
+     \returns file name
+  */
+  string setFileName(string s="");
+
+  /**
+     Sets up the file index
+     @param i file index
      \returns file index
   */
-  int setReceiverFileIndex(int fileIndex=-1);
+  int setFileIndex(int i=-1);
+
+  /**
+     \returns file dir
+  */
+  string getFilePath(){return setFilePath();};
+
+  /**
+     \returns file name
+  */
+  string getFileName(){return setFileName();};
+
+  /**
+     \returns file index
+  */
+  int getFileIndex(){return setFileIndex();};
 
 
-  /**   Starts the listening mode of receiver
+ /**   Starts the listening mode of receiver
 	\returns OK or FAIL
   */
   int startReceiver();