--- yoda/techmodel/Calib2_Ac2Reader.cpp	2005/01/29 00:26:55	2.5
+++ yoda/techmodel/Calib2_Ac2Reader.cpp	2005/08/29 09:46:13	5.0
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
- * $Id: Calib2_Ac2Reader.cpp,v 2.4 2005/01/03 14:20:09 kusanagi Exp $
+ * $Id: Calib2_Ac2Reader.cpp,v 4.4 2005/05/28 10:44:10 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.4 2005/01/03 14:20:09 kusanagi Exp $\n";
+  return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 4.4 2005/05/28 10:44:10 kusanagi Exp $\n";
 }
 
 /**
@@ -53,20 +53,28 @@
  * Unpack the CalibAc event from an input file.
  */
 void Calib2_Ac2Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){
-  /*
-    char   subData[dataLength];
+
+    char   *subData = new char[dataLength];
+    struct calibstruct output = {0};
+
     InputFile->read(subData, sizeof(unsigned char)*dataLength);
-  
-    struct calibstruct output;
-    
-    calib1_Ac2->ERROR       = ACcalib(dataLength, (unsigned char*)subData, &output);
-    calib1_Ac2->ResetDSP    = output.ResetDSP;
-    calib1_Ac2->DSPinit     = output.DSPinit;
-    calib1_Ac2->DSPprog     = output.DSPprog;
-    calib1_Ac2->ModeCalib   = output.ModeCalib;
-    calib1_Ac2->SetDAC      = output.SetDAC;
-    calib1_Ac2->ModePhysics = output.ModePhysics;
-    */
+
+    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;
   }