some changes to receiver defs

slsReceiverSoftware/include/genericSocket.h

@@ -60,7 +60,6 @@ class sockaddr_in;
 #include <ifaddrs.h>
 
 #endif
-
 #include <stdlib.h>  /******exit */
 
 #include <unistd.h>
@@ -71,6 +70,8 @@ class sockaddr_in;
 #include <errno.h>
 #include <stdio.h>
 
+
+
 using namespace std;
 
 #define DEFAULT_PACKET_SIZE 1286
@@ -279,7 +280,11 @@ typedef struct
        if (socketDescriptor >= 0){		\
 	 close(socketDescriptor);		\
        }					\
-       file_des=-1;				\
+       if(is_a_server and getProtocol() == TCP){\
+    	   if(file_des>0)\
+    		   close(file_des);\
+       }
+	   file_des=-1;				\
        serverAddress.sin_port=-1;	\
      };
      
@@ -383,6 +388,7 @@ typedef struct
 #ifdef VERY_VERBOSE
     			 cout << "client connected "<< file_des << endl;
 #endif
+
     		 }
 
     	 }
@@ -399,7 +405,6 @@ typedef struct
     		 cerr << "Can not create socket "<<endl;
     		 file_des = socketDescriptor;
     	 } else {
-
     		 if(connect(socketDescriptor,(struct sockaddr *) &serverAddress,sizeof(serverAddress))<0){
     			 cerr << "Can not connect to socket "<<endl;
     			 file_des = -1;
@@ -420,6 +425,16 @@ typedef struct
 
      int getsocketDescriptor(){return socketDescriptor;};
 
+
+     void exitServer(){
+    	 if(is_a_server){
+    		  if (socketDescriptor>=0){
+    		    close(socketDescriptor);
+    		    socketDescriptor = -1;
+    		  }
+    	 }
+     }
+
      /** @short free connection */
      void Disconnect(){
     	 if (protocol==UDP){
@@ -442,7 +457,8 @@ typedef struct
 
 
      void ShutDownSocket(){
-   		 while(!shutdown(socketDescriptor, SHUT_RDWR));
+    	 while(!shutdown(socketDescriptor, SHUT_RDWR));
+    	 Disconnect();
      };
 
 
@@ -518,6 +534,9 @@ typedef struct
        }
        mac[sizeof(mac)-1]='\0';
        
+       if(sock!=1){
+    	   close(sock);
+       }
        return string(mac);
        
      };
@@ -539,6 +558,9 @@ typedef struct
        strncpy(addr,p,sizeof(addr)-1);
        addr[sizeof(addr)-1]='\0';
        
+       if(sock!=1){
+    	   close(sock);
+       }
        return string(addr);
        
      };

slsReceiverSoftware/include/gitInfoReceiver.h

@@ -1,11 +1,11 @@
 //#define SVNPATH ""
-#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git"
+#define SVNURL "maliakal_d@gitorious.psi.ch:sls_det_software/sls_receiver_software.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "e019a6ce7d96d4ac9cb5762b7137245aedb4d5b8"
-//#define SVNREV 0x22
+#define SVNREPUUID "750a0a06945a748a18d0b8b19b7cf94ecf2fec23"
+//#define SVNREV 0x112
 //#define SVNKIND ""
 //#define SVNSCHED ""
-#define SVNAUTH "Anna_Bergamaschi"
-#define SVNREV 0x22
-#define SVNDATE 0x20141015
+#define SVNAUTH "Dhanya_Maliakal"
+#define SVNREV 0x112
+#define SVNDATE 0x20150626
 //

slsReceiverSoftware/include/receiver_defs.h

@@ -51,6 +51,26 @@
 
 
 
+
+#define PROPIX_PIXELS_IN_ROW				22
+#define PROPIX_PIXELS_IN_COL				22
+#define PROPIX_DATABYTES_PER_PIXEL			2
+
+#define PROPIX_FIFO_SIZE					25000 //cannot be less than max jobs per thread = 1000
+#define PROPIX_PACKETS_PER_FRAME			2
+#define PROPIX_ONE_PACKET_SIZE				1286
+#define PROPIX_BUFFER_SIZE 					(PROPIX_ONE_PACKET_SIZE*PROPIX_PACKETS_PER_FRAME) 	//1286*2
+//#define PROPIX_DATA_BYTES 					(1280*PROPIX_PACKETS_PER_FRAME) 	//1280*2
+#define PROPIX_DATA_BYTES	 				(PROPIX_PIXELS_IN_ROW * PROPIX_PIXELS_IN_COL * PROPIX_DATABYTES_PER_PIXEL) //22 * 22 * 2
+
+#define PROPIX_FRAME_INDEX_MASK				0xFFFFFFFE
+#define PROPIX_FRAME_INDEX_OFFSET			1
+#define PROPIX_PACKET_INDEX_MASK			0x1
+
+
+
+
+
 #define MOENCH_FIFO_SIZE					2500 //cannot be less than max jobs per thread = 1000
 /*#define MOENCH_ALIGNED_FRAME_SIZE			65536*/
 #define MOENCH_PACKETS_PER_FRAME			40
@@ -68,8 +88,9 @@
 
 
 
-#define JCTB_FIFO_SIZE					2500 //cannot be less than max jobs per thread = 1000
+#define JCTB_FIFO_SIZE						2500 //cannot be less than max jobs per thread = 1000
 /*#define MOENCH_ALIGNED_FRAME_SIZE			65536*/
+<<<<<<< HEAD
 #define JCTB_PACKETS_PER_FRAME			        1
 #define JCTB_ONE_PACKET_SIZE				8224
 #define JCTB_BUFFER_SIZE 				(JCTB_ONE_PACKET_SIZE*40) 	
@@ -78,9 +99,19 @@
 #define JCTB_FRAME_INDEX_MASK			0xFFFFFFFF
 #define JCTB_FRAME_INDEX_OFFSET			6+8
 #define JCTB_PACKET_INDEX_MASK			0xFFFFFFFF
+=======
+#define JCTB_PACKETS_PER_FRAME			    50
+#define JCTB_ONE_PACKET_SIZE				8214
+#define JCTB_BUFFER_SIZE 					(MOENCH_ONE_PACKET_SIZE*MOENCH_PACKETS_PER_FRAME)
+#define JCTB_DATA_BYTES	 					(JCTB_BUFFER_PER_FRAME)
 
-#define JCTB_BYTES_PER_ADC		        (2)
-#define JCTB_PIXELS_IN_ONE_ROW			32
+#define JCTB_FRAME_INDEX_MASK				0xFFFFFF00
+#define JCTB_FRAME_INDEX_OFFSET				8
+#define JCTB_PACKET_INDEX_MASK				0xFF
+>>>>>>> 8bad1d33fcf4601752bb6722a9eca00aa2cd4ed2
+
+#define JCTB_BYTES_PER_ADC		        	(2)
+#define JCTB_PIXELS_IN_ONE_ROW				32
 #define JCTB_BYTES_IN_ONE_ROW		       (JCTB_PIXELS_IN_ONE_ROW*2)
 
 

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -170,6 +170,9 @@ private:
 	/** gotthard specific read frame */
 	int gotthard_read_frame();
 
+	/** propix specific read frame */
+	int propix_read_frame();
+
 	/** moench specific read frame */
 	int moench_read_frame();
 

slsReceiverSoftware/include/sls_receiver_defs.h

@@ -58,7 +58,8 @@ public:
 		AGIPD, /**< agipd */
 		MOENCH, /**< moench */
 		JUNGFRAU, /**< jungfrau */
-		JUNGFRAUCTB /**< jungfrauCTBversion */
+		JUNGFRAUCTB, /**< jungfrauCTBversion */
+		PROPIX /**< propix */
 	};