From 9d29cbcb3d930511656a872f2b509972e8972dcc Mon Sep 17 00:00:00 2001 From: kharlov Date: Sat, 9 Feb 2013 20:53:25 +0000 Subject: [PATCH] Since PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener is replaced by PWGGAUtils/AliEPFlattener, AliAnalysisTaskPi0Flow and AliAnalysisTaskPi0V2 depend on PWGGAUtils now. --- PWGGA/CMakelibPWGGAEMCALTasks.pkg | 2 +- PWGGA/CMakelibPWGGAPHOSTasks.pkg | 2 +- PWGGA/EMCALTasks/AliAnalysisTaskPi0V2.h | 8 +- .../PHOS_PbPb/AliAnalysisTaskPi0Flow.cxx | 14 +- .../PHOS_PbPb/AliAnalysisTaskPi0Flow.h | 8 +- .../PHOS_PbPb/AliPHOSEPFlattener.cxx | 143 ------------------ .../PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.h | 43 ------ 7 files changed, 17 insertions(+), 203 deletions(-) delete mode 100644 PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.cxx delete mode 100644 PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.h diff --git a/PWGGA/CMakelibPWGGAEMCALTasks.pkg b/PWGGA/CMakelibPWGGAEMCALTasks.pkg index daf392b46a1..ced3ea3d868 100644 --- a/PWGGA/CMakelibPWGGAEMCALTasks.pkg +++ b/PWGGA/CMakelibPWGGAEMCALTasks.pkg @@ -48,4 +48,4 @@ set ( DHDR PWGGAEMCALTasksLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE PWGGA/EMCALTasks PWGGA/PHOSTasks/PHOS_PbPb PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS) +set ( EINCLUDE PWGGA/PWGGAUtils PWGGA/EMCALTasks PWGGA/PHOSTasks/PHOS_PbPb PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS) diff --git a/PWGGA/CMakelibPWGGAPHOSTasks.pkg b/PWGGA/CMakelibPWGGAPHOSTasks.pkg index e7a78304b7f..64d1742b659 100644 --- a/PWGGA/CMakelibPWGGAPHOSTasks.pkg +++ b/PWGGA/CMakelibPWGGAPHOSTasks.pkg @@ -49,7 +49,7 @@ set ( DHDR PWGGAPHOSTasksLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE PWGGA/PHOSTasks/PHOS_pp_pi0 PWGGA/PHOSTasks/CaloCellQA PWGGA/PHOSTasks/omega3pi PHOS STEER/ESD STEER/STEERBase) +set ( EINCLUDE PWGGA/PWGGAUtils PWGGA/PHOSTasks/PHOS_pp_pi0 PWGGA/PHOSTasks/CaloCellQA PWGGA/PHOSTasks/omega3pi PHOS STEER/ESD STEER/STEERBase) install (FILES PHOSTasks/CaloCellQA/macros/AddTaskCaloCellsQA.C PHOSTasks/CaloCellQA/macros/AddTaskPHOSQA.C diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskPi0V2.h b/PWGGA/EMCALTasks/AliAnalysisTaskPi0V2.h index 5880951ddff..5ae9965e6d9 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskPi0V2.h +++ b/PWGGA/EMCALTasks/AliAnalysisTaskPi0V2.h @@ -28,7 +28,7 @@ class AliCaloPID; class AliCalorimeterUtils; class AliCaloTrackReader; class TProfile; -class AliPHOSEPFlattener; +class AliEPFlattener; class AliOADBContainer; #ifndef ALIANALYSISTASKSE_H @@ -174,9 +174,9 @@ class AliAnalysisTaskPi0V2 : public AliAnalysisTaskSE { TH3F *hdifout_EPV0C; //! 3-D histo dif phi out EMC with EPV0C TString fEPcalibFileName; - AliPHOSEPFlattener * fTPCFlat ; //Object for flattening of TPC - AliPHOSEPFlattener * fV0AFlat ; //Object for flattening of V0A - AliPHOSEPFlattener * fV0CFlat ; //Object for flattening of V0C + AliEPFlattener * fTPCFlat ; //Object for flattening of TPC + AliEPFlattener * fV0AFlat ; //Object for flattening of V0A + AliEPFlattener * fV0CFlat ; //Object for flattening of V0C THnSparse *fClusterPbV0; THnSparse *fClusterPbV0A; diff --git a/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.cxx b/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.cxx index 7fb0943d455..0e8ecd24aa2 100644 --- a/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.cxx +++ b/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.cxx @@ -53,7 +53,7 @@ #include "AliEventplane.h" #include "TProfile.h" #include "AliOADBContainer.h" -#include "AliPHOSEPFlattener.h" +#include "AliEPFlattener.h" // Analysis task to fill histograms with PHOS ESD or AOD clusters and cells // Authors : Dmitri Peressounko @@ -1746,17 +1746,17 @@ void AliAnalysisTaskPi0Flow::SetFlatteningData(){ } else{ AliInfo(Form("Setting PHOS flattening with name %s \n",maps->GetName())) ; - AliPHOSEPFlattener * h = (AliPHOSEPFlattener*)maps->At(0) ; + AliEPFlattener * h = (AliEPFlattener*)maps->At(0) ; if(fTPCFlat) delete fTPCFlat ; - fTPCFlat = new AliPHOSEPFlattener() ; + fTPCFlat = new AliEPFlattener() ; fTPCFlat = h ; - h = (AliPHOSEPFlattener*)maps->At(1) ; + h = (AliEPFlattener*)maps->At(1) ; if(fV0AFlat) delete fV0AFlat ; - fV0AFlat = new AliPHOSEPFlattener() ; + fV0AFlat = new AliEPFlattener() ; fV0AFlat = h ; - h = (AliPHOSEPFlattener*)maps->At(2) ; + h = (AliEPFlattener*)maps->At(2) ; if(fV0CFlat) delete fV0CFlat ; - fV0CFlat = new AliPHOSEPFlattener() ; + fV0CFlat = new AliEPFlattener() ; fV0CFlat = h ; } diff --git a/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.h b/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.h index e0f5e7952fb..93873921408 100644 --- a/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.h +++ b/PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.h @@ -23,7 +23,7 @@ class AliESDEvent ; class AliPHOSCalibData; class AliESDtrack ; class AliESDCaloCluster ; -class AliPHOSEPFlattener; +class AliEPFlattener; #include "TArrayD.h" @@ -186,9 +186,9 @@ private: AliESDtrackCuts *fESDtrackCuts; // Track cut AliPHOSCalibData *fPHOSCalibData; // PHOS calibration object TString fEPcalibFileName; - AliPHOSEPFlattener * fTPCFlat ; //Object for flattening of TPC - AliPHOSEPFlattener * fV0AFlat ; //Object for flattening of V0A - AliPHOSEPFlattener * fV0CFlat ; //Object for flattening of V0C + AliEPFlattener * fTPCFlat ; //Object for flattening of TPC + AliEPFlattener * fV0AFlat ; //Object for flattening of V0A + AliEPFlattener * fV0CFlat ; //Object for flattening of V0C // Step 2: Vertex diff --git a/PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.cxx b/PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.cxx deleted file mode 100644 index a3ed6202383..00000000000 --- a/PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.cxx +++ /dev/null @@ -1,143 +0,0 @@ -/************************************************************************** - * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * * - * Author: The ALICE Off-line Project. * - * Contributors are mentioned in the code where appropriate. * - * * - * Permission to use, copy, modify and distribute this software and its * - * documentation strictly for non-commercial purposes is hereby granted * - * without fee, provided that the above copyright notice appears in all * - * copies and that both the copyright notice and this permission notice * - * appear in the supporting documentation. The authors make no claims * - * about the suitability of this software for any purpose. It is * - * provided "as is" without express or implied warranty. * - **************************************************************************/ - -/* $Id$ */ - -//_________________________________________________________________________ -// Class to perform flattening of the event plane distribution -// It stores necessary parameterizations and apply when requested -// -//*-- Author: Dmitri Peressounko (RRC KI) - -// --- ROOT system --- - -#include "TMath.h" -#include "TH2.h" - -// --- Standard library --- - -// --- AliRoot header files --- - -#include "AliPHOSEPFlattener.h" - - - -ClassImp(AliPHOSEPFlattener) - -//____________________________________________________________________________ -AliPHOSEPFlattener::AliPHOSEPFlattener() : - TNamed(), - fNCentrBins(0), - fNHarmonics(0), - fNparam(0), - fParam(0x0) -{ - // default ctor -// Nothing to initialize -} - -//____________________________________________________________________________ -AliPHOSEPFlattener::AliPHOSEPFlattener(const char * name) : - TNamed(name,"PHOSEPFlattener"), - fNCentrBins(0), - fNHarmonics(0), - fNparam(0), - fParam(0x0) -{ -// Nothing to initialize -} -//____________________________________________________________________________ -AliPHOSEPFlattener::AliPHOSEPFlattener(const AliPHOSEPFlattener & fl): - TNamed(fl.GetName(),"PHOSEPFlattener"), - fNCentrBins(0), - fNHarmonics(0), - fNparam(0), - fParam(0x0) - -{ - - fNCentrBins = fl.fNCentrBins ; - fNHarmonics = fl.fNHarmonics ; - fNparam = fl.fNparam ; - fParam = new Double32_t[fNparam] ; - for(Int_t i=0; i=fNCentrBins)icen = fNCentrBins-1 ; - - //Offset in the array - icen=icen*fNHarmonics ; - - for(Int_t i = 1; i<=fNHarmonics/2; i++){ - Double_t c = 2./i*fParam[icen+2*i-2] ; //fParam==Mean cos(n*phi) for a given centrality - Double_t s = 2./i*fParam[icen+2*i-1]; //fParam==Mean sin(n*phi) for a given centrality - result += c*TMath::Sin(i*oldPhi)-s*TMath::Cos(i*oldPhi) ; - } - return result ; -} -//____________________________________________________________________________ -void AliPHOSEPFlattener::SetParameterization(TH2 * h){ - //Fill parameterizations - //We expect histogram with , with centrality bins in x axis - //and harmonics: , , , , .... in y axis - - fNCentrBins = h->GetXaxis()->GetNbins() ; - fNHarmonics = h->GetYaxis()->GetNbins() ; - fNparam = fNCentrBins*fNHarmonics ; - if(fParam) delete [] fParam ; - fParam = new Double32_t[fNparam] ; - for(Int_t i=0; iGetBinContent(i+1,j+1) ; -} - diff --git a/PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.h b/PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.h deleted file mode 100644 index 6d9a60e8ab7..00000000000 --- a/PWGGA/PHOSTasks/PHOS_PbPb/AliPHOSEPFlattener.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef ALIPHOSEPFLATTENER_H -#define ALIPHOSEPFLATTENER_H -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice */ - -/* $Id$ */ - -//_________________________________________________________________________ -// Class to perform flattening of the event plane distribution -// It stores necessary parameterizations and apply when requested -// -//*-- Author: Dmitri Peressounko (RRC KI) - -// --- ROOT system --- -class TH2 ; -#include "TNamed.h" - -class AliPHOSEPFlattener : public TNamed { - - public: - - AliPHOSEPFlattener() ; - AliPHOSEPFlattener(const char * name) ; //To separate different runs use names - AliPHOSEPFlattener(const AliPHOSEPFlattener & fl) ; - virtual ~AliPHOSEPFlattener() ; - AliPHOSEPFlattener & operator = (const AliPHOSEPFlattener & flat); - -public: - - Double_t MakeFlat(Double_t oldPhi,Double_t centrality)const ; //Apply (centrality-dependent) flattening to oldPhi - void SetParameterization(TH2 * h) ; //Set Parameterization to use (see code for the meaning of parameters - -private: - Int_t fNCentrBins ; // Number of centrality bins - Int_t fNHarmonics ; // Number of harmonics used in parameterization - Int_t fNparam ; // Total number of parameters (fNCentrBins*fNHarmonics) - Double32_t *fParam ; //[fNparam][-1.,1.,16] array of flattening parameters - - ClassDef(AliPHOSEPFlattener,1) - -} ; - -#endif // ALIPHOSEPFLATTENER_H -- 2.43.0