Coding conventions (J.Klay)

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALDigit.cxx

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index eebb930db24bf366d0cd39eb46d9bbb915c71d65..96f1153de5b0fd09d67924b3961de8f7efb75d24 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -30,14 +30,12 @@
 
 // --- Standard library ---
 
-#include <iostream.h>
+#include <Riostream.h>
 
 // --- AliRoot header files ---
 
 #include "AliEMCALDigit.h"
 #include "AliEMCALGeometry.h"
-#include "AliEMCALGetter.h"
-
 
 ClassImp(AliEMCALDigit)
 
@@ -46,15 +44,16 @@ ClassImp(AliEMCALDigit)
 {
   // default ctor 
 
-  fIndexInList = 0 ; 
+  fIndexInList = -1 ; 
   fNprimary    = 0 ;  
-  fNMaxPrimary = 0 ; 
-  fNiparent     = 0 ;
-
-  fNMaxiparent = 0; 
+  fNMaxPrimary = 5 ; 
+  fNiparent    = 0 ;
+  fNMaxiparent = 5; 
   fPrimary = 0 ;
   fIparent = 0 ;
   fMaxIter = 0;
+  fTime = 0. ; 
+  fTimeR = 0. ; 
 }
 
 //____________________________________________________________________________
@@ -63,11 +62,12 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
   // ctor with all data 
 
   fNMaxPrimary = 25 ; 
-  fNMaxiparent = 40 ; 
+  fNMaxiparent = 150 ; 
   fPrimary = new Int_t[fNMaxPrimary] ;
   fIparent = new Int_t[fNMaxiparent] ; 
   fAmp         = DigEnergy ;
   fTime        = time ;
+  fTimeR       = fTime ;
   fId          = id ;
   fIndexInList = index ; 
   fMaxIter     = 5;
@@ -93,7 +93,7 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
 }
 
 //____________________________________________________________________________
-AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) 
+AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit)
 {
   // copy ctor
   
@@ -110,6 +110,7 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit)
   fIparent[j]  = digit.fIparent[j] ;
   fAmp         = digit.fAmp ;
   fTime        = digit.fTime ;
+  fTimeR       = digit.fTimeR ;
   fId          = digit.fId;
   fMaxIter     = digit.fMaxIter;
   fIndexInList = digit.fIndexInList ; 
@@ -149,21 +150,25 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
 }
 
 //____________________________________________________________________________
-const Float_t AliEMCALDigit::GetEta() const
-{
+Float_t AliEMCALDigit::GetEta() const
+{ 
+  //return pseudorapidity for this digit
+  // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
 }
 
 //____________________________________________________________________________
-const Float_t AliEMCALDigit::GetPhi() const
-{
+Float_t AliEMCALDigit::GetPhi() const
+{ 
+  //return phi coordinate of digit
+  // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return phi ;
 }
@@ -173,7 +178,7 @@ Int_t AliEMCALDigit::GetPrimary(Int_t index) const
 {
   // retrieves the primary particle number given its index in the list 
   Int_t rv = -1 ;
-  if ( index <= fNprimary && index > 0){
+  if ( (index <= fNprimary) && (index > 0)){
     rv = fPrimary[index-1] ;
   } 
 
@@ -194,19 +199,9 @@ Int_t AliEMCALDigit::GetIparent(Int_t index) const
   
 }
 
-//______________________________________________________________________
-const Bool_t AliEMCALDigit::IsInPreShower() const 
-{
-  Bool_t rv = kFALSE ;
-  const AliEMCALGeometry * geom = AliEMCALGetter::GetInstance()->EMCALGeometry() ;
-  if( GetId() > (geom->GetNZ() * geom->GetNPhi() )) 
-    rv = kTRUE; 
-  return rv; 
-} 
-
 //____________________________________________________________________________
 void AliEMCALDigit::ShiftPrimary(Int_t shift){
-  //shifts primary nimber to BIG offset, to separate primary in different TreeK
+  //shifts primary number to BIG offset, to separate primary in different TreeK
   Int_t index  ;
   for(index = 0; index <fNprimary; index++ ){
     fPrimary[index] = fPrimary[index]+ shift * 10000000   ;}
@@ -233,6 +228,7 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
   fAmp += digit.fAmp ;
   if(fTime > digit.fTime)
     fTime = digit.fTime ;
+  fTimeR = fTime ; 
 
   Int_t max1 = fNprimary ; 
   Int_t max2 = fNiparent ;  
@@ -249,10 +245,12 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
       fNprimary++ ;
       max1++;}
       if(fNprimary==fNMaxPrimary) {
+
        TString mess = " NMaxPrimary  =  " ; 
        mess += fNMaxPrimary ; 
        mess += " is too small" ; 
        Fatal("AliEMCALDigit::Operator+ -->" , mess.Data()) ; 
+
       }
     }
   }
@@ -269,10 +267,12 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
       fNiparent++ ;
       max2++;}
       if(fNiparent==fNMaxiparent) {
+
        TString mess = " NMaxiparent  =  " ; 
        mess += fNMaxiparent ; 
        mess += " is too small" ; 
        Fatal("AliEMCALDigit::Operator+ -->", mess.Data()) ; 
+
       }
     }
   }