/[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.5 by kusanagi, Sat Jan 29 00:26:55 2005 UTC revision 2.6 by kusanagi, Tue Feb 8 08:20:41 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.4 2005/01/03 14:20:09 kusanagi Exp $   * $Id: Calib2_Ac2Reader.cpp,v 2.5 2005/01/29 00:26:55 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.4 2005/01/03 14:20:09 kusanagi Exp $\n";    return "$Header: /home/cvsmanager/yoda/techmodel/Calib2_Ac2Reader.cpp,v 2.5 2005/01/29 00:26:55 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){
   /*  
     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    
60        InputFile->read(subData, sizeof(unsigned char)*dataLength);
61    
62        for (int i = 0; i < dataLength; i++){
63            printf("input2 %i   %x \n", i, subData[i]);
64        }
65        
66        calib2_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, output);
67        memcpy(calib2_Ac2->header,     output->header,     sizeof(output->header));
68        memcpy(calib2_Ac2->status,     output->status,     sizeof(output->status));
69        memcpy(calib2_Ac2->temp,       output->temp,       sizeof(output->temp));
70        memcpy(calib2_Ac2->DAC1,       output->DAC1,       sizeof(output->DAC1));
71        memcpy(calib2_Ac2->DAC2,       output->DAC2,       sizeof(output->DAC2));
72        memcpy(calib2_Ac2->regist,     output->regist,     sizeof(output->regist));
73        memcpy(calib2_Ac2->time,       output->time,       sizeof(output->time));
74        calib2_Ac2->n_tr = output->n_tr;
75        memcpy(calib2_Ac2->hitmap_tr,  output->hitmap_tr,  sizeof(output->hitmap_tr));
76        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            
     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;  
     */  
83        
84      //delete [] subData;      //delete [] subData;
85    }    }
Legend:
Removed from v.2.5  
changed lines
  Added in v.2.6
  ViewVC Help
Powered by ViewVC 1.1.23