minor interface fixes and additions

diff --git a/PWG/FLOW/Base/AliFlowEventSimple.cxx b/PWG/FLOW/Base/AliFlowEventSimple.cxx
index a921fb6f1b9306a5d7536e5d76e84be488e0e99e..903f9aa2221819829c88efcb87265b50569ae9bf 100644 (file)
--- a/PWG/FLOW/Base/AliFlowEventSimple.cxx
+++ b/PWG/FLOW/Base/AliFlowEventSimple.cxx
@@ -1023,6 +1023,13 @@ void AliFlowEventSimple::TagPOI( const AliFlowTrackSimpleCuts* cuts, Int_t poiTy
   }
 }
 
+//_____________________________________________________________________________
+void AliFlowEventSimple::TagTracks( const AliFlowTrackSimpleCuts* cutsRP, const AliFlowTrackSimpleCuts* cutsPOI)
+{
+    // simple interface to tagging poi's and rp's
+    TagPOI(cutsRP, 0);
+    TagPOI(cutsPOI, 1);
+}
 //_____________________________________________________________________________
 void AliFlowEventSimple::DefineDeadZone( Double_t etaMin,
                                          Double_t etaMax,

diff --git a/PWG/FLOW/Base/AliFlowEventSimple.h b/PWG/FLOW/Base/AliFlowEventSimple.h
index 8851d066e510b10753d33fa9d4a182c2251d55cb..519b1913dffbacda4cb452d0ab7141bee6b5f82f 100644 (file)
--- a/PWG/FLOW/Base/AliFlowEventSimple.h
+++ b/PWG/FLOW/Base/AliFlowEventSimple.h
@@ -90,6 +90,7 @@ class AliFlowEventSimple: public TObject {
   void TagSubeventsByCharge();
   void TagRP(const AliFlowTrackSimpleCuts* cuts );
   void TagPOI(const AliFlowTrackSimpleCuts* cuts, Int_t poiType=1);
+  void TagTracks(const AliFlowTrackSimpleCuts* cutsRP, const AliFlowTrackSimpleCuts* cutsPOI);
   void CloneTracks(Int_t n);
   void AddV1( Double_t v1 );
   void AddV2( Double_t v2 );

diff --git a/PWG/FLOW/Tasks/AliAnalysisTaskFlowEvent.h b/PWG/FLOW/Tasks/AliAnalysisTaskFlowEvent.h
index 9ed59b2c720c8204c7cb1cfa54bc438c51cdcf6d..7ba4daf75b530260d630123929b436b4271f3b9f 100644 (file)
--- a/PWG/FLOW/Tasks/AliAnalysisTaskFlowEvent.h
+++ b/PWG/FLOW/Tasks/AliAnalysisTaskFlowEvent.h
@@ -28,7 +28,7 @@ class AliESDpid;
 class AliAnalysisTaskFlowEvent : public AliAnalysisTaskSE {
  public:
   AliAnalysisTaskFlowEvent();
-  AliAnalysisTaskFlowEvent(const char *name, TString RPtype, Bool_t QAon, UInt_t seed=666, Bool_t bCandidates=kFALSE);
+  AliAnalysisTaskFlowEvent(const char *name, TString RPtype = "", Bool_t QAon = kFALSE, UInt_t seed=666, Bool_t bCandidates=kFALSE);
   virtual ~AliAnalysisTaskFlowEvent();
   
   virtual void   UserCreateOutputObjects();

diff --git a/PWG/FLOW/Tasks/AliFlowTrackCuts.cxx b/PWG/FLOW/Tasks/AliFlowTrackCuts.cxx
index 8b223e4f3ad1522a88e2f171c337816f4181aa28..0dc64d99543744c67a3e7ea7919a6ef57b8fb200 100644 (file)
--- a/PWG/FLOW/Tasks/AliFlowTrackCuts.cxx
+++ b/PWG/FLOW/Tasks/AliFlowTrackCuts.cxx
@@ -1406,10 +1406,10 @@ Int_t AliFlowTrackCuts::Count(AliVEvent* event)
 }
 
 //-----------------------------------------------------------------------
-AliFlowTrackCuts* AliFlowTrackCuts::GetAODTrackCutsForFilterBit(UInt_t bit)
+AliFlowTrackCuts* AliFlowTrackCuts::GetAODTrackCutsForFilterBit(UInt_t bit, TString suffix)
 {
   // object which in its default form only cuts on filterbit (for AOD analysis)
-  AliFlowTrackCuts* cuts = new AliFlowTrackCuts(Form("AOD fitlerbit %i", (int)bit));
+  AliFlowTrackCuts* cuts = new AliFlowTrackCuts(Form("AOD fitlerbit %i, %s", (int)bit, suffix.Data()));
   cuts->SetMinimalTPCdedx(-999999999);
   cuts->SetAODfilterBit(bit);
   cuts->SetParamType(AliFlowTrackCuts::kAODFilterBit);
@@ -1436,7 +1436,7 @@ AliFlowTrackCuts* AliFlowTrackCuts::GetStandardVZEROOnlyTrackCuts2010()
   //step 2 is available only for n==2 and n==3, for the higher harmonics the user
   //is repsonsible for making sure the q-sub distributions are (sufficiently) flat
   //or a sensible NUA procedure is applied !
-  AliFlowTrackCuts* cuts = new AliFlowTrackCuts("standard vzero flow cuts 2010");
+  AliFlowTrackCuts* cuts = new AliFlowTrackCuts("standard vzero flow cuts");
   cuts->SetParamType(AliFlowTrackCuts::kVZERO);
   cuts->SetEtaRange( -10, +10 );
   cuts->SetEtaGap(-1., 1.);

diff --git a/PWG/FLOW/Tasks/AliFlowTrackCuts.h b/PWG/FLOW/Tasks/AliFlowTrackCuts.h
index 6f95364904b75ad4e9e23dcbb7dd19ebb6d3cb39..f6c17cf3113f0a97e4014f3f4e7c304471cd059e 100644 (file)
--- a/PWG/FLOW/Tasks/AliFlowTrackCuts.h
+++ b/PWG/FLOW/Tasks/AliFlowTrackCuts.h
@@ -48,7 +48,7 @@ class AliFlowTrackCuts : public AliFlowTrackSimpleCuts {
   AliFlowTrackCuts& operator=(const AliFlowTrackCuts& someCuts);
   virtual ~AliFlowTrackCuts();
 
-  static AliFlowTrackCuts* GetAODTrackCutsForFilterBit(UInt_t bit = 1);
+  static AliFlowTrackCuts* GetAODTrackCutsForFilterBit(UInt_t bit = 1, TString suffix = "");
   static AliFlowTrackCuts* GetStandardTPCStandaloneTrackCuts();
   static AliFlowTrackCuts* GetStandardTPCStandaloneTrackCuts2010();
   static AliFlowTrackCuts* GetStandardGlobalTrackCuts2010();
@@ -69,7 +69,9 @@ class AliFlowTrackCuts : public AliFlowTrackSimpleCuts {
                             kVZERO, //forward VZERO detector
                             kMUON,  // XZhang 20120604
                             kKink,
-                            kAODFilterBit
+                            kAODFilterBit,
+                            kUserA, // reserved for custom cuts
+                            kUserB  // reserved for custom cuts
                           };
   enum trackParameterMix  { kPure, 
                             kTrackWithMCkine,