histo switch

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.cxx b/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.cxx
index 54e564ed9cbb9eab81f3afffd31905f294ec4f76..b4dff308459fc3d12ee65d357933969284a28c43 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.cxx
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.cxx
@@ -57,6 +57,7 @@ AliAnalysisTaskRho::AliAnalysisTaskRho() :
 {
   // Constructor
 }
+
 //________________________________________________________________________
 AliAnalysisTaskRho::AliAnalysisTaskRho(const char *name) :
   AliAnalysisTaskRhoBase(name),
@@ -92,9 +93,48 @@ AliAnalysisTaskRho::AliAnalysisTaskRho(const char *name) :
 {
   // Constructor
 
-  DefineOutput(1, TList::Class());
 }
 
+//________________________________________________________________________
+AliAnalysisTaskRho::AliAnalysisTaskRho(const char *name, Bool_t histo) :
+  AliAnalysisTaskRhoBase(name),
+  fTracksName("tracks"),
+  fJetsName("KtJets"),
+  fClustersName("caloClusters"),
+  fRhoScaledName(""),
+  fPhiMin(0),
+  fPhiMax(0),
+  fEtaMin(0),
+  fEtaMax(0),
+  fAreaCut(0),
+  fNExclLeadJets(0),
+  fScaleFunction(0),
+  fCreateHisto(histo),
+  fOutputList(0),
+  fHistCentrality(0),
+  fHistJetPt(0),
+  fHistJetArea(0),
+  fHistRhovsCent(0),
+  fHistDeltaRhovsCent(0),
+  fHistDeltaRhoScalevsCent(0),
+  fHistJetPtvsCent(0),
+  fHistJetAreavsCent(0),
+  fHistNjetvsCent(0),
+  fHistRhovsNtrack(0),
+  fHistDeltaRhovsNtrack(0),
+  fHistDeltaRhoScalevsNtrack(0),
+  fHistJetPtvsNtrack(0),
+  fHistJetAreavsNtrack(0),
+  fHistNjetvsNtrack(0),
+  fRhoScaled(0)
+{
+  // Constructor
+
+  if (fCreateHisto)
+    DefineOutput(1, TList::Class());
+}
+
+
 //________________________________________________________________________
 void AliAnalysisTaskRho::UserCreateOutputObjects()
 {
@@ -104,6 +144,9 @@ void AliAnalysisTaskRho::UserCreateOutputObjects()
   fRhoScaledName += "_Scaled";
   fRhoScaled = new TParameter<Double_t>(fRhoScaledName, 0);  
 
+  if (!fCreateHisto)
+    return;
+
   OpenFile(1);
   fOutputList = new TList();
   fOutputList->SetOwner();

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h b/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h
index db14abece8b3b91b6c5376f67fa2e82347904a81..bf9e87e94f2d414fab87f8c8b3f597a24742ef46 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h
@@ -19,6 +19,7 @@ class AliAnalysisTaskRho : public AliAnalysisTaskRhoBase {
  public:
   AliAnalysisTaskRho();
   AliAnalysisTaskRho(const char *name);
+  AliAnalysisTaskRho(const char *name, Bool_t histo);
   virtual ~AliAnalysisTaskRho() {}
   
   virtual void           UserCreateOutputObjects();
@@ -32,7 +33,6 @@ class AliAnalysisTaskRho : public AliAnalysisTaskRhoBase {
   void                   SetScaleFunction(TF1* sf)                             { fScaleFunction = sf   ; }
   void                   SetTracksName(const char *n)                          { fTracksName    = n    ; }
   void                   SetExcludeLeadJets(UInt_t n)                          { fNExclLeadJets = n    ; }
-  void                   SetCreateHistograms(Bool_t h = kTRUE)                 { fCreateHisto   = h    ; }
   
  protected:
   virtual Double_t       GetScaleFactor(Double_t cent);

diff --git a/PWGGA/EMCALJetTasks/AliHadCorrTask.cxx b/PWGGA/EMCALJetTasks/AliHadCorrTask.cxx
index 3ab26df6b3c24e6fe5f12730123845262e7571ab..dbf561caa75b221ed9809ce006296e8596a2b795 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliHadCorrTask.cxx
+++ b/PWGGA/EMCALJetTasks/AliHadCorrTask.cxx
@@ -106,8 +106,52 @@ AliHadCorrTask::AliHadCorrTask(const char *name) :
   } 
 
   fBranchNames="ESD:AliESDRun.,AliESDHeader.,PrimaryVertex.";
+}
+
+//________________________________________________________________________
+AliHadCorrTask::AliHadCorrTask(const char *name, Bool_t histo) : 
+  AliAnalysisTaskSE(name),
+  fTracksName("Tracks"),
+  fCaloName("CaloClusters"),
+  fOutCaloName("CaloClustersCorr"),
+  fPhiMatch(0.05),
+  fEtaMatch(0.025),
+  fDoTrackClus(0),
+  fHadCorr(0),
+  fMinPt(0.15),
+  fCreateHisto(histo),
+  fOutClusters(0),
+  fOutputList(0),
+  fHistNclusvsCent(0),
+  fHistNclusMatchvsCent(0),
+  fHistEbefore(0),
+  fHistEafter(0),
+  fHistEoPCent(0),
+  fHistNMatchCent(0),
+  fHistNMatchCent_trk(0),
+  fHistCentrality(0)
 
-  DefineOutput(1, TList::Class());
+{
+  // Standard constructor.
+
+   for(Int_t i=0; i<8; i++) {
+    if (i<4) {
+      fHistMatchEvsP[i]   = 0;
+      fHistMatchdRvsEP[i] = 0;
+      for(Int_t j=0; j<3; j++) {
+       fHistEsubPch[i][j] = 0;
+       fHistEsubPchRat[i][j] = 0;
+      }
+    }
+    for(Int_t j=0; j<9; j++) {
+      fHistMatchEtaPhi[i][j] = 0;
+    }
+  } 
+
+  fBranchNames="ESD:AliESDRun.,AliESDHeader.,PrimaryVertex.";
+
+  if (fCreateHisto)
+    DefineOutput(1, TList::Class());
 }
 
 //________________________________________________________________________
@@ -385,6 +429,9 @@ void AliHadCorrTask::UserCreateOutputObjects()
   }
   fOutClusters->SetName(fOutCaloName);
 
+  if (!fCreateHisto)
+    return;
+
   OpenFile(1);
   fOutputList = new TList();
   fOutputList->SetOwner();

diff --git a/PWGGA/EMCALJetTasks/AliHadCorrTask.h b/PWGGA/EMCALJetTasks/AliHadCorrTask.h
index a6670cb696e31c190d917a433dfa81a97868925e..86168b9da42157b6945169b0b02f809e48a1b6f8 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliHadCorrTask.h
+++ b/PWGGA/EMCALJetTasks/AliHadCorrTask.h
@@ -14,6 +14,7 @@ class AliHadCorrTask : public AliAnalysisTaskSE {
  public:
   AliHadCorrTask();
   AliHadCorrTask(const char *name); 
+  AliHadCorrTask(const char *name, Bool_t histo); 
   virtual ~AliHadCorrTask();
 
   void         UserCreateOutputObjects();
@@ -28,7 +29,6 @@ class AliHadCorrTask : public AliAnalysisTaskSE {
   void         SetPhiMatch(Double_t phi)               { fPhiMatch       = phi; }
   void         SetTracksName(const char *n)            { fTracksName     = n;   }
   void         SetTrackClus(Int_t c)                   { fDoTrackClus    = c;   }
-  void         SetCreateHistograms(Bool_t h = kTRUE)   { fCreateHisto    = h;   }
 
  protected:
   Int_t        GetCentBin(Double_t cent) const;

diff --git a/PWGGA/EMCALJetTasks/macros/AddTaskHadCorr.C b/PWGGA/EMCALJetTasks/macros/AddTaskHadCorr.C
index 6d775b50419ffc46190807059fcae44084f787ad..23e9bc9af06803ebae3846ce7f8b22d0cf681d99 100644 (file)
--- a/PWGGA/EMCALJetTasks/macros/AddTaskHadCorr.C
+++ b/PWGGA/EMCALJetTasks/macros/AddTaskHadCorr.C
@@ -8,7 +8,8 @@ AliHadCorrTask* AddTaskHadCorr(
   const Double_t minPt       = 0.15,
   const Double_t phiMatch    = 0.050,
   const Double_t etaMatch    = 0.025,
-  const char *outputname     = "AnalysisResults.root"
+  const char *outputname     = "AnalysisResults.root",
+  const Bool_t   histo       = kFALSE
 )
 {  
   // Get the pointer to the existing analysis manager via the static access method.
@@ -33,7 +34,7 @@ AliHadCorrTask* AddTaskHadCorr(
   //-------------------------------------------------------
 
   TString name(Form("HadCorr_%s", outClusName));
-  AliHadCorrTask *hcor = new AliHadCorrTask(name);
+  AliHadCorrTask *hcor = new AliHadCorrTask(name, histo);
   hcor->SetTracksName(nTracks);
   hcor->SetClusName(nClusters);
   hcor->SetOutClusName(outClusName);

diff --git a/PWGGA/EMCALJetTasks/macros/AddTaskRho.C b/PWGGA/EMCALJetTasks/macros/AddTaskRho.C
index 0eb43493e0e0666aa88ad21e7ef03ad28038952e..365da93d673f718ae48d05733a2e0e8616a92317 100644 (file)
--- a/PWGGA/EMCALJetTasks/macros/AddTaskRho.C
+++ b/PWGGA/EMCALJetTasks/macros/AddTaskRho.C
@@ -10,7 +10,8 @@ AliAnalysisTaskRho* AddTaskRho(
    const Double_t minEta      = -0.3,
    const Double_t maxEta      = 0.3,
    const Double_t minArea     = 0.0,
-   const UInt_t   exclJets    = 0
+   const UInt_t   exclJets    = 0,
+   const Bool_t   histo       = kFALSE
 )
 {  
   // Get the pointer to the existing analysis manager via the static access method.
@@ -35,7 +36,7 @@ AliAnalysisTaskRho* AddTaskRho(
   //-------------------------------------------------------
 
   TString name(Form("Rho_%s", nJets));
-  AliAnalysisTaskRho *rhotask = new AliAnalysisTaskRho(name);
+  AliAnalysisTaskRho *rhotask = new AliAnalysisTaskRho(name, histo);
   rhotask->SetJetsName(nJets);
   rhotask->SetTracksName(nTracks);
   rhotask->SetRhoName(nRho);