From 9e4cc50d36e1a922f8ef44ee621f59de0b64ba7d Mon Sep 17 00:00:00 2001 From: morsch Date: Tue, 4 Mar 2008 22:41:55 +0000 Subject: [PATCH] Warnings corrected. --- JETAN/AliAnalysisTaskJets.cxx | 3 - JETAN/AliAnalysisTaskJets.h | 3 + JETAN/AliDAJetFinder.cxx | 18 ++--- JETAN/AliDAJetFinder.h | 5 -- JETAN/AliJetAODReader.cxx | 2 +- JETAN/AliJetAODReader.h | 5 +- JETAN/AliJetAODReaderHeader.cxx | 3 +- JETAN/AliJetDummyGeo.h | 4 +- JETAN/AliJetDummyShishKebabTrd1Module.cxx | 3 +- JETAN/AliJetDummyShishKebabTrd1Module.h | 2 - JETAN/AliJetESDReader.h | 3 + JETAN/AliJetESDReaderHeader.cxx | 2 + JETAN/AliJetESDmcReader.h | 10 ++- JETAN/AliJetFillUnitArrayEMCalDigits.h | 3 + JETAN/AliJetFillUnitArrayTracks.h | 3 + JETAN/AliJetFinder.cxx | 1 - JETAN/AliJetGrid.cxx | 81 ++++++++++++++++++----- JETAN/AliJetGrid.h | 1 + JETAN/AliJetHadronCorrectionv1.cxx | 8 ++- JETAN/AliJetHadronCorrectionv1.h | 2 +- JETAN/AliJetHistos.h | 6 +- JETAN/AliJetMCReader.h | 6 +- JETAN/AliJetReader.cxx | 7 +- JETAN/AliJetReaderHeader.cxx | 2 + JETAN/AliJetUnitArray.h | 3 + JETAN/AliUA1JetFinderV1.cxx | 9 ++- JETAN/AliUA1JetFinderV2.cxx | 6 +- 27 files changed, 140 insertions(+), 61 deletions(-) diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx index d41d27b541c..b350b9031c2 100644 --- a/JETAN/AliAnalysisTaskJets.cxx +++ b/JETAN/AliAnalysisTaskJets.cxx @@ -102,9 +102,6 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/) // Execute analysis for current event // - if (MCEvent()) { - AliStack* stack = MCEvent()->Stack(); - } fJetFinder->GetReader()->SetInputEvent(InputEvent(), AODEvent(), MCEvent()); fJetFinder->ProcessEvent(); diff --git a/JETAN/AliAnalysisTaskJets.h b/JETAN/AliAnalysisTaskJets.h index c2f900f8ac4..7ff88605044 100644 --- a/JETAN/AliAnalysisTaskJets.h +++ b/JETAN/AliAnalysisTaskJets.h @@ -25,6 +25,9 @@ class AliAnalysisTaskJets : public AliAnalysisTaskSE virtual void UserExec(Option_t *option); virtual void Terminate(Option_t *option); virtual void SetDebugLevel(Int_t level) {fDebug = level;} + private: + AliAnalysisTaskJets(const AliAnalysisTaskJets &det); + AliAnalysisTaskJets &operator=(const AliAnalysisTaskJets &det); private: Int_t fDebug; // Debug flag diff --git a/JETAN/AliDAJetFinder.cxx b/JETAN/AliDAJetFinder.cxx index 69f2d3597d7..38e8d1c3b49 100644 --- a/JETAN/AliDAJetFinder.cxx +++ b/JETAN/AliDAJetFinder.cxx @@ -1,3 +1,4 @@ + // ************************************************************************** // * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * // * * @@ -47,8 +48,7 @@ AliDAJetFinder::AliDAJetFinder(): fPy(0x0), fXEta(0x0), fXPhi(0x0), - fNin(0), - fHeader(0x0) + fNin(0) { // Constructor } @@ -57,7 +57,6 @@ AliDAJetFinder::AliDAJetFinder(): AliDAJetFinder::~AliDAJetFinder() { // Destructor - delete fHeader; delete fPyx; delete fY; delete fPx; @@ -99,7 +98,10 @@ void AliDAJetFinder::InitDetAnn(Double_t &dEtSum) fBeta=0.1; TClonesArray *lvArray = fReader->GetMomentumArray(); fNin = lvArray->GetEntries(); - fNclustMax= fHeader->GetFixedCl() ? fHeader->GetNclustMax() : TMath::Max((Int_t)TMath::Sqrt(fNin),5); + fNclustMax= ((AliDAJetHeader*)fHeader)->GetFixedCl() ? + ((AliDAJetHeader*)fHeader)->GetNclustMax() + : + TMath::Max((Int_t)TMath::Sqrt(fNin),5); fXEta=new Double_t[fNin]; fXPhi=new Double_t[fNin]; fPx = new TVectorD(fNin); for (Int_t iIn=0; iInGetEtaCut(),pi}; + Double_t df[2]={((AliDAJetHeader*)fHeader)->GetEtaCut(),pi}; TVectorD vPart(2); Double_t *m = new Double_t[nk]; Double_t chi,chi1; @@ -368,7 +370,7 @@ void AliDAJetFinder::StoreJets(Int_t nk,Int_t *xx) { //evaluate significant clusters properties const Double_t pi=TMath::Pi(); - Double_t dMeanDist=TMath::Sqrt(4*fHeader->GetEtaCut()*pi/fNin); + Double_t dMeanDist=TMath::Sqrt(4*((AliDAJetHeader*)fHeader)->GetEtaCut()*pi/fNin); Bool_t *isJet = new Bool_t[nk]; Double_t *etNoBg= new Double_t[nk]; Double_t *dDeltaEta=new Double_t[nk]; @@ -394,7 +396,7 @@ void AliDAJetFinder::StoreJets(Int_t nk,Int_t *xx) etDens[iClust]=(*fY)(3,iClust)/surf[iClust]; } - if (fHeader->GetSelJets()){ + if (((AliDAJetHeader*)fHeader)->GetSelJets()){ for (Int_t iClust=0; iClustGetEtaCut()*pi; + Double_t extSurf=4*((AliDAJetHeader*)fHeader)->GetEtaCut()*pi; for (Int_t iClust1=0; iClust1GetReaderHeader()->GetDebug(); Bool_t ok = fReader->FillMomentumArray(); if (!ok) return kFALSE; diff --git a/JETAN/AliJetGrid.cxx b/JETAN/AliJetGrid.cxx index e96a164b667..55b30229eb3 100644 --- a/JETAN/AliJetGrid.cxx +++ b/JETAN/AliJetGrid.cxx @@ -120,26 +120,34 @@ AliJetGrid::AliJetGrid(Int_t nphi,Int_t neta,Double_t phiMin,Double_t phiMax,Dou } //__________________________________________________________ -AliJetGrid::AliJetGrid(const AliJetGrid& grid):TNamed(grid) { +AliJetGrid::AliJetGrid(const AliJetGrid& grid) : TNamed(grid), + fGrid(grid.fGrid), + fNphi(grid.fNphi), + fNeta(grid.fNeta), + fPhi(0), + fEta(0), + fIndex(0), + fIndexI(grid.fIndexI), + fIndexJ(grid.fIndexJ), + fPhiMin(grid.fPhiMin), + fPhiMax(grid.fPhiMax), + fEtaMin(grid.fEtaMin), + fEtaMax(grid.fEtaMax), + fEtaBinInTPCAcc(grid.fEtaBinInTPCAcc), + fPhiBinInTPCAcc(grid.fPhiBinInTPCAcc), + fEtaBinInEMCalAcc(grid.fEtaBinInEMCalAcc), + fPhiBinInEMCalAcc(grid.fPhiBinInEMCalAcc), + fNbinEta(grid.fNbinEta), + fNbinPhi(grid.fNbinPhi), + fMaxPhi(grid.fMaxPhi), + fMinPhi(grid.fMinPhi), + fMaxEta(grid.fMaxEta), + fMinEta(grid.fMinEta), + fDebug(grid.fDebug) +{ // Copy constructor - fNphi = grid.fNphi; - fNeta = grid.fNeta; - fPhiMin = grid.fPhiMin; - fPhiMax = grid.fPhiMax; - fEtaMin = grid.fEtaMin; - fEtaMax = grid.fEtaMax; - fEtaBinInTPCAcc = grid.fEtaBinInTPCAcc; - fPhiBinInTPCAcc = grid.fPhiBinInTPCAcc; - fEtaBinInEMCalAcc = grid.fEtaBinInEMCalAcc; - fPhiBinInEMCalAcc = grid.fPhiBinInEMCalAcc; - fNbinPhi = grid.fNbinPhi; - fMaxPhi = grid.fMaxPhi; - fMinPhi = grid.fMinPhi; - fMaxEta = grid.fMaxEta; - fMinEta = grid.fMinEta; - fPhi = new TArrayD(fNphi+1); for(Int_t i=0; iAt(i); fEta = new TArrayD(fNeta+1); @@ -151,6 +159,45 @@ AliJetGrid::AliJetGrid(const AliJetGrid& grid):TNamed(grid) { } } + +AliJetGrid& AliJetGrid::operator=(const AliJetGrid& other) +{ +// Assignment + fGrid = other.fGrid; + fNphi = other.fNphi; + fNeta = other.fNeta; + fPhi = 0; + fEta = 0; + fIndex = 0; + fIndexI = other.fIndexI; + fIndexJ = other.fIndexJ; + fPhiMin = other.fPhiMin; + fPhiMax = other.fPhiMax; + fEtaMin = other.fEtaMin; + fEtaMax = other.fEtaMax; + fEtaBinInTPCAcc = other.fEtaBinInTPCAcc; + fPhiBinInTPCAcc = other.fPhiBinInTPCAcc; + fEtaBinInEMCalAcc = other.fEtaBinInEMCalAcc; + fPhiBinInEMCalAcc = other.fPhiBinInEMCalAcc; + fNbinEta = other.fNbinEta; + fNbinPhi = other.fNbinPhi; + fMaxPhi = other.fMaxPhi; + fMinPhi = other.fMinPhi; + fMaxEta = other.fMaxEta; + fMinEta = other.fMinEta; + fDebug = other.fDebug; + fPhi = new TArrayD(fNphi+1); + for(Int_t i=0; iAt(i); + fEta = new TArrayD(fNeta+1); + for(Int_t i=0; iAt(i); + + fIndex = new TMatrixD(fNphi+1,fNeta+1); + for(Int_t i=0; i ( AliJetUnitArray unit1) const; Bool_t operator< ( AliJetUnitArray unit1) const; Bool_t operator== ( AliJetUnitArray unit1) const; + private: + AliJetUnitArray(const AliJetUnitArray &det); + AliJetUnitArray &operator=(const AliJetUnitArray &det); protected: Float_t fUnitEnergy; // Energy of the unit diff --git a/JETAN/AliUA1JetFinderV1.cxx b/JETAN/AliUA1JetFinderV1.cxx index aacda75ead2..fc8e2bb0073 100644 --- a/JETAN/AliUA1JetFinderV1.cxx +++ b/JETAN/AliUA1JetFinderV1.cxx @@ -39,14 +39,13 @@ ClassImp(AliUA1JetFinderV1) -//////////////////////////////////////////////////////////////////////// - -AliUA1JetFinderV1::AliUA1JetFinderV1() +///////////////////////////////////////////////////////////////////// +AliUA1JetFinderV1::AliUA1JetFinderV1() : + AliJetFinder(), + fLego(0) { // Constructor - fHeader = 0x0; - fLego = 0x0; } //////////////////////////////////////////////////////////////////////// diff --git a/JETAN/AliUA1JetFinderV2.cxx b/JETAN/AliUA1JetFinderV2.cxx index 0182689096a..2cac03ab4a9 100644 --- a/JETAN/AliUA1JetFinderV2.cxx +++ b/JETAN/AliUA1JetFinderV2.cxx @@ -47,13 +47,13 @@ ClassImp(AliUA1JetFinderV2) //////////////////////////////////////////////////////////////////////// - AliUA1JetFinderV2::AliUA1JetFinderV2(): +AliUA1JetFinderV2::AliUA1JetFinderV2() : + AliJetFinder(), + fLego(0), fDebug(0), fOpt(0) { // Constructor - fHeader = 0x0; - fLego = 0x0; } //////////////////////////////////////////////////////////////////////// -- 2.39.3