--- yoda/techmodel/forroutines/anticounter/AC.c	2004/12/03 22:08:07	2.2
+++ yoda/techmodel/forroutines/anticounter/AC.c	2004/12/21 16:51:17	2.5
@@ -1,10 +1,11 @@
-/*******************************v1.0********************************
+/*******************************v1.1********************************
 
 Functions to read AC physics data (ACphysics) and AC calibration
 data (ACcalib).
 Author: Petter Hofverberg, petter@particle.kth.se
 
 0410 v1.0 alive
+0412 v1.1 fixed problem with found, and changed headers
 
 Errors: (returned to the main program as the variable "err")
 err=
@@ -18,7 +19,7 @@
 #include <stdio.h>
 #include "AC.h"
 
-int i,found,j;
+int i,j,found;
 unsigned short buffer[1000];
 unsigned short tmp1,tmp2;
 unsigned char err;
@@ -29,14 +30,56 @@
 struct calibstruct calibdata[2];
 struct calibstruct *calibpointer;
 
+//Fill physicsdata from buffer
+void fillphys(int k,unsigned short *buff)
+{
+  for(i=0;i<2;i++) physicsdata[k].header[i]=buff[i];
+  physicsdata[k].status=buff[2];
+  physicsdata[k].hitmap=buff[3];
+  for(i=0;i<6;i++) physicsdata[k].regist[i]=buff[4+i];
+  for(i=0;i<16;i++) physicsdata[k].shift[i]=buff[10+i];
+  for(i=0;i<16;i++) physicsdata[k].counters[i]=buff[26+i];
+  for(i=0;i<8;i++) physicsdata[k].coinc[i]=buff[42+i];
+  physicsdata[k].trigg=buff[50];
+  for(i=0;i<2;i++) physicsdata[k].clock[i]=buff[51+i];
+  for(i=0;i<2;i++) physicsdata[k].temp[i]=buff[53+i];
+  for(i=0;i<8;i++) physicsdata[k].DAC[i]=buff[55+i];
+  physicsdata[k].CRC=buff[63];
 
+}
+
+//Fill calibdata from buffer
+void fillcalib(int k,unsigned short *buff)
+{
+  for(i=0;i<2;i++) calibdata[k].header[i]=buff[i];
+  for(i=0;i<5;i++) calibdata[k].status[i]=buff[2+i];
+  for(i=0;i<8;i++) calibdata[k].temp[i]=buff[7+i];
+  for(i=0;i<8;i++) calibdata[k].DAC1[i]=buff[15+i];
+  for(i=0;i<8;i++) calibdata[k].DAC2[i]=buff[23+i];
+  for(i=0;i<6;i++) calibdata[k].regist[i]=buff[31+i];
+  for(i=0;i<8;i++) calibdata[k].time[i]=buff[37+i];
+  calibdata[k].n_tr=buff[45];
+  for(i=0;i<16;i++) calibdata[k].hitmap_tr[i]=buff[46+i];
+  for(i=0;i<4096;i++) calibdata[k].curve1[i]=buff[62+i];
+  for(i=0;i<4096;i++) calibdata[k].curve2[i]=buff[4158+i];
+  calibdata[k].iCRC=buff[8254];
+  calibdata[k].tail=buff[8255];
+  calibdata[k].CRC=buff[8256];
+  printf("tail:CRC > %hx:%hx\n",buff[8255],buff[8256]);
+}
 
 unsigned char ACphysics(int length,unsigned char* datapointer,struct physicsstruct* physicspointer)
 {
 
- int iter=2;
-  physicspointer[0]=physicsdata[0];
-  physicspointer[1]=physicsdata[1];
+  err=0;
+  found=0;
+  int iter=2;
+  for(i=0;i<1000;i++)
+    buffer[i]=0;
+  fillphys(0,&buffer[0]);
+  fillphys(1,&buffer[0]);
+
+  
 
   //look for top header ACAC, then unpack data to main card buffer or extra card buffer depending on the subheader
   //AC11 for main, AC22 for extra
@@ -45,9 +88,8 @@
       tmp1 = ((*datapointer) << 8) | *(datapointer+1);
       tmp2 = ((*(datapointer+2)) << 8) | *(datapointer+3);
 
-      if(tmp1 == 0xAC11 && ((tmp2 == 0xAC11 && (err&0xF0)==0x0) || (tmp2 == 0xAC22 && (err&0x0F)==0x0)))
+      if(tmp1 == 0xACAC && ((tmp2 == 0xAC11 && (err&0xF0)==0x0) || (tmp2 == 0xAC22 && (err&0x0F)==0x0)))
 	{ 
-	 
 	  for(i=0;i<64;i++)
 	    {
 	      buffer[i]=((*datapointer) << 8) | *(datapointer+1);
@@ -69,7 +111,8 @@
 	datapointer++;
 	iter=iter+1;}
     }
-
+  physicspointer[0]=physicsdata[0];
+  physicspointer[1]=physicsdata[1];
   return err;
 
 }
@@ -78,11 +121,16 @@
 unsigned char ACcalib(int length, unsigned char* datapointer, struct calibstruct* calibpointer)
 {
 
+  err=0;
+  found=0;
   int iter=2;
-	    
+  for(i=0;i<1000;i++)
+    buffer[i]=0;
+  fillcalib(0,&buffer[0]);
+  fillcalib(1,&buffer[0]);
+
   //point struct-pointer to calibdata
-  calibpointer[0]=calibdata[0];  //card1
-  calibpointer[1]=calibdata[1];  //card2
+  
 
   //look for the top header 0xACCA, then the subheaders 0xAC11 and 0xAC22, and unpack the data
   //to each card depending on these.
@@ -91,9 +139,9 @@
       tmp1 = ((*datapointer) << 8) | *(datapointer+1);
       tmp2 = ((*(datapointer+2)) << 8) | *(datapointer+3);
 
-      if(tmp1 == 0xACCA && ((tmp2 == 0xAC11 && (err&0xF0)==0x0) || (tmp2 == 0xAC22 && (err&0x0F)==0x0)))
+      if(tmp1 == 0xACCA && ((tmp2 == 0xAC11 && (err&0xF0)==0x0) || (tmp2 == 0xACA2 && (err&0x0F)==0x0)))
 	{
-	  for(i=0;i<8256;i++)
+	  for(i=0;i<8258;i++)
 	    {
 	      buffer[i]=((*datapointer) << 8) | *(datapointer+1);
 	      datapointer=datapointer+2;
@@ -114,43 +162,8 @@
 	datapointer++;
 	iter=iter+1;}
     }
-
+  calibpointer[0]=calibdata[0];  //card1
+  calibpointer[1]=calibdata[1];  //card2
   return err;
 }
 
-//Fill physicsdata from buffer
-void fillphys(int k,unsigned short *buff)
-{
-  for(i=0;i<2;i++) physicsdata[k].header[i]=buff[i];
-  physicsdata[k].status=buff[2];
-  physicsdata[k].hitmap=buff[3];
-  for(i=0;i<6;i++) physicsdata[k].regist[i]=buff[4+i];
-  for(i=0;i<16;i++) physicsdata[k].shift[i]=buff[10+i];
-  for(i=0;i<16;i++) physicsdata[k].counters[i]=buff[26+i];
-  for(i=0;i<8;i++) physicsdata[k].coinc[i]=buff[42+i];
-  physicsdata[k].trigg=buff[50];
-  for(i=0;i<2;i++) physicsdata[k].clock[i]=buff[51+i];
-  for(i=0;i<2;i++) physicsdata[k].temp[i]=buff[53+i];
-  for(i=0;i<8;i++) physicsdata[k].DAC[i]=buff[55+i];
-  physicsdata[k].CRC=buff[63];
-
-}
-
-//Fill calibdata from buffer
-void fillcalib(int k,unsigned short *buff)
-{
-  calibdata[k].header=buff[0];
-  for(i=0;i<5;i++) calibdata[k].status[i]=buff[1+i];
-  for(i=0;i<8;i++) calibdata[k].temp[i]=buff[6+i];
-  for(i=0;i<8;i++) calibdata[k].DAC1[i]=buff[14+i];
-  for(i=0;i<8;i++) calibdata[k].DAC2[i]=buff[22+i];
-  for(i=0;i<6;i++) calibdata[k].regist[i]=buff[30+i];
-  for(i=0;i<8;i++) calibdata[k].time[i]=buff[36+i];
-  calibdata[k].n_tr=buff[44];
-  for(i=0;i<16;i++) calibdata[k].hitmap_tr[i]=buff[45+i];
-  for(i=0;i<4096;i++) calibdata[k].curve1[i]=buff[61+i];
-  for(i=0;i<4096;i++) calibdata[k].curve2[i]=buff[4157+i];
-  calibdata[k].iCRC=buff[8253];
-  calibdata[k].tail=buff[8254];
-  calibdata[k].CRC=buff[8255];
-}