/[PAMELA software]/yoda/techmodel/Calib2_Ac1Reader.cpp
ViewVC logotype

Diff of /yoda/techmodel/Calib2_Ac1Reader.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2.5 by kusanagi, Sat Jan 29 00:26:55 2005 UTC revision 4.4 by kusanagi, Sat May 28 10:44:10 2005 UTC
# Line 1  Line 1 
1  /** @file  /** @file
2   * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac1Reader.cpp,v $   * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac1Reader.cpp,v $
3   * $Id: Calib2_Ac1Reader.cpp,v 2.4 2005/01/03 14:20:09 kusanagi Exp $   * $Id: Calib2_Ac1Reader.cpp,v 4.0 2005/03/06 04:33:02 kusanagi Exp $
4   * $Author: kusanagi $   * $Author: kusanagi $
5   *   *
6   * Implementation of the Calib2_Ac1Reader class.   * Implementation of the Calib2_Ac1Reader class.
# Line 13  Line 13 
13  extern "C" {  extern "C" {
14      #include "CRC.h"      #include "CRC.h"
15      #include "forroutines/anticounter/AC.h"      #include "forroutines/anticounter/AC.h"
16      extern int ACcalib(int length, unsigned char* calibpointer, struct calibstruct* calibpointer);      extern int ACcalib(int length, unsigned char* calibpointer, struct calibstruct *calibpointer);
17  }  }
18    
19  #include "ReaderAlgorithms.h"  #include "ReaderAlgorithms.h"
# Line 36  Calib2_Ac1Reader::Calib2_Ac1Reader(void) Line 36  Calib2_Ac1Reader::Calib2_Ac1Reader(void)
36   * Get a string with the version info of the algorithm.   * Get a string with the version info of the algorithm.
37   */   */
38  std::string Calib2_Ac1Reader::GetVersionInfo(void) const {  std::string Calib2_Ac1Reader::GetVersionInfo(void) const {
39    return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac1Reader.cpp,v 2.4 2005/01/03 14:20:09 kusanagi Exp $\n";    return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac1Reader.cpp,v 4.0 2005/03/06 04:33:02 kusanagi Exp $\n";
40  }  }
41    
42  /**  /**
# Line 53  void Calib2_Ac1Reader::Init(PamelaRun *r Line 53  void Calib2_Ac1Reader::Init(PamelaRun *r
53   * Unpack the CalibAc event from an input file.   * Unpack the CalibAc event from an input file.
54   */   */
55  void Calib2_Ac1Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){  void Calib2_Ac1Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){
   /*  
     char   subData[dataLength];  
     InputFile->read(subData, sizeof(unsigned char)*dataLength);  
56        
57      struct calibstruct output;      char   *subData = new char[dataLength];
58            struct calibstruct output = {0};
59      calib1_Ac1->ERROR       = ACcalib(dataLength, (unsigned char*)subData, &output);  
60      calib1_Ac1->ResetDSP    = output.ResetDSP;      InputFile->read(subData, sizeof(unsigned char)*dataLength);
61      calib1_Ac1->DSPinit     = output.DSPinit;  
62      calib1_Ac1->DSPprog     = output.DSPprog;      calib2_Ac1->ERROR = ACcalib(dataLength, (unsigned char*)subData, &output);
63      calib1_Ac1->ModeCalib   = output.ModeCalib;      memcpy(calib2_Ac1->header,     output.header,     sizeof(output.header));
64      calib1_Ac1->SetDAC      = output.SetDAC;      memcpy(calib2_Ac1->status,     output.status,     sizeof(output.status));
65      calib1_Ac1->ModePhysics = output.ModePhysics;      memcpy(calib2_Ac1->temp,       output.temp,       sizeof(output.temp));
66      */      memcpy(calib2_Ac1->DAC1,       output.DAC1,       sizeof(output.DAC1));
67        memcpy(calib2_Ac1->DAC2,       output.DAC2,       sizeof(output.DAC2));
68        memcpy(calib2_Ac1->regist,     output.regist,     sizeof(output.regist));
69        memcpy(calib2_Ac1->time,       output.time,       sizeof(output.time));
70        calib2_Ac1->n_tr = output.n_tr;
71        memcpy(calib2_Ac1->hitmap_tr,  output.hitmap_tr,  sizeof(output.hitmap_tr));
72        memcpy(calib2_Ac1->curve1,     output.curve1,     sizeof(output.curve1));
73        memcpy(calib2_Ac1->curve2,     output.curve2,     sizeof(output.curve2));
74        calib2_Ac1->iCRC        = output.iCRC;
75        calib2_Ac1->tail        = output.tail;
76        calib2_Ac1->CRC         = output.CRC;
77        calib2_Ac1->CRCcheck    = output.CRCcheck;
78    
79      //delete [] subData;      //delete [] subData;
80    }    }

Legend:
Removed from v.2.5  
changed lines
  Added in v.4.4

  ViewVC Help
Powered by ViewVC 1.1.23