--- yoda/techmodel/Calib2_Ac2Reader.cpp	2004/12/16 17:32:57	2.1
+++ yoda/techmodel/Calib2_Ac2Reader.cpp	2006/09/29 10:19:18	6.3
@@ -1,19 +1,16 @@
 /** @file
- * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
- * $Id: CalibAcReader.cpp,v 2.2 2004/12/03 22:08:00 kusanagi Exp $
+ * $Source: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
+ * $Id: Calib2_Ac2Reader.cpp,v 6.2 2006/05/30 19:10:03 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.2 2004/12/03 22:08:00 kusanagi Exp $\n";
+  return "$Header: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/Calib2_Ac2Reader.cpp,v 6.2 2006/05/30 19:10:03 kusanagi Exp $\n";
 }
 
 /**
@@ -53,11 +50,11 @@
  * 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;
-  int ERROR;
 
-/*
+    char   *subData = new char[dataLength];
+    memset(subData,  0, dataLength*sizeof(char));
+    struct calibstruct output = {0};
+
     InputFile->read(subData, sizeof(unsigned char)*dataLength);
 
     calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, &output);
@@ -72,10 +69,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;
   }