slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener

slsReceiverSoftware/include/DataProcessor.h

@@ -209,6 +209,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
     void SetSilentMode(bool mode);
 
 
+
  private:
 
 	/**
@@ -335,9 +336,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	/** temporary buffer for processing */
 	char* tempBuffer;
 
-	/** x coord hardcoded ad 1D, if detector does not send them yet **/
-	uint16_t xcoordin1D;
-
 	/** Activated/Deactivated */
 	bool* activated;
 
@@ -345,7 +343,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	bool* deactivatedPaddingEnable;
 
 
-
 	//acquisition start
 	/** Aquisition Started flag */
 	bool acquisitionStartedFlag;

slsReceiverSoftware/include/HDF5File.h

@@ -114,6 +114,9 @@ class HDF5File : private virtual slsReceiverDefs, public File, public HDF5FileSt
 	 */
 	void EndofAcquisition(bool anyPacketsCaught, uint64_t numf);
 
+
+ private:
+
 	/**
 	 * Create Virtual File
 	 * @param numf number of images caught
@@ -121,8 +124,12 @@ class HDF5File : private virtual slsReceiverDefs, public File, public HDF5FileSt
 	 */
 	int CreateVirtualFile(uint64_t numf);
 
-
- private:
+	/**
+	 * Link virtual file in master file
+	 * Only for Jungfrau at the moment for 1 module and 1 data file
+	 * @returns OK or FAIL
+	 */
+	int LinkVirtualFileinMasterFile();
 
 	/**
 	 * Get Type

slsReceiverSoftware/include/Listener.h

@@ -145,6 +145,15 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
      */
     int CreateDummySocketForUDPSocketBufferSize(uint32_t s);
 
+    /**
+     * Set xcoord and y coord
+     * xcoord is in 1d if detector has not send them yet in firmware,
+     * xcoord is in 2d for jungfrau and eiger (for missing packets/deactivated eiger)
+     * ycoord when used is in 2d
+     */
+    void SetHardCodedCoords(uint16_t x, uint16_t y);
+
+
 
  private:
 
@@ -244,6 +253,15 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	/** Deactivated padding enable */
 	bool* deactivatedPaddingEnable;
 
+	/** x coord hardcoded as 1D or 2d,
+	 * if detector does not send them yet or
+	 * missing packets/deactivated (eiger/jungfrau sends 2d pos) **/
+	uint16_t xcoord;
+
+	/** y coord hardcoded as 2D,
+	 * deactivated eiger/missing packets (eiger/jungfrau sends 2d pos) **/
+	uint16_t ycoord;
+
 
 	// acquisition start
 	/** Aquisition Started flag */