From a7ae9b243565648e3b84ca26805e8fe92913b53a Mon Sep 17 00:00:00 2001 From: cnattras Date: Fri, 10 Dec 2010 02:20:52 +0000 Subject: [PATCH] Fixing some coding violations. Mostly not enough comments at the top of the file. --- PWG4/totEt/AliAnalysisEt.h | 9 +++++---- PWG4/totEt/AliAnalysisEtCommon.h | 4 ++-- PWG4/totEt/AliAnalysisEtSelectionContainer.cxx | 7 +++++++ PWG4/totEt/AliAnalysisEtSelectionContainer.h | 14 +++++++++++--- PWG4/totEt/AliAnalysisEtSelectionHandler.cxx | 7 +++++++ PWG4/totEt/AliAnalysisEtSelectionHandler.h | 7 +++++++ PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx | 14 +++++++++++--- PWG4/totEt/AliAnalysisTaskTransverseEnergy.h | 13 +++++++++++-- 8 files changed, 61 insertions(+), 14 deletions(-) diff --git a/PWG4/totEt/AliAnalysisEt.h b/PWG4/totEt/AliAnalysisEt.h index 9f6b021579f..930d5f75afb 100644 --- a/PWG4/totEt/AliAnalysisEt.h +++ b/PWG4/totEt/AliAnalysisEt.h @@ -1,7 +1,4 @@ -#ifndef ALIANALYSISET_H -#define ALIANALYSISET_H - -class AliESDCentrality;//_________________________________________________________________________ +//_________________________________________________________________________ // Utility Class for transverse energy studies // Base class for ESD & MC analysis // - reconstruction and MonteCarlo output @@ -9,6 +6,10 @@ class AliESDCentrality;//_______________________________________________________ //*-- Authors: Oystein Djuvsland (Bergen), David Silvermyr (ORNL) //_________________________________________________________________________ +#ifndef ALIANALYSISET_H +#define ALIANALYSISET_H + +class AliESDCentrality; #include "AliAnalysisEtCommon.h" class TString; diff --git a/PWG4/totEt/AliAnalysisEtCommon.h b/PWG4/totEt/AliAnalysisEtCommon.h index da4beee7028..fcec25c18ea 100644 --- a/PWG4/totEt/AliAnalysisEtCommon.h +++ b/PWG4/totEt/AliAnalysisEtCommon.h @@ -144,8 +144,8 @@ protected: TF1 *fLambdaData;//function with Levy fit parameters for Lambda in data TF1 *fAntiLambdaData;//function with Levy fit parameters for AntiLambda in data - TF1 *fLambdaEnhancement; - TF1 *fProtonEnhancement; + TF1 *fLambdaEnhancement;//Function for lambda baryon enhancement factor + TF1 *fProtonEnhancement;//function for proton baryon enhancement factor Float_t LambdaBaryonEnhancement(Float_t pt);//Function which gives the factor to reweigh a lambda or antilambda so it roughly matches baryon enhancement seen at RHIC Float_t ProtonBaryonEnhancement(Float_t pt);//Function which gives the factor to reweigh a lambda or antilambda so it roughly matches baryon enhancement seen at RHIC diff --git a/PWG4/totEt/AliAnalysisEtSelectionContainer.cxx b/PWG4/totEt/AliAnalysisEtSelectionContainer.cxx index 0cc1bc16570..da0a9f248ec 100644 --- a/PWG4/totEt/AliAnalysisEtSelectionContainer.cxx +++ b/PWG4/totEt/AliAnalysisEtSelectionContainer.cxx @@ -1,3 +1,10 @@ +//_________________________________________________________________________ +// Utility Class for transverse energy studies +// Class for determining physics selection +// - reconstruction and MonteCarlo output +// +//*-- Authors: Oystein Djuvsland (Bergen) +//_________________________________________________________________________// #include "AliAnalysisEtSelectionContainer.h" #include "TNamed.h" diff --git a/PWG4/totEt/AliAnalysisEtSelectionContainer.h b/PWG4/totEt/AliAnalysisEtSelectionContainer.h index 4a2e2b4739d..cb7e3ec104b 100644 --- a/PWG4/totEt/AliAnalysisEtSelectionContainer.h +++ b/PWG4/totEt/AliAnalysisEtSelectionContainer.h @@ -1,3 +1,10 @@ +//_________________________________________________________________________ +// Utility Class for transverse energy studies +// Class for determining physics selection +// - reconstruction and MonteCarlo output +// +//*-- Authors: Oystein Djuvsland (Bergen) +//_________________________________________________________________________// #ifndef ALIANALYSISETSELECTIONCONTAINER_H #define ALIANALYSISETSELECTIONCONTAINER_H @@ -5,7 +12,8 @@ #include -class AliPhysicsSelection; + +class AliPhysicsSelection; class AliAnalysisEtSelectionContainer : public TNamed { @@ -21,10 +29,10 @@ public: virtual ~AliAnalysisEtSelectionContainer(); /** Return the physics selection for the current run */ - AliPhysicsSelection* GetPhysicsSelection(Int_t runNumber) { return fPhysicsSelectionMap[runNumber]; } + AliPhysicsSelection* GetPhysicsSelection(Int_t runNumber){ return fPhysicsSelectionMap[runNumber]; } /** Return the physics selection for the current run */ - AliPhysicsSelection* GetDefaultPhysicsSelection() { return fPhysicsSelectionMap[0]; } + AliPhysicsSelection* GetDefaultPhysicsSelection(){ return fPhysicsSelectionMap[0]; } /** Get the map */ std::map GetPhysicsSelectionMap() const { return fPhysicsSelectionMap; } diff --git a/PWG4/totEt/AliAnalysisEtSelectionHandler.cxx b/PWG4/totEt/AliAnalysisEtSelectionHandler.cxx index de98aba495d..2f09dfdee46 100644 --- a/PWG4/totEt/AliAnalysisEtSelectionHandler.cxx +++ b/PWG4/totEt/AliAnalysisEtSelectionHandler.cxx @@ -1,3 +1,10 @@ +//_________________________________________________________________________ +// Utility Class for transverse energy studies +// for handling event selection +// +// +//*-- Authors: Oystein Djuvsland (Bergen) +//_________________________________________________________________________// #include "AliAnalysisEtSelectionHandler.h" #include "AliAnalysisEtSelectionContainer.h" #include "AliPhysicsSelection.h" diff --git a/PWG4/totEt/AliAnalysisEtSelectionHandler.h b/PWG4/totEt/AliAnalysisEtSelectionHandler.h index 10987627176..c672b716299 100644 --- a/PWG4/totEt/AliAnalysisEtSelectionHandler.h +++ b/PWG4/totEt/AliAnalysisEtSelectionHandler.h @@ -1,3 +1,10 @@ +//_________________________________________________________________________ +// Utility Class for transverse energy studies +// for handling event selection +// +// +//*-- Authors: Oystein Djuvsland (Bergen) +//_________________________________________________________________________// #ifndef ALIANALYSISETSELECTIONHANDLER_H #define ALIANALYSISETSELECTIONHANDLER_H diff --git a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx index 1ebe309ae27..36853116ea1 100644 --- a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx +++ b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx @@ -6,6 +6,14 @@ #include "AliPhysicsSelection.h" #include "AliESDCentrality.h" #include "AliESDEvent.h" +//_________________________________________________________________________ +// Utility Class for transverse energy studies +// Base class for Et tasks +// - reconstruction and MonteCarlo output +// +//*-- Authors: Oystein Djuvsland (Bergen) +//_________________________________________________________________________// +#include "AliESDtrackCuts.h" #include "AliLog.h" #include @@ -25,7 +33,7 @@ AliAnalysisTaskTransverseEnergy::AliAnalysisTaskTransverseEnergy(const char* nam ,fCentSelTaskName("centralityTask") ,fIsMc(isMc) ,fUsingDefaultSelection(true) - ,fCurrentRunNumber(-1) + ,fCurrentRunNum(-1) ,fSelectionHandler(0) { // Constructor @@ -40,7 +48,7 @@ AliAnalysisTaskTransverseEnergy::~AliAnalysisTaskTransverseEnergy() Int_t AliAnalysisTaskTransverseEnergy::CheckPhysicsSelection(Int_t runNumber) { // Check if the physics selection is valid, if not load a new one - if (runNumber == fCurrentRunNumber || fIsMc) + if (runNumber == fCurrentRunNum || fIsMc) { return 0; } @@ -78,7 +86,7 @@ Int_t AliAnalysisTaskTransverseEnergy::CheckPhysicsSelection(Int_t runNumber) AliInputEventHandler* handler = dynamic_cast (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()); physSelTask->SetPhysicsSelection(selection); handler->SetEventSelection(selection); - fCurrentRunNumber = runNumber; + fCurrentRunNum = runNumber; } diff --git a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h index 80c50ee761d..111be95214d 100644 --- a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h +++ b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h @@ -1,11 +1,20 @@ +//_________________________________________________________________________ +// Utility Class for transverse energy studies +// Base class for Et tasks +// - reconstruction and MonteCarlo output +// +//*-- Authors: Oystein Djuvsland (Bergen) +//_________________________________________________________________________// #ifndef ALIANALYSISTASKTRANSVERSEENERGY_H #define ALIANALYSISTASKTRANSVERSEENERGY_H #include "AliAnalysisTaskSE.h" -#include "AliESDtrackCuts.h" class AliESDCentrality; class AliAnalysisEtSelectionHandler; +class AliESDtrackCuts; +class AliESDEvent; +class TH2F; class AliAnalysisTaskTransverseEnergy : public AliAnalysisTaskSE { @@ -60,7 +69,7 @@ protected: private: - Int_t fCurrentRunNumber; // The current run number + Int_t fCurrentRunNum; // The current run number AliAnalysisEtSelectionHandler* fSelectionHandler; //! Taking care of loading the correct selections AliAnalysisTaskTransverseEnergy(); -- 2.43.5