- Added a multiple histogram memory control module. This required a

tiny change in the countable interface which in turn required updating
  of header file includes in a lot of files.
- Some small fixes to TRICS writing as well.

sinqhm/SinqHM_def.h

@@ -23,7 +23,7 @@
 #define	MAX_CLIENTS	8	/* The maximum number of active clients   */
 #define MAX_TOF_CNTR	1024	/* The maximum number of individual counters ..
 				** which can be handled in TOF mode */
-#define MAX_PSD_CNTR    65536   /* maximum number of PSD elements */
+#define MAX_PSD_CNTR    1048576 /* maximum number of PSD elements */
 #define MAX_TOF_NBINS	32768	/* The maximum number of bins in a TOF histog */
 #define MAX_TOF_EDGE	16	/* The maximum number of TOF edge arrays */
 #define VMIO_BASE_ADDR	0x1900	/* VME address of a (possible) VMIO10 module */

sinqhm/SinqHM_srv_filler.c

@@ -168,6 +168,7 @@
 	taskDelay (0);	/* If FIFO is empty, we can take a breather! */
       }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_HM_NC_C1) {
 	VmioBase[VMIO_PORT_A] = 0xff;   /* Set timer level (if present) */
+	 
 	
 	for (i=0; i<1000000; i++) {
 	  lwl_data.ui4 = *Lwl_fifo;		/* Get the 16 bits of data */
@@ -176,7 +177,7 @@
           }
 	  taskDelay (0); 			/* But wait if FIFO is slow! */
 	}
-	
+	 
 	if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
 	  printf ("Time-out getting histogram data word! Event # = %d\n",
 		    N_events);
@@ -255,7 +256,6 @@
 				*/
       }else {					/* Anything else gets flushed */
 	lwl_Packet_Read (lwl_hdr.ui4, my_buff);
-
       }
 
 /*      if (FillTimer_expired) { */
@@ -809,8 +809,8 @@
           if(yPos >= 32767)
              yPos -= 65536;
 
-          xPos = (xPos + psdXOffset)/psdXFactor;
-          yPos = (yPos + psdYOffset)/psdYFactor;
+          xPos = xPos/psdXFactor + psdXOffset;
+          yPos = yPos/psdYFactor + psdYOffset;
           if(xPos < 0 || xPos > psdXSize)
 	  {
 	    printf("X position out of range: %d, alllowed 0 - %d\n",