fix compilation warnings for GCC 4.8.2 (Christian Holms mail)

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
index ff53ab98e70acd15c72c2598229f789b6e103d2a..9dd0d60c4dc6de89e38fdc33e4ae7e82abb6e26a 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
@@ -302,7 +302,7 @@ void AliAnaCalorimeterQA::CalculateAverageTime(AliVCluster *clus,
   // First recalculate energy in case non linearity was applied
   Float_t  energy = 0;
   Float_t  ampMax = 0, amp = 0;
-  Int_t    absIdMax =-1;
+//  Int_t    absIdMax =-1;
   for (Int_t ipos = 0; ipos < clus->GetNCells(); ipos++) 
   {
     Int_t id       = clus->GetCellsAbsId()[ipos];
@@ -316,7 +316,7 @@ void AliAnaCalorimeterQA::CalculateAverageTime(AliVCluster *clus,
     if(amp> ampMax) 
     {
       ampMax   = amp;
-      absIdMax = id;
+//      absIdMax = id;
     }
     
   } // energy loop       
@@ -1016,7 +1016,8 @@ Bool_t AliAnaCalorimeterQA::ClusterMCHistograms(TLorentzVector mom, Bool_t match
   
   Int_t pdg0  =-1;Int_t status = -1; Int_t iMother = -1; Int_t iParent = -1;
   Float_t vxMC= 0; Float_t vyMC = 0;   
-  Float_t eMC = 0; Float_t ptMC= 0; Float_t phiMC =0; Float_t etaMC = 0;
+  Float_t eMC = 0; //Float_t ptMC= 0;
+  Float_t phiMC =0; Float_t etaMC = 0;
   Int_t charge = 0;    
   
   //Check the origin.
@@ -1121,7 +1122,7 @@ Bool_t AliAnaCalorimeterQA::ClusterMCHistograms(TLorentzVector mom, Bool_t match
     }
     
     eMC    = primary->Energy();
-    ptMC   = primary->Pt();
+    //ptMC   = primary->Pt();
     phiMC  = primary->Phi();
     etaMC  = primary->Eta();
     pdg    = TMath::Abs(primary->GetPdgCode());
@@ -1226,7 +1227,7 @@ Bool_t AliAnaCalorimeterQA::ClusterMCHistograms(TLorentzVector mom, Bool_t match
     
     status = aodprimary->IsPrimary();
     eMC    = aodprimary->E();
-    ptMC   = aodprimary->Pt();
+    //ptMC   = aodprimary->Pt();
     phiMC  = aodprimary->Phi();
     etaMC  = aodprimary->Eta();
     pdg    = TMath::Abs(aodprimary->GetPdgCode());

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaElectron.cxx b/PWGGA/CaloTrackCorrelations/AliAnaElectron.cxx
index 96d731f8fbcd6ebf7df0b9856d34f317c53d7c01..6338f1822e91437a50c727a41a992502f3d3dc41 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaElectron.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaElectron.cxx
@@ -332,14 +332,10 @@ void  AliAnaElectron::FillShowerShapeHistograms(AliVCluster* cluster, Int_t mcTa
       
     }  // embedded fraction    
     
-    // Get the fraction of the cluster energy that carries the cell with highest energy
-    Int_t absID             =-1 ;
-    Float_t maxCellFraction = 0.;
-    Int_t index             = 0 ;
-    absID = GetCaloUtils()->GetMaxEnergyCell(cells, cluster,maxCellFraction);
-    
     // Check the origin and fill histograms
-    if( GetMCAnalysisUtils()->CheckTagBit(mcTag,AliMCAnalysisUtils::kMCPhoton) && 
+    Int_t index = -1;
+
+    if( GetMCAnalysisUtils()->CheckTagBit(mcTag,AliMCAnalysisUtils::kMCPhoton) &&
        !GetMCAnalysisUtils()->CheckTagBit(mcTag,AliMCAnalysisUtils::kMCConversion) &&
        !GetMCAnalysisUtils()->CheckTagBit(mcTag,AliMCAnalysisUtils::kMCPi0) &&
        !GetMCAnalysisUtils()->CheckTagBit(mcTag,AliMCAnalysisUtils::kMCEta))
@@ -376,7 +372,7 @@ void  AliAnaElectron::FillShowerShapeHistograms(AliVCluster* cluster, Int_t mcTa
           fhMCElectronELambda0NOverlap   ->Fill(energy, lambda0);
         }
         else {
-          printf("AliAnaElectron::FillShowerShapeHistogram() - n overlaps = %d!!", noverlaps);
+          printf("AliAnaElectron::FillShowerShapeHistogram() - n overlaps = %d for ancestor %d!!", noverlaps, ancLabel);
         }
       }//No embedding
       
@@ -427,11 +423,9 @@ void  AliAnaElectron::FillShowerShapeHistograms(AliVCluster* cluster, Int_t mcTa
       fhMCEDispPhi        [pidIndex][index]-> Fill(energy,dPhi);
       fhMCESumEtaPhi      [pidIndex][index]-> Fill(energy,sEtaPhi);
       fhMCEDispEtaPhiDiff [pidIndex][index]-> Fill(energy,dPhi-dEta);
-      if(dEta+dPhi>0)fhMCESphericity     [pidIndex][index]-> Fill(energy,(dPhi-dEta)/(dEta+dPhi));  
-      
+      if(dEta+dPhi>0)fhMCESphericity     [pidIndex][index]-> Fill(energy,(dPhi-dEta)/(dEta+dPhi));
     }
     
-    
   }//MC data
   
 }
@@ -1367,11 +1361,10 @@ void  AliAnaElectron::MakeAnalysisFillAOD()
                               aodpart.Pt(), aodpart.GetIdentifiedParticleType());
     
     //FIXME, this to MakeAnalysisFillHistograms ...
-    Int_t absID             = 0; 
     Float_t maxCellFraction = 0;
     
-    absID = GetCaloUtils()->GetMaxEnergyCell(cells, calo,maxCellFraction);
-    fhMaxCellDiffClusterE[pidIndex]->Fill(aodpart.E(),maxCellFraction);
+    Int_t absID = GetCaloUtils()->GetMaxEnergyCell(cells, calo,maxCellFraction);
+    if(absID>=0)fhMaxCellDiffClusterE[pidIndex]->Fill(aodpart.E(),maxCellFraction);
     fhNCellsE[pidIndex]            ->Fill(aodpart.E(),calo->GetNCells());
     fhNLME[pidIndex]               ->Fill(aodpart.E(),nMaxima);
     fhTimeE[pidIndex]              ->Fill(aodpart.E(),calo->GetTOF()*1.e9);
@@ -1474,7 +1467,7 @@ void  AliAnaElectron::MakeAnalysisFillHistograms()
       }
       
       Float_t eprim   = 0;
-      Float_t ptprim  = 0;
+      //Float_t ptprim  = 0;
       if(GetReader()->ReadStack()){
         
         if(label >=  stack->GetNtrack()) {
@@ -1489,7 +1482,7 @@ void  AliAnaElectron::MakeAnalysisFillHistograms()
         }
         
         eprim   = primary->Energy();
-        ptprim  = primary->Pt();               
+        //ptprim  = primary->Pt();
         
       }
       else if(GetReader()->ReadAODMCParticles()){
@@ -1512,7 +1505,7 @@ void  AliAnaElectron::MakeAnalysisFillHistograms()
         }
         
         eprim   = aodprimary->E();
-        ptprim  = aodprimary->Pt();
+        //ptprim  = aodprimary->Pt();
         
       }
       

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.cxx
index a5004c0b54617aa38ebe898a8e4bb9eca22f9471..415f81f117121170df242a5be439bbad424863ec 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.cxx
@@ -774,8 +774,8 @@ void  AliAnaPhotonConvInCalo::MakeAnalysisFillHistograms()
           continue;
         }
         
-        Float_t eprim   = 0;
-        Float_t ptprim  = 0;
+        //Float_t eprim   = 0;
+        //Float_t ptprim  = 0;
         if(GetReader()->ReadStack()){
           
           if(label >=  stack->GetNtrack()) {
@@ -788,8 +788,8 @@ void  AliAnaPhotonConvInCalo::MakeAnalysisFillHistograms()
             printf("AliAnaPhotonConvInCalo::MakeAnalysisFillHistograms() *** no primary ***:  label %d \n", label);
             continue;
           }
-          eprim   = primary->Energy();
-          ptprim  = primary->Pt();             
+          //eprim   = primary->Energy();
+          //ptprim  = primary->Pt();
           
         }
         else if(GetReader()->ReadAODMCParticles()){
@@ -811,8 +811,8 @@ void  AliAnaPhotonConvInCalo::MakeAnalysisFillHistograms()
             continue;
           }
           
-          eprim   = aodprimary->E();
-          ptprim  = aodprimary->Pt();
+          //eprim   = aodprimary->E();
+          //ptprim  = aodprimary->Pt();
           
         }
         

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaPi0.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPi0.cxx
index e3d3c409d0920ac09b8c183973ebbfa218f499d4..feb81764c282e684179d4a3c7b6279bcbc657490 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaPi0.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaPi0.cxx
@@ -1605,8 +1605,6 @@ void AliAnaPi0::FillArmenterosThetaStar(Int_t pdg,             TLorentzVector me
   if(en > 20)             ebin = 3;
   if(ebin < 0 || ebin > 3) return ;
   
-  Float_t asym = 0;
-  if(daugh1.E()+daugh2.E() > 0) asym = TMath::Abs(daugh1.E()-daugh2.E())/(daugh1.E()+daugh2.E());
   
   if(pdg==111)
   {
@@ -1619,10 +1617,15 @@ void AliAnaPi0::FillArmenterosThetaStar(Int_t pdg,             TLorentzVector me
     fhArmPrimEta[ebin]->Fill(alphaArm,pTArm);
   }
   
-  if(GetDebug() > 2 ) printf("AliAnaPi0::FillArmenterosThetaStar() - E %f, alphaArm %f, pTArm %f, cos(theta*) %f\n",en,alphaArm,pTArm,cosThStar);
-  
-}
+  if(GetDebug() > 2 )
+  {
+    Float_t asym = 0;
+    if(daugh1.E()+daugh2.E() > 0) asym = TMath::Abs(daugh1.E()-daugh2.E())/(daugh1.E()+daugh2.E());
 
+    printf("AliAnaPi0::FillArmenterosThetaStar() - E %f, alphaArm %f, pTArm %f, cos(theta*) %f, asymmetry %1.3f\n",
+         en,alphaArm,pTArm,cosThStar,asym);
+  }
+}
 
 //_______________________________________________________________________________________
 void AliAnaPi0::FillMCVersusRecDataHistograms(Int_t index1,  Int_t index2,

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx
index 300c2a3f33b35f177a016c5a95b5e08d0205fdb4..196c6c83bbba197e43a3717673ded2930f6f6620 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx
@@ -2959,15 +2959,6 @@ void  AliAnaPi0EbE::MakeShowerShapeIdentification()
       noverlaps = GetMCAnalysisUtils()->GetNOverlaps(calo->GetLabels(), nlabels,tag,mesonLabel,GetReader(),overpdg);
     }
     
-    Int_t inlm = 2;
-    if     ( nMaxima == 1 ) inlm = 0;
-    else if( nMaxima == 2 ) inlm = 1;
-    else if( nMaxima < 1 )
-    {
-      Info("MakeShowerShapeIdentification","Wrong number of maxima %d\n",nMaxima);
-      return;
-    }
-    
     //mass of all clusters
     fhMass       ->Fill(mom.E() ,mass);
     fhMassPt     ->Fill(mom.Pt(),mass);