Clean up some compiler warnings
authormvl <marco.van.leeuwen@cern.ch>
Tue, 29 Jul 2014 10:34:43 +0000 (12:34 +0200)
committermvl <marco.van.leeuwen@cern.ch>
Tue, 29 Jul 2014 10:34:43 +0000 (12:34 +0200)
PWGJE/AliAnalysisTaskPartonDisc.cxx
PWGJE/CMakelibPWGJE.pkg
PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
PWGJE/EMCALJetTasks/AliEmcalJetFinder.cxx
PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskCLQA.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalBadCells.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadEPpid.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSOH.cxx

index 064b84e..03b9906 100644 (file)
@@ -4596,7 +4596,7 @@ Bool_t AliAnalysisTaskPartonDisc::NumberOfReadEventsAOD(const char* currFile, In
          fnev->Close();
          return kFALSE;
        }
-      fNEvents = ((TH1*)list->FindObject("NJetsH"))->GetEntries();
+      fNEvents = Int_t(((TH1*)list->FindObject("NJetsH"))->GetEntries());
       fnev->Close();
     }
   return kTRUE;
index 2fb3e4e..4b59334 100644 (file)
@@ -74,7 +74,8 @@ string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
 set ( EINCLUDE ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWG/FLOW/Tasks PWG/TRD PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase STEER/CDB STEER/STEER)
 if(FASTJET_FOUND)
-  set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGCF/Correlations PWGCF/Correlations/DPhi ${EINCLUDE})
+  set ( EDEFINE -isystem${FASTJET_INCLUDE_DIR})
+  set ( EINCLUDE PWGCF/Correlations PWGCF/Correlations/DPhi ${EINCLUDE})
   set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h  )
 endif(FASTJET_FOUND)
 
index c585017..765c28d 100644 (file)
@@ -103,7 +103,7 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 if(FASTJET_FOUND)
   set ( EDEFINE -isystem${FASTJET_INCLUDE_DIR})
-  set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
+  set ( EINCLUDE PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
   set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h )
 else()
   set ( EINCLUDE PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
index c2a75da..e3f7c2e 100644 (file)
@@ -114,7 +114,7 @@ void AliEmcalJetFinder::FillPtHistogram(TH1* histogram)
 {
   if(!histogram)
     return;
-  for (Int_t i=0; i<fJetArray.size(); i++)
+  for (std::size_t i=0; i<fJetArray.size(); i++)
   {
     histogram->Fill(fJetArray[i]->Pt());
   }
@@ -125,7 +125,7 @@ void AliEmcalJetFinder::FillPhiHistogram(TH1* histogram)
 {
   if(!histogram)
     return;
-  for (Int_t i=0; i<fJetArray.size(); i++)
+  for (std::size_t i=0; i<fJetArray.size(); i++)
   {
     histogram->Fill(fJetArray[i]->Phi());
   }
@@ -136,7 +136,7 @@ void AliEmcalJetFinder::FillEtaHistogram(TH1* histogram)
 {
   if(!histogram)
     return;
-  for (Int_t i=0; i<fJetArray.size(); i++)
+  for (std::size_t i=0; i<fJetArray.size(); i++)
   {
     histogram->Fill(fJetArray[i]->Eta());
   }
index d3aed41..545ca91 100644 (file)
@@ -439,7 +439,7 @@ void AliEmcalJetTask::FindJets()
     if(fDoGenericSubtraction) {
 #ifdef FASTJET_VERSION
       std::vector<fastjet::contrib::GenericSubtractorInfo> jetMassInfo = fjw.GetGenSubtractorInfoJetMass();
-      UInt_t n = (UInt_t)jetMassInfo.size();
+      Int_t n = (Int_t)jetMassInfo.size();
       if(n>ij && n>0) {
        jet->SetFirstDerivative(jetMassInfo[ij].first_derivative());
        jet->SetSecondDerivative(jetMassInfo[ij].second_derivative());
index 9026291..2ac8deb 100644 (file)
@@ -491,7 +491,7 @@ void AliAnalysisTaskCLQA::RunCumulants(Double_t Mmin, Double_t ptmin, Double_t p
     AliVVZERO *vzero = InputEvent()->GetVZEROData();
     Double_t v0a = vzero->GetMTotV0A();
     Double_t v0c = vzero->GetMTotV0C();
-    Double_t v0m = vzero->GetMTotV0A()+vzero->GetMTotV0C();
+    //Double_t v0m = vzero->GetMTotV0A()+vzero->GetMTotV0C();
     fHists[112]->Fill(Mall);
     fHists[113]->Fill(M);
     fHists[117]->Fill(v0a,M);
index 8690677..9ffbb25 100644 (file)
@@ -70,7 +70,7 @@ Bool_t AliAnalysisTaskEmcalBadCells::FillHistograms()
   Short_t absId = -1;
   Int_t nCells  =  0;
 
-  Int_t absIdMin = 1e6;
+  Int_t absIdMin = 1000000;
   Int_t absIdMax = -1;
 
   if (fCaloCells) {
index a83e04d..ac71184 100644 (file)
@@ -599,9 +599,9 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
 
   // set up centrality bins for mixed events
   // for pp we need mult bins for event mixing. Create binning here, to also make a histogram from it
-  Int_t nCentralityBinspp = 8;
+  //Int_t nCentralityBinspp = 8;
   //Double_t centralityBinspp[nCentralityBinspp+1];
-  Double_t centralityBinspp[9] = {0.0, 4., 9, 15, 25, 35, 55, 100.0, 500.0};  
+  //Double_t centralityBinspp[9] = {0.0, 4., 9, 15, 25, 35, 55, 100.0, 500.0};  
 
   // Setup for Pb-Pb collisions
   Int_t nCentralityBinsPbPb = 100;
index ec43bff..f72c274 100644 (file)
@@ -591,7 +591,7 @@ void AliAnalysisTaskSOH::ProcessCluster()
     
     if(TrackLabels->GetSize() == 1)
     {
-      AliESDtrack *esdtrack = fESD->GetTrack(TrackLabels->GetAt(0));
+      AliESDtrack *esdtrack = fESD->GetTrack(TrackLabels->operator[](0));
       AliESDtrack *newTrack = GetAcceptTrack(esdtrack);
       if(newTrack && TMath::Abs(newTrack->Eta())<0.7)
       {
@@ -604,8 +604,8 @@ void AliAnalysisTaskSOH::ProcessCluster()
 
     if(TrackLabels->GetSize() == 2)
     {
-      AliESDtrack *esdtrack1 = fESD->GetTrack(TrackLabels->GetAt(0));
-      AliESDtrack *esdtrack2 = fESD->GetTrack(TrackLabels->GetAt(1));
+      AliESDtrack *esdtrack1 = fESD->GetTrack(TrackLabels->operator[](0));
+      AliESDtrack *esdtrack2 = fESD->GetTrack(TrackLabels->operator[](1));
       AliESDtrack *newTrack1 = GetAcceptTrack(esdtrack1);
       AliESDtrack *newTrack2 = GetAcceptTrack(esdtrack2);
       if(newTrack1 && newTrack2 && TMath::Abs(newTrack1->Eta())<0.7  && TMath::Abs(newTrack2->Eta())<0.7)
@@ -638,8 +638,8 @@ void AliAnalysisTaskSOH::ProcessCluster()
     if(MCLabels->GetSize() == 1) 
     {
       fHEventStat->Fill(4.5);
-      AliVParticle* vParticle1 = fMC->GetTrack(MCLabels->GetAt(0));
-      if(IsGoodMcParticle(vParticle1, MCLabels->GetAt(0)))
+      AliVParticle* vParticle1 = fMC->GetTrack(MCLabels->operator[](0));
+      if(IsGoodMcParticle(vParticle1, MCLabels->operator[](0)))
       {
        Double_t Entries[4] = {VClsPos.Phi(), VClsPos.Eta(), vParticle1->E(), cluster->E()/vParticle1->E()}; 
        fHClsEoverMcE_All->Fill(Entries);
@@ -660,9 +660,9 @@ void AliAnalysisTaskSOH::ProcessCluster()
     if(MCLabels->GetSize() == 2) 
     {
       fHEventStat->Fill(5.5);
-      AliVParticle* vParticle1 = fMC->GetTrack(MCLabels->GetAt(0));
-      AliVParticle* vParticle2 = fMC->GetTrack(MCLabels->GetAt(1));
-      if(IsGoodMcParticle(vParticle1, MCLabels->GetAt(0)) && IsGoodMcParticle(vParticle2, MCLabels->GetAt(1))) 
+      AliVParticle* vParticle1 = fMC->GetTrack(MCLabels->operator[](0));
+      AliVParticle* vParticle2 = fMC->GetTrack(MCLabels->operator[](1));
+      if(IsGoodMcParticle(vParticle1, MCLabels->operator[](0)) && IsGoodMcParticle(vParticle2, MCLabels->operator[](1))) 
       {
        fHEventStat->Fill(6.5);
        if((vParticle1->PdgCode()==22) && (vParticle2->PdgCode()==22)) {;}
@@ -817,8 +817,8 @@ void AliAnalysisTaskSOH::ProcessMc()
             AliESDCaloCluster *cluster = fESD->GetCaloCluster(fClusterIndices->At(k));
             Double_t clsE = cluster->E();
             TArrayI *MCLabels = cluster->GetLabelsArray();
-            AliVParticle* vParticle1 = fMC->GetTrack(MCLabels->GetAt(0));
-            AliVParticle* vParticle2 = fMC->GetTrack(MCLabels->GetAt(1));
+            AliVParticle* vParticle1 = fMC->GetTrack(MCLabels->operator[](0));
+            AliVParticle* vParticle2 = fMC->GetTrack(MCLabels->operator[](1));
             
             if(vParticle1->PdgCode()==22 && vParticle2 == vParticle)
             {