--- yoda/techmodel/Calib2_Ac2Reader.cpp	2005/02/08 12:36:25	2.7
+++ yoda/techmodel/Calib2_Ac2Reader.cpp	2006/05/30 19:10:03	6.2
@@ -1,19 +1,16 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
- * $Id: Calib2_Ac2Reader.cpp,v 2.6 2005/02/08 08:20:41 kusanagi Exp $
+ * $Id: Calib2_Ac2Reader.cpp,v 6.1 2006/05/30 19:10:01 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Implementation of the Calib2_Ac2Reader class.
  */
 
-#include <string>
 #include <log4cxx/logger.h>
-#include <fstream>
-#include "stdio.h"
 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 +33,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.6 2005/02/08 08:20:41 kusanagi Exp $\n";
+  return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 6.1 2006/05/30 19:10:01 kusanagi Exp $\n";
 }
 
 /**
@@ -53,33 +50,28 @@
  * Unpack the CalibAc event from an input file.
  */
 void Calib2_Ac2Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){
-  /*
+
     char   *subData = new char[dataLength];
-    struct calibstruct *output = {0};
+    struct calibstruct output = {0};
 
     InputFile->read(subData, sizeof(unsigned char)*dataLength);
 
-    for (int i = 0; i < dataLength; i++){
-        printf("input2 %i   %x \n", i, subData[i]);
-    }
-    
-    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;
-    */
+    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;
   }