-fixed small bug for new flow task in default constructor
authorfbock <friederike.bock@cern.ch>
Thu, 20 Nov 2014 14:16:57 +0000 (15:16 +0100)
committerfbock <friederike.bock@cern.ch>
Thu, 20 Nov 2014 14:16:57 +0000 (15:16 +0100)
PWGGA/GammaConv/AliAnalysisTaskGammaConvFlow.cxx
PWGGA/GammaConv/AliAnalysisTaskGammaConvFlow.h

index c9b2022..30e1586 100644 (file)
@@ -143,17 +143,12 @@ fDoMesonAnalysis(kTRUE),
 fDoMesonQA(0),
 fDoPhotonQA(0),
 fIsFromMBHeader(kTRUE),
-
 fCandidates(0),
 fDebug(0),
 fCutsRP(0),     // track cuts for reference particles
 fNullCuts(0), // dummy cuts for flow event tracks
 fFlowEvent(0) // flow events
-
-
 {
-    DefineOutput(1, TList::Class());
-    DefineOutput(2, AliFlowEventSimple::Class());
 
 }
 
@@ -164,7 +159,6 @@ fV0Reader(NULL),
 fBGHandler(NULL),
 fBGHandlerRP(NULL),
 fInputEvent(NULL),
-
 fCutFolder(NULL),
 fESDList(NULL),
 fBackList(NULL),
@@ -204,7 +198,6 @@ hESDMotherPi0PtAlpha(NULL),
 hESDMotherEtaPtAlpha(NULL),
 hESDMotherPi0PtOpenAngle(NULL),
 hESDMotherEtaPtOpenAngle(NULL),
-
 hNEvents(NULL),
 hNGoodESDTracks(NULL),
 hNGammaCandidates(NULL),
@@ -667,7 +660,7 @@ void AliAnalysisTaskGammaConvFlow::UserExec(Option_t *)
         //======================= FlowPackage Stuff ================================
         fCandidates->SetLast(-1);
         SetNullCuts(fInputEvent);
-        PrepareFlowEvent(fInputEvent->GetNumberOfTracks(),fFlowEvent);    //Calculate event plane Qvector and EP resolution for inclusive
+        PrepareFlowEvent(fInputEvent->GetNumberOfTracks());    //Calculate event plane Qvector and EP resolution for inclusive
         //==========================================================================
         
         hNEvents[iCut]->Fill(eventQuality); // Should be 0 here
@@ -952,7 +945,7 @@ template <typename T> void AliAnalysisTaskGammaConvFlow::SetNullCuts(T* event)
     fNullCuts->SetEvent(event, MCEvent());
 }
 //_____________________________________________________________________________
-void AliAnalysisTaskGammaConvFlow::PrepareFlowEvent(Int_t iMulti, AliFlowEvent *FlowEv) const
+void AliAnalysisTaskGammaConvFlow::PrepareFlowEvent(Int_t iMulti) const
 {
     // Prepare flow events
     if (fDebug > 0 ) cout << " *** PrepareFlowEvent() *** " << endl;
index bf01e2b..40dc8bd 100644 (file)
@@ -48,7 +48,7 @@ public:
     //void CalculateBackground();
   //  void CalculateBackgroundRP();
 
-    void RelabelAODPhotonCandidates(Bool_t mode);
+//     void RelabelAODPhotonCandidates(Bool_t mode);
 
     //void RotateParticle(AliAODConversionPhoton *gamma);
     //void RotateParticleAccordingToEP(AliAODConversionPhoton *gamma, Double_t previousEventEP, Double_t thisEventEP);
@@ -68,7 +68,7 @@ public:
     
     // BG HandlerSettings
    // void SetMoveParticleAccordingToVertex(Bool_t flag){fMoveParticleAccordingToVertex = flag;}
-    void FillPhotonCombinatorialBackgroundHist(AliAODConversionPhoton *TruePhotonCandidate, Int_t pdgCode[]);
+//     void FillPhotonCombinatorialBackgroundHist(AliAODConversionPhoton *TruePhotonCandidate, Int_t pdgCode[]);
    // void MoveParticleAccordingToVertex(AliAODConversionPhoton* particle,const AliGammaConversionAODBGHandler::GammaConversionVertex *vertex);
     void UpdateEventByEventData();
     void SetLogBinningXTH2(TH2* histoRebin);
@@ -77,7 +77,7 @@ public:
     
     //=========================================Flow Staff=========================================================================================
     template <typename T> void           SetNullCuts(T* esd);
-    void                                 PrepareFlowEvent(Int_t iMulti, AliFlowEvent *FlowEv) const;
+    void                                 PrepareFlowEvent(Int_t iMulti) const;
     void                                 SetRPCuts(AliFlowTrackCuts *cutsRP) { fCutsRP = cutsRP; }
     void                                 ProcessPhotonCandidatesforV2();
     void                                 MakeTrack(Double_t mass, Double_t pt, Double_t phi, Double_t eta/*, Int_t nDau, Int_t iID[]*/) const;