Merge branch 'feature-movesplit'

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

diff --git a/PWGGA/GammaConv/AliDalitzElectronCuts.h b/PWGGA/GammaConv/AliDalitzElectronCuts.h
index 363f0f05e99594e2a97b5a70b1587a9c814291eb..bc96458aa41af596f31d4ede8396cab877e4efb2 100644 (file)
--- a/PWGGA/GammaConv/AliDalitzElectronCuts.h
+++ b/PWGGA/GammaConv/AliDalitzElectronCuts.h
@@ -59,6 +59,7 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
         kDCACut,
         kmassCut,
         kWeights,
+       kuseVPhotonMCPSmearing,
        kNCuts
   };
 
@@ -75,7 +76,7 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   Bool_t SetCutIds(TString cutString); 
   Int_t fCuts[kNCuts];
   Bool_t SetCut(cutIds cutID, Int_t cut);
-  Bool_t UpdateCutString();
+  Bool_t UpdateCutString(cutIds cutID, Int_t value);
   static const char * fgkCutNames[kNCuts];
 
 
@@ -133,7 +134,6 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   Bool_t SetEtaCut(Int_t etaCut);
   Bool_t SetPtCut(Int_t ptCut);
   Bool_t SetDCACut(Int_t dcaCut);
-  void SetEtaShift(Double_t etaShift){fEtaShift = etaShift;}
   Bool_t SetMinMomPiondEdxCut(Int_t piMinMomdedxSigmaCut);
   Bool_t SetMaxMomPiondEdxCut(Int_t piMaxMomdedxSigmaCut);
   Bool_t SetLowPRejectionCuts(Int_t LowPRejectionSigmaCut);
@@ -144,6 +144,7 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   Bool_t SetNumberOfRotations(Int_t NumberOfRotations);
   Bool_t SetMassCut(Int_t massCut);
   Bool_t SetDoWeights(Int_t opc);
+  Bool_t SetUseVPhotonMCPmearing(Int_t useMCPSmearing);
   
   // Request Flags
 
@@ -156,10 +157,14 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   Int_t    GetBKGMethod(){ return fBKGMethod; }
   Int_t    NumberOfRotationEvents(){return fnumberOfRotationEventsForBG;}
   Bool_t   DoMassCut(){return  fDoMassCut;}
+  Bool_t   DoMassMinCut(){return fDoMassMinCut;}
   Double_t GetMassCutLowPt(){return fMassCutLowPt;}
   Double_t GetMassCutHighPt(){return fMassCutHighPt;}
   Double_t GetPtMinMassCut(){return fMassCutPtMin;}
+  Double_t GetMassMinCut(){return fMassMinCut;}
   Bool_t   DoWeights(){return fDoWeights;}
+  Bool_t   GetUseVPhotonMCPmearing(){return fUseVPhotonMCPSmearing; }
+  Bool_t   GetUseElectronMCSmearing(){ return fUseElectronMCPSmearing;}
   
 
   
@@ -170,14 +175,14 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   AliESDtrackCuts *fesdTrackCuts;
 
   Double_t fEtaCut; //eta cutç
-  Double_t fEtaShift;
   Bool_t   fDoEtaCut;
-  Double_t fPtCut;
+  Double_t fPtMinCut;
+  Double_t fPtMaxCut;
   Double_t fRadiusCut; // radius cut
   Double_t fPsiPairCut;
   Double_t fDeltaPhiCutMin;
   Double_t fDeltaPhiCutMax;
-  Int_t fMinClsTPC; // minimum clusters in the TPC
+  Double_t fMinClsTPC; // minimum clusters in the TPC
   Double_t fMinClsTPCToF; // minimum clusters to findable clusters
   Bool_t   fDodEdxSigmaITSCut; // flag to use the dEdxCut ITS based on sigmas
   Bool_t   fDodEdxSigmaTPCCut; // flag to use the dEdxCut TPC based on sigmas
@@ -205,16 +210,21 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   Double_t fPIDMinPPionRejectionLowP; // Momentum limit to apply proton rejection
 
   Bool_t   fUseCorrectedTPCClsInfo; // flag to use corrected tpc cl info
+  Bool_t   fUseCrossedRows;  //UseCrossedRows 2011
   Bool_t   fUseTOFpid; // flag to use tof pid
   Bool_t   fRequireTOF; //flg to analyze only tracks with TOF signal
   Bool_t   fUseTrackMultiplicityForBG; // use multiplicity
   Int_t    fBKGMethod;
   Int_t    fnumberOfRotationEventsForBG;
   Bool_t   fDoMassCut;
+  Bool_t   fDoMassMinCut;
   Double_t fMassCutLowPt;
   Double_t fMassCutHighPt;
   Double_t fMassCutPtMin;
+  Double_t fMassMinCut;
   Bool_t   fDoWeights;
+  Bool_t   fUseVPhotonMCPSmearing;
+  Bool_t   fUseElectronMCPSmearing;
 
 
   // Histograms
@@ -235,6 +245,10 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   TH2F *hTrackDCAzPtafter;
   TH2F *hTrackNFindClsPtTPCbefore;
   TH2F *hTrackNFindClsPtTPCafter;
+  TH1F *hTrackPosEtabeforeDedx;
+  TH1F *hTrackNegEtabeforeDedx;
+  TH1F *hTrackPosEtaafterDedx;
+  TH1F *hTrackNegEtaafterDedx;