From: loizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 6 Jun 2012 17:14:56 +0000 (+0000)
Subject: use rho parameter
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=1b3d7f8fe3e1748c1267a11d57d8fe2702552378;p=u%2Fmrichter%2FAliRoot.git

use rho parameter
---

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h b/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h
index 05ddcdc67f6..cf54c9bcf12 100644
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskRho.h
@@ -1,5 +1,5 @@
-#ifndef ALIANALYSISTASKRHO_cxx
-#define ALIANALYSISTASKRHO_cxx
+#ifndef ALIANALYSISTASKRHO_H
+#define ALIANALYSISTASKRHO_H
 
 // $Id$
 
@@ -9,8 +9,7 @@ class TH2F;
 class TClonesArray;
 class TString;
 class TF1;
-
-#include <TParameter.h>
+class AliRhoParameter;
 
 #include "AliAnalysisTaskRhoBase.h"
 
@@ -65,11 +64,11 @@ class AliAnalysisTaskRho : public AliAnalysisTaskRhoBase {
   TH2F                  *fHistJetPtvsNtrack;             //!jet pt vs. no. of tracks
   TH2F                  *fHistJetAreavsNtrack;           //!jet area vs. no. of tracks
   TH2F                  *fHistNjetvsNtrack;              //!no. of jets vs. no. of tracks
-  TParameter<Double_t>  *fRhoScaled;                     //!per event scaled rho
+  AliRhoParameter       *fRhoScaled;                     //!per event scaled rho
 
   AliAnalysisTaskRho(const AliAnalysisTaskRho&);             // not implemented
   AliAnalysisTaskRho& operator=(const AliAnalysisTaskRho&);  // not implemented
   
-  ClassDef(AliAnalysisTaskRho, 4); // Rho task
+  ClassDef(AliAnalysisTaskRho, 5); // Rho task
 };
 #endif
diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.cxx b/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.cxx
index 89f1ec33293..481420cbea0 100644
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.cxx
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.cxx
@@ -2,20 +2,20 @@
 //
 // Calculation of rho, method: sum of all particle pt / full acceptance area
 //
-// Authors: Salvatore Aiola
+// Authors: S. Aiola
 
 #include <TList.h>
 #include <TClonesArray.h>
 #include <TMath.h>
 
-#include "AliLog.h"
 #include "AliAnalysisManager.h"
-#include "AliVEventHandler.h"
 #include "AliCentrality.h"
 #include "AliEmcalJet.h"
-#include "AliVTrack.h"
+#include "AliLog.h"
+#include "AliRhoParameter.h"
 #include "AliVCluster.h"
-
+#include "AliVEventHandler.h"
+#include "AliVTrack.h"
 #include "AliAnalysisTaskRhoAverage.h"
 
 ClassImp(AliAnalysisTaskRhoAverage)
diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.h b/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.h
index eb07078018d..0f78131fca7 100644
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.h
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoAverage.h
@@ -1,5 +1,5 @@
-#ifndef ALIANALYSISTASKRHOAVERAGE_cxx
-#define ALIANALYSISTASKRHOAVERAGE_cxx
+#ifndef ALIANALYSISTASKRHOAVERAGE_H
+#define ALIANALYSISTASKRHOAVERAGE_H
 
 // $Id$
 
@@ -10,8 +10,6 @@ class TClonesArray;
 class TString;
 class TF1;
 
-#include <TParameter.h>
-
 #include "AliAnalysisTaskRhoBase.h"
 
 class AliAnalysisTaskRhoAverage : public AliAnalysisTaskRhoBase {
diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoBase.cxx b/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoBase.cxx
index 8820ece575a..fb3a74c7887 100644
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoBase.cxx
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskRhoBase.cxx
@@ -2,17 +2,18 @@
 //
 // Base class for rho calculation
 //
-// Author: A.Saiola
+// Author: S.Aiola
 
 #include <TF1.h>
 
-#include "AliESDEvent.h"
-#include "AliLog.h"
 #include "AliAnalysisManager.h"
-#include "AliVEventHandler.h"
 #include "AliCentrality.h"
+#include "AliESDEvent.h"
 #include "AliEmcalJet.h"
+#include "AliLog.h"
+#include "AliRhoParameter.h"
 #include "AliVCluster.h"
+#include "AliVEventHandler.h"
 
 #include "AliAnalysisTaskRhoBase.h"
 
@@ -51,7 +52,7 @@ void AliAnalysisTaskRhoBase::UserCreateOutputObjects()
     return;
   }
 
-  fRho = new TParameter<Double_t>(fRhoName, 0);
+  fRho = new AliRhoParameter(fRhoName, 0);
 }
 
 //________________________________________________________________________
@@ -109,11 +110,10 @@ void AliAnalysisTaskRhoBase::UserExec(Option_t *)
 
   // add rho to event if not yet there
   if (!(InputEvent()->FindListObject(fRhoName))) {
-    new(fRho) TParameter<Double_t>(fRhoName, 0);
     InputEvent()->AddObject(fRho);
   }
 
-  // get centrality 
+  // determine centrality 
   fCent = 99; 
   
   if (GetBeamType() == "A-A") {