minor interface fixes and additions
authorrbertens <rbertens@cern.ch>
Thu, 19 Jun 2014 12:11:24 +0000 (14:11 +0200)
committerrbertens <rbertens@cern.ch>
Thu, 19 Jun 2014 12:11:43 +0000 (14:11 +0200)
PWG/FLOW/Base/AliFlowEventSimple.cxx
PWG/FLOW/Base/AliFlowEventSimple.h
PWG/FLOW/Tasks/AliAnalysisTaskFlowEvent.h
PWG/FLOW/Tasks/AliFlowTrackCuts.cxx
PWG/FLOW/Tasks/AliFlowTrackCuts.h

index a921fb6..903f9aa 100644 (file)
@@ -1024,6 +1024,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,
                                          Double_t phiMin,
index 8851d06..519b191 100644 (file)
@@ -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 );
index 9ed59b2..7ba4daf 100644 (file)
@@ -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();
index 8b223e4..0dc64d9 100644 (file)
@@ -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.);
index 6f95364..f6c17cf 100644 (file)
@@ -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,