fixcompiler warnings

diff --git a/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx b/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx
index 354b3a050f9dce9c6f397329d71b63f72d1904f3..be12fa9adcf3cfa9e714bd04f78f806d9bbd34d0 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx
@@ -290,10 +290,10 @@ void AliAnalysisTaskMCParticleFilter::UserExec(Option_t */*option*/)
     if (ccEH) {
       TList *genHeaders = ccEH->GetHeaders();
       for (int imch=0; imch<genHeaders->GetEntries(); imch++) {
-       if(!pyH)dynamic_cast<AliGenPythiaEventHeader*>(genHeaders->At(imch));
-       if(!hiH)dynamic_cast<AliGenHijingEventHeader*>(genHeaders->At(imch));
+       if(!pyH)pyH = dynamic_cast<AliGenPythiaEventHeader*>(genHeaders->At(imch));
+       if(!hiH)hiH = dynamic_cast<AliGenHijingEventHeader*>(genHeaders->At(imch));
        if(!colG)colG = dynamic_cast<AliCollisionGeometry *>(genHeaders->At(imch));
-       if(!dpmH)dynamic_cast<AliGenDPMjetEventHeader*>(genHeaders->At(imch));
+       if(!dpmH)dpmH = dynamic_cast<AliGenDPMjetEventHeader*>(genHeaders->At(imch));
       }
     }
   }

diff --git a/ANALYSIS/AliESDv0KineCuts.cxx b/ANALYSIS/AliESDv0KineCuts.cxx
index 80df0676b7ed5219bfbeba4d10736b7c7459de85..e9181466a4cbce1c3beda439ebbc37619a9199d9 100644 (file)
--- a/ANALYSIS/AliESDv0KineCuts.cxx
+++ b/ANALYSIS/AliESDv0KineCuts.cxx
@@ -881,18 +881,20 @@ Bool_t  AliESDv0KineCuts::GetHelixCenter(AliESDtrack * const track, Double_t b,I
       xpoint = - xpoint;\r
       ypoint = - ypoint;\r
     }\r
-\r
+    /* avoid self assignment\r
     if(charge < 0){\r
       xpoint =  xpoint;\r
       ypoint =  ypoint;\r
     }\r
+    */\r
   }\r
   if(b>0){\r
+    /* avoid self assignment\r
     if(charge > 0){\r
       xpoint =  xpoint;\r
       ypoint =  ypoint;\r
     }\r
-\r
+    */\r
     if(charge < 0){\r
       xpoint = - xpoint;\r
       ypoint = - ypoint;\r

diff --git a/PWG4/Base/AliAnalysisHelperJetTasks.cxx b/PWG4/Base/AliAnalysisHelperJetTasks.cxx
index 2d29171fc6a2d6ac1af85c26cb072df6a86aa675..524e3ae100f5b8a2ec8bf89e7493a19bb6391e56 100644 (file)
--- a/PWG4/Base/AliAnalysisHelperJetTasks.cxx
+++ b/PWG4/Base/AliAnalysisHelperJetTasks.cxx
@@ -626,7 +626,7 @@ void  AliAnalysisHelperJetTasks::MergeOutputDirs(const char* cFiles,const char*
   }
 }
 
-void  AliAnalysisHelperJetTasks::MergeOutput(char* cFiles, char* cDir, char *cList,char *cOutFile,Bool_t bUpdate){
+void  AliAnalysisHelperJetTasks::MergeOutput(const char* cFiles,const char* cDir,const char *cList,const char *cOutFile,Bool_t bUpdate){
 
   // This is used to merge the analysis-output from different 
   // data samples/pt_hard bins

diff --git a/PWG4/Base/AliAnalysisHelperJetTasks.h b/PWG4/Base/AliAnalysisHelperJetTasks.h
index 4627f57fdd8cd2b893a5e004605948acb2728d13..39bc3f4f06253c4300d9823be79c0b192a57cf7b 100644 (file)
--- a/PWG4/Base/AliAnalysisHelperJetTasks.h
+++ b/PWG4/Base/AliAnalysisHelperJetTasks.h
@@ -74,7 +74,7 @@ class AliAnalysisHelperJetTasks : public TObject {
 
   static void MergeOutputDirs(const char* cFiles,const char* cPattern,const char *cOutFile,Bool_t bUpdate = false); // merges all directories containing the pattern
 
-  static void MergeOutput(char* cFiles, char* cDir = "",char *cList = "",char* cOutFile ="allpt.root",Bool_t bUpdate = false); // Merges the files in the input text file  needs the two histograms fh1PtHard_Trials, fh1Xsec and the name of the input list
+  static void MergeOutput(const char* cFiles,const char* cDir = "",const char *cList = "",const char* cOutFile ="allpt.root",Bool_t bUpdate = false); // Merges the files in the input text file  needs the two histograms fh1PtHard_Trials, fh1Xsec and the name of the input list
   static Bool_t PythiaInfoFromFile(const char* currFile,Float_t &fXsec,Float_t &fTrials);// get the cross section and the trails either from pyxsec.root or from pysec_hists.root
   static Bool_t PrintDirectorySize(const char* currFile,Int_t iDetail = -1); // print the size of the output on a given file
   static Bool_t GetEventShapes(TVector3 &n01,const TVector3 * pTrack, Int_t nTracks, Double_t * eventShapes);