General PWG2/RESONANCES package upgrade

Function, FunctionAxis:
- added new axis types
- removed static local variables

Daughter, Event, Pair, PairManager, PIDIndex:
- added awareness of customizable PID weights
- added some necessary getters to carry informations around

AnalysisSE and virtual:
- corrected temporarily the TaskInfo fill procedure
- added the possibility to set some overall event cuts for whole analysis

diff --git a/PWG2/RESONANCES/AliRsnAnalysisSE.cxx b/PWG2/RESONANCES/AliRsnAnalysisSE.cxx
index c0979333f78268f050d1cd14a18af086f8a5a437..6ee21ad7db352dc1c9b29082cd6cbdfb36b7c7e6 100644 (file)
--- a/PWG2/RESONANCES/AliRsnAnalysisSE.cxx
+++ b/PWG2/RESONANCES/AliRsnAnalysisSE.cxx
@@ -6,7 +6,9 @@
 // authors: Alberto Pulvirenti (alberto.pulvirenti@ct.infn.it)
 //          Martin Vala (martin.vala@cern.ch)
 //
-
+#include "Riostream.h"
+#include "AliRsnCutSet.h"
+#include "AliRsnVATProcessInfo.h"
 #include "AliRsnAnalysisSE.h"
 
 ClassImp(AliRsnAnalysisSE)
@@ -17,6 +19,7 @@ AliRsnAnalysisSE::AliRsnAnalysisSE(const char *name) :
     fRsnAnalysisManager(),
     fPIDIndex(0),
     fEvent(),
+    fEventCuts(0x0),
     fESDCuts(0)
 {
 //
@@ -30,6 +33,7 @@ AliRsnAnalysisSE::AliRsnAnalysisSE(const AliRsnAnalysisSE& copy) : AliRsnVAnalys
     fRsnAnalysisManager(copy.fRsnAnalysisManager),
     fPIDIndex(copy.fPIDIndex),
     fEvent(copy.fEvent),
+    fEventCuts(copy.fEventCuts),
     fESDCuts(copy.fESDCuts)
 {
   AliDebug(AliLog::kDebug+2,"<-");
@@ -75,6 +79,23 @@ void AliRsnAnalysisSE::RsnUserExec(Option_t* )
   else
     return;
   if (fEvent.GetMultiplicity()<2) return;
+  if (fEventCuts) {
+    if (!fEventCuts->IsSelected(AliRsnCut::kEvent, &fEvent)) {
+      fTaskInfo.SetNumberOfTracks(0);
+      return;
+    }
+    else {
+      if (fESDEvent) {
+        fTaskInfo.SetNumberOfTracks(fESDEvent->GetNumberOfTracks());
+      }
+      else if (fAODEventOut) {
+        fTaskInfo.SetNumberOfTracks(fAODEventOut->GetNumberOfTracks());
+      }
+      else if (fAODEventIn) {
+        fTaskInfo.SetNumberOfTracks(fAODEventIn->GetNumberOfTracks());
+      }
+    }
+  }
 
   // sort tracks w.r. to PID
   fPIDIndex.ResetAll(fEvent.GetMultiplicity());

diff --git a/PWG2/RESONANCES/AliRsnAnalysisSE.h b/PWG2/RESONANCES/AliRsnAnalysisSE.h
index 17b928502ff0c4184b259e5a41b4007c1176b8ac..9e4a9a61044bfdb09a1623896e7e91d692d55e22 100644 (file)
--- a/PWG2/RESONANCES/AliRsnAnalysisSE.h
+++ b/PWG2/RESONANCES/AliRsnAnalysisSE.h
@@ -15,6 +15,9 @@
 #include "AliRsnAnalysisManager.h"\r
 #include "AliRsnPIDIndex.h"\r
 \r
+class AliRsnPIDDefESD;\r
+class AliRsnCutSet;\r
+\r
 class AliRsnAnalysisSE : public AliRsnVAnalysisTaskSE\r
 {\r
 \r
@@ -38,6 +41,12 @@ public:
     // ESD cuts\r
     void            SetESDtrackCuts(AliESDtrackCuts *cuts) {fESDCuts = cuts;}\r
 \r
+    // Indexer\r
+    AliRsnPIDIndex* GetPIDIndex() {return &fPIDIndex;}\r
+    AliRsnPIDDefESD* GetPIDDef() {return fPIDIndex.GetPIDDef();}\r
+    AliRsnCutSet* GetEventCuts() {return fEventCuts;}\r
+    void SetEventCuts(AliRsnCutSet *cuts) {fEventCuts = cuts;}\r
+\r
 private:\r
 \r
     AliRsnAnalysisSE& operator=(const AliRsnAnalysisSE& /*copy*/) {return *this;}\r
@@ -45,6 +54,7 @@ private:
     AliRsnAnalysisManager fRsnAnalysisManager;      // analysis main engine\r
     AliRsnPIDIndex        fPIDIndex;                // utility --> PID sorter\r
     AliRsnEvent           fEvent;                   // utility --> event interface\r
+    AliRsnCutSet         *fEventCuts;               // event cuts\r
 \r
     AliESDtrackCuts      *fESDCuts;                 // ESD track cuts\r
     Double_t              fPrior[AliPID::kSPECIES]; // prior probabilities\r

diff --git a/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx b/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx
index 251cf0ca0653346b179c952ed7c4921f8e322b90..627281b51a386ea79843da4903bab1e6cf7e0a88 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx
+++ b/PWG2/RESONANCES/AliRsnCutBetheBloch.cxx
@@ -42,7 +42,7 @@ AliRsnCutBetheBloch::AliRsnCutBetheBloch() :
 //_________________________________________________________________________________________________
 AliRsnCutBetheBloch::AliRsnCutBetheBloch
 (const char *name, Double_t fractionRange, AliPID::EParticleType type, Double_t mip, Bool_t correct) :
-  AliRsnCut(name, -fractionRange, fractionRange),
+  AliRsnCut(name, 0.0, fractionRange),
   fCorrect(correct),
   fMIP(mip),
   fType(type)
@@ -94,6 +94,20 @@ Double_t AliRsnCutBetheBloch::BetheBloch(AliRsnDaughter *track)
   return out * fMIP;
 }
 
+//_____________________________________________________________________________
+Double_t AliRsnCutBetheBloch::RelDiff(AliRsnDaughter *track)
+{
+//
+// Relative difference between BB value and TPC signal
+//
+
+  if (!track->GetRefESD()) return -99999.9;
+
+  // compute Bethe-Bloch with the given mass hypothesis
+  Double_t bb = BetheBloch(track);
+  return TMath::Abs((track->GetRefESD()->GetTPCsignal() - bb) / bb);
+}
+
 //_________________________________________________________________________________________________
 Bool_t AliRsnCutBetheBloch::IsSelected(ETarget tgt, AliRsnDaughter *track)
 {
@@ -120,15 +134,12 @@ Bool_t AliRsnCutBetheBloch::IsSelected(ETarget tgt, AliRsnDaughter *track)
     return kTRUE;
   }
 
-  // compute Bethe-Bloch with the given mass hypothesis
-  Double_t bb = BetheBloch(track);
-
   // the cut range is the relative fraction of the value:
   // BB*(1-fraction) < TPC < BB*(1+fraction)
   // which means:
   // -fraction < (TPC - BB)/BB < fraction
   // so we must compute the cut value accordingly
-  fCutValueD = (esd->GetTPCsignal() - bb) / bb;
+  fCutValueD = RelDiff(track);
 
   // then, this cut is checked inside the range
   return OkRange();

diff --git a/PWG2/RESONANCES/AliRsnCutBetheBloch.h b/PWG2/RESONANCES/AliRsnCutBetheBloch.h
index 83fe31d89eda441174634176d3dd06f2711f18ef..c71de547f70e2dd0218af3eafd5d4c0a963b0eca 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutBetheBloch.h
+++ b/PWG2/RESONANCES/AliRsnCutBetheBloch.h
@@ -26,6 +26,7 @@ class AliRsnCutBetheBloch : public AliRsnCut
   void           SetMIP(Double_t mip) {fMIP = mip;}
   void           SetCalibConstant(Int_t i, Double_t value) {if (i>=0&&i<5) fConst[i] = value;}
   Double_t       BetheBloch(AliRsnDaughter *track);
+  Double_t       RelDiff(AliRsnDaughter *track);
 
   virtual Bool_t IsSelected(ETarget tgt, AliRsnDaughter *daughter);
   virtual Bool_t IsSelected(ETarget tgt, AliRsnPairParticle *pair);

diff --git a/PWG2/RESONANCES/AliRsnCutStd.cxx b/PWG2/RESONANCES/AliRsnCutStd.cxx
index 62dfe5f424d1e66624f46d12cf59c619136c402a..689a0f7ff9cd83dfacb471ec86dedfcc9a5d819c 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutStd.cxx
+++ b/PWG2/RESONANCES/AliRsnCutStd.cxx
@@ -318,6 +318,8 @@ Bool_t AliRsnCutStd::IsSelected(ETarget tgt, AliRsnPairParticle *pair)
     case kEta:
       fCutValueD = (fUseMC ? pair->GetEtaMC() : pair->GetEta());
       return OkRange();
+    case kSameLabel:
+      return pair->IsLabelEqual();
     case kTruePair:
       fCutValueI = pair->CommonMother();
       return OkValue();

diff --git a/PWG2/RESONANCES/AliRsnEvent.h b/PWG2/RESONANCES/AliRsnEvent.h
index e04fbd9a7939acb51651b512720ba1c721a9e9a5..330b79506e2bfc6ac4ed9b401231d94284efbfda 100644 (file)
--- a/PWG2/RESONANCES/AliRsnEvent.h
+++ b/PWG2/RESONANCES/AliRsnEvent.h
@@ -35,8 +35,10 @@ class AliRsnEvent : public TObject
     AliRsnEvent& operator= (const AliRsnEvent& copy);
     virtual ~AliRsnEvent();
 
-    void SetRef(AliVEvent *event, AliMCEvent *mc = 0) {fRef = event; fRefMC = mc;}
-    void SetRefMC(AliMCEvent *mc) {fRefMC = mc;}
+    void        SetRef(AliVEvent *event, AliMCEvent *mc = 0) {fRef = event; fRefMC = mc;}
+    void        SetRefMC(AliMCEvent *mc) {fRefMC = mc;}
+    AliVEvent*  GetRef() {return fRef;}
+    AliMCEvent* GetRefMC() {return fRefMC;}
 
     void            SetDaughter(AliRsnDaughter &daughter, Int_t index);
     AliRsnDaughter  GetDaughter(Int_t i);

diff --git a/PWG2/RESONANCES/AliRsnFunction.cxx b/PWG2/RESONANCES/AliRsnFunction.cxx
index 80580084b4f257265d128b6e22d013d9a709d196..4b7a645b099ea980de6a5901961c1f5a76badfda 100644 (file)
--- a/PWG2/RESONANCES/AliRsnFunction.cxx
+++ b/PWG2/RESONANCES/AliRsnFunction.cxx
@@ -130,9 +130,9 @@ THnSparseD* AliRsnFunction::CreateHistogram(const char *histoName, const char *h
     return 0x0;
   }
 
-  static Int_t    *nbins = new Int_t[size];
-  static Double_t *min   = new Double_t[size];
-  static Double_t *max   = new Double_t[size];
+  Int_t    *nbins = new Int_t[size];
+  Double_t *min   = new Double_t[size];
+  Double_t *max   = new Double_t[size];
 
   // retrieve binnings for main and secondary axes
   AliRsnFunctionAxis *fcnAxis = 0;
@@ -168,7 +168,7 @@ Bool_t AliRsnFunction::Fill()
   AliDebug(AliLog::kDebug +2,"->");
 
   Int_t  i, nAxes = fAxisList.GetEntries();
-  static Double_t *values = new Double_t[nAxes];
+  Double_t *values = new Double_t[nAxes];
 
   AliRsnFunctionAxis *fcnAxis = 0;
   for (i = 0; i < nAxes; i++)
@@ -199,6 +199,7 @@ Bool_t AliRsnFunction::Fill()
     AliError("Histogram is not yet initialized");
     return kFALSE;
   }
+  //TArrayD val(values); val->Print();
   fHistogram->Fill(values);
 
   AliDebug(AliLog::kDebug +2,"->");

diff --git a/PWG2/RESONANCES/AliRsnFunctionAxis.cxx b/PWG2/RESONANCES/AliRsnFunctionAxis.cxx
index 6f5a637e7c2a3fe8fdab5c24540bb8ce9320a097..aae03d2eda513c1b729e5946ae2b783541803249 100644 (file)
--- a/PWG2/RESONANCES/AliRsnFunctionAxis.cxx
+++ b/PWG2/RESONANCES/AliRsnFunctionAxis.cxx
@@ -70,6 +70,10 @@ const char* AliRsnFunctionAxis::GetName() const
 
   switch (fType)
   {
+    case kTrack1P:        return "P1";
+    case kTrack2P:        return "P2";
+    case kTrack1Pt:       return "PT1";
+    case kTrack2Pt:       return "PT2";
     case kPairInvMass:    return "IM";
     case kPairInvMassMC:  return "IMMC";
     case kPairInvMassRes: return "IMRES";
@@ -89,6 +93,10 @@ AliRsnFunctionAxis::EAxisObject AliRsnFunctionAxis::GetAxisObject()
 
   switch (fType)
   {
+    case kTrack1P:
+    case kTrack2P:
+    case kTrack1Pt:
+    case kTrack2Pt:
     case kPairInvMass:
     case kPairInvMassMC:
     case kPairInvMassRes:
@@ -165,6 +173,14 @@ Double_t AliRsnFunctionAxis::Eval(AliRsnPairParticle *pair, AliRsnPairDef *pairD
 
   switch (fType)
   {
+    case kTrack1P:
+      return pair->GetDaughter(0)->P();
+    case kTrack2P:
+      return pair->GetDaughter(1)->P();
+    case kTrack1Pt:
+      return pair->GetDaughter(0)->Pt();
+    case kTrack2Pt:
+      return pair->GetDaughter(1)->Pt();
     case kPairInvMass:
       return pair->GetInvMass(pairDef->GetMass(0), pairDef->GetMass(1));
     case kPairInvMassMC:

diff --git a/PWG2/RESONANCES/AliRsnFunctionAxis.h b/PWG2/RESONANCES/AliRsnFunctionAxis.h
index 4a5b81bcca04e5bef9a23c7eafc23293d5e868b9..2650a832e271483e4154f2614ecc0bf1afd70b9f 100644 (file)
--- a/PWG2/RESONANCES/AliRsnFunctionAxis.h
+++ b/PWG2/RESONANCES/AliRsnFunctionAxis.h
@@ -19,6 +19,10 @@ class AliRsnFunctionAxis : public TObject
 
     enum EAxisType
     {
+      kTrack1P,
+      kTrack2P,
+      kTrack1Pt,
+      kTrack2Pt,
       kPairInvMass,
       kPairInvMassMC,
       kPairInvMassRes,

diff --git a/PWG2/RESONANCES/AliRsnPIDDefESD.cxx b/PWG2/RESONANCES/AliRsnPIDDefESD.cxx
index 09e5b0b106b96be05a5e4750b5b87515d5a440c7..47fd60a04f32065a063e8258d917d64935a1af59 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPIDDefESD.cxx
+++ b/PWG2/RESONANCES/AliRsnPIDDefESD.cxx
@@ -37,7 +37,9 @@
 ClassImp(AliRsnPIDDefESD)
 
 //_____________________________________________________________________________
-AliRsnPIDDefESD::AliRsnPIDDefESD() : fUseESDWeights(kTRUE) {
+AliRsnPIDDefESD::AliRsnPIDDefESD() :
+  fUseESDWeights(kTRUE)
+{
 //
 // Default constructor.
 // By default, it is set for using ESD weights,
@@ -54,8 +56,9 @@ AliRsnPIDDefESD::AliRsnPIDDefESD() : fUseESDWeights(kTRUE) {
 
 //_____________________________________________________________________________
 AliRsnPIDDefESD::AliRsnPIDDefESD(const AliRsnPIDDefESD& copy) :
-    TObject(copy),
-    fUseESDWeights(copy.fUseESDWeights) {
+  TObject(copy),
+  fUseESDWeights(copy.fUseESDWeights)
+{
 //
 // Copy constructor.
 // Implemented to manage passing of this object to functions
@@ -70,7 +73,8 @@ AliRsnPIDDefESD::AliRsnPIDDefESD(const AliRsnPIDDefESD& copy) :
 }
 
 //_____________________________________________________________________________
-void AliRsnPIDDefESD::SetScheme(EScheme scheme, Double_t divValue) {
+void AliRsnPIDDefESD::SetScheme(EScheme scheme, Double_t divValue)
+{
 //
 // Set one of the predefined schemes
 //
@@ -158,7 +162,8 @@ void AliRsnPIDDefESD::SetScheme(EScheme scheme, Double_t divValue) {
 }
 
 //_____________________________________________________________________________
-void AliRsnPIDDefESD::ComputeWeights(AliESDtrack *track, Double_t *weights) {
+void AliRsnPIDDefESD::ComputeWeights(AliESDtrack *track, Double_t *weights)
+{
 //
 // Computes the global PID weights using the given ranges
 //
@@ -192,7 +197,8 @@ void AliRsnPIDDefESD::ComputeWeights(AliESDtrack *track, Double_t *weights) {
 }
 
 //_____________________________________________________________________________
-void AliRsnPIDDefESD::PrintStatus() {
+void AliRsnPIDDefESD::PrintStatus()
+{
 //
 // Print informations about this object configurations
 //
@@ -214,7 +220,8 @@ void AliRsnPIDDefESD::PrintStatus() {
 }
 
 //_____________________________________________________________________________
-const char* AliRsnPIDDefESD::DetName(EDetector det) {
+const char* AliRsnPIDDefESD::DetName(EDetector det)
+{
 //
 // Detector name for messages
 //
@@ -230,7 +237,8 @@ const char* AliRsnPIDDefESD::DetName(EDetector det) {
 }
 
 //_____________________________________________________________________________
-const char* AliRsnPIDDefESD::SchemeName() {
+const char* AliRsnPIDDefESD::SchemeName()
+{
 //
 // Scheme name for messages
 //
@@ -250,7 +258,8 @@ const char* AliRsnPIDDefESD::SchemeName() {
 }
 
 //_____________________________________________________________________________
-void AliRsnPIDDefESD::SetDivValue(EDetector det, Double_t value, Bool_t userHigher) {
+void AliRsnPIDDefESD::SetDivValue(EDetector det, Double_t value, Bool_t userHigher)
+{
 //
 // Sets div.value properties for detector
 //
@@ -261,7 +270,8 @@ void AliRsnPIDDefESD::SetDivValue(EDetector det, Double_t value, Bool_t userHigh
 }
 
 //_____________________________________________________________________________
-Bool_t AliRsnPIDDefESD::CheckDivValue(EDetector det,Double_t value) {
+Bool_t AliRsnPIDDefESD::CheckDivValue(EDetector det,Double_t value)
+{
 //
 // Sets div.value properties for detector
 //

diff --git a/PWG2/RESONANCES/AliRsnPIDDefESD.h b/PWG2/RESONANCES/AliRsnPIDDefESD.h
index 01f3c5eabfef6d1643ab0a3135a8b9cf046a6529..f3b3ec8902d47c7053fc567439f9730a5bd7ba45 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPIDDefESD.h
+++ b/PWG2/RESONANCES/AliRsnPIDDefESD.h
@@ -17,11 +17,12 @@
 
 class AliESDtrack;
 
-class AliRsnPIDDefESD : public TObject {
+class AliRsnPIDDefESD : public TObject
+{
   public:
 
     enum EDetector {
-      kITS,
+      kITS = 0,
       kTPC,
       kTRD,
       kTOF,

diff --git a/PWG2/RESONANCES/AliRsnPIDIndex.cxx b/PWG2/RESONANCES/AliRsnPIDIndex.cxx
index e7098c5e164de231d6d28b71a4ec3a8807511f07..feef344640b66254c2df4c614f099fa861c87a2c 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPIDIndex.cxx
+++ b/PWG2/RESONANCES/AliRsnPIDIndex.cxx
@@ -18,7 +18,7 @@
 ClassImp(AliRsnPIDIndex)
 
 //_____________________________________________________________________________
-AliRsnPIDIndex::AliRsnPIDIndex(Int_t num)
+AliRsnPIDIndex::AliRsnPIDIndex(Int_t num) : fPIDDef()
 {
 //
 // Default constructor
@@ -38,7 +38,8 @@ AliRsnPIDIndex::AliRsnPIDIndex(Int_t num)
 
 //_____________________________________________________________________________
 AliRsnPIDIndex::AliRsnPIDIndex(const AliRsnPIDIndex & copy)
-    : TObject(copy)
+    : TObject(copy),
+    fPIDDef(copy.fPIDDef)
 {
 //
 // Copy constructor.
@@ -254,7 +255,7 @@ void AliRsnPIDIndex::FillFromEvent(AliRsnEvent* event, AliESDtrackCuts *cuts)
       AliESDtrack *track = daughter.GetRefESD();
       if (track) if (!cuts->IsSelected(track)) continue;
     }
-    daughter.CombineWithPriors(fPrior);
+    daughter.CombineWithPriors(fPrior, &fPIDDef);
 //     daughter.Print("ALL");
 
     AddIndex(i,AliRsnDaughter::kNoPID,IndexCharge(daughter.Charge()),AliPID::kUnknown);

diff --git a/PWG2/RESONANCES/AliRsnPIDIndex.h b/PWG2/RESONANCES/AliRsnPIDIndex.h
index 964fb5019aa3b27f665e775e9cd0c1a435ff67f7..abd2f1a0e2359cd92620833796e6ea22fbaa09cd 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPIDIndex.h
+++ b/PWG2/RESONANCES/AliRsnPIDIndex.h
@@ -15,6 +15,7 @@
 #include "AliRsnEvent.h"
 #include "AliAODTrack.h"
 #include "AliRsnDaughter.h"
+#include "AliRsnPIDDefESD.h"
 
 class AliESDtrackCuts;
 
@@ -45,6 +46,8 @@ class AliRsnPIDIndex : public TObject
     void            DumpPriors();
     void            GetPriorProbability(Double_t *out);
 
+    AliRsnPIDDefESD* GetPIDDef() {return &fPIDDef;}
+
   private:
 
     Int_t     ChargeIndex(Char_t sign) const;
@@ -53,7 +56,8 @@ class AliRsnPIDIndex : public TObject
     TArrayI   fIndex[AliRsnDaughter::kMethods][2][AliPID::kSPECIES + 1];       // index arrays of pos/neg particles of each PID
     Int_t     fNumOfIndex[AliRsnDaughter::kMethods][2][AliPID::kSPECIES + 1];  //! array size
     
-    Double_t  fPrior[AliPID::kSPECIES]; // prior probabilities
+    Double_t         fPrior[AliPID::kSPECIES]; // prior probabilities
+    AliRsnPIDDefESD  fPIDDef; // customization of weights
 
     ClassDef(AliRsnPIDIndex, 1);
 };

diff --git a/PWG2/RESONANCES/AliRsnPair.cxx b/PWG2/RESONANCES/AliRsnPair.cxx
index 992a3b543c5e6f81b671796e4cb0f97a74a25700..4e9f86c31a42af9a9b7d92ee49411159f95a77b2 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPair.cxx
+++ b/PWG2/RESONANCES/AliRsnPair.cxx
@@ -228,7 +228,7 @@ void AliRsnPair::LoopPair(TArrayI *a1, TArrayI *a2, AliRsnEvent *ev1, AliRsnEven
       if (!CutPass(&fPairParticle)) continue;
       AliDebug(AliLog::kDebug+1, "pairParticle cut passed");
 
-//       pairParticle.PrintInfo();
+//       fPairParticle.PrintInfo();
 
       // fill all histograms
       TObjArrayIter nextFcn(&fFunctions);
@@ -244,7 +244,7 @@ void AliRsnPair::LoopPair(TArrayI *a1, TArrayI *a2, AliRsnEvent *ev1, AliRsnEven
 }
 
 //_____________________________________________________________________________
-TList * AliRsnPair::GenerateHistograms(TString prefix)
+TList * AliRsnPair::GenerateHistograms(TString prefix,TList *list)
 {
 //
 // Generates needed histograms, giving them a name based on
@@ -254,9 +254,10 @@ TList * AliRsnPair::GenerateHistograms(TString prefix)
 // All generated histograms are stored into the output TList.
 //
   AliDebug(AliLog::kDebug+2,"<-");
-  TList *list = new TList();
-  list->SetName(GetPairHistName(0x0).Data());
-
+  if (!list){
+    TList *list = new TList();
+    list->SetName(GetPairHistName(0x0).Data());
+  }
   Char_t hName[255], hTitle[255];
   //AliRsnFunction *fcn = 0;
   AliRsnFunction *fcn = 0;

diff --git a/PWG2/RESONANCES/AliRsnPair.h b/PWG2/RESONANCES/AliRsnPair.h
index 9b752837fb9d8f8c963fc2a9c5482052d19c7fe5..c5507923f61e40c8eee079607e8a9dd4a80a2b06 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPair.h
+++ b/PWG2/RESONANCES/AliRsnPair.h
@@ -45,8 +45,7 @@ class AliRsnPair : public TObject
     void    LoopPair(TArrayI *a1, TArrayI *a2, AliRsnEvent *ev1, AliRsnEvent *ev2 = 0);
     void    SetCutMgr(AliRsnCutMgr* theValue) { fCutMgr = theValue; }
     void    AddFunction(AliRsnFunction *fcn);
-    TList*  GenerateHistograms(TString prefix = "");
-    void    GenerateHistograms(TString prefix, TList *tgt);
+    TList*  GenerateHistograms(TString prefix = "", TList *list=0);
 
     Bool_t  IsMixed() {return fIsMixed;}
     Bool_t  IsPairEqual() {if (fPIDMethod == AliRsnDaughter::kNoPID) return (fPairDef->IsLikeSign());

diff --git a/PWG2/RESONANCES/AliRsnPairManager.cxx b/PWG2/RESONANCES/AliRsnPairManager.cxx
index ec0acf04a2389d3966e0af4121ecc0500210ed4a..a97a8c6134f4b26d9cb7ead070ff814aa1328395 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPairManager.cxx
+++ b/PWG2/RESONANCES/AliRsnPairManager.cxx
@@ -106,7 +106,7 @@ TList* AliRsnPairManager::InitAllPairs()
   while ((pair = (AliRsnPair*)next())) {
     if (!pair) continue;
     AliDebug(AliLog::kDebug+1, Form("InitAllPairs of the PairManager(%s) [%d] ...", pair->GetPairName().Data(), i++));
-    list->Add(pair->GenerateHistograms(GetName()));
+    pair->GenerateHistograms(GetName(),list);
   }
 
   AliDebug(AliLog::kDebug+2, "->");

diff --git a/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx b/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
index fb9f0cd227bba5d56a14a0c76eddb398a6a4cd24..4526c92a0d328c7c563778bb2fb37cc04d992d03 100644 (file)
--- a/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
+++ b/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
@@ -258,6 +258,7 @@ void AliRsnVAnalysisTaskSE::FillInfo()
 //
 
   AliDebug(AliLog::kDebug+2, "<-");
+  /*
   if (fAODEventOut) {
     fTaskInfo.SetNumberOfTracks(fAODEventOut->GetNumberOfTracks());
   }
@@ -267,7 +268,7 @@ void AliRsnVAnalysisTaskSE::FillInfo()
   else if (fAODEventIn) {
     fTaskInfo.SetNumberOfTracks(fAODEventIn->GetNumberOfTracks());
   }
-
+  */
   fTaskInfo.FillInfo();
   AliDebug(AliLog::kDebug+2,"->");
 }

diff --git a/PWG2/RESONANCES/macros/RsnConfig.C b/PWG2/RESONANCES/macros/RsnConfig.C
index cafe0da25395448a73c6b18df3c3ac85e1eeda08..450e8c1841f527f525859f220aadd50ba4fb923b 100644 (file)
--- a/PWG2/RESONANCES/macros/RsnConfig.C
+++ b/PWG2/RESONANCES/macros/RsnConfig.C
@@ -99,26 +99,28 @@ AliRsnPairManager* CreatePairs
 
   // === CUTS =====================================================================================
 
+  /*
   // cuts for tracks:
   // - probability to be a kaon (only for kaons)
-  AliRsnCut *cutAssignedKaon = new AliRsnCut("cutAssignedKaon", "", AliRsnCut::kAssignedPID, AliAODTrack::kKaon);
-  AliRsnCut *cutProbKaon = new AliRsnCut("cutProbKaon", "", AliRsnCut::kPIDProbForSpecies, (Int_t)AliAODTrack::kKaon);
+  AliRsnCutStd *cutAssignedKaon = new AliRsnCut("cutAssignedKaon", "", AliRsnCut::kAssignedPID, AliAODTrack::kKaon);
+  AliRsnCutStd *cutProbKaon = new AliRsnCut("cutProbKaon", "", AliRsnCut::kPIDProbForSpecies, (Int_t)AliAODTrack::kKaon);
   cutProbKaon->SetCutValues(AliRsnCut::kPIDProbForSpecies, 0.15, 1.0);
+  */
   AliRsnCutSet *cutSetTrack = new AliRsnCutSet("tracks");
-  cutSetTrack->AddCut(cutAssignedKaon);
-  cutSetTrack->AddCut(cutProbKaon);
-  cutSetTrack->SetCutScheme("(!cutAssignedKaon)|(cutAssignedKaon&cutProbKaon)");
+  //cutSetTrack->AddCut(cutAssignedKaon);
+  //cutSetTrack->AddCut(cutProbKaon);
+  //cutSetTrack->SetCutScheme("(!cutAssignedKaon)|(cutAssignedKaon&cutProbKaon)");
 
   // cuts on pairs:
   // - true daughters of the defined resonance (only for true pairs histogram)
-  AliRsnCut    *cutPairTrue    = new AliRsnCut("cutTrue", "", AliRsnCut::kIsTruePair, resonancePDG);
+  AliRsnCutStd *cutPairTrue    = new AliRsnCutStd("cutTrue", "", AliRsnCut::kTruePair, resonancePDG);
   AliRsnCutSet *cutSetPairTrue = new AliRsnCutSet("truePairs");
   cutSetPairTrue->AddCut(cutPairTrue);
   cutSetPairTrue->SetCutScheme("cutTrue");
 
   // cuts on events:
   // - multiplicity bin
-  AliRsnCut    *cutEventMult = new AliRsnCut("cutMult", "", AliRsnCut::kMultiplicity, multMin, multMax);
+  AliRsnCutStd *cutEventMult = new AliRsnCutStd("cutMult", "", AliRsnCut::kMultiplicity, multMin, multMax);
   AliRsnCutSet *cutSetEvent  = new AliRsnCutSet("multiplicity");
   cutSetEvent->AddCut(cutEventMult);
   cutSetEvent->SetCutScheme("cutMult");