Merge branch 'master' into TPCdev

[u/mrichter/AliRoot.git] / PWGGA / GammaConv / AliConversionSelection.h

diff --git a/PWGGA/GammaConv/AliConversionSelection.h b/PWGGA/GammaConv/AliConversionSelection.h
index 327b3201a8c5a6b9a03da0353a0f2ca7c0c9bb8d..bca04afd188008b29817849f727854137a06da42 100644 (file)
--- a/PWGGA/GammaConv/AliConversionSelection.h
+++ b/PWGGA/GammaConv/AliConversionSelection.h
@@ -6,6 +6,7 @@
 #include "AliAODConversionPhoton.h"
 #include "AliConversionAODBGHandlerRP.h"
 #include "AliConversionCuts.h"
+#include "AliConversionMesonCuts.h"
 #include "TRandom3.h"
 #include "AliVEvent.h"
 #include "AliMCEvent.h"
@@ -16,7 +17,11 @@ class AliConversionSelection : public TObject{
 
 public:
 
-    AliConversionSelection(AliConversionCuts *convCut);
+    AliConversionSelection(AliConversionCuts *convCut=NULL, AliConversionMesonCuts *mesonCut=NULL);
+    AliConversionSelection(TString convCut, TString mesonCut);
+    AliConversionSelection(const AliConversionSelection&);
+    AliConversionSelection& operator=(const AliConversionSelection&); // not implemented
+
     virtual ~AliConversionSelection();
 
     // Main Functions
@@ -51,6 +56,8 @@ public:
 
     Int_t GetEventNumber(AliVEvent *inputEvent);
 
+    TString GetCutString();
+
 protected:
    
     void InitializeBGHandler();
@@ -64,23 +71,18 @@ protected:
     AliVEvent *fInputEvent;
     AliMCEvent *fMCEvent;
     AliConversionCuts *fConversionCut;
+    AliConversionMesonCuts *fMesonCut;
     AliESDtrackCuts *fESDTrackCuts;
     TObjArray *fGoodGammas; // Pointer to selected photons
     TClonesArray *fPi0Candidates;
     TClonesArray *fBGPi0s;
     TRandom3 *fRandomizer; // Randomizer for Rotation
     AliConversionAODBGHandlerRP *fBGHandler;
-    Double_t *fInvMassRange;
-    Double_t *fUnsmearedPx;
-    Double_t *fUnsmearedPy;
-    Double_t *fUnsmearedPz;
-    Double_t *fUnsmearedE;
+    Double_t fInvMassRange[2];
     Int_t fCurrentEventNumber; // Current Event Number
+    Bool_t fIsOwner; // Cuts will be deleted when the destructor is called
 
-    AliConversionSelection(const AliConversionSelection&); // not implemented
-    AliConversionSelection& operator=(const AliConversionSelection&); // not implemented
-  
-    ClassDef(AliConversionSelection, 1); // example of analysis
+    ClassDef(AliConversionSelection, 2); // example of analysis
 };
 
 #endif