Avoid cast from pointer to integer

diff --git a/EMCAL/AliEMCALClusterizerv1.cxx b/EMCAL/AliEMCALClusterizerv1.cxx
index 2db085eb788c0378c4d5e83e248dbae6197a53ea..a4e6772825c9b5f938fc82f60a27882df4d63578 100644 (file)
--- a/EMCAL/AliEMCALClusterizerv1.cxx
+++ b/EMCAL/AliEMCALClusterizerv1.cxx
@@ -235,7 +235,7 @@ void AliEMCALClusterizerv1::Exec(Option_t * option)
 }
 
 //____________________________________________________________________________
-Bool_t AliEMCALClusterizerv1::FindFit(AliEMCALTowerRecPoint * emcRP, int * maxAt, Float_t * maxAtEnergy,
+Bool_t AliEMCALClusterizerv1::FindFit(AliEMCALTowerRecPoint * emcRP, AliEMCALDigit ** maxAt, Float_t * maxAtEnergy,
                                    Int_t nPar, Float_t * fitparameters) const
 { 
   // Calls TMinuit to fit the energy distribution of a cluster with several maxima 
@@ -269,7 +269,7 @@ Bool_t AliEMCALClusterizerv1::FindFit(AliEMCALTowerRecPoint * emcRP, int * maxAt
   AliEMCALGeometry * geom = gime->EMCALGeometry() ; 
 
   for(iDigit = 0; iDigit < nDigits; iDigit++){
-    digit = (AliEMCALDigit *) maxAt[iDigit]; 
+    digit = maxAt[iDigit]; 
 
     Int_t relid[4] ;
     Float_t x = 0.;
@@ -764,7 +764,7 @@ Double_t  AliEMCALClusterizerv1::ShowerShape(Double_t r)
 //____________________________________________________________________________
 void  AliEMCALClusterizerv1::UnfoldCluster(AliEMCALTowerRecPoint * iniTower, 
                                                 Int_t nMax, 
-                                                int * maxAt, 
+                                                AliEMCALDigit ** maxAt, 
                                                 Float_t * maxAtEnergy)
 {
   // Performs the unfolding of a cluster with nMax overlapping showers 

diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h
index 1e15dbd694459104891f8e0096aaf5edb89607d1..1d9b62623d86667ce0e3b387a17b5fae1f2cf14a 100644 (file)
--- a/EMCAL/AliEMCALClusterizerv1.h
+++ b/EMCAL/AliEMCALClusterizerv1.h
@@ -86,13 +86,13 @@ private:
 
   void    GetCalibrationParameters(void) ;
   
-  Bool_t  FindFit(AliEMCALTowerRecPoint * emcRP, int * MaxAt, Float_t * maxAtEnergy, 
+  Bool_t  FindFit(AliEMCALTowerRecPoint * emcRP, AliEMCALDigit ** MaxAt, Float_t * maxAtEnergy, 
                  Int_t NPar, Float_t * FitParametres) const; //Used in UnfoldClusters, calls TMinuit
   void Init() ;
 
   virtual void   MakeUnfolding() ;
   void           UnfoldCluster(AliEMCALTowerRecPoint * iniEmc,Int_t Nmax, 
-                      int * maxAt,Float_t * maxAtEnergy ) ; //Unfolds cluster using TMinuit package
+                      AliEMCALDigit ** maxAt,Float_t * maxAtEnergy ) ; //Unfolds cluster using TMinuit package
   void           PrintRecPoints(Option_t * option) ;
 
 private:

diff --git a/EMCAL/AliEMCALDigit.h b/EMCAL/AliEMCALDigit.h
index 6cacf437554447f9f017b14fafa35d3d4fb47e49..eba93033be78c543d832d9fbd6b7b0d67db2314b 100644 (file)
--- a/EMCAL/AliEMCALDigit.h
+++ b/EMCAL/AliEMCALDigit.h
@@ -37,7 +37,7 @@ class AliEMCALDigit : public AliDigitNew {
 
   Bool_t operator==(const AliEMCALDigit &rValue) const;
   AliEMCALDigit& operator+(AliEMCALDigit const &rValue) ;
-  AliEMCALDigit& AliEMCALDigit::operator*(Float_t factor) ; 
+  AliEMCALDigit& operator*(Float_t factor) ; 
  
   Int_t   Compare(const TObject * obj) const ;  
   const Float_t GetEta() const ; 

diff --git a/EMCAL/AliEMCALTowerRecPoint.cxx b/EMCAL/AliEMCALTowerRecPoint.cxx
index d6aff63003c14967a53bd526226baba89cf172c0..a132176d57606c55d48c06876aeb3008cea7b943 100644 (file)
--- a/EMCAL/AliEMCALTowerRecPoint.cxx
+++ b/EMCAL/AliEMCALTowerRecPoint.cxx
@@ -610,7 +610,7 @@ Int_t AliEMCALTowerRecPoint::GetMultiplicityAtLevel(const Float_t H) const
 }
 
 //____________________________________________________________________________
-Int_t  AliEMCALTowerRecPoint::GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxAtEnergy,
+Int_t  AliEMCALTowerRecPoint::GetNumberOfLocalMax(AliEMCALDigit **  maxAt, Float_t * maxAtEnergy,
                                               Float_t locMaxCut,TClonesArray * digits) const
 { 
   // Calculates the number of local maxima in the cluster using fLocalMaxCut as the minimum
@@ -624,28 +624,28 @@ Int_t  AliEMCALTowerRecPoint::GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxA
   Int_t iDigit ;
 
   for(iDigit = 0; iDigit < fMulDigit; iDigit++)
-    maxAt[iDigit] = (Int_t) digits->At(fDigitsList[iDigit])  ;
+    maxAt[iDigit] = (AliEMCALDigit*) digits->At(fDigitsList[iDigit])  ;
 
   
   for(iDigit = 0 ; iDigit < fMulDigit; iDigit++) {   
-    if(maxAt[iDigit] != -1) {
-      digit = (AliEMCALDigit *) maxAt[iDigit] ;
+    if(maxAt[iDigit]) {
+      digit = maxAt[iDigit] ;
           
       for(iDigitN = 0; iDigitN < fMulDigit; iDigitN++) {       
        digitN = (AliEMCALDigit *) digits->At(fDigitsList[iDigitN]) ; 
        
        if ( AreNeighbours(digit, digitN) ) {
          if (fEnergyList[iDigit] > fEnergyList[iDigitN] ) {    
-           maxAt[iDigitN] = -1 ;
+           maxAt[iDigitN] = 0 ;
            // but may be digit too is not local max ?
            if(fEnergyList[iDigit] < fEnergyList[iDigitN] + locMaxCut) 
-             maxAt[iDigit] = -1 ;
+             maxAt[iDigit] = 0 ;
          }
          else {
-           maxAt[iDigit] = -1 ;
+           maxAt[iDigit] = 0 ;
            // but may be digitN too is not local max ?
            if(fEnergyList[iDigit] > fEnergyList[iDigitN] - locMaxCut) 
-             maxAt[iDigitN] = -1 ; 
+             maxAt[iDigitN] = 0 ; 
          } 
        } // if Areneighbours
       } // while digitN
@@ -654,7 +654,7 @@ Int_t  AliEMCALTowerRecPoint::GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxA
   
   iDigitN = 0 ;
   for(iDigit = 0; iDigit < fMulDigit; iDigit++) { 
-    if(maxAt[iDigit] != -1){
+    if(maxAt[iDigit] ){
       maxAt[iDigitN] = maxAt[iDigit] ;
       maxAtEnergy[iDigitN] = fEnergyList[iDigit] ;
       iDigitN++ ; 

diff --git a/EMCAL/AliEMCALTowerRecPoint.h b/EMCAL/AliEMCALTowerRecPoint.h
index 52ea583245f930f6ad9f18c186fbeaa717f64454..c9162f5d5d8f433fd17dc8da3ff980d5061d0817 100644 (file)
--- a/EMCAL/AliEMCALTowerRecPoint.h
+++ b/EMCAL/AliEMCALTowerRecPoint.h
@@ -56,7 +56,7 @@ public:
   Int_t       GetMultiplicity(void) const { return fMulDigit ; }   // gets the number of digits making this recpoint
   Int_t       GetMultiplicityAtLevel(const Float_t level) const ;  // computes multiplicity of digits with 
                                                                    // energy above relative level
-  virtual Int_t GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxAtEnergy,
+  virtual Int_t GetNumberOfLocalMax(AliEMCALDigit **  maxAt, Float_t * maxAtEnergy,
                                     Float_t locMaxCut,TClonesArray * digits ) const ; 
                                                                    // searches for the local maxima 
   Float_t     GetTime(void) const{return  fTime ; } 

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 8e99aeda45e66801f82937a9072cacc5072e832e..2dc006095f8466712f9d166733583a301bb56e71 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -238,7 +238,7 @@ void AliPHOSClusterizerv1::Exec(Option_t * option)
 }
 
 //____________________________________________________________________________
-Bool_t AliPHOSClusterizerv1::FindFit(AliPHOSEmcRecPoint * emcRP, int * maxAt, Float_t * maxAtEnergy,
+Bool_t AliPHOSClusterizerv1::FindFit(AliPHOSEmcRecPoint * emcRP, AliPHOSDigit ** maxAt, Float_t * maxAtEnergy,
                                    Int_t nPar, Float_t * fitparameters) const
 { 
   // Calls TMinuit to fit the energy distribution of a cluster with several maxima 
@@ -272,7 +272,7 @@ Bool_t AliPHOSClusterizerv1::FindFit(AliPHOSEmcRecPoint * emcRP, int * maxAt, Fl
   const AliPHOSGeometry * geom = gime->PHOSGeometry() ; 
 
   for(iDigit = 0; iDigit < nDigits; iDigit++){
-    digit = (AliPHOSDigit *) maxAt[iDigit]; 
+    digit = maxAt[iDigit]; 
 
     Int_t relid[4] ;
     Float_t x = 0.;
@@ -699,7 +699,7 @@ void AliPHOSClusterizerv1::MakeUnfolding()
        break ;
       
       Int_t nMultipl = emcRecPoint->GetMultiplicity() ; 
-      Int_t * maxAt = new Int_t[nMultipl] ;
+      AliPHOSDigit ** maxAt = new AliPHOSDigit*[nMultipl] ;
       Float_t * maxAtEnergy = new Float_t[nMultipl] ;
       Int_t nMax = emcRecPoint->GetNumberOfLocalMax(maxAt, maxAtEnergy,fEmcLocMaxCut,digits) ;
       
@@ -736,7 +736,7 @@ void AliPHOSClusterizerv1::MakeUnfolding()
       AliPHOSEmcRecPoint * emcRecPoint = (AliPHOSEmcRecPoint*) recPoint ; 
       
       Int_t nMultipl = emcRecPoint->GetMultiplicity() ; 
-      Int_t * maxAt = new Int_t[nMultipl] ;
+      AliPHOSDigit ** maxAt = new AliPHOSDigit*[nMultipl] ;
       Float_t * maxAtEnergy = new Float_t[nMultipl] ;
       Int_t nMax = emcRecPoint->GetNumberOfLocalMax(maxAt, maxAtEnergy,fCpvLocMaxCut,digits) ;
       
@@ -772,7 +772,7 @@ Double_t  AliPHOSClusterizerv1::ShowerShape(Double_t r)
 //____________________________________________________________________________
 void  AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, 
                                                 Int_t nMax, 
-                                                int * maxAt, 
+                                                AliPHOSDigit ** maxAt, 
                                                 Float_t * maxAtEnergy)
 { 
   // Performs the unfolding of a cluster with nMax overlapping showers 

diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h
index 5a24c81314b282bf68fecb2abe6feef0237eaa11..057299b97d4a8cec923a281060b81344abed8c51 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.h
+++ b/PHOS/AliPHOSClusterizerv1.h
@@ -86,13 +86,13 @@ private:
 
   void    GetCalibrationParameters(void) ;
   
-  Bool_t  FindFit(AliPHOSEmcRecPoint * emcRP, int * MaxAt, Float_t * maxAtEnergy, 
+  Bool_t  FindFit(AliPHOSEmcRecPoint * emcRP, AliPHOSDigit ** MaxAt, Float_t * maxAtEnergy, 
                  Int_t NPar, Float_t * FitParametres) const; //Used in UnfoldClusters, calls TMinuit
   void Init() ;
 
   virtual void   MakeUnfolding() ;
   void           UnfoldCluster(AliPHOSEmcRecPoint * iniEmc,Int_t Nmax, 
-                      int * maxAt,Float_t * maxAtEnergy ) ; //Unfolds cluster using TMinuit package
+                      AliPHOSDigit ** maxAt,Float_t * maxAtEnergy ) ; //Unfolds cluster using TMinuit package
   void           PrintRecPoints(Option_t * option) ;
 
 private:

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 9deeb3d1df3a19548dfabd88c02946d1f4f3f924..6724a961783324e2b2e11c2589bb6275163ab6f7 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -592,7 +592,7 @@ Int_t AliPHOSEmcRecPoint::GetMultiplicityAtLevel(const Float_t H) const
 }
 
 //____________________________________________________________________________
-Int_t  AliPHOSEmcRecPoint::GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxAtEnergy,
+Int_t  AliPHOSEmcRecPoint::GetNumberOfLocalMax( AliPHOSDigit **  maxAt, Float_t * maxAtEnergy,
                                               Float_t locMaxCut,TClonesArray * digits) const
 { 
   // Calculates the number of local maxima in the cluster using fLocalMaxCut as the minimum
@@ -606,28 +606,28 @@ Int_t  AliPHOSEmcRecPoint::GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxAtEn
   Int_t iDigit ;
 
   for(iDigit = 0; iDigit < fMulDigit; iDigit++)
-    maxAt[iDigit] = (Int_t) digits->At(fDigitsList[iDigit])  ;
+    maxAt[iDigit] = (AliPHOSDigit*) digits->At(fDigitsList[iDigit])  ;
 
   
   for(iDigit = 0 ; iDigit < fMulDigit; iDigit++) {   
-    if(maxAt[iDigit] != -1) {
-      digit = (AliPHOSDigit *) maxAt[iDigit] ;
+    if(maxAt[iDigit]) {
+      digit = maxAt[iDigit] ;
           
       for(iDigitN = 0; iDigitN < fMulDigit; iDigitN++) {       
        digitN = (AliPHOSDigit *) digits->At(fDigitsList[iDigitN]) ; 
        
        if ( AreNeighbours(digit, digitN) ) {
          if (fEnergyList[iDigit] > fEnergyList[iDigitN] ) {    
-           maxAt[iDigitN] = -1 ;
+           maxAt[iDigitN] = 0 ;
            // but may be digit too is not local max ?
            if(fEnergyList[iDigit] < fEnergyList[iDigitN] + locMaxCut) 
-             maxAt[iDigit] = -1 ;
+             maxAt[iDigit] = 0 ;
          }
          else {
-           maxAt[iDigit] = -1 ;
+           maxAt[iDigit] = 0 ;
            // but may be digitN too is not local max ?
            if(fEnergyList[iDigit] > fEnergyList[iDigitN] - locMaxCut) 
-             maxAt[iDigitN] = -1 ; 
+             maxAt[iDigitN] = 0 ; 
          } 
        } // if Areneighbours
       } // while digitN
@@ -636,7 +636,7 @@ Int_t  AliPHOSEmcRecPoint::GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxAtEn
   
   iDigitN = 0 ;
   for(iDigit = 0; iDigit < fMulDigit; iDigit++) { 
-    if(maxAt[iDigit] != -1){
+    if(maxAt[iDigit]){
       maxAt[iDigitN] = maxAt[iDigit] ;
       maxAtEnergy[iDigitN] = fEnergyList[iDigit] ;
       iDigitN++ ; 

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index c681d7a4f9680270583640891bf0dda4f0276d3c..94bc7a78b8cdd33284ec7d0b7fd60ce50f30fe77 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -54,7 +54,7 @@ public:
   Int_t       GetMultiplicity(void) const { return fMulDigit ; }   // gets the number of digits making this recpoint
   Int_t       GetMultiplicityAtLevel(const Float_t level) const ;  // computes multiplicity of digits with 
                                                                    // energy above relative level
-  virtual Int_t GetNumberOfLocalMax(Int_t *  maxAt, Float_t * maxAtEnergy,
+  virtual Int_t GetNumberOfLocalMax(AliPHOSDigit **  maxAt, Float_t * maxAtEnergy,
                                     Float_t locMaxCut,TClonesArray * digits ) const ; 
                                                                    // searches for the local maxima 
   Float_t     GetTime(void) const{return  fTime ; } 

diff --git a/PHOS/AliPHOSEvalRecPoint.cxx b/PHOS/AliPHOSEvalRecPoint.cxx
index cc867925013659c1e2ba09eb889d23227293c778..e837b84396b78c5c739f8408f86803f5b8ddfc95 100644 (file)
--- a/PHOS/AliPHOSEvalRecPoint.cxx
+++ b/PHOS/AliPHOSEvalRecPoint.cxx
@@ -887,7 +887,7 @@ Int_t AliPHOSEvalRecPoint::UnfoldLocalMaxima()
   // if multiplicity less then 2 - nothing to unfold
   if(GetMultiplicity()<2) return 1; 
 
-  Int_t maxAt[1000];
+  AliPHOSDigit * maxAt[1000];
   Float_t maxAtEnergy[1000];  
   Float_t LocMaxCut, LogWeight;
   Int_t relid[4] ; 
@@ -940,7 +940,7 @@ Int_t AliPHOSEvalRecPoint::UnfoldLocalMaxima()
 
       for(Int_t iMax=0; iMax<Nmax; iMax++)
        {
-         AliPHOSDigit* digitMax = (AliPHOSDigit*)maxAt[iMax];
+         AliPHOSDigit* digitMax = maxAt[iMax];
          Float_t eMax = maxAtEnergy[iMax]; 
          fGeom->AbsToRelNumbering(digitMax->GetId(), relid) ;
          fGeom->RelPosInModule(relid, xMax, zMax);
@@ -956,7 +956,7 @@ Int_t AliPHOSEvalRecPoint::UnfoldLocalMaxima()
 
   for(Int_t iMax=0; iMax<Nmax; iMax++) 
     {
-      AliPHOSDigit* digitMax = (AliPHOSDigit*)maxAt[iMax];
+      AliPHOSDigit* digitMax = maxAt[iMax];
       fGeom->AbsToRelNumbering(digitMax->GetId(), relid) ;
       fGeom->RelPosInModule(relid, xMax, zMax);
       Float_t eMax = maxAtEnergy[iMax];