- Fixes to HM code for AMOR TOF

- A couple of TAS fixes
- o2t was fixed to work with any drivable
- FOCUS was mended to include beam monitor in data file

sinqhm/SinqHM_srv_filler.c

@@ -950,8 +950,10 @@
 	}
           /*
             We have a valid single detector packet. 
+	    Subtract one form the number because Urs Greuter starts 
+	    counting at 1, and ANSI-C at 0
 	  */
-	  edNum = edData.ui2[1];
+	  edNum = edData.ui2[1] - 1;
           if(edNum < 0 || edNum >= MAX_PSD_ED){
 	    printf("Got invalid detector number %d\n",edNum);
 	    continue;
@@ -999,7 +1001,13 @@
          /* 
 	    calculate histogram position to update 
 	 */
-         dataPos = (psdYSize*psdXSize + edNum)*Tof_edges[0]->n_bins  + middl;
+         dataPos = (psdYSize*psdXSize)*Tof_edges[0]->n_bins  
+	           + edNum*Tof_edges[0]->n_bins + middl - 1;
+
+	 if(Dbg_lev1){
+	   printf("dataPos = %d\n", dataPos);
+         }
+
 
          /* UD must come but the UD bit is not defined......
 	 if ((Hm_mode_UD != 0) &&
@@ -1358,3 +1366,6 @@
     exit (KER__SUCCESS);
   }
 /*======================================= End of SinqHM_srv_filler.c ========*/
+
+
+