--- yoda/techmodel/Calib2_Ac2Reader.cpp	2004/12/20 14:15:13	2.2
+++ yoda/techmodel/Calib2_Ac2Reader.cpp	2005/01/29 00:26:55	2.5
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
- * $Id: Calib2_Ac2Reader.cpp,v 2.1 2004/12/16 17:32:57 kusanagi Exp $
+ * $Id: Calib2_Ac2Reader.cpp,v 2.4 2005/01/03 14:20:09 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Implementation of the Calib2_Ac2Reader class.
@@ -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.1 2004/12/16 17:32:57 kusanagi Exp $\n";
+  return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 2.4 2005/01/03 14:20:09 kusanagi Exp $\n";
 }
 
 /**
@@ -53,29 +53,20 @@
  * 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];
-  int ERROR;
-
-
+  /*
+    char   subData[dataLength];
     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;
-    }
-
+  
+    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;
+    */
+  
     //delete [] subData;
   }