--- yoda/techmodel/Calib2_Ac2Reader.cpp	2004/12/21 16:50:45	2.3
+++ yoda/techmodel/Calib2_Ac2Reader.cpp	2005/05/28 10:44:10	4.4
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
- * $Id: Calib2_Ac2Reader.cpp,v 2.2 2004/12/20 14:15:13 kusanagi Exp $
+ * $Id: Calib2_Ac2Reader.cpp,v 4.0 2005/03/06 04:33:02 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.2 2004/12/20 14:15:13 kusanagi Exp $\n";
+  return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 4.0 2005/03/06 04:33:02 kusanagi Exp $\n";
 }
 
 /**
@@ -53,29 +53,28 @@
  * 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[2] = {0};
-  int ERROR;
 
+    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);
-    for(int i = 0; i<2; i++){
-        memcpy(calib2_Ac2->header[i],     output[i].header,     sizeof(output[i].header));
-        memcpy(calib2_Ac2->status[i],     output[i].status,     sizeof(output[i].status));
-        memcpy(calib2_Ac2->temp[i],       output[i].temp,       sizeof(output[i].temp));
-        memcpy(calib2_Ac2->DAC1[i],       output[i].DAC1,       sizeof(output[i].DAC1));
-        memcpy(calib2_Ac2->DAC2[i],       output[i].DAC2,       sizeof(output[i].DAC2));
-        memcpy(calib2_Ac2->regist[i],     output[i].regist,     sizeof(output[i].regist));
-        memcpy(calib2_Ac2->time[i],       output[i].time,       sizeof(output[i].time));
-        calib2_Ac2->n_tr[i] = output[i].n_tr;
-        memcpy(calib2_Ac2->hitmap_tr[i],  output[i].hitmap_tr,  sizeof(output[i].hitmap_tr));
-        memcpy(calib2_Ac2->curve1[i],     output[i].curve1,     sizeof(output[i].curve1));
-        memcpy(calib2_Ac2->curve2[i],     output[i].curve2,     sizeof(output[i].curve2));
-        calib2_Ac2->iCRC[i] = output[i].iCRC;
-        calib2_Ac2->tail[i] = output[i].tail;
-        calib2_Ac2->CRC[i]  = output[i].CRC;
-    }
 
+    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));
+    memcpy(calib2_Ac2->DAC1,       output.DAC1,       sizeof(output.DAC1));
+    memcpy(calib2_Ac2->DAC2,       output.DAC2,       sizeof(output.DAC2));
+    memcpy(calib2_Ac2->regist,     output.regist,     sizeof(output.regist));
+    memcpy(calib2_Ac2->time,       output.time,       sizeof(output.time));
+    calib2_Ac2->n_tr = output.n_tr;
+    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->CRCcheck    = output.CRCcheck;
+  
     //delete [] subData;
   }