/[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.2 by kusanagi, Mon Dec 20 14:15:13 2004 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.1 2004/12/16 17:32:57 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.1 2004/12/16 17:32:57 kusanagi Exp $\n";
40  }  }
41    
42  /**  /**
# Line 54  void Calib2_Ac2Reader::Init(PamelaRun *r Line 54  void Calib2_Ac2Reader::Init(PamelaRun *r
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];    char   subData[dataLength];
57    struct calibstruct output;    struct calibstruct output[2];
58    int ERROR;    int ERROR;
59    
 /*  
     InputFile->read(subData, sizeof(unsigned char)*dataLength);  
60    
61      calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, &output);      InputFile->read(subData, sizeof(unsigned char)*dataLength);
62      memcpy(calib2_Ac2->header,     output.header,     sizeof(output.header));      calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, &(*output));
63      memcpy(calib2_Ac2->status,     output.status,     sizeof(output.status));      for(int i = 0; i<2; i++){
64      memcpy(calib2_Ac2->temp,       output.temp,       sizeof(output.temp));          memcpy(calib2_Ac2->header[i],     output[i].header,     sizeof(output[i].header));
65      memcpy(calib2_Ac2->DAC1,       output.DAC1,       sizeof(output.DAC1));          memcpy(calib2_Ac2->status[i],     output[i].status,     sizeof(output[i].status));
66      memcpy(calib2_Ac2->DAC2,       output.DAC2,       sizeof(output.DAC2));          memcpy(calib2_Ac2->temp[i],       output[i].temp,       sizeof(output[i].temp));
67      memcpy(calib2_Ac2->regist,     output.regist,     sizeof(output.regist));          memcpy(calib2_Ac2->DAC1[i],       output[i].DAC1,       sizeof(output[i].DAC1));
68      memcpy(calib2_Ac2->time,       output.time,       sizeof(output.time));          memcpy(calib2_Ac2->DAC2[i],       output[i].DAC2,       sizeof(output[i].DAC2));
69      calib2_Ac2->n_tr = output.n_tr;          memcpy(calib2_Ac2->regist[i],     output[i].regist,     sizeof(output[i].regist));
70      memcpy(calib2_Ac2->hitmap_tr,  output.hitmap_tr,  sizeof(output.hitmap_tr));          memcpy(calib2_Ac2->time[i],       output[i].time,       sizeof(output[i].time));
71      memcpy(calib2_Ac2->curve1,     output.curve1,     sizeof(output.curve1));          calib2_Ac2->n_tr[i] = output[i].n_tr;
72      memcpy(calib2_Ac2->curve2,     output.curve2,     sizeof(output.curve2));          memcpy(calib2_Ac2->hitmap_tr[i],  output[i].hitmap_tr,  sizeof(output[i].hitmap_tr));
73      calib2_Ac2->iCRC = output.iCRC;          memcpy(calib2_Ac2->curve1[i],     output[i].curve1,     sizeof(output[i].curve1));
74      calib2_Ac2->tail = output.tail;          memcpy(calib2_Ac2->curve2[i],     output[i].curve2,     sizeof(output[i].curve2));
75      calib2_Ac2->CRC  = output.CRC;          calib2_Ac2->iCRC[i] = output[i].iCRC;
76    */            calib2_Ac2->tail[i] = output[i].tail;
77            calib2_Ac2->CRC[i]  = output[i].CRC;
78        }
79    
80      //delete [] subData;      //delete [] subData;
81    }    }
Legend:
Removed from v.2.1  
changed lines
  Added in v.2.2
  ViewVC Help
Powered by ViewVC 1.1.23