From de26523029b5bc429e6dd61e1dca0b13de12eaa7 Mon Sep 17 00:00:00 2001 From: morsch Date: Thu, 5 Apr 2007 16:30:21 +0000 Subject: [PATCH] Modifications needed to run analysis with proof. --- JETAN/AliJetHadronCorrection.h | 9 ++++---- JETAN/AliJetHadronCorrectionv0.h | 3 ++- JETAN/AliJetHadronCorrectionv1.h | 37 ++++++++++++++++---------------- JETAN/AliJetReader.h | 8 +++---- JETAN/AliUA1JetFinderV1.h | 2 +- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/JETAN/AliJetHadronCorrection.h b/JETAN/AliJetHadronCorrection.h index 3a7635ba679..26c65ab9aae 100644 --- a/JETAN/AliJetHadronCorrection.h +++ b/JETAN/AliJetHadronCorrection.h @@ -15,13 +15,14 @@ class AliJetHadronCorrection : public TNamed { public: - AliJetHadronCorrection(const char *name="name", const char *title="title"); - virtual ~AliJetHadronCorrection() {} + AliJetHadronCorrection(); + AliJetHadronCorrection(const char *name, const char *title); + virtual ~AliJetHadronCorrection() {} // Add for particle - virtual Double_t GetEnergy(Double_t pmom, Double_t eta, Int_t gid)=0; + virtual Double_t GetEnergy(Double_t pmom, Double_t eta, Int_t gid)=0; - ClassDef(AliJetHadronCorrection,1) // Hadron correction for EMC (abstract class) + ClassDef(AliJetHadronCorrection,1) // Hadron correction for EMC (abstract class) }; #endif // ALIJETHADRONCORRECTION_H diff --git a/JETAN/AliJetHadronCorrectionv0.h b/JETAN/AliJetHadronCorrectionv0.h index 68d53ebf543..998fbc16049 100644 --- a/JETAN/AliJetHadronCorrectionv0.h +++ b/JETAN/AliJetHadronCorrectionv0.h @@ -16,7 +16,8 @@ class AliJetHadronCorrectionv0: public AliJetHadronCorrection { static AliJetHadronCorrectionv0* fHadrCorr; protected: - AliJetHadronCorrectionv0(const char *name="HadronCorrectionv0", const char *title="title"); + AliJetHadronCorrectionv0() {;} + AliJetHadronCorrectionv0(const char *name, const char *title); public: static AliJetHadronCorrectionv0* Instance(); diff --git a/JETAN/AliJetHadronCorrectionv1.h b/JETAN/AliJetHadronCorrectionv1.h index 73630d158ee..b8da7fc7920 100644 --- a/JETAN/AliJetHadronCorrectionv1.h +++ b/JETAN/AliJetHadronCorrectionv1.h @@ -18,27 +18,28 @@ class AliJetDummyGeo; class AliJetHadronCorrectionv1 : public AliJetHadronCorrection { public: - static AliJetHadronCorrectionv1* Instance(); - virtual Double_t GetEnergy(Double_t pmom, Double_t eta, Int_t gid); - Double_t GetEnergy(Double_t pmom, Double_t eta) {return GetEnergy(pmom,eta,7);} - - void SetGeometry(TString name, Double_t fs = 1.); - virtual ~AliJetHadronCorrectionv1() {} - + AliJetHadronCorrectionv1(){;} + static AliJetHadronCorrectionv1* Instance(); + virtual Double_t GetEnergy(Double_t pmom, Double_t eta, Int_t gid); + Double_t GetEnergy(Double_t pmom, Double_t eta) {return GetEnergy(pmom,eta,7);} + + void SetGeometry(TString name, Double_t fs = 1.); + virtual ~AliJetHadronCorrectionv1() {} + protected: - AliJetHadronCorrectionv1(const char *name="HadronCorrectionv1", const char *title="Hadron Correction"); - // AliJetHadronCorrectionv1(const char *name="HadronCorrectionv1", const char *title="Hadron Correction",AliJetGeometry *geometry = NULL); - void SetGeometry(AliJetDummyGeo *geometry); + AliJetHadronCorrectionv1(const char *name, const char *title); + void SetGeometry(AliJetDummyGeo *geometry); private: - void SetParameters(TString name = "") {Warning("SetParameter","Dummy method with argument %s",name.Data());} + void SetParameters(TString name = "") {Warning("SetParameter","Dummy method with argument %s",name.Data());} - static AliJetHadronCorrectionv1* fgHadrCorr; // Pointer to global instance (singleton) - static Double_t fgParLookup[HCPARAMETERS][HCPARAMETERSETS]; // Global array with parameters for hadronic response - Double_t fPar[6]; - Float_t fSamplingFraction; // Sampling fraction - - ClassDef(AliJetHadronCorrectionv1,2) // Hadron correction for EMC (version for MDC) + static AliJetHadronCorrectionv1* fgHadrCorr; // Pointer to global instance (singleton) + static Double_t fgParLookup[HCPARAMETERS][HCPARAMETERSETS]; // Global array with parameters for hadronic response + Double_t fPar[6]; + Float_t fSamplingFraction; // Sampling fraction + + ClassDef(AliJetHadronCorrectionv1,2) // Hadron correction for EMC (version for MDC) }; - + #endif // ALIJETHADRONCORRECTIONV1_H + diff --git a/JETAN/AliJetReader.h b/JETAN/AliJetReader.h index 300d04adc99..0c08ee9cf85 100755 --- a/JETAN/AliJetReader.h +++ b/JETAN/AliJetReader.h @@ -62,14 +62,14 @@ class AliJetReader : public TObject AliJetReader(const AliJetReader& rJetReader); AliJetReader& operator = (const AliJetReader& rhsr); TClonesArray *fMomentumArray; // array of particle momenta - TClonesArray *fArrayMC; // array of mc particles - TTask *fFillUnitArray; // task list for filling the UnitArray + TClonesArray *fArrayMC; //! array of mc particles + TTask *fFillUnitArray; //! task list for filling the UnitArray AliJetReaderHeader *fReaderHeader; // pointer to header TArrayI fSignalFlag; // to flag if a particle comes from pythia or // from the underlying event TArrayI fCutFlag; // to flag if a particle passed the pt cut or not - AliJetUnitArray *fUnitArray; // array of digit position and energy - AliJetUnitArray *fUnitArrayNoCuts; // array of digit position and energy + AliJetUnitArray *fUnitArray; //! array of digit position and energy + AliJetUnitArray *fUnitArrayNoCuts; //! array of digit position and energy Bool_t fArrayInitialised; // To check that array of units is initialised ClassDef(AliJetReader,1) }; diff --git a/JETAN/AliUA1JetFinderV1.h b/JETAN/AliUA1JetFinderV1.h index a7b2a175b92..342b02273a7 100644 --- a/JETAN/AliUA1JetFinderV1.h +++ b/JETAN/AliUA1JetFinderV1.h @@ -55,7 +55,7 @@ class AliUA1JetFinderV1 : public AliJetFinder protected: AliUA1JetFinderV1(const AliUA1JetFinderV1& rJetF1); AliUA1JetFinderV1& operator = (const AliUA1JetFinderV1& rhsf); - TH2F * fLego; //! Lego Histo + TH2F * fLego; // Lego Histo ClassDef(AliUA1JetFinderV1,1) }; -- 2.39.3