X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWGGA%2FGammaConv%2FAliV0ReaderV1.h;h=345723e48d5eda5b7755b8c01e4ce8a218621e5c;hb=17468990ce23c0022b814f0e120f16ec33f8f417;hp=e9206284fd8119464190676268917d238007e1fb;hpb=4803eb1f7553262aa17e37d355c7851e4041f239;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWGGA/GammaConv/AliV0ReaderV1.h b/PWGGA/GammaConv/AliV0ReaderV1.h
index e9206284fd8..345723e48d5 100644
--- a/PWGGA/GammaConv/AliV0ReaderV1.h
+++ b/PWGGA/GammaConv/AliV0ReaderV1.h
@@ -4,7 +4,8 @@
 #include "AliAnalysisTaskSE.h"
 #include "AliAODv0.h"
 #include "AliESDv0.h"
-#include "AliConversionCuts.h"
+#include "AliConversionPhotonCuts.h"
+#include "AliConvEventCuts.h"
 #include "AliExternalTrackParam.h"
 #include "TObject.h"
 #include "AliMCEvent.h"   // for CF
@@ -32,95 +33,112 @@ using namespace std;
 
 class AliV0ReaderV1 : public AliAnalysisTaskSE {
 
- public:
-
-  AliV0ReaderV1(const char *name="V0ReaderV1");
-  virtual ~AliV0ReaderV1();                            //virtual destructor
-  void UserCreateOutputObjects();
-  virtual Bool_t Notify();
-  virtual void UserExec(Option_t *option);
-  virtual void Terminate(Option_t *);
-  virtual void Init();
-
-  Bool_t ProcessEvent(AliVEvent *inputEvent,AliMCEvent *mcEvent=NULL);
-  Bool_t IsEventSelected(){return fEventIsSelected;}
-
-  // Return Reconstructed Gammas
-  TClonesArray *GetReconstructedGammas(){return fConversionGammas;}
-  Int_t GetNReconstructedGammas(){if(fConversionGammas){return fConversionGammas->GetEntriesFast();}else{return 0;}}
-  AliConversionCuts *GetConversionCuts(){return fConversionCuts;}
-  TList *GetCutHistograms(){if(fConversionCuts){return fConversionCuts->GetCutHistograms();}return NULL;}
-  // Set Options
-
-  void CountTracks();
-  void SetConversionCuts(const TString cut);
-  void SetConversionCuts(AliConversionCuts *cuts){fConversionCuts=cuts;}
-  void SetUseOwnXYZCalculation(Bool_t flag){fUseOwnXYZCalculation=flag;}
-  void SetUseConstructGamma(Bool_t flag){fUseConstructGamma=flag;}
-  void SetUseAODConversionPhoton(Bool_t b){if(b){cout<<"Setting Outputformat to AliAODConversionPhoton "<<endl;}else{cout<<"Setting Outputformat to AliKFConversionPhoton "<<endl;};kUseAODConversionPhoton=b;}
-  void SetCreateAODs(Bool_t k=kTRUE){fCreateAOD=k;}
-  void SetDeltaAODFilename(TString s){fDeltaAODFilename=s;}
-  void SetDeltaAODBranchName(TString string) { fDeltaAODBranchName = string;AliInfo(Form("Set DeltaAOD BranchName to: %s",fDeltaAODBranchName.Data()));}
-  void RelabelAODs(Bool_t relabel=kTRUE){fRelabelAODs=relabel;}
-  Bool_t AreAODsRelabeled(){return fRelabelAODs;}
-  void RelabelAODPhotonCandidates(AliAODConversionPhoton *PhotonCandidate);
-  TString GetPeriodName(){return fPeriodName;}
-  Int_t GetNumberOfPrimaryTracks(){return fNumberOfPrimaryTracks;}
-  
-protected:
-    // Reconstruct Gammas
-    Bool_t ProcessESDV0s();
-    AliKFConversionPhoton *ReconstructV0(AliESDv0* fCurrentV0,Int_t currentV0Index);
-    void FillAODOutput();
-    void FindDeltaAODBranchName();
-    Bool_t GetAODConversionGammas();
-
-    // Getter Functions
-
-    const AliExternalTrackParam *GetExternalTrackParam(AliESDv0 *fCurrentV0,Int_t &tracklabel,Int_t charge);
-    const AliExternalTrackParam *GetExternalTrackParamP(AliESDv0 *fCurrentV0,Int_t &tracklabel){return GetExternalTrackParam(fCurrentV0,tracklabel,1);};
-    const AliExternalTrackParam *GetExternalTrackParamN(AliESDv0 *fCurrentV0,Int_t &tracklabel){return GetExternalTrackParam(fCurrentV0,tracklabel,-1);};
-    AliKFParticle *GetPositiveKFParticle(AliAODv0 *fCurrentV0,Int_t fTrackLabel[2]);
-    AliKFParticle *GetNegativeKFParticle(AliAODv0 *fCurrentV0,Int_t fTrackLabel[2]);
-    AliKFParticle *GetPositiveKFParticle(AliESDv0 *fCurrentV0,Int_t fTrackLabel[2]);
-    AliKFParticle *GetNegativeKFParticle(AliESDv0 *fCurrentV0,Int_t fTrackLabel[2]);
-
-    Bool_t GetConversionPoint(const AliExternalTrackParam *pparam,const AliExternalTrackParam *nparam,Double_t convpos[3],Double_t dca[2]);
-    Bool_t GetHelixCenter(const AliExternalTrackParam *track,Double_t center[2]);
-    Double_t GetPsiPair(const AliESDv0* v0, const AliExternalTrackParam *positiveparam,const AliExternalTrackParam *negativeparam) const;
-
-    AliConversionCuts *fConversionCuts; // Pointer to the ConversionCut Selection
-    TClonesArray *fConversionGammas; // TClonesArray holding the reconstructed photons
-    Bool_t fUseImprovedVertex; // set flag to improve primary vertex estimation by adding photons
-    Bool_t fUseOwnXYZCalculation; //flag that determines if we use our own calculation of xyz (markus)
-    Bool_t fUseConstructGamma; //flag that determines if we use ConstructGamma method from AliKF
-    Bool_t kUseAODConversionPhoton; // set flag to use AOD instead of KF output format for photons
-    Bool_t fCreateAOD; // set flag for AOD creation
-    TString     fDeltaAODBranchName;// File where Gamma Conv AOD is located, if not in default AOD
-    TString fDeltaAODFilename; // set filename for delta/satellite aod
-    Bool_t fRelabelAODs; //
-    Bool_t fEventIsSelected;
-    Int_t fNumberOfPrimaryTracks; // Number of Primary Tracks in AOD or ESD
-    TString fPeriodName;
-    
-private:
-    AliV0ReaderV1(AliV0ReaderV1 &original);
-    AliV0ReaderV1 &operator=(const AliV0ReaderV1 &ref);
-
-
-    ClassDef(AliV0ReaderV1,2)
+	public:
+
+		AliV0ReaderV1(const char *name="V0ReaderV1");
+		virtual ~AliV0ReaderV1();                            //virtual destructor
+		void UserCreateOutputObjects();
+		virtual Bool_t Notify();
+		virtual void UserExec(Option_t *option);
+		virtual void Terminate(Option_t *);
+		virtual void Init();
+
+		Bool_t ProcessEvent(AliVEvent *inputEvent,AliMCEvent *mcEvent=NULL);
+		Bool_t IsEventSelected(){return fEventIsSelected;}
+
+		// Return Reconstructed Gammas
+		TClonesArray *GetReconstructedGammas(){return fConversionGammas;}
+		Int_t GetNReconstructedGammas(){if(fConversionGammas){return fConversionGammas->GetEntriesFast();}else{return 0;}}
+		
+		AliConversionPhotonCuts *GetConversionCuts(){return fConversionCuts;}
+		AliConvEventCuts *GetEventCuts(){return fEventCuts;}
+		TList *GetCutHistograms(){if(fConversionCuts){return fConversionCuts->GetCutHistograms();}return NULL;}
+		TList *GetEventCutHistograms(){if(fEventCuts){return fEventCuts->GetCutHistograms();}return NULL;}
+		// Set Options
+
+		void CountTracks();
+		void SetConversionCuts(const TString cut);
+		void SetConversionCuts(AliConversionPhotonCuts *cuts){fConversionCuts=cuts;}
+		void SetEventCuts(const TString cut);
+		void SetEventCuts(AliConvEventCuts *cuts){fEventCuts=cuts;}
+
+		void SetUseOwnXYZCalculation(Bool_t flag){fUseOwnXYZCalculation=flag;}
+		void SetUseConstructGamma(Bool_t flag){fUseConstructGamma=flag;}
+		void SetUseAODConversionPhoton(Bool_t b){if(b){cout<<"Setting Outputformat to AliAODConversionPhoton "<<endl;}else{cout<<"Setting Outputformat to AliKFConversionPhoton "<<endl;};kUseAODConversionPhoton=b;}
+		void SetCreateAODs(Bool_t k=kTRUE){fCreateAOD=k;}
+		void SetDeltaAODFilename(TString s){fDeltaAODFilename=s;}
+		void SetDeltaAODBranchName(TString string) { fDeltaAODBranchName = string;AliInfo(Form("Set DeltaAOD BranchName to: %s",fDeltaAODBranchName.Data()));}
+		void RelabelAODs(Bool_t relabel=kTRUE){fRelabelAODs=relabel;}
+		Bool_t AreAODsRelabeled(){return fRelabelAODs;}
+		void RelabelAODPhotonCandidates(AliAODConversionPhoton *PhotonCandidate);
+		TString GetPeriodName(){return fPeriodName;}
+		Int_t GetNumberOfPrimaryTracks(){return fNumberOfPrimaryTracks;}
+	
+	protected:
+		// Reconstruct Gammas
+		Bool_t ProcessESDV0s();
+		AliKFConversionPhoton *ReconstructV0(AliESDv0* fCurrentV0,Int_t currentV0Index);
+		void FillAODOutput();
+		void FindDeltaAODBranchName();
+		Bool_t GetAODConversionGammas();
+
+		// Getter Functions
+
+		const AliExternalTrackParam *GetExternalTrackParam(AliESDv0 *fCurrentV0,Int_t &tracklabel,Int_t charge);
+		const AliExternalTrackParam *GetExternalTrackParamP(AliESDv0 *fCurrentV0,Int_t &tracklabel){return GetExternalTrackParam(fCurrentV0,tracklabel,1);};
+		const AliExternalTrackParam *GetExternalTrackParamN(AliESDv0 *fCurrentV0,Int_t &tracklabel){return GetExternalTrackParam(fCurrentV0,tracklabel,-1);};
+		AliKFParticle *GetPositiveKFParticle(AliAODv0 *fCurrentV0,Int_t fTrackLabel[2]);
+		AliKFParticle *GetNegativeKFParticle(AliAODv0 *fCurrentV0,Int_t fTrackLabel[2]);
+		AliKFParticle *GetPositiveKFParticle(AliESDv0 *fCurrentV0,Int_t fTrackLabel[2]);
+		AliKFParticle *GetNegativeKFParticle(AliESDv0 *fCurrentV0,Int_t fTrackLabel[2]);
+
+		Bool_t GetConversionPoint(const AliExternalTrackParam *pparam,const AliExternalTrackParam *nparam,Double_t convpos[3],Double_t dca[2]);
+		Bool_t GetHelixCenter(const AliExternalTrackParam *track,Double_t center[2]);
+		Double_t GetPsiPair(const AliESDv0* v0, const AliExternalTrackParam *positiveparam,const AliExternalTrackParam *negativeparam) const;
+
+		AliConversionPhotonCuts	*fConversionCuts; 			// Pointer to the ConversionCut Selection
+		AliConvEventCuts 	*fEventCuts; 				// Pointer to the ConversionCut Selection
+		TClonesArray 		*fConversionGammas; 		// TClonesArray holding the reconstructed photons
+		Bool_t 				fUseImprovedVertex; 		// set flag to improve primary vertex estimation by adding photons
+		Bool_t 				fUseOwnXYZCalculation; 		//flag that determines if we use our own calculation of xyz (markus)
+		Bool_t 				fUseConstructGamma; 		//flag that determines if we use ConstructGamma method from AliKF
+		Bool_t 				kUseAODConversionPhoton; 	// set flag to use AOD instead of KF output format for photons
+		Bool_t 				fCreateAOD; 				// set flag for AOD creation
+		TString     		fDeltaAODBranchName;		// File where Gamma Conv AOD is located, if not in default AOD
+		TString 			fDeltaAODFilename; 			// set filename for delta/satellite aod
+		Bool_t 				fRelabelAODs; 				//
+		Bool_t 				fEventIsSelected;
+		Int_t 				fNumberOfPrimaryTracks;	 	// Number of Primary Tracks in AOD or ESD
+		TString 			fPeriodName;
+		
+	private:
+		AliV0ReaderV1(AliV0ReaderV1 &original);
+		AliV0ReaderV1 &operator=(const AliV0ReaderV1 &ref);
+
+
+    ClassDef(AliV0ReaderV1, 4)
 };
 
 inline void AliV0ReaderV1::SetConversionCuts(const TString cut){
     if(fConversionCuts != NULL){
 	delete fConversionCuts;
-	fConversionCuts=NULL;
+		fConversionCuts=NULL;
     }
     if(fConversionCuts == NULL){
-	fConversionCuts=new AliConversionCuts("V0ReaderCuts","V0ReaderCuts");
-	fConversionCuts->InitializeCutsFromCutString(cut.Data());
+		fConversionCuts=new AliConversionPhotonCuts("V0ReaderCuts","V0ReaderCuts");
+		fConversionCuts->InitializeCutsFromCutString(cut.Data());
     }
 }
 
+inline void AliV0ReaderV1::SetEventCuts(const TString cut){
+    if(fEventCuts != NULL){
+	delete fEventCuts;
+		fEventCuts=NULL;
+    }
+    if(fEventCuts == NULL){
+		fEventCuts=new AliConvEventCuts("V0ReaderEventCuts","V0ReaderEventCuts");
+		fEventCuts->InitializeCutsFromCutString(cut.Data());
+    }
+}
 
 #endif