/[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.1 by kusanagi, Thu Dec 16 17:32:57 2004 UTC revision 2.7 by kusanagi, Tue Feb 8 12:36:25 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: CalibAcReader.cpp,v 2.2 2004/12/03 22:08:00 kusanagi Exp $   * $Id: Calib2_Ac2Reader.cpp,v 2.6 2005/02/08 08:20:41 kusanagi Exp $
4   * $Author: kusanagi $   * $Author: kusanagi $
5   *   *
6   * Implementation of the Calib2_Ac2Reader class.   * Implementation of the Calib2_Ac2Reader class.
# 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.2 2004/12/03 22:08:00 kusanagi Exp $\n";    return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 2.6 2005/02/08 08:20:41 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;      char   *subData = new char[dataLength];
58    int ERROR;      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);      for (int i = 0; i < dataLength; i++){
63      memcpy(calib2_Ac2->header,     output.header,     sizeof(output.header));          printf("input2 %i   %x \n", i, subData[i]);
64      memcpy(calib2_Ac2->status,     output.status,     sizeof(output.status));      }
65      memcpy(calib2_Ac2->temp,       output.temp,       sizeof(output.temp));      
66      memcpy(calib2_Ac2->DAC1,       output.DAC1,       sizeof(output.DAC1));      calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, output);
67      memcpy(calib2_Ac2->DAC2,       output.DAC2,       sizeof(output.DAC2));      memcpy(calib2_Ac2->header,     output->header,     sizeof(output->header));
68      memcpy(calib2_Ac2->regist,     output.regist,     sizeof(output.regist));      memcpy(calib2_Ac2->status,     output->status,     sizeof(output->status));
69      memcpy(calib2_Ac2->time,       output.time,       sizeof(output.time));      memcpy(calib2_Ac2->temp,       output->temp,       sizeof(output->temp));
70      calib2_Ac2->n_tr = output.n_tr;      memcpy(calib2_Ac2->DAC1,       output->DAC1,       sizeof(output->DAC1));
71      memcpy(calib2_Ac2->hitmap_tr,  output.hitmap_tr,  sizeof(output.hitmap_tr));      memcpy(calib2_Ac2->DAC2,       output->DAC2,       sizeof(output->DAC2));
72      memcpy(calib2_Ac2->curve1,     output.curve1,     sizeof(output.curve1));      memcpy(calib2_Ac2->regist,     output->regist,     sizeof(output->regist));
73      memcpy(calib2_Ac2->curve2,     output.curve2,     sizeof(output.curve2));      memcpy(calib2_Ac2->time,       output->time,       sizeof(output->time));
74      calib2_Ac2->iCRC = output.iCRC;      calib2_Ac2->n_tr = output->n_tr;
75      calib2_Ac2->tail = output.tail;      memcpy(calib2_Ac2->hitmap_tr,  output->hitmap_tr,  sizeof(output->hitmap_tr));
76      calib2_Ac2->CRC  = output.CRC;      memcpy(calib2_Ac2->curve1,     output->curve1,     sizeof(output->curve1));
77    */        memcpy(calib2_Ac2->curve2,     output->curve2,     sizeof(output->curve2));
78        calib2_Ac2->iCRC        = output->iCRC;
79        calib2_Ac2->tail        = output->tail;
80        calib2_Ac2->CRC         = output->CRC;
81        calib2_Ac2->CRCcheck    = output->CRCcheck;
82        */
83      
84      //delete [] subData;      //delete [] subData;
85    }    }
Legend:
Removed from v.2.1  
changed lines
  Added in v.2.7
  ViewVC Help
Powered by ViewVC 1.1.23