Changeset 374 for trunk


Ignore:
Timestamp:
03/13/00 09:27:12 (25 years ago)
Author:
harald
Message:
some small changes to get out the timestamp of the event.
Location:
trunk/MagicSoft/include-Classes
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/include-Classes/LinkDef.h

    r354 r374  
    1010#pragma link C++ class MMcEvt;
    1111#pragma link C++ class MMcTrig;
    12 #pragma link C++ class MMcRunHeader;
    13 #pragma link C++ class MCameraDisplay;
    14 #pragma link C++ class MCameraPixel;
    15 #pragma link C++ class MCameraCoord;
    16 #pragma link C++ class MFastControl;
    17 #pragma link C++ class MCurrentPixel;
     12
     13#pragma link C++ class MPedData;
     14#pragma link C++ class MWeather;
     15
     16
     17//#pragma link C++ class MMcRunHeader;
     18//#pragma link C++ class MCameraDisplay;
     19//#pragma link C++ class MCameraPixel;
     20//#pragma link C++ class MCameraCoord;
     21//#pragma link C++ class MFastControl;
     22//#pragma link C++ class MCurrentPixel;
    1823
    1924

  • trunk/MagicSoft/include-Classes/MRawEvt.cxx

    r371 r374  
    3737// ----------
    3838//
    39 // ULong_t   TimeStamp
     39// ULong_t   fTimeStamp
    4040//   
    4141// Time of the event.
    … …  
    109109
    110110  EvtNo      = 0 ;
    111   TimeStamp  = 0 ;
     111  fTimeStamp  = 0 ;
    112112  EvtStatus  = 0 ;
    113113  Trig1st    = 0 ;
    … …  
    141141  //
    142142  EvtNo      = 0 ;
    143   TimeStamp  = 0 ;
     143  fTimeStamp  = 0 ;
    144144  EvtStatus  = 0 ;
    145145  Trig1st    = 0 ;
    … …  
    158158  // Prints out the data of one Pixel
    159159  cout << endl << "EventNumber      " << EvtNo          ;
    160   cout << endl << "Event Time Stamp " << TimeStamp      ;
     160  cout << endl << "Event Time Stamp " << fTimeStamp      ;
    161161  cout << endl << "Event Status     " << (int) EvtStatus      ;
    162162  cout << endl << "Trigger 1. Level " << Trig1st        ;
    … …  
    177177
    178178  EvtNo      = uiN ;
    179   TimeStamp  = ulT ;
     179  fTimeStamp  = ulT ;
    180180
    181181  UChar_t   ucA[FADC_SLICES] ;
    … …  
    189189}
    190190
    191 void MRawEvt::FillHeader ( UInt_t uiN, ULong_t ulT ) {
     191void MRawEvt::FillHeader ( UInt_t uiN, ULong_t ulT, UChar_t ucSta ) {
    192192   
    193193  EvtNo      = uiN ;
    194   TimeStamp  = ulT ;
    195  
    196   EvtStatus  = 0 ;
     194  fTimeStamp  = ulT ;
     195 
     196  EvtStatus  = ucSta ;
    197197  Trig1st    = 0 ;
    198198  MultPixel  = 0   ;
    … …  
    225225
    226226  EvtNo      = uiN ;
    227   TimeStamp  = ulT ;
     227  fTimeStamp  = ulT ;
    228228
    229229  MultPixel = 0 ;

  • trunk/MagicSoft/include-Classes/MRawEvt.h

    r371 r374  
    1313  UInt_t        EvtNo     ;  // Number of Event
    1414
    15   ULong_t       TimeStamp ;  // Time of the Event
    16 
     15  ULong_t       fTimeStamp ;  // Time of the Event
     16 
    1717  UChar_t       EvtStatus ;  // Status of this event (DAQ, Pedestal, ..)
    1818 
    … …  
    3535  void FillRandom( UInt_t, ULong_t, UShort_t   ) ;
    3636
    37   void FillHeader( UInt_t, ULong_t ) ;
     37  void FillHeader( UInt_t, ULong_t, UChar_t = 0 ) ;
    3838
    3939  void FillPixel(  UShort_t, Float_t * ) ;
    … …  
    4444
    4545  TClonesArray *&GetPixelList() {
    46   //
    47   //   returns a Pointer to the pixel list
    48   //
    49   return  Pixels ;
    50 }
    51 
    52 
     46    //
     47    //   returns a Pointer to the pixel list
     48    //
     49    return  Pixels ;
     50  }
     51 
     52  ULong_t GetTimeStamp() {
     53    return fTimeStamp ;
     54  }
     55 
     56 
    5357/*    void AddPixel( UShort_t  ) ;  */
    5458
Note: See TracChangeset for help on using the changeset viewer.