--- yoda/techmodel/Calib1_Ac1Reader.cpp	2004/12/16 17:32:57	2.1
+++ yoda/techmodel/Calib1_Ac1Reader.cpp	2005/01/29 00:26:55	2.3
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/Calib1_Ac1Reader.cpp,v $
- * $Id: CalibAcReader.cpp,v 2.2 2004/12/03 22:08:00 kusanagi Exp $
+ * $Id: Calib1_Ac1Reader.cpp,v 2.2 2004/12/20 14:15:13 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Implementation of the Calib1_Ac1Reader class.
@@ -36,7 +36,7 @@
  * Get a string with the version info of the algorithm.
  */
 std::string Calib1_Ac1Reader::GetVersionInfo(void) const {
-  return "$Header: /home/cvsmanager/yoda/techmodel/Calib1_Ac1Reader.cpp,v 2.2 2004/12/03 22:08:00 kusanagi Exp $\n";
+  return "$Header: /home/cvsmanager/yoda/techmodel/Calib1_Ac1Reader.cpp,v 2.2 2004/12/20 14:15:13 kusanagi Exp $\n";
 }
 
 /**
@@ -53,21 +53,32 @@
  * Unpack the Calib1_Ac1Reader event from an input file.
  */
 void Calib1_Ac1Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){
-  /*char   subData[dataLength];
-  InputFile->read(subData, sizeof(unsigned char)*dataLength);
-  
-    struct calibstruct output;
-    int ERROR;
-
-    calib1_Ac1->ResetDSP    = output.ResetDSP;
-    calib1_Ac1->DSPinit     = output.DSPinit;
-    calib1_Ac1->DSPprog     = output.DSPprog;
-    calib1_Ac1->ModeCalib   = output.ModeCalib;
-    calib1_Ac1->SetDac      = output.SetDac;
-    calib1_Ac1->ModePhysics = output.ModePhysics;
-    calib1_Ac1->ERROR       = ACcalib(dataLength, (unsigned char*)subData, &output);
-    */
-
-    //delete [] subData;
+/*
+    char   *subData = new char[dataLength];
+    struct calibstruct *output = {0};
+
+    InputFile->read(subData, sizeof(unsigned char)*dataLength);
+
+    for (int i = 0; i < dataLength; i++){
+        printf("input1 %i   %x \n", i, (unsigned char)subData[i]);
+    }
+
+    calib1_Ac1->ERROR = ACcalib(dataLength, (unsigned char*)subData, output);
+    memcpy(calib1_Ac1->header,     output->header,     sizeof(output->header));
+    memcpy(calib1_Ac1->status,     output->status,     sizeof(output->status));
+    memcpy(calib1_Ac1->temp,       output->temp,       sizeof(output->temp));
+    memcpy(calib1_Ac1->DAC1,       output->DAC1,       sizeof(output->DAC1));
+    memcpy(calib1_Ac1->DAC2,       output->DAC2,       sizeof(output->DAC2));
+    memcpy(calib1_Ac1->regist,     output->regist,     sizeof(output->regist));
+    memcpy(calib1_Ac1->time,       output->time,       sizeof(output->time));
+    calib1_Ac1->n_tr = output->n_tr;
+    memcpy(calib1_Ac1->hitmap_tr,  output->hitmap_tr,  sizeof(output->hitmap_tr));
+    memcpy(calib1_Ac1->curve1,     output->curve1,     sizeof(output->curve1));
+    memcpy(calib1_Ac1->curve2,     output->curve2,     sizeof(output->curve2));
+    calib1_Ac1->iCRC = output->iCRC;
+    calib1_Ac1->tail = output->tail;
+    calib1_Ac1->CRC  = output->CRC;
+*/  
+  //delete [] subData;
 }