From b8bf1e9094620192e316aecfb7dd72e41c15f61b Mon Sep 17 00:00:00 2001 From: morsch Date: Fri, 14 Aug 2009 09:57:31 +0000 Subject: [PATCH] AODPWG4JetEventBackground renamed to AODJetEventBackground --- JETAN/AliAnalysisTaskJets.cxx | 4 ++-- JETAN/AliFastJetFinder.cxx | 2 +- JETAN/AliFastJetFinder.h | 1 - JETAN/AliJetFinder.cxx | 4 +--- JETAN/AliJetFinder.h | 16 ++++++++-------- STEER/AODLinkDef.h | 2 +- ...ground.cxx => AliAODJetEventBackground.cxx} | 18 +++++++++--------- ...Background.h => AliAODJetEventBackground.h} | 16 ++++++++-------- STEER/libAOD.pkg | 2 +- 9 files changed, 31 insertions(+), 34 deletions(-) rename STEER/{AliAODPWG4JetEventBackground.cxx => AliAODJetEventBackground.cxx} (78%) rename STEER/{AliAODPWG4JetEventBackground.h => AliAODJetEventBackground.h} (74%) diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx index 561ba9ef3a5..f485ab049f9 100644 --- a/JETAN/AliAnalysisTaskJets.cxx +++ b/JETAN/AliAnalysisTaskJets.cxx @@ -106,8 +106,8 @@ void AliAnalysisTaskJets::UserCreateOutputObjects() AddAODBranch("TClonesArray",&tca); fJetFinder->ConnectAODNonStd(AODEvent(), fNonStdBranch.Data()); } - AliAODPWG4JetEventBackground* evBkg = fJetFinder->GetEventBackground(); - AddAODBranch("AliAODPWG4JetEventBackground",&evBkg); + AliAODJetEventBackground* evBkg = fJetFinder->GetEventBackground(); + AddAODBranch("AliAODJetEventBackground",&evBkg); // Histograms OpenFile(1); diff --git a/JETAN/AliFastJetFinder.cxx b/JETAN/AliFastJetFinder.cxx index 99ce9f8a266..16ee13efb02 100644 --- a/JETAN/AliFastJetFinder.cxx +++ b/JETAN/AliFastJetFinder.cxx @@ -39,7 +39,7 @@ #include "AliJetUnitArray.h" #include "AliFastJetInput.h" #include "AliJetBkg.h" -#include "AliAODPWG4JetEventBackground.h" +#include "AliAODJetEventBackground.h" #include "fastjet/PseudoJet.hh" #include "fastjet/ClusterSequenceArea.hh" diff --git a/JETAN/AliFastJetFinder.h b/JETAN/AliFastJetFinder.h index 5d55b3b6015..b4ceff003c2 100644 --- a/JETAN/AliFastJetFinder.h +++ b/JETAN/AliFastJetFinder.h @@ -35,7 +35,6 @@ using namespace std; class AliFastJetInput; class AliJetBkg; -class AliAODPWG4JetEventBackground; class AliFastJetFinder : public AliJetFinder { diff --git a/JETAN/AliJetFinder.cxx b/JETAN/AliJetFinder.cxx index 1c397e757d9..2e4aaa3c019 100644 --- a/JETAN/AliJetFinder.cxx +++ b/JETAN/AliJetFinder.cxx @@ -33,9 +33,7 @@ #include "AliJetReaderHeader.h" #include "AliJetHeader.h" #include "AliJetReader.h" - -class TProcessID; -class TClonesArray; +#include "AliAODJetEventBackground.h" ClassImp(AliJetFinder) diff --git a/JETAN/AliJetFinder.h b/JETAN/AliJetFinder.h index 63604fa90d4..a874b1c489e 100755 --- a/JETAN/AliJetFinder.h +++ b/JETAN/AliJetFinder.h @@ -22,7 +22,7 @@ class TChain; class TTree; class AliAODJet; class AliAODEvent; -class AliAODPWG4JetEventBackground; +class AliAODJetEventBackground; class AliJetHeader; class AliJetReader; class AliJetReaderHeader; @@ -36,11 +36,11 @@ class AliJetFinder : public TObject // Getters virtual AliJetReader *GetReader() const {return fReader;} virtual AliJetHeader *GetHeader() const {return fHeader;} - virtual AliAODPWG4JetEventBackground* GetEventBackground() const {return fAODEvBkg;} + virtual AliAODJetEventBackground* GetEventBackground() const {return fAODEvBkg;} // Setters virtual void SetJetReader(AliJetReader* r) {fReader=r;} virtual void SetJetHeader(AliJetHeader* h) {fHeader=h;} - virtual void SetEventBackground(AliAODPWG4JetEventBackground* bkg) {fAODEvBkg = bkg;} + virtual void SetEventBackground(AliAODJetEventBackground* bkg) {fAODEvBkg = bkg;} // Others virtual void AddJet(AliAODJet jet); virtual void WriteRHeaderToFile(); @@ -62,11 +62,11 @@ class AliJetFinder : public TObject protected: AliJetFinder(const AliJetFinder& rJetFinder); AliJetFinder& operator = (const AliJetFinder& rhsf); - AliJetReader* fReader; // pointer to reader - AliJetHeader* fHeader; // pointer to header - TClonesArray* fAODjets; //! reconstructed jets - Int_t fNAODjets; //! number of reconstructed jets - AliAODPWG4JetEventBackground* fAODEvBkg; //! bkg object to be store + AliJetReader* fReader; // pointer to reader + AliJetHeader* fHeader; // pointer to header + TClonesArray* fAODjets; //! reconstructed jets + Int_t fNAODjets; //! number of reconstructed jets + AliAODJetEventBackground* fAODEvBkg; //! bkg object to be store ClassDef(AliJetFinder,2) }; diff --git a/STEER/AODLinkDef.h b/STEER/AODLinkDef.h index 9c1cba161fb..6234fa94869 100644 --- a/STEER/AODLinkDef.h +++ b/STEER/AODLinkDef.h @@ -24,7 +24,7 @@ #pragma link C++ class AliAODPmdCluster+; #pragma link C++ class AliAODFmdCluster+; #pragma link C++ class AliAODJet+; -#pragma link C++ class AliAODPWG4JetEventBackground+; +#pragma link C++ class AliAODJetEventBackground+; #pragma link C++ class AliAODPhoton+; #pragma link C++ class AliAODRedCov<3>+; #pragma link C++ class AliAODRedCov<4>+; diff --git a/STEER/AliAODPWG4JetEventBackground.cxx b/STEER/AliAODJetEventBackground.cxx similarity index 78% rename from STEER/AliAODPWG4JetEventBackground.cxx rename to STEER/AliAODJetEventBackground.cxx index 04929ef9063..d8cf5ae9067 100644 --- a/STEER/AliAODPWG4JetEventBackground.cxx +++ b/STEER/AliAODJetEventBackground.cxx @@ -14,23 +14,23 @@ **************************************************************************/ //------------------------------------------------------------------------- -// AOD class for PWG4 jet backgrounds +// AOD class for jet backgrounds // Author: Christian Klein-Boesing IKP Muenster //------------------------------------------------------------------------- -#include "AliAODPWG4JetEventBackground.h" +#include "AliAODJetEventBackground.h" using namespace std; -ClassImp(AliAODPWG4JetEventBackground) +ClassImp(AliAODJetEventBackground) -TString AliAODPWG4JetEventBackground::fgkStdBranchName("jeteventbackground"); +TString AliAODJetEventBackground::fgkStdBranchName("jeteventbackground"); //______________________________________________________________________________ -AliAODPWG4JetEventBackground::AliAODPWG4JetEventBackground() : +AliAODJetEventBackground::AliAODJetEventBackground() : TObject() { for(int i = 0;i < kMaxBackground;++i){ @@ -39,7 +39,7 @@ AliAODPWG4JetEventBackground::AliAODPWG4JetEventBackground() : } //______________________________________________________________________________ -AliAODPWG4JetEventBackground::~AliAODPWG4JetEventBackground() +AliAODJetEventBackground::~AliAODJetEventBackground() { // // destructor @@ -47,7 +47,7 @@ AliAODPWG4JetEventBackground::~AliAODPWG4JetEventBackground() } //______________________________________________________________________________ -AliAODPWG4JetEventBackground::AliAODPWG4JetEventBackground(const AliAODPWG4JetEventBackground& back) : +AliAODJetEventBackground::AliAODJetEventBackground(const AliAODJetEventBackground& back) : TObject(back) { // @@ -60,7 +60,7 @@ AliAODPWG4JetEventBackground::AliAODPWG4JetEventBackground(const AliAODPWG4JetEv } //______________________________________________________________________________ -AliAODPWG4JetEventBackground& AliAODPWG4JetEventBackground::operator=(const AliAODPWG4JetEventBackground& back) +AliAODJetEventBackground& AliAODJetEventBackground::operator=(const AliAODJetEventBackground& back) { // // Assignment operator @@ -76,7 +76,7 @@ AliAODPWG4JetEventBackground& AliAODPWG4JetEventBackground::operator=(const AliA return *this; } -void AliAODPWG4JetEventBackground::Print(Option_t* /*option*/) const +void AliAODJetEventBackground::Print(Option_t* /*option*/) const { // // Print information of all data members diff --git a/STEER/AliAODPWG4JetEventBackground.h b/STEER/AliAODJetEventBackground.h similarity index 74% rename from STEER/AliAODPWG4JetEventBackground.h rename to STEER/AliAODJetEventBackground.h index eaf851f2c40..d62393db5e7 100644 --- a/STEER/AliAODPWG4JetEventBackground.h +++ b/STEER/AliAODJetEventBackground.h @@ -1,5 +1,5 @@ -#ifndef AliPWG4AODJETBACKGROUND_H -#define AliPWG4AODJETBACKGROUND_H +#ifndef AliAODJETBACKGROUND_H +#define AliAODJETBACKGROUND_H /* Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -13,13 +13,13 @@ #include "TString.h" -class AliAODPWG4JetEventBackground : public TObject { +class AliAODJetEventBackground : public TObject { public: - AliAODPWG4JetEventBackground(); - virtual ~AliAODPWG4JetEventBackground(); - AliAODPWG4JetEventBackground(const AliAODPWG4JetEventBackground& jet); - AliAODPWG4JetEventBackground& operator=(const AliAODPWG4JetEventBackground& jet); + AliAODJetEventBackground(); + virtual ~AliAODJetEventBackground(); + AliAODJetEventBackground(const AliAODJetEventBackground& jet); + AliAODJetEventBackground& operator=(const AliAODJetEventBackground& jet); virtual void SetBackground(Int_t i,Double_t back){ @@ -43,7 +43,7 @@ class AliAODPWG4JetEventBackground : public TObject { private: static TString fgkStdBranchName; // Standard branch name Double32_t fBackground[kMaxBackground]; // Background from different schemes, normalized to area - ClassDef(AliAODPWG4JetEventBackground,1); + ClassDef(AliAODJetEventBackground,1); }; diff --git a/STEER/libAOD.pkg b/STEER/libAOD.pkg index 37eea53bb86..9203fe2d974 100644 --- a/STEER/libAOD.pkg +++ b/STEER/libAOD.pkg @@ -3,7 +3,7 @@ SRCS = AliAODEvent.cxx AliAODHeader.cxx \ AliAODTrack.cxx AliAODPid.cxx AliAODVertex.cxx \ AliAODCluster.cxx AliAODCaloCluster.cxx AliAODPmdCluster.cxx AliAODFmdCluster.cxx \ - AliAODJet.cxx AliAODPWG4JetEventBackground.cxx AliAODPhoton.cxx AliAODRedCov.cxx AliAODRecoDecay.cxx \ + AliAODJet.cxx AliAODJetEventBackground.cxx AliAODPhoton.cxx AliAODRedCov.cxx AliAODRecoDecay.cxx \ AliAODHandler.cxx AliAODTracklets.cxx AliAODTagCreator.cxx \ AliAODv0.cxx AliAODcascade.cxx AliAODCaloCells.cxx AliAODInputHandler.cxx \ AliMultiAODInputHandler.cxx AliAODDiJet.cxx AliAODMCParticle.cxx AliAODMCHeader.cxx -- 2.43.0