fix compilation warnings for GCC 4.8.2 (Christian Holms mail)

diff --git a/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx b/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx
index 54978278efea38418796e167483344cca3d63cca..7850b824430af90dc8ad1299769fb684a87fe10b 100644 (file)
--- a/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx
+++ b/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx
@@ -678,7 +678,7 @@ void AliAnalysisTaskCaloFilter::FillAODHeader()
   header->SetZDCP2Energy(fEvent->GetZDCP2Energy());
   header->SetZDCEMEnergy(fEvent->GetZDCEMEnergy(0),fEvent->GetZDCEMEnergy(1));
   
-  Float_t diamxy[2]={fEvent->GetDiamondX(),fEvent->GetDiamondY()};
+  Float_t diamxy[2]={(Float_t)fEvent->GetDiamondX(),(Float_t)fEvent->GetDiamondY()};
   Float_t diamcov[3];
   fEvent->GetDiamondCovXY(diamcov);
   header->SetDiamond(diamxy,diamcov);

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx
index 4a09571d666eb3737cf0a5e1984e58ddefbf0228..a34c0ab5a7e6c8839343b4052b834705022eff13 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx
@@ -907,7 +907,7 @@ void AliAnalysisTaskEMCALClusterize::FillAODHeader()
   header->SetZDCP2Energy(fEvent->GetZDCP2Energy());
   header->SetZDCEMEnergy(fEvent->GetZDCEMEnergy(0),fEvent->GetZDCEMEnergy(1));
   
-  Float_t diamxy[2]={fEvent->GetDiamondX(),fEvent->GetDiamondY()};
+  Float_t diamxy[2]={(Float_t)fEvent->GetDiamondX(),(Float_t)fEvent->GetDiamondY()};
   Float_t diamcov[3];
   fEvent->GetDiamondCovXY(diamcov);
   header->SetDiamond(diamxy,diamcov);

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.cxx
index 0ed83de26a8e081c36bbbf33514c411662ef7299..5bbfbf9398de213cb7b7820e1b734248b6464749 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.cxx
@@ -952,11 +952,11 @@ void AliAnalysisTaskEMCALTriggerQA::UserExec(Option_t *)
   
   //map for cells and patches
   
-  Double_t emcalCell     [fgkFALTRORows][fgkFALTROCols], emcalCellL1G  [fgkFALTRORows][fgkFALTROCols],emcalCellL1G2 [fgkFALTRORows][fgkFALTROCols],emcalCellL1G_ [fgkFALTRORows][fgkFALTROCols];
+  Double_t emcalCell     [fgkFALTRORows][fgkFALTROCols], emcalCellL1G  [fgkFALTRORows][fgkFALTROCols],emcalCellL1G2 [fgkFALTRORows][fgkFALTROCols];
   Double_t emcalCellL1J  [fgkFALTRORows][fgkFALTROCols], emcalCellL1J2 [fgkFALTRORows][fgkFALTROCols],emcalTrigL0   [fgkFALTRORows][fgkFALTROCols];
   Double_t emcalTrigL0L1G[fgkFALTRORows][fgkFALTROCols], emcalTrigL0L1J[fgkFALTRORows][fgkFALTROCols];
   Double_t emcalTrigL1G  [fgkFALTRORows][fgkFALTROCols], emcalTrigL1G2 [fgkFALTRORows][fgkFALTROCols],emcalTrigL1J  [fgkFALTRORows][fgkFALTROCols], emcalTrigL1J2 [fgkFALTRORows][fgkFALTROCols],emcalTrigL1  [fgkFALTRORows][fgkFALTROCols];
-  Double_t emcalPatchL0  [fgkFALTRORows][fgkFALTROCols], emcalPatchL1G [fgkFALTRORows][fgkFALTROCols],emcalPatchL1G2[fgkFALTRORows][fgkFALTROCols], emcalPatchL1J[fgkFALTRORows][fgkFALTROCols], emcalPatchL1J2[fgkFALTRORows][fgkFALTROCols];
+  //Double_t emcalPatchL0  [fgkFALTRORows][fgkFALTROCols], emcalPatchL1G [fgkFALTRORows][fgkFALTROCols],emcalPatchL1G2[fgkFALTRORows][fgkFALTROCols], emcalPatchL1J[fgkFALTRORows][fgkFALTROCols], emcalPatchL1J2[fgkFALTRORows][fgkFALTROCols];
   
   for (Int_t i = 0; i < fgkFALTRORows; i++)
   {
@@ -973,14 +973,13 @@ void AliAnalysisTaskEMCALTriggerQA::UserExec(Option_t *)
       emcalCell[i][j]      = 0.;
       emcalCellL1G[i][j]   = 0.;
       emcalCellL1G2[i][j]  = 0.;
-      emcalCellL1G_[i][j]  = 0.;
       emcalCellL1J[i][j]   = 0.;
       emcalCellL1J2[i][j]  = 0.;
-      emcalPatchL0[i][j]   = 0.;
-      emcalPatchL1G[i][j]  = 0.;
-      emcalPatchL1G2[i][j] = 0.;
-      emcalPatchL1J[i][j]  = 0.;
-      emcalPatchL1J2[i][j] = 0.;
+//      emcalPatchL0[i][j]   = 0.;
+//      emcalPatchL1G[i][j]  = 0.;
+//      emcalPatchL1G2[i][j] = 0.;
+//      emcalPatchL1J[i][j]  = 0.;
+//      emcalPatchL1J2[i][j] = 0.;
     }
   }
   
@@ -1088,7 +1087,7 @@ void AliAnalysisTaskEMCALTriggerQA::UserExec(Option_t *)
       if (l0fired)
       {
          nL0Patch += nTimes;
-         emcalPatchL0[posY][posX] = 1.;
+         //emcalPatchL0[posY][posX] = 1.;
          fhL0Patch->Fill(posX,posY);
       }
                        
@@ -1107,7 +1106,7 @@ void AliAnalysisTaskEMCALTriggerQA::UserExec(Option_t *)
       {
 //     cout << "(bit >> fBitEGA) & 0x1"<<endl;
         nL1Patch ++;
-        emcalPatchL1G[posY][posX] = 1.;
+        //emcalPatchL1G[posY][posX] = 1.;
         if( bL1G  ) fhL1GPatch ->Fill(posX,posY);
         if( bL1G2 ) fhL1G2Patch->Fill(posX,posY);
         if (ts > 0 && bL1G)  emcalTrigL1G [posY][posX] = ts;
@@ -1118,7 +1117,7 @@ void AliAnalysisTaskEMCALTriggerQA::UserExec(Option_t *)
       if (bit >> fBitEJE & 0x1)
       {
         nL1Patch ++;
-        emcalPatchL1J[posY][posX] = 1.;
+        //emcalPatchL1J[posY][posX] = 1.;
         if( bL1J  ) fhL1JPatch ->Fill(posX,posY);
         if( bL1J2 ) fhL1J2Patch->Fill(posX,posY);
         if (ts > 0 && bL1J ) emcalTrigL1J [posY][posX] = ts;