hist switch
authorloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 8 Jun 2012 21:00:15 +0000 (21:00 +0000)
committerloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 8 Jun 2012 21:00:15 +0000 (21:00 +0000)
PWGGA/EMCALTasks/AliAnalysisTaskEmcal.h
PWGGA/EMCALTasks/AliEmcalClusTrackMatcherTask.cxx
PWGGA/EMCALTasks/AliEmcalParticleMaker.cxx

index 6e41f10..f2f6615 100644 (file)
@@ -37,11 +37,11 @@ class AliAnalysisTaskEmcal : public AliAnalysisTaskSE {
   virtual void                UserExec(Option_t *option);
   virtual void                Terminate(Option_t *option);
 
-  void                        SetTracksName(const char *n)                         { fTracksName     = n          ; }
-  void                        SetClusName(const char *n)                           { fCaloName       = n          ; }
   void                        SetAnaType(EmcalAnaType type)                        { fAnaType        = type       ; }
-  void                        SetPtCut(Float_t cut)                                { fPtCut          = cut        ; }
+  void                        SetClusName(const char *n)                           { fCaloName       = n          ; }
   void                        SetHistoBins(Int_t nbins, Float_t min, Float_t max)  { fNbins = nbins; fMinBinPt = min; fMaxBinPt = max; }
+  void                        SetPtCut(Float_t cut)                                { fPtCut          = cut        ; }
+  void                        SetTracksName(const char *n)                         { fTracksName     = n          ; }
 
  protected:
 
@@ -50,28 +50,25 @@ class AliAnalysisTaskEmcal : public AliAnalysisTaskSE {
   Bool_t                      AcceptTrack(AliVTrack            *track, Bool_t acceptMC = kFALSE)       const;
   BeamType                    GetBeamType()                                                                 ;
 
-  virtual Bool_t              FillHistograms()             { return kFALSE; }
+  virtual Bool_t              FillHistograms()             { return fCreateHisto; }
   virtual Bool_t              RetrieveEventObjects();
   virtual Bool_t              Run()                        { return kTRUE ; }
 
   EmcalAnaType                fAnaType;                    // analysis type
   Bool_t                      fInitialized;                // whether or not the task has been already initialized
   Bool_t                      fCreateHisto;                // whether or not create histograms
-
   TString                     fTracksName;                 // name of track collection
   TString                     fCaloName;                   // name of calo cluster collection
   Int_t                       fNbins;                      // no. of pt bins
   Float_t                     fMinBinPt;                   // min pt in histograms
   Float_t                     fMaxBinPt;                   // max pt in histograms
   Float_t                     fPtCut;                      // cut on particle pt
-
   TClonesArray               *fTracks;                     //!tracks
   TClonesArray               *fCaloClusters;               //!clusters
   Float_t                     fCent;                       //!event centrality
   Int_t                       fCentBin;                    //!event centrality bin
   Double_t                    fVertex[3];                  //!event vertex
   BeamType                    fBeamType;                   //!event beam type
-
   TList                      *fOutput;                     //!output list
 
  private:
index acf29c8..b8c739a 100644 (file)
@@ -18,7 +18,7 @@ ClassImp(AliEmcalClusTrackMatcherTask)
 
 //________________________________________________________________________
 AliEmcalClusTrackMatcherTask::AliEmcalClusTrackMatcherTask() : 
-  AliAnalysisTaskEmcal("AliEmcalClusTrackMatcherTask"),
+  AliAnalysisTaskEmcal("AliEmcalClusTrackMatcherTask",kFALSE),
   fMaxDistance(0.1)
 {
   // Constructor.
@@ -26,7 +26,7 @@ AliEmcalClusTrackMatcherTask::AliEmcalClusTrackMatcherTask() :
 
 //________________________________________________________________________
 AliEmcalClusTrackMatcherTask::AliEmcalClusTrackMatcherTask(const char *name) : 
-  AliAnalysisTaskEmcal(name),
+  AliAnalysisTaskEmcal(name,kFALSE),
   fMaxDistance(0.1)
 {
   // Standard constructor.
@@ -101,5 +101,7 @@ Bool_t AliEmcalClusTrackMatcherTask::Run()
     AliVTrack *track = partT->GetTrack();
     track->SetEMCALcluster(partT->GetMatchedObjId());
   }
+
+  return kTRUE;
 }
 
index 5e00435..89d29b7 100644 (file)
@@ -17,7 +17,7 @@ ClassImp(AliEmcalParticleMaker)
 
 //________________________________________________________________________
 AliEmcalParticleMaker::AliEmcalParticleMaker() : 
-  AliAnalysisTaskEmcal("AliEmcalParticleMaker"),
+  AliAnalysisTaskEmcal("AliEmcalParticleMaker",kFALSE),
   fTracksOutName("EmcalTracks"),
   fCaloOutName("EmcalClusters"),
   fTracksOut(0),
@@ -28,7 +28,7 @@ AliEmcalParticleMaker::AliEmcalParticleMaker() :
 
 //________________________________________________________________________
 AliEmcalParticleMaker::AliEmcalParticleMaker(const char *name) : 
-  AliAnalysisTaskEmcal(name),
+  AliAnalysisTaskEmcal(name,kFALSE),
   fTracksOutName("EmcalTracks"),
   fCaloOutName("EmcalClusters"),
   fTracksOut(0),