Merge branch 'feature-movesplit'

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

diff --git a/PWGGA/GammaConv/AliConvEventCuts.h b/PWGGA/GammaConv/AliConvEventCuts.h
index 17e395c6177299d551204be33ba93d5eb0641d83..dcbff40af7831345ddb28f91706d82364667239e 100644 (file)
--- a/PWGGA/GammaConv/AliConvEventCuts.h
+++ b/PWGGA/GammaConv/AliConvEventCuts.h
@@ -161,7 +161,7 @@ class AliConvEventCuts : public AliAnalysisCuts {
                
                // Cut Selection
                Bool_t          EventIsSelected(AliVEvent *fInputEvent, AliVEvent *fMCEvent);
-               Int_t           IsEventAcceptedByCut(AliConvEventCuts *ReaderCuts, AliVEvent *InputEvent, AliMCEvent *MCEvent, Int_t isHeavyIon);
+               Int_t           IsEventAcceptedByCut(AliConvEventCuts *ReaderCuts, AliVEvent *InputEvent, AliMCEvent *MCEvent, Int_t isHeavyIon, Bool_t isEMCALAnalysis);
                        
                void            PrintCuts();
                void            PrintCutsWithValues();
@@ -179,13 +179,16 @@ class AliConvEventCuts : public AliAnalysisCuts {
                Bool_t          HasV0AND()                                                                                              { return fHasV0AND                                                                              ; }
                Bool_t          IsSDDFired()                                                                                    { return fIsSDDFired                                                                    ; }
                Int_t           IsSpecialTrigger()                                                                              { return fSpecialTrigger                                                                ; }
+               Int_t           IsSpecialSubTrigger()                                                                   { return fSpecialSubTrigger                                                             ; }     
                void            InitializeEMCALTrigger( AliVEvent *fInputEvent);
                Bool_t          HasTriggerType(TriggerTypeEMCAL t);
                
                // Request Flags
                Int_t           IsHeavyIon()                                                                                    { return fIsHeavyIon                                                                    ; }
                void            DoEtaShift(Bool_t doEtaShift)                                                   { fDoEtaShift = doEtaShift                                                              ; }
-       
+               
+               //MC particle flags - determine whether particle is primary or secondary
+               Bool_t IsConversionPrimaryESD( AliStack *MCStack, Int_t stackpos, Double_t prodVtxX, Double_t prodVtxY, Double_t prodVtxZ); 
                
        protected:
                TList                                           *fHistograms;
@@ -255,6 +258,8 @@ class AliConvEventCuts : public AliAnalysisCuts {
                ULong_t                                         fTriggersEMCAL;                                                 // list of fired EMCAL triggers
                ULong_t                                         fTriggersEMCALSelected;                                 // list of accepted triggers
                Bool_t                                          fEMCALTrigInitialized;                                  // EMCAL triggers initialized
+               // Primary secondary distinction
+               Double_t                                        fSecProdBoundary;                                               // 3D radius of production (cm) for primary-secodary distinction
                
        private: