Fix warnings

diff --git a/PWG3/dielectron/AliAnalysisTaskDielectronEfficiency.cxx b/PWG3/dielectron/AliAnalysisTaskDielectronEfficiency.cxx
index ed8e58c..97ed8d0 100644 (file)
--- a/PWG3/dielectron/AliAnalysisTaskDielectronEfficiency.cxx
+++ b/PWG3/dielectron/AliAnalysisTaskDielectronEfficiency.cxx
@@ -359,8 +359,8 @@ void AliAnalysisTaskDielectronEfficiency::FillPlots(AliVEvent *event)
             fHist->Fill("DataCuts","dndyPt",v.Rapidity(),jpsi.GetPt());
 
             //Additional TRD cuts
-            if ( (trackN->GetStatus()&AliESDtrack::kTRDrefit!=0) &&trackN->GetTRDntrackletsPID()>4 ){
-              if ( (trackP->GetStatus()&AliESDtrack::kTRDrefit!=0) &&trackP->GetTRDntrackletsPID()>4 ){
+            if ( ((trackN->GetStatus()&AliESDtrack::kTRDrefit)!=0) && trackN->GetTRDntrackletsPID()>4 ){
+              if ( ((trackP->GetStatus()&AliESDtrack::kTRDrefit)!=0) && trackP->GetTRDntrackletsPID()>4 ){
                 if (motherN){
                   fHist->Fill("DataTRDCuts","JpsiMCPt",motherN->Pt());
                   fHist->Fill("DataTRDCuts","e+Pt",pP->Pt());
@@ -411,8 +411,8 @@ void AliAnalysisTaskDielectronEfficiency::FillMCInfo(AliStack *pStack)
   
   TLorentzVector v;
   //Fill MC info
-  for (Int_t ipart=0; ipart<pStack->GetNprimary(); ++ipart){
-    TParticle *part=pStack->Particle(pStack->GetPrimary(ipart));
+  for (Int_t ipart=0; ipart<pStack->GetNtrack(); ++ipart){
+    TParticle *part=pStack->Particle(ipart);
 //     printf("Particle %d\n",part->GetPdgCode());
     if (part->GetPdgCode()!=fIdMCMother || part->GetNDaughters()!=2) continue;
     TParticle *d1=pStack->Particle(part->GetFirstDaughter());

diff --git a/PWG3/dielectron/AliDielectron.cxx b/PWG3/dielectron/AliDielectron.cxx
index c9a46d0..902e3ed 100644 (file)
--- a/PWG3/dielectron/AliDielectron.cxx
+++ b/PWG3/dielectron/AliDielectron.cxx
@@ -155,8 +155,8 @@ void AliDielectron::Process(AliVEvent *ev1, AliVEvent *ev2)
   UInt_t selectedMask=(1<<fEventFilter.GetCuts()->GetEntries())-1;
 
   //apply event cuts
-    if (ev1&&fEventFilter.IsSelected(ev1)!=selectedMask ||
-        ev2&&fEventFilter.IsSelected(ev2)!=selectedMask) return;
+    if ((ev1&&fEventFilter.IsSelected(ev1)!=selectedMask) ||
+        (ev2&&fEventFilter.IsSelected(ev2)!=selectedMask)) return;
 
   //fill track arrays for the first event
   if (ev1) FillTrackArrays(ev1);
@@ -187,7 +187,7 @@ void AliDielectron::ProcessMC()
   for (Int_t ipart=0; ipart<dieMC->GetNMCTracks();++ipart){
     //TODO: MC truth cut properly!!!
     AliVParticle *mcPart=dieMC->GetMCTrackFromMCEvent(ipart);
-    if (!AliDielectronMC::Instance()->IsMCMotherToEE(mcPart, fPdgMother)) continue;
+    if (!dieMC->IsMCMotherToEE(mcPart, fPdgMother)) continue;
     fCfManagerPair->FillMC(mcPart);
   }
 }

diff --git a/PWG3/dielectron/AliDielectronCF.cxx b/PWG3/dielectron/AliDielectronCF.cxx
index 831aa29..258739f 100644 (file)
--- a/PWG3/dielectron/AliDielectronCF.cxx
+++ b/PWG3/dielectron/AliDielectronCF.cxx
@@ -173,7 +173,7 @@ void AliDielectronCF::InitialiseContainer(const AliAnalysisFilter& filter)
   //Steps for each of the cuts
   if (fStepsForEachCut){
     for (Int_t iCut=0; iCut<fNCuts;++iCut) {
-      TString cutName=filter.GetCuts()->At(iCut)->GetName(); //TODO: User GetTitle???
+      cutName=filter.GetCuts()->At(iCut)->GetName(); //TODO: User GetTitle???
       fCfContainer->SetStepTitle(step++, cutName.Data()); //Step for the cut
       cutName+=" (MC truth)";
       fCfContainer->SetStepTitle(step++, cutName.Data()); //Step for the cut with MC truth
@@ -182,7 +182,7 @@ void AliDielectronCF::InitialiseContainer(const AliAnalysisFilter& filter)
 
   //Steps for increasing cut match
   if (fStepsForCutsIncreasing&&fNCuts>2){
-    TString cutName=filter.GetCuts()->At(0)->GetName(); //TODO: User GetTitle???
+    cutName=filter.GetCuts()->At(0)->GetName(); //TODO: User GetTitle???
     for (Int_t iCut=1; iCut<fNCuts-1;++iCut) {
       cutName+="&";
       cutName+=filter.GetCuts()->At(iCut)->GetName();
@@ -194,7 +194,7 @@ void AliDielectronCF::InitialiseContainer(const AliAnalysisFilter& filter)
 
   //Steps of user defined cut combinations
   for (UInt_t iComb=0; iComb<fNStepMasks; ++iComb){
-    TString cutName;
+    cutName="";
     UInt_t mask=fStepMasks[iComb];
     for (Int_t iCut=0; iCut<fNCuts;++iCut) {
       if (mask&(1<<iCut)){

diff --git a/PWG3/dielectron/AliDielectronHistos.cxx b/PWG3/dielectron/AliDielectronHistos.cxx
index 4d9343f..8fab66b 100644 (file)
--- a/PWG3/dielectron/AliDielectronHistos.cxx
+++ b/PWG3/dielectron/AliDielectronHistos.cxx
@@ -333,8 +333,8 @@ void AliDielectronHistos::Draw(const Option_t* option)
   // Draw histograms
   //
 
-  TString drawOpt(option);
-  drawOpt.ToLower();
+  TString drawStr(option);
+  drawStr.ToLower();
   //options
 //   Bool_t same=drawOpt.Contains("same"); //FIXME not yet implemented