script to compare background maps in the central region

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

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index b23fd68a45f4cd3ae5b93834ef19870f32b8607b..55723d157dab8eb85bd3712ed8abe4590765809d 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -60,8 +60,8 @@ AliDigitNew(),
   fTimeR(0.),
   fChi2(0.),
   fNDF(0),
-  fDigitType(kUnknown)
-
+  fDigitType(kUnknown),
+  fAmpCalib(-1)
 {
   // default ctor 
 
@@ -102,7 +102,8 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Float_t dig
     fTimeR(time),
     fChi2(chi2),
     fNDF(ndf),
-    fDigitType(type)
+    fDigitType(type),
+    fAmpCalib(-1)
 {  
   // ctor with all data 
 
@@ -165,7 +166,8 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit)
     fTimeR(digit.fTimeR), 
     fChi2(digit.fChi2), 
     fNDF(digit.fNDF),
-    fDigitType(digit.fDigitType)
+    fDigitType(digit.fDigitType),
+    fAmpCalib(digit.fAmpCalib)
 {
   // copy ctor
   // data memebrs of the base class (AliNewDigit)
@@ -246,7 +248,7 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
   // Compares two digits with respect to its Id
   // to sort according increasing Id
 
-  Int_t rv ;
+  Int_t rv = 2 ;
 
   AliEMCALDigit * digit = (AliEMCALDigit *)obj ; 
 
@@ -419,13 +421,13 @@ AliEMCALDigit AliEMCALDigit::operator+(const AliEMCALDigit &digit)
   fAmpFloat += digit.fAmpFloat ;
   for (Int_t i=0; i < fNSamples  ; i++) fSamples[i]   += digit.fSamples[i];
   for (Int_t i=0; i < fNSamplesHG; i++) fSamplesHG[i] += digit.fSamplesHG[i];
-
+  
   fAmp    += digit.fAmp ;
   if(fTime > digit.fTime)
     fTime = digit.fTime ;
   if (digit.fTimeR < fTimeR)
     fTimeR = digit.fTimeR ; 
-
+  
   Int_t max1 = fNprimary ; 
   Int_t max2 = fNiparent ;  
   Int_t index ; 
@@ -434,24 +436,24 @@ AliEMCALDigit AliEMCALDigit::operator+(const AliEMCALDigit &digit)
     Int_t old ;
     for ( old = 0 ; (old < max1) && newPrim; old++) { //already have this primary?
       if(fPrimary[old] == digit.fPrimary[index]) {
-       newPrim = kFALSE;
-       fDEPrimary[old] += digit.fDEPrimary[index];
+        newPrim = kFALSE;
+        fDEPrimary[old] += digit.fDEPrimary[index];
       }
     }
     if (newPrim) {
       if(max1<fNMaxPrimary){ 
-       fPrimary[max1] = digit.fPrimary[index] ; 
-       fDEPrimary[max1] = digit.fDEPrimary[index] ; 
-       fNprimary++ ;
-       max1++;
+        fPrimary[max1] = digit.fPrimary[index] ; 
+        fDEPrimary[max1] = digit.fDEPrimary[index] ; 
+        fNprimary++ ;
+        max1++;
       }
       if(fNprimary==fNMaxPrimary) {
-       
-       TString mess = " NMaxPrimary  =  " ; 
-       mess += fNMaxPrimary ; 
-       mess += " is too small" ; 
-       Fatal("AliEMCALDigit::Operator+ -->" , mess.Data()) ; 
-
+        
+        TString mess = " NMaxPrimary  =  " ; 
+        mess += fNMaxPrimary ; 
+        mess += " is too small" ; 
+        AliFatal(mess.Data()) ; 
+        
       }
     }
   }
@@ -461,24 +463,24 @@ AliEMCALDigit AliEMCALDigit::operator+(const AliEMCALDigit &digit)
     Int_t old ;
     for ( old = 0 ; (old < max2) && newParent; old++) { //already have this primary?
       if(fIparent[old] == digit.fIparent[index]) {
-       newParent = kFALSE;
-       fDEParent[old] += digit.fDEParent[index];
+        newParent = kFALSE;
+        fDEParent[old] += digit.fDEParent[index];
       }
     }
     if(newParent){
       if(max2<fNMaxiparent) { 
-       fIparent[max2] = digit.fIparent[index] ; 
-       fDEParent[max2] = digit.fDEParent[index] ; 
-       fNiparent++ ;
-       max2++;
+        fIparent[max2] = digit.fIparent[index] ; 
+        fDEParent[max2] = digit.fDEParent[index] ; 
+        fNiparent++ ;
+        max2++;
       }
       if(fNiparent==fNMaxiparent) {
-       
-       TString mess = " NMaxiparent  =  " ; 
-       mess += fNMaxiparent ; 
-       mess += " is too small" ; 
-       Fatal("AliEMCALDigit::Operator+ -->", mess.Data()) ; 
-
+        
+        TString mess = " NMaxiparent  =  " ; 
+        mess += fNMaxiparent ; 
+        mess += " is too small" ; 
+        AliFatal(mess.Data()) ; 
+        
       }
     }
   }
@@ -513,12 +515,11 @@ ostream& operator << ( ostream& out , const AliEMCALDigit & digit)
   // Prints the data of the digit
   
   out << "ID " << digit.fId << " Energy = " << digit.fAmp <<  " Time = " << digit.fTime << endl ; 
-  Int_t i,j ;
-  for(i=0;i<digit.fNprimary;i++) 
+  for(Int_t i=0;i<digit.fNprimary;i++) 
     out << "Primary " << i+1 << " = " << digit.fPrimary[i] 
        << " : DE " << digit.fDEPrimary[i] << endl ;
    
-  for(j=0;j<digit.fNiparent;j++)
+  for(Int_t j=0;j<digit.fNiparent;j++)
     out << "Iparent " << j+1 << " = " << digit.fIparent[j] 
        << " : DE " << digit.fDEParent[j] << endl ;
   out << "Position in list = " << digit.fIndexInList << endl ;