Changeset 371 for trunk/MagicSoft


Ignore:
Timestamp:
02/21/00 14:52:28 (25 years ago)
Author:
harald
Message:
Changed the namespace for all the members. To be more readable all the
prefixes to tell the type of variables are removed. This is a topic only
of the class and is not really interesting for the outside world.
Location:
trunk/MagicSoft/include-Classes
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r306 r371  
    2222// ----------
    2323//
    24 // UInt_t    uiEvtNo   
     24// UInt_t    EvtNo   
    2525//
    2626// This it the number of the Event in one
    … …  
    3737// ----------
    3838//
    39 // ULong_t   ulTimeStamp
     39// ULong_t   TimeStamp
    4040//   
    4141// Time of the event.
    … …  
    4949// ----------
    5050//
    51 // UChar_t   ucEvtStatus
     51// UChar_t   EvtStatus
    5252//
    5353// Status of Event.
    … …  
    5757// ----------
    5858//
    59 // UShort_t  usTrig1st
     59// UShort_t  Trig1st
    6060//
    6161// Number of first level trigger
    … …  
    7070// ----------
    7171//
    72 // UShort_t  usMultPixel
     72// UShort_t  MultPixel
    7373//
    7474// Multiplicity of Pixels
    … …  
    8080// ----------
    8181//
    82 // TClonesArray  *taPixels
     82// TClonesArray  *Pixels
    8383//
    8484// Array of Pixels
    … …  
    108108  //   set all member to zero, init the pointer to ClonesArray,
    109109
    110   uiEvtNo      = 0 ;
    111   ulTimeStamp  = 0 ;
    112   ucEvtStatus  = 0 ;
    113   usTrig1st    = 0 ;
    114   usMultPixel  = 0 ;
     110  EvtNo      = 0 ;
     111  TimeStamp  = 0 ;
     112  EvtStatus  = 0 ;
     113  Trig1st    = 0 ;
     114  MultPixel  = 0 ;
    115115
    116116  //
    … …  
    120120  //   initialize the list to this global pointer
    121121 
    122   taPixels = new TClonesArray ("MRawPixel", 2*CAMERA_PIXELS ) ;
     122  Pixels = new TClonesArray ("MRawPixel", 2*CAMERA_PIXELS ) ;
    123123
    124124  cout << " default constructor " << endl ;
    … …  
    130130  //   Implementation of the default destructor
    131131  //
    132   delete taPixels ;
     132  delete Pixels ;
    133133  cout << " default destructor " << endl ;
    134134}
    … …  
    140140  //   Resets all members to zero, clear the list of Pixels
    141141  //
    142   uiEvtNo      = 0 ;
    143   ulTimeStamp  = 0 ;
    144   ucEvtStatus  = 0 ;
    145   usTrig1st    = 0 ;
    146   usMultPixel  = 0 ;
    147 
    148   taPixels->Clear() ;
     142  EvtNo      = 0 ;
     143  TimeStamp  = 0 ;
     144  EvtStatus  = 0 ;
     145  Trig1st    = 0 ;
     146  MultPixel  = 0 ;
     147
     148  Pixels->Clear() ;
    149149}
    150150
    … …  
    157157
    158158  // Prints out the data of one Pixel
    159   cout << endl << "EventNumber      " << uiEvtNo          ;
    160   cout << endl << "Event Time Stamp " << ulTimeStamp      ;
    161   cout << endl << "Event Status     " << (int) ucEvtStatus      ;
    162   cout << endl << "Trigger 1. Level " << usTrig1st        ;
    163   cout << endl << "Number of Pixels " << usMultPixel      ;
    164 
    165   for (Int_t i=0 ; i<usMultPixel; i++ ) {
    166     ((MRawPixel *)taPixels->At(i))->Print() ;   
     159  cout << endl << "EventNumber      " << EvtNo          ;
     160  cout << endl << "Event Time Stamp " << TimeStamp      ;
     161  cout << endl << "Event Status     " << (int) EvtStatus      ;
     162  cout << endl << "Trigger 1. Level " << Trig1st        ;
     163  cout << endl << "Number of Pixels " << MultPixel      ;
     164
     165  for (Int_t i=0 ; i<MultPixel; i++ ) {
     166    ((MRawPixel *)Pixels->At(i))->Print() ;   
    167167  }
    168168}
    … …  
    176176  //
    177177
    178   uiEvtNo      = uiN ;
    179   ulTimeStamp  = ulT ;
     178  EvtNo      = uiN ;
     179  TimeStamp  = ulT ;
    180180
    181181  UChar_t   ucA[FADC_SLICES] ;
    … …  
    184184    GetFadcNoise ( ucA ) ;   
    185185 
    186     TClonesArray &caP = *taPixels ;
    187     new ( caP[usMultPixel++] ) MRawPixel((usMultPixel), 0, ucA) ;
     186    TClonesArray &caP = *Pixels ;
     187    new ( caP[MultPixel++] ) MRawPixel((MultPixel), 0, ucA) ;
    188188  }
    189189}
    … …  
    191191void MRawEvt::FillHeader ( UInt_t uiN, ULong_t ulT ) {
    192192   
    193   uiEvtNo      = uiN ;
    194   ulTimeStamp  = ulT ;
    195  
    196   ucEvtStatus  = 0 ;
    197   usTrig1st    = 0 ;
    198   usMultPixel  = 0   ;
    199 
    200   taPixels->Clear()  ;
     193  EvtNo      = uiN ;
     194  TimeStamp  = ulT ;
     195 
     196  EvtStatus  = 0 ;
     197  Trig1st    = 0 ;
     198  MultPixel  = 0   ;
     199
     200  Pixels->Clear()  ;
    201201}
    202202
    … …  
    213213  }
    214214 
    215   TClonesArray &caP = *taPixels ;
    216   new ( caP[usMultPixel++] ) MRawPixel((uiPix), 0, ucA) ;
     215  TClonesArray &caP = *Pixels ;
     216  new ( caP[MultPixel++] ) MRawPixel((uiPix), 0, ucA) ;
    217217}
    218218
    … …  
    224224  //
    225225
    226   uiEvtNo      = uiN ;
    227   ulTimeStamp  = ulT ;
    228 
    229   usMultPixel = 0 ;
     226  EvtNo      = uiN ;
     227  TimeStamp  = ulT ;
     228
     229  MultPixel = 0 ;
    230230
    231231  UChar_t   ucA[FADC_SLICES] ;
    … …  
    239239      ucA[5] = (UShort_t) (array[i]) ;
    240240     
    241       TClonesArray &caP = *taPixels ;
    242       new ( caP[usMultPixel++] ) MRawPixel(i, 0, ucA) ;
     241      TClonesArray &caP = *Pixels ;
     242      new ( caP[MultPixel++] ) MRawPixel(i, 0, ucA) ;
    243243    }
    244244  }
    … …  
    249249  //  returns the pixel multiplicity of the Event
    250250  //
    251   return usMultPixel;
     251  return MultPixel;
    252252}
    253253

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

    r306 r371  
    1111
    1212 private:
    13   UInt_t        uiEvtNo     ;  // Number of Event
     13  UInt_t        EvtNo     ;  // Number of Event
    1414
    15   ULong_t       ulTimeStamp ;  // Time of the Event
     15  ULong_t       TimeStamp ;  // Time of the Event
    1616
    17   UChar_t       ucEvtStatus ;  // Status of this event (DAQ, Pedestal, ..)
     17  UChar_t       EvtStatus ;  // Status of this event (DAQ, Pedestal, ..)
    1818 
    19   UShort_t      usTrig1st   ;  // Number of 1st level tiggers between 2 events
     19  UShort_t      Trig1st   ;  // Number of 1st level tiggers between 2 events
    2020
    21   UShort_t      usMultPixel ;  // Multiplicity of the Pixels in this event   
     21  UShort_t      MultPixel ;  // Multiplicity of the Pixels in this event   
    2222
    23   TClonesArray  *taPixels   ;  // list of the events
     23  TClonesArray  *Pixels   ;  // list of the events
    2424
    2525 public:
    … …  
    4747  //   returns a Pointer to the pixel list
    4848  //
    49   return  taPixels ;
     49  return  Pixels ;
    5050}
    5151

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

    r306 r371  
    2626// ---------
    2727//
    28 // UShort_t     usPixelId     ;   
     28// UShort_t     PixelId     ;   
    2929//
    3030// This is to identify the Pixel.
    … …  
    3434// To reduce the amount of data, we store the information of the
    3535// low-gain-branch of the Fadc´s only if there is a signal in. Then the
    36 // usPixelId is:
    37 //                   usPixelId = 10000 + PixelId   .
     36// PixelId is:
     37//                   PixelId = 10000 + PixelId   .
    3838//
    3939// For the high gain Fadc values the rule is:
    40 //                   usPixelId = PixelId .
     40//                   PixelId = PixelId .
    4141//
    4242//
    4343// ---------
    4444//
    45 // UChar_t      ucPixelStatus ;   
     45// UChar_t      PixelStatus ;   
    4646//
    4747// The PixelStatus may contain information if the Pixel has triggered
    4848// this event. Also the kind of gain-branch (high or low) may be indicated
    49 // by one bit of the ucPixelStatus. etc
     49// by one bit of the PixelStatus. etc
    5050//
    5151// ---------
    5252//
    53 // UChar_t      aucFadc[ FADC_SLICES ]  ;
     53// UChar_t      Fadc[ FADC_SLICES ]  ;
    5454//
    5555// The values of FADC_SLICES fadc-slices. This is the information of the
    5656// measured ADC values for one branch (high gain or low gain). The typ of
    57 // branch is indicated in the usPixelNumber and in the ucPixelStatus.
     57// branch is indicated in the usPixelNumber and in the PixelStatus.
    5858
    5959ClassImp(MRawPixel)
    … …  
    6666  //
    6767   
    68     usPixelId     = 0 ;
    69     ucPixelStatus = 0 ;
     68    PixelId     = 0 ;
     69    PixelStatus = 0 ;
    7070   
    7171    for (Int_t i = 0; i<FADC_SLICES; i++)
    72       aucFadc[i]   = 0 ;
     72      Fadc[i]   = 0 ;
    7373}
    7474
    … …  
    8080  //  Parameter is the PixelId. All other data member are set to zero
    8181 
    82   usPixelId     = PId ;
    83   ucPixelStatus = 0 ;
     82  PixelId     = PId ;
     83  PixelStatus = 0 ;
    8484 
    8585  for (Int_t i = 0; i<FADC_SLICES; i++)
    86     aucFadc[i]   = 0 ;
     86    Fadc[i]   = 0 ;
    8787}
    8888
    … …  
    9494  // parameters are PixelId, Status and an array with Fadc numbers.
    9595 
    96   usPixelId     = usPId ;
    97   ucPixelStatus = ucSt  ;
     96  PixelId     = usPId ;
     97  PixelStatus = ucSt  ;
    9898 
    9999  for (Int_t i = 0; i<FADC_SLICES; i++)
    100     aucFadc[i]   = ucF[i] ;
     100    Fadc[i]   = ucF[i] ;
    101101}
    102102MRawPixel::~MRawPixel(){
    … …  
    110110  //  Sets the data member back to zero
    111111  //
    112   usPixelId     = 0 ;
    113   ucPixelStatus = 0 ;
     112  PixelId     = 0 ;
     113  PixelStatus = 0 ;
    114114 
    115115  for (Int_t i = 0; i<FADC_SLICES; i++)
    116     aucFadc[i]   = 0 ;
     116    Fadc[i]   = 0 ;
    117117}
    118118
    … …  
    124124  //
    125125
    126   cout << endl << "PixId " << usPixelId          ;
    127   cout << " Stat " << (Int_t) ucPixelStatus << " --> "     ;
     126  cout << endl << "PixId " << PixelId          ;
     127  cout << " Stat " << (Int_t) PixelStatus << " --> "     ;
    128128
    129129  for (Int_t i=0 ; i<FADC_SLICES ; i++ ) {
    130     cout<<" / " << (int) aucFadc[i] ;
     130    cout<<" / " << (int) Fadc[i] ;
    131131  }
    132132}
    … …  
    136136  // returns back the PixelId of the Pixel
    137137  //
    138   return usPixelId;
     138  return PixelId;
    139139}
    140140
    … …  
    143143  // returns back the fadc content of the slice iSli
    144144  //
    145   return ( aucFadc[iSli] ) ;
     145  return ( Fadc[iSli] ) ;
    146146}
    147147

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

    r306 r371  
    1313 private:
    1414
    15   UShort_t     usPixelId     ;           //  Identification of PixelNumber and gain branch
     15  UShort_t     PixelId     ;           //  Identification of PixelNumber and gain branch
    1616
    17   UChar_t      ucPixelStatus ;           //  The Status of the pixel
     17  UChar_t      PixelStatus ;           //  The Status of the pixel
    1818
    19   UChar_t      aucFadc[ FADC_SLICES ]  ; // The values of fadc-slices.
     19  UChar_t      Fadc[ FADC_SLICES ]  ; // The values of fadc-slices.
    2020
    2121 public:
Note: See TracChangeset for help on using the changeset viewer.