/[PAMELA software]/DarthVader/ToFLevel2/inc/ToFLevel2.h
ViewVC logotype

Diff of /DarthVader/ToFLevel2/inc/ToFLevel2.h

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

revision 1.1 by mocchiut, Sat Jun 17 12:14:55 2006 UTC revision 1.2 by mocchiut, Sat Jun 17 12:21:32 2006 UTC
# Line 19  class ToFTrkVar : public TObject { Line 19  class ToFTrkVar : public TObject {
19    
20   public:   public:
21    Int_t trkseqno; // tracker entry coming from tracker, 100 if image track is used, -100 if the track is not consistent with MyDetector2 one    Int_t trkseqno; // tracker entry coming from tracker, 100 if image track is used, -100 if the track is not consistent with MyDetector2 one
 <<<<<<< ToFLevel2.h  
     //  
     Float_t beta_a[5];  
     Float_t adc_c[12][4];  
   
     //  
     ToFTrkVar();  
     ToFTrkVar(const ToFTrkVar&);  
     ToFTrkVar *GetToFTrkVar(){return this;};  // <<< ELENA  
     //  
     ClassDef(ToFTrkVar,1);  
     //  
 =======  
22    //    //
23    Float_t beta_a[13];    Float_t beta_a[13];
24    Float_t adc_c[12][4];    Float_t adc_c[12][4];
# Line 44  class ToFTrkVar : public TObject { Line 31  class ToFTrkVar : public TObject {
31        
32    ClassDef(ToFTrkVar,1);    ClassDef(ToFTrkVar,1);
33    //    //
 >>>>>>> 1.2  
34  };  };
35    
36  class ToFLevel2 : public TObject {  class ToFLevel2 : public TObject {
# Line 59  class ToFLevel2 : public TObject { Line 45  class ToFLevel2 : public TObject {
45    Float_t adctof_c[12][4];    Float_t adctof_c[12][4];
46    Float_t tdc_c[12][4];    Float_t tdc_c[12][4];
47    TClonesArray *ToFTrk; // track related variable class    TClonesArray *ToFTrk; // track related variable class
 <<<<<<< ToFLevel2.h  
   //  
   //  
   // methods to make life simplier during the analysis, returns a pointer to the ToFTrkVar class containing track related variables  
   //  
   Int_t ntrk(){return ToFTrk->GetEntries();};  
   //  
   ToFTrkVar *GetToFTrkVar(Int_t notrack);    
   //  
   ToFLevel2 *GetToFLevel2(){return this;};  
   //  
   // constructor  
   //  
   ToFLevel2();  
   //  
   ClassDef(ToFLevel2,1);  
 =======  
48    //    //
49    //    //
50    // methods to make life simplier during the analysis, returns a pointer to the ToFTrkVar class containing track related variables    // methods to make life simplier during the analysis, returns a pointer to the ToFTrkVar class containing track related variables
# Line 123  class ToFLevel2 : public TObject { Line 92  class ToFLevel2 : public TObject {
92        
93      //      //
94      ClassDef(ToFLevel2,1);      ClassDef(ToFLevel2,1);
 >>>>>>> 1.2  
95  };  };
96    
97  #endif  #endif

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

  ViewVC Help
Powered by ViewVC 1.1.23