--- yoda/techmodel/Calib2_Ac2Reader.cpp	2005/01/03 14:20:09	2.4
+++ yoda/techmodel/Calib2_Ac2Reader.cpp	2005/03/04 15:54:11	3.0
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
- * $Id: Calib2_Ac2Reader.cpp,v 2.3 2004/12/21 16:50:45 kusanagi Exp $
+ * $Id: Calib2_Ac2Reader.cpp,v 2.8 2005/02/09 22:20:16 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Implementation of the Calib2_Ac2Reader class.
@@ -13,7 +13,7 @@
 extern "C" {
     #include "CRC.h"
     #include "forroutines/anticounter/AC.h"
-    extern int ACcalib(int length, unsigned char* calibpointer, struct calibstruct* calibpointer);
+    extern int ACcalib(int length, unsigned char* calibpointer, struct calibstruct *calibpointer);
 }
 
 #include "ReaderAlgorithms.h"
@@ -36,7 +36,7 @@
  * Get a string with the version info of the algorithm.
  */
 std::string Calib2_Ac2Reader::GetVersionInfo(void) const {
-  return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 2.3 2004/12/21 16:50:45 kusanagi Exp $\n";
+  return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 2.8 2005/02/09 22:20:16 kusanagi Exp $\n";
 }
 
 /**
@@ -53,12 +53,13 @@
  * Unpack the CalibAc event from an input file.
  */
 void Calib2_Ac2Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){
-    char   subData[dataLength];
-    struct calibstruct *output = {0};
+
+    char   *subData = new char[dataLength];
+    struct calibstruct output = {0};
 
     InputFile->read(subData, sizeof(unsigned char)*dataLength);
-/*
-    calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, output);
+
+    calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, &output);
     memcpy(calib2_Ac2->header,     output.header,     sizeof(output.header));
     memcpy(calib2_Ac2->status,     output.status,     sizeof(output.status));
     memcpy(calib2_Ac2->temp,       output.temp,       sizeof(output.temp));
@@ -70,9 +71,10 @@
     memcpy(calib2_Ac2->hitmap_tr,  output.hitmap_tr,  sizeof(output.hitmap_tr));
     memcpy(calib2_Ac2->curve1,     output.curve1,     sizeof(output.curve1));
     memcpy(calib2_Ac2->curve2,     output.curve2,     sizeof(output.curve2));
-    calib2_Ac2->iCRC = output.iCRC;
-    calib2_Ac2->tail = output.tail;
-    calib2_Ac2->CRC  = output.CRC;
-*/
+    calib2_Ac2->iCRC        = output.iCRC;
+    calib2_Ac2->tail        = output.tail;
+    calib2_Ac2->CRC         = output.CRC;
+    calib2_Ac2->CRCcheck    = output.CRCcheck;
+  
     //delete [] subData;
   }