--- yoda/techmodel/forroutines/anticounter/ACcalib.c	2004/07/08 12:48:23	1.1
+++ yoda/techmodel/forroutines/anticounter/ACcalib.c	2004/07/17 20:03:42	1.2
@@ -2,14 +2,25 @@
 #include "ACcalib.h"
 
 
-int ACcalib(unsigned short* datapointer, struct datastruct* calibpointer)
-{
+int ACcalib(int length, unsigned short* datapointer, struct datastruct* calibpointer){
+
+struct datastruct calibdata;
+
+//pointer to struct
+struct datastruct *calibpointer;
+
+int fd,i,j,err,found;
+unsigned short buffer[10000];
+unsigned short tmp1,tmp2;
+
+ 
+  int iter=2;
 
   //point struc-pointer to calibdata
   *calibpointer=calibdata;  
 
   //look for header 0xACCA
-  while(found==0)
+  while(found==0 && iter<length)
     {
       tmp1=*datapointer;
       tmp2=*(datapointer+1);
@@ -23,7 +34,7 @@
 	    }
 	  tmp1=0x0000;
 	}
-      if((tmp1&0x00FF) + (tmp2&0xFF00)==0xACCA)
+      else if((tmp1&0x00FF) + (tmp2&0xFF00)==0xACCA)
 	{
 	  found=1;
 	  for(i=0;i<8256;i++)
@@ -34,12 +45,16 @@
 	      tmp2=*(datapointer+1);
 	    }
 	}
+      else{
       datapointer++;
+      iter=iter+2;}
 
     }
 
-  //check tail. CHANGE!
-  if(buffer[8253]==0xAC22)
+  //check errors
+  if(iter>=length)
+    err=2;
+  else if(buffer[8254]==0x22AC)
     err=0;
   else
     err=1;
@@ -58,7 +73,7 @@
   calibdata.iCRC=buffer[8253];
   calibdata.tail=buffer[8254];
   calibdata.CRC=buffer[8255];
-
+  
   /*
   //debug
   printf("header: %hx\n",calibdata.header);
@@ -79,4 +94,3 @@
 
   return err;
 }
-