Amplitude of the EMCAL cells changed from Int_t to Float_t from Gustavo

diff --git a/EVE/EveDet/AliEveEMCALData.cxx b/EVE/EveDet/AliEveEMCALData.cxx
index eef7b9341c6df206fc3ec416e6fc28485f9561d9..029da42fc473b841e3ee9f8542ff4fe7beb92c0c 100644 (file)
--- a/EVE/EveDet/AliEveEMCALData.cxx
+++ b/EVE/EveDet/AliEveEMCALData.cxx
@@ -402,7 +402,7 @@ void AliEveEMCALData::LoadDigits(TTree *t)
   AliEMCALDigit * dig;
 
   //  Double_t amp   = -1 ;
-  Double_t ampInt   = -1 ;
+  Double_t ampFlo   = -1 ;
   Int_t id      = -1 ;
   Int_t iSupMod =  0 ;
   Double_t x, y, z;
@@ -414,9 +414,9 @@ void AliEveEMCALData::LoadDigits(TTree *t)
       if(dig != 0) {
        id   = dig->GetId() ; //cell (digit) label
        // adc
-       ampInt  = dig->GetAmp(); //amplitude in cell (digit)
+       ampFlo  = dig->GetAmplitude(); //amplitude in cell (digit)
        // GeV
-       //      amp = ampInt*0.0153; // To be modified with correct OCDB conversion     
+       //      amp = ampFlo*0.0153; // To be modified with correct OCDB conversion     
 
        GetGeomInfo(id,iSupMod,x,y,z);
 
@@ -425,7 +425,7 @@ void AliEveEMCALData::LoadDigits(TTree *t)
 // //  fSM[iSupMod]->SaveDigit(dig);
 // //  if(iSupMod<fNsmfull) fSMfull[iSupMod]->RegisterDigit(id,iSupMod,amp,x,y,z);
 // //  if(iSupMod>fNsmfull) fSMhalf[iSupMod-10]->RegisterDigit(id,iSupMod,amp,x,y,z);
-       fSM[iSupMod]->RegisterDigit(id,iSupMod,ampInt,x,y,z);
+       fSM[iSupMod]->RegisterDigit(id,iSupMod,ampFlo,x,y,z);
 //     fSM[iSupMod]->SaveDigit(dig);
 //     if(iSupMod<fNsmfull) fSMfull[iSupMod]->RegisterDigit(id,iSupMod,amp,x,y,z);
 //     if(iSupMod>fNsmfull) fSMhalf[iSupMod-10]->RegisterDigit(id,iSupMod,amp,x,y,z);
@@ -454,7 +454,7 @@ void AliEveEMCALData::LoadDigitsFromEMCALLoader(AliEMCALLoader* const emcl)
   //Get digits from the list  
   
   //  Double_t amp   = -1 ;
-  Double_t ampInt   = -1 ;
+  Double_t ampFlo   = -1 ;
   Int_t id      = -1 ;
   Int_t iSupMod =  0 ;
   Double_t x, y, z;
@@ -467,16 +467,16 @@ void AliEveEMCALData::LoadDigitsFromEMCALLoader(AliEMCALLoader* const emcl)
        if(fDebug>1) cout << "Digit info " << dig->GetId() << " " << dig->GetAmp() << endl;
        id   = dig->GetId() ; //cell (digit) label
        // adc
-       ampInt  = dig->GetAmp(); //amplitude in cell (digit)
+       ampFlo  = dig->GetAmplitude(); //amplitude in cell (digit)
        // GeV
-       //       amp = ampInt*0.0153.; // To be modified with correct OCDB conversion
+       //       amp = ampFlo*0.0153.; // To be modified with correct OCDB conversion
 
        GetGeomInfo(id,iSupMod,x,y,z);
        
        //       // GeV
        //       fSM[iSupMod]->RegisterDigit(id,iSupMod,amp,x,y,z);
        // adc
-       fSM[iSupMod]->RegisterDigit(id,iSupMod,ampInt,x,y,z);
+       fSM[iSupMod]->RegisterDigit(id,iSupMod,ampFlo,x,y,z);
      }
       else {
        cout << "Digit object empty" << endl;
@@ -503,9 +503,9 @@ void AliEveEMCALData::LoadDigitsFromESD()
     {
       Int_t id   = cells.GetCellNumber(icell);
       // adc
-      Double_t ampInt  = cells.GetAmplitude(icell);
+      Double_t ampFlo  = cells.GetAmplitude(icell);
       // GeV
-      //      Double_t amp = ampInt*0.0153; // To be modified with correct OCDB conversion
+      //      Double_t amp = ampFlo*0.0153; // To be modified with correct OCDB conversion
 
       GetGeomInfo(id,iSupMod,x,y,z);
 
@@ -514,9 +514,9 @@ void AliEveEMCALData::LoadDigitsFromESD()
 //       if(iSupMod<fNsmfull) fSMfull[iSupMod]->RegisterDigit(id,iSupMod,amp,x,y,z);
 //       if(iSupMod>fNsmfull) fSMhalf[iSupMod-10]->RegisterDigit(id,iSupMod,amp,x,y,z);
       // adc
-      fSM[iSupMod]->RegisterDigit(id,iSupMod,ampInt,x,y,z);
-      if(iSupMod<fNsmfull) fSMfull[iSupMod]->RegisterDigit(id,iSupMod,ampInt,x,y,z);
-      if(iSupMod>fNsmfull) fSMhalf[iSupMod-10]->RegisterDigit(id,iSupMod,ampInt,x,y,z);
+      fSM[iSupMod]->RegisterDigit(id,iSupMod,ampFlo,x,y,z);
+      if(iSupMod<fNsmfull) fSMfull[iSupMod]->RegisterDigit(id,iSupMod,ampFlo,x,y,z);
+      if(iSupMod>fNsmfull) fSMhalf[iSupMod-10]->RegisterDigit(id,iSupMod,ampFlo,x,y,z);
 
     } // end loop cells
 }
@@ -548,14 +548,14 @@ void AliEveEMCALData::LoadRecPoints(TTree* const t)
        // GeV
        Double_t amp = (Double_t)rp->GetEnergy();
        // adc
-       Double_t ampInt = amp/0.0153; // To be modified with correct OCDB conversion
+       Double_t ampFlo = amp/0.0153; // To be modified with correct OCDB conversion
        TVector3 lpos;
        rp->GetLocalPosition(lpos);
 
 //     // GeV
 //     fSM[iSupMod]->RegisterCluster(iSupMod,amp,lpos[0],lpos[1],lpos[2]);
         // adc
-       fSM[iSupMod]->RegisterCluster(iSupMod,ampInt,lpos[0],lpos[1],lpos[2]);
+       fSM[iSupMod]->RegisterCluster(iSupMod,ampFlo,lpos[0],lpos[1],lpos[2]);
       }
     }
   }
@@ -590,14 +590,14 @@ void AliEveEMCALData::LoadRecPointsFromEMCALLoader(AliEMCALLoader* const emcl)
        if(fDebug>1) cout << "RecPoint info " << rp->GetAbsId() << " " << rp->GetEnergy() << endl;
        Int_t iSupMod = rp->GetSuperModuleNumber();
        Double_t amp = (Double_t)rp->GetEnergy();
-       Double_t ampInt = amp/0.0153; // To be modified with correct OCDB conversion
+       Double_t ampFlo = amp/0.0153; // To be modified with correct OCDB conversion
        TVector3 lpos;
        rp->GetLocalPosition(lpos);
        
 //        // GeV
 //        fSM[iSupMod]->RegisterCluster(iSupMod,amp,lpos[0],lpos[1],lpos[2]);
        // adc
-       fSM[iSupMod]->RegisterCluster(iSupMod,ampInt,lpos[0],lpos[1],lpos[2]);
+       fSM[iSupMod]->RegisterCluster(iSupMod,ampFlo,lpos[0],lpos[1],lpos[2]);
     }
   }