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

Diff of /yoda/techmodel/Calib2_Ac2Reader.cpp

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

revision 2.4 by kusanagi, Mon Jan 3 14:20:09 2005 UTC revision 3.0 by kusanagi, Fri Mar 4 15:54:11 2005 UTC
# Line 1  Line 1 
1  /** @file  /** @file
2   * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $   * $Source: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v $
3   * $Id: Calib2_Ac2Reader.cpp,v 2.3 2004/12/21 16:50:45 kusanagi Exp $   * $Id: Calib2_Ac2Reader.cpp,v 2.8 2005/02/09 22:20:16 kusanagi Exp $
4   * $Author: kusanagi $   * $Author: kusanagi $
5   *   *
6   * Implementation of the Calib2_Ac2Reader class.   * Implementation of the Calib2_Ac2Reader 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_Ac2Reader::Calib2_Ac2Reader(void) Line 36  Calib2_Ac2Reader::Calib2_Ac2Reader(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_Ac2Reader::GetVersionInfo(void) const {  std::string Calib2_Ac2Reader::GetVersionInfo(void) const {
39    return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 2.3 2004/12/21 16:50:45 kusanagi Exp $\n";    return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 2.8 2005/02/09 22:20:16 kusanagi Exp $\n";
40  }  }
41    
42  /**  /**
# Line 53  void Calib2_Ac2Reader::Init(PamelaRun *r Line 53  void Calib2_Ac2Reader::Init(PamelaRun *r
53   * Unpack the CalibAc event from an input file.   * Unpack the CalibAc event from an input file.
54   */   */
55  void Calib2_Ac2Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){  void Calib2_Ac2Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){
56      char   subData[dataLength];  
57      struct calibstruct *output = {0};      char   *subData = new char[dataLength];
58        struct calibstruct output = {0};
59    
60      InputFile->read(subData, sizeof(unsigned char)*dataLength);      InputFile->read(subData, sizeof(unsigned char)*dataLength);
61  /*  
62      calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, output);      calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, &output);
63      memcpy(calib2_Ac2->header,     output.header,     sizeof(output.header));      memcpy(calib2_Ac2->header,     output.header,     sizeof(output.header));
64      memcpy(calib2_Ac2->status,     output.status,     sizeof(output.status));      memcpy(calib2_Ac2->status,     output.status,     sizeof(output.status));
65      memcpy(calib2_Ac2->temp,       output.temp,       sizeof(output.temp));      memcpy(calib2_Ac2->temp,       output.temp,       sizeof(output.temp));
# Line 70  void Calib2_Ac2Reader::RunEvent(int Even Line 71  void Calib2_Ac2Reader::RunEvent(int Even
71      memcpy(calib2_Ac2->hitmap_tr,  output.hitmap_tr,  sizeof(output.hitmap_tr));      memcpy(calib2_Ac2->hitmap_tr,  output.hitmap_tr,  sizeof(output.hitmap_tr));
72      memcpy(calib2_Ac2->curve1,     output.curve1,     sizeof(output.curve1));      memcpy(calib2_Ac2->curve1,     output.curve1,     sizeof(output.curve1));
73      memcpy(calib2_Ac2->curve2,     output.curve2,     sizeof(output.curve2));      memcpy(calib2_Ac2->curve2,     output.curve2,     sizeof(output.curve2));
74      calib2_Ac2->iCRC = output.iCRC;      calib2_Ac2->iCRC        = output.iCRC;
75      calib2_Ac2->tail = output.tail;      calib2_Ac2->tail        = output.tail;
76      calib2_Ac2->CRC  = output.CRC;      calib2_Ac2->CRC         = output.CRC;
77  */      calib2_Ac2->CRCcheck    = output.CRCcheck;
78      
79      //delete [] subData;      //delete [] subData;
80    }    }
Legend:
Removed from v.2.4  
changed lines
  Added in v.3.0
  ViewVC Help
Powered by ViewVC 1.1.23