fixed warnings

diff --git a/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx b/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx
index dd1cea1a12ced4237e12622e95b4dda00766fe09..573416fda49b2f820bc497a5eda5764c224def27 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx
+++ b/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx
@@ -119,7 +119,7 @@ Bool_t AliRsnCutBetheBloch::IsSelected(TObject *obj1, TObject* /*obj2*/)
   // coherence check
   if (!AliRsnCut::TargetOK(obj1))
   {
-    AliError(Form("Wrong target. Skipping cut", GetName()));
+    AliError("Wrong target. Skipping cut");
     return kTRUE;
   }
   

diff --git a/PWG2/RESONANCES/AliRsnCutPID.cxx b/PWG2/RESONANCES/AliRsnCutPID.cxx
index a8fba814093118bc58a29b5cfa95525abceec2ac..22582bc76196f81c3a346a173cd5d24e4fc89100 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutPID.cxx
+++ b/PWG2/RESONANCES/AliRsnCutPID.cxx
@@ -261,7 +261,7 @@ Bool_t AliRsnCutPID::IsSelected(TObject *obj1, TObject* /*obj2*/)
   // coherence check
   if (!AliRsnCut::TargetOK(obj1))
   {
-    AliError(Form("Wrong target. Skipping cut", GetName()));
+    AliError("Wrong target. Skipping cut");
     return kTRUE;
   }
   

diff --git a/PWG2/RESONANCES/AliRsnDaughter.cxx b/PWG2/RESONANCES/AliRsnDaughter.cxx
index f54b076d1fc0356ba85764821070079dd2c2502d..ca966938ff3be5d6002b5b72da51d6d5d521850f 100644 (file)
--- a/PWG2/RESONANCES/AliRsnDaughter.cxx
+++ b/PWG2/RESONANCES/AliRsnDaughter.cxx
@@ -145,12 +145,12 @@ void AliRsnDaughter::Print(Option_t * const /*option*/) const
   
   if (fRef)
   {
-    AliInfo(Form(".......Px, Py, Pz, Pt (ref)   : %d %d %d %d", fP.X(), fP.Y(), fP.Z(), fP.Perp()));
+    AliInfo(Form(".......Px, Py, Pz, Pt (ref)   : %f %f %f %f", fP.X(), fP.Y(), fP.Z(), fP.Perp()));
   } else AliInfo("....... absent REF");
   
   if (fRefMC) 
   {
-    AliInfo(Form(".......Px, Py, Pz, Pt (ref MC): %d %d %d %d", fP.X(), fP.Y(), fP.Z(), fP.Perp())); 
+    AliInfo(Form(".......Px, Py, Pz, Pt (ref MC): %f %f %f %f", fP.X(), fP.Y(), fP.Z(), fP.Perp())); 
     AliInfo(Form(".......PDG code               : %d", fRefMC->Particle()->GetPdgCode()));
     AliInfo(Form(".......Mother (label)         : %d", fRefMC->Particle()->GetFirstMother()));
     AliInfo(Form(".......Mother (PDG code)      : %d", fMotherPDG));

diff --git a/PWG2/RESONANCES/AliRsnFunction.cxx b/PWG2/RESONANCES/AliRsnFunction.cxx
index 82fafa471a78734997c2ad2464dab2d421e09c67..ac176f376bbf3cee9d8d27951b9f415b5dac73fc 100644 (file)
--- a/PWG2/RESONANCES/AliRsnFunction.cxx
+++ b/PWG2/RESONANCES/AliRsnFunction.cxx
@@ -220,17 +220,14 @@ THnSparseF* AliRsnFunction::CreateHistogramSparse(const char *histoName, const c
   
   // update the various axes using the definitions given in the array of axes here
   AliRsnValue *fcnAxis = 0;
-  TAxis       *axis = 0;
   for (Int_t i = 0; i < fSize; i++) 
   {
     fcnAxis = (AliRsnValue*)fAxisList.At(i);
-    axis    = fHSparse->GetAxis(i);
     if (!fcnAxis) {
-      axis->Set(1, -1E5, 1E5);
       AliError("Empty axis: doing unique bin betweeen -100000 and 100000");
       continue;
     }
-    axis->Set(fcnAxis->GetArray().GetSize() - 1, fcnAxis->GetArray().GetArray());
+    fHSparse->SetBinEdges(i, fcnAxis->GetArray().GetArray());
   }
 
   return fHSparse;

diff --git a/PWG2/RESONANCES/AliRsnPairDef.cxx b/PWG2/RESONANCES/AliRsnPairDef.cxx
index 24d953082cc0ca4a02938eb585f36daa5c03e53c..292a71f231dfdc2bef97f24b84ff33c92fdd42d5 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPairDef.cxx
+++ b/PWG2/RESONANCES/AliRsnPairDef.cxx
@@ -95,7 +95,7 @@ Bool_t AliRsnPairDef::SetDaughter(Int_t i, AliPID::EParticleType type, Char_t ch
   }
   if (charge != '+' && charge != '-' && charge != '0')
   {
-    AliError(Form("Character '%c' not recognized as charge sign"));
+    AliError(Form("Character '%c' not recognized as charge sign", charge));
     return kFALSE;
   }
   if (type < 0 && type > (Int_t)AliPID::kSPECIESN) 

diff --git a/PWG2/RESONANCES/AliRsnVATProcessInfo.cxx b/PWG2/RESONANCES/AliRsnVATProcessInfo.cxx
index 215bc62a36dc92d23bf8e0e52176e4896fc07f2c..6853a7a196a2eb0a6c882745b2770876463d1a39 100644 (file)
--- a/PWG2/RESONANCES/AliRsnVATProcessInfo.cxx
+++ b/PWG2/RESONANCES/AliRsnVATProcessInfo.cxx
@@ -111,7 +111,7 @@ void AliRsnVATProcessInfo::PrintInfo(const Long64_t &num)
 // to inform about number of events processed
 //
 
-  if ((num+1) % fPrintInfoNumber == 0) AliInfo(Form("Events processed %d",num+1));
+  if ((num+1) % fPrintInfoNumber == 0) AliInfo(Form("Events processed %d", (Int_t)num+1));
 }
 
 

diff --git a/PWG2/RESONANCES/AliRsnVAnalysisTaskME.cxx b/PWG2/RESONANCES/AliRsnVAnalysisTaskME.cxx
index aa9e81a5b58c272448419ed11f350695f401e7af..a010f21a38cb04169264b6157e33c94a35ac37ef 100644 (file)
--- a/PWG2/RESONANCES/AliRsnVAnalysisTaskME.cxx
+++ b/PWG2/RESONANCES/AliRsnVAnalysisTaskME.cxx
@@ -233,9 +233,9 @@ void AliRsnVAnalysisTaskME::Terminate(Option_t* opt)
   }
 
   AliInfo(Form("=== %s ==================", GetName()));
-  AliInfo(Form("Number Of Events Processed : %10d", (Long64_t)hEventInfo->Integral()));
-  AliInfo(Form("Number Of Events Accepted  : %10d", (Long64_t)hEventInfo->GetBinContent(2)));
-  AliInfo(Form("Number Of Events Skipped   : %10d", (Long64_t)hEventInfo->GetBinContent(1)));
+  AliInfo(Form("Number Of Events Processed : %10d", (Int_t)hEventInfo->Integral()));
+  AliInfo(Form("Number Of Events Accepted  : %10d", (Int_t)hEventInfo->GetBinContent(2)));
+  AliInfo(Form("Number Of Events Skipped   : %10d", (Int_t)hEventInfo->GetBinContent(1)));
   AliInfo(Form("=== end %s ==============", GetName()));
 
   AliDebug(AliLog::kDebug+2,"->");

diff --git a/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx b/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
index 9e645be8262aed3693b9979570033d1afb2f2219..158811ab34155ff3bbf299d9deaeaf748e999122 100644 (file)
--- a/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
+++ b/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
@@ -259,9 +259,9 @@ void AliRsnVAnalysisTaskSE::Terminate(Option_t* opt)
   }
 
   AliInfo(Form("=== %s ==================",GetName()));
-  AliInfo(Form("Number Of Events Processed : %10d",(Long64_t)hEventInfo->Integral()));
-  AliInfo(Form("Number Of Events Accepted  : %10d",(Long64_t)hEventInfo->GetBinContent(2)));
-  AliInfo(Form("Number Of Events Skipped   : %10d",(Long64_t)hEventInfo->GetBinContent(1)));
+  AliInfo(Form("Number Of Events Processed : %10d",(Int_t)hEventInfo->Integral()));
+  AliInfo(Form("Number Of Events Accepted  : %10d",(Int_t)hEventInfo->GetBinContent(2)));
+  AliInfo(Form("Number Of Events Skipped   : %10d",(Int_t)hEventInfo->GetBinContent(1)));
   AliInfo(Form("=== end %s ==============",GetName()));
 
   AliDebug(AliLog::kDebug+2, "->");

diff --git a/PWG2/RESONANCES/AliRsnValue.cxx b/PWG2/RESONANCES/AliRsnValue.cxx
index f005caeb93673c301626ea5d356f5f4c132a0c00..4df1c45ce17fa9e59c356fc768d84fced616f68f 100644 (file)
--- a/PWG2/RESONANCES/AliRsnValue.cxx
+++ b/PWG2/RESONANCES/AliRsnValue.cxx
@@ -242,6 +242,12 @@ Bool_t AliRsnValue::Eval(AliRsnMother * const mother, AliRsnPairDef * const pair
          else fValue = 0;
       }
       break;
+    case kQInv:
+      {
+        TLorentzVector diff = mother->GetDaughter(0)->P() - mother->GetDaughter(1)->P();
+        fValue = diff.M();
+      }
+      break;
     default:
       AliWarning("Invalid value type");
       return kFALSE;

diff --git a/PWG2/RESONANCES/AliRsnValue.h b/PWG2/RESONANCES/AliRsnValue.h
index 3c01e865a02f1df3f39346279490e01b3fac6724..9dee22847dfaec9e5acc01af1b55d2b84c36c4fd 100644 (file)
--- a/PWG2/RESONANCES/AliRsnValue.h
+++ b/PWG2/RESONANCES/AliRsnValue.h
@@ -45,6 +45,7 @@ class AliRsnValue : public TNamed
       kPairCosThetaStarMC2,
       kAngleToLeading,
       kLeadingPt,
+      kQInv,
       kEventMult,
       kValueTypes
     };

diff --git a/PWG2/RESONANCES/macros/test/ConfigTaskRsnTest.C b/PWG2/RESONANCES/macros/test/ConfigTaskRsnTest.C
index 6f6ae3fe6a899d51c3a3a6ae6f0faa698698490a..2a6e26c12787560f98bae99e866920dfdcf7c6fe 100644 (file)
--- a/PWG2/RESONANCES/macros/test/ConfigTaskRsnTest.C
+++ b/PWG2/RESONANCES/macros/test/ConfigTaskRsnTest.C
@@ -133,10 +133,10 @@ Bool_t RsnConfigTask(AliRsnAnalysisSE* &task, const char *dataLabel)
 
   // function axes
   Double_t ybins[] = {-0.8, -0.7, -0.6, -0.5, 0.5, 0.6, 0.7, 0.8};
-  AliRsnValue *axisIM = new AliRsnValue("IM", AliRsnValue::kPairInvMass, 50,  0.9,  1.4);
-  AliRsnValue *axisPt = new AliRsnValue("PT", AliRsnValue::kPairPt,      0.0, 20.0, 0.1);
-  AliRsnValue *axisY  = new AliRsnValue("Y" , AliRsnValue::kPairY,       sizeof(ybins)/sizeof(ybins[0]), ybins);
-  AliRsnValue *axisEta = new AliRsnValue("Eta", AliRsnValue::kPairEta,   sizeof(ybins)/sizeof(ybins[0]), ybins);
+  AliRsnValue *axisIM   = new AliRsnValue("IM"  , AliRsnValue::kPairInvMass, 50,  0.9,  1.4);
+  AliRsnValue *axisPt   = new AliRsnValue("PT"  , AliRsnValue::kPairPt,      0.0, 20.0, 0.1);
+  AliRsnValue *axisY    = new AliRsnValue("Y"   , AliRsnValue::kPairY,       sizeof(ybins)/sizeof(ybins[0]), ybins);
+  AliRsnValue *axisQinv = new AliRsnValue("QInv", AliRsnValue::kQInv,       100,  0.0, 10.0);
 
   // functions for TH1-like output
   AliRsnFunction *fcnPt    = new AliRsnFunction;
@@ -144,7 +144,7 @@ Bool_t RsnConfigTask(AliRsnAnalysisSE* &task, const char *dataLabel)
   fcnPt   ->AddAxis(axisIM);
   fcnPt   ->AddAxis(axisPt);
   fcnPt   ->AddAxis(axisY);
-  fcnPt   ->AddAxis(axisEta);
+  fcnPt   ->AddAxis(axisQinv);
   
   // add functions to TH1-like output
   pairPMhist->AddFunction(fcnPt);
@@ -153,10 +153,12 @@ Bool_t RsnConfigTask(AliRsnAnalysisSE* &task, const char *dataLabel)
   // add values to TNtuple-like output
   pairPMntp->AddValue(axisIM);
   pairPMntp->AddValue(axisPt);
+  pairPMntp->AddValue(axisY);
+  pairPMntp->AddValue(axisQinv);
   
   // add everything to analysis manager
-  task->GetAnalysisManager()->Add(pairPMhist);
-  //task->GetAnalysisManager()->Add(pairPMntp);
+  //task->GetAnalysisManager()->Add(pairPMhist);
+  task->GetAnalysisManager()->Add(pairPMntp);
 
   return kTRUE;
 }

diff --git a/PWG2/RESONANCES/macros/test/runLocal.C b/PWG2/RESONANCES/macros/test/runLocal.C
index 27e9a29061d0d99b9a0b4cf79fbc1ccaeadc6558..355e6c875f7e6605ddcd0ad7aa3c2dd7df7c8d00 100644 (file)
--- a/PWG2/RESONANCES/macros/test/runLocal.C
+++ b/PWG2/RESONANCES/macros/test/runLocal.C
@@ -26,10 +26,10 @@
 //
 void runLocal
 (
-  Int_t       nReadFiles  = 1,
+  Int_t       nReadFiles  = 0,
   Int_t       nSkipFiles  = 0,
   const char *addTaskName = "AddAnalysisTaskRsnTest.C",
-  const char *inputSource = "/home/pulvir/analysis/resonances/LHC2010-7TeV-phi/rsn-package/sim.txt",
+  const char *inputSource = "/home/pulvir/analysis/resonances/LHC2010-7TeV-phi/alien+plugin/sim.txt",
   const char *dataLabel   = "7TeV_pass2_sim_ESD",
   const char *outName     = "rsn-test"
 )