From 702ab87e845509d9379dca12e47c7e8a37eba7f6 Mon Sep 17 00:00:00 2001 From: schutz Date: Sat, 28 May 2005 14:19:05 +0000 Subject: [PATCH] Compilation warnings fixed by T.P. --- PHOS/AliPHOSCalibrator.cxx | 8 +++- PHOS/AliPHOSCalibrator.h | 9 ++++- PHOS/AliPHOSClusterizer.h | 7 +++- PHOS/AliPHOSClusterizerv1.cxx | 7 +++- PHOS/AliPHOSClusterizerv1.h | 7 +++- PHOS/AliPHOSConTableDB.cxx | 7 +++- PHOS/AliPHOSConTableDB.h | 7 +++- PHOS/AliPHOSCpvRecPoint.cxx | 9 ++++- PHOS/AliPHOSCpvRecPoint.h | 9 ++++- PHOS/AliPHOSDigit.cxx | 7 +++- PHOS/AliPHOSDigit.h | 7 +++- PHOS/AliPHOSDigitizer.cxx | 6 ++- PHOS/AliPHOSDigitizer.h | 8 +++- PHOS/AliPHOSEmcRecPoint.cxx | 7 +++- PHOS/AliPHOSEmcRecPoint.h | 12 +++++- PHOS/AliPHOSFastRecParticle.cxx | 7 +++- PHOS/AliPHOSFastRecParticle.h | 7 +++- PHOS/AliPHOSGammaJet.cxx | 7 +++- PHOS/AliPHOSGammaJet.h | 7 +++- PHOS/AliPHOSGetter.h | 1 + PHOS/AliPHOSGridFile.cxx | 18 ++++++++- PHOS/AliPHOSGridFile.h | 8 +++- PHOS/AliPHOSImpact.cxx | 7 +++- PHOS/AliPHOSImpact.h | 7 +++- PHOS/AliPHOSJet.cxx | 2 +- PHOS/AliPHOSJet.h | 2 +- PHOS/AliPHOSJetFinder.cxx | 9 ++++- PHOS/AliPHOSJetFinder.h | 9 ++++- PHOS/AliPHOSLoader.cxx | 60 +++++++++++++++++------------ PHOS/AliPHOSLoader.h | 27 +++++++------ PHOS/AliPHOSPID.h | 7 +++- PHOS/AliPHOSPIDv0.cxx | 7 +++- PHOS/AliPHOSPIDv0.h | 6 ++- PHOS/AliPHOSPIDv1.cxx | 7 +++- PHOS/AliPHOSPIDv1.h | 6 ++- PHOS/AliPHOSRaw2Digits.cxx | 9 ++++- PHOS/AliPHOSRaw2Digits.h | 11 ++++-- PHOS/AliPHOSReconstructor.h | 7 ++++ PHOS/AliPHOSSDigitizer.cxx | 7 +++- PHOS/AliPHOSSDigitizer.h | 7 +++- PHOS/AliPHOSTrackSegment.cxx | 10 ++++- PHOS/AliPHOSTrackSegment.h | 9 ++++- PHOS/AliPHOSTrackSegmentMaker.cxx | 6 +++ PHOS/AliPHOSTrackSegmentMaker.h | 7 +++- PHOS/AliPHOSTrackSegmentMakerv1.cxx | 8 +++- PHOS/AliPHOSTrackSegmentMakerv1.h | 6 ++- PHOS/AliPHOSv0.cxx | 7 +++- PHOS/AliPHOSv0.h | 12 +++++- PHOS/AliPHOSv1.cxx | 12 ++++-- PHOS/AliPHOSv1.h | 11 +++++- PHOS/AliPHOSv2.cxx | 8 +++- PHOS/AliPHOSv2.h | 10 ++++- PHOS/AliPHOSvFast.cxx | 12 ++++-- PHOS/AliPHOSvFast.h | 7 +++- PHOS/AliPHOSvImpacts.cxx | 7 +++- PHOS/AliPHOSvImpacts.h | 11 +++++- 56 files changed, 413 insertions(+), 99 deletions(-) diff --git a/PHOS/AliPHOSCalibrator.cxx b/PHOS/AliPHOSCalibrator.cxx index bbebc01584f..577f859a5ee 100644 --- a/PHOS/AliPHOSCalibrator.cxx +++ b/PHOS/AliPHOSCalibrator.cxx @@ -13,6 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ //_________________________________________________________________________ // Class to calculate calibration parameters from beam tests etc. @@ -687,7 +693,7 @@ void AliPHOSCalibrator::WriteGains(const char * version) cmngr->WriteData(gains) ; } //_____________________________________________________________________________ -void AliPHOSCalibrator::Print()const +void AliPHOSCalibrator::Print(const Option_t *)const { // prints everything AliInfo(Form("--------------PHOS Calibrator-----------------\n")) ; diff --git a/PHOS/AliPHOSCalibrator.h b/PHOS/AliPHOSCalibrator.h index 277791c779d..dcc47c17e4c 100644 --- a/PHOS/AliPHOSCalibrator.h +++ b/PHOS/AliPHOSCalibrator.h @@ -3,6 +3,13 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Class for performing calibration in PHOS @@ -48,7 +55,7 @@ public: void PlotGain(Int_t channel) ; //Plot histo with gains for a channel void PlotGains() ; //Plot all gains - virtual void Print() const ; + virtual void Print(const Option_t * = "") const ; TH1F * PedestalHisto(Int_t channel) {return dynamic_cast(fPedHistos->At(channel)) ;} ; diff --git a/PHOS/AliPHOSClusterizer.h b/PHOS/AliPHOSClusterizer.h index 1ab2b3a25f8..76e3d4ba072 100644 --- a/PHOS/AliPHOSClusterizer.h +++ b/PHOS/AliPHOSClusterizer.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Base class for the clusterization algorithm //*-- Author: Yves Schutz (SUBATECH) & Dmitri Peressounko (SUBATECH & Kurchatov Institute) @@ -37,7 +42,7 @@ public: virtual Int_t GetRecPointsInRun() const {Warning("GetRecPointsInRun", "Not Defined" ) ; return 0 ; } virtual void MakeClusters() {Warning("MakeClusters", "Not Defined" ) ; } - virtual void Print()const {Warning("Print", "Not Defined" ) ; } + virtual void Print(const Option_t * = "")const {Warning("Print", "Not Defined" ) ; } virtual void SetEmcClusteringThreshold(Float_t) = 0; virtual void SetEmcLocalMaxCut(Float_t ) = 0; diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx index e132c604178..85891235728 100644 --- a/PHOS/AliPHOSClusterizerv1.cxx +++ b/PHOS/AliPHOSClusterizerv1.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //*-- Author: Yves Schutz (SUBATECH) & Dmitri Peressounko (SUBATECH & Kurchatov Institute) ////////////////////////////////////////////////////////////////////////////// // Clusterization class. Performs clusterization (collects neighbouring active cells) and @@ -938,7 +943,7 @@ void AliPHOSClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Dou } //____________________________________________________________________________ -void AliPHOSClusterizerv1::Print()const +void AliPHOSClusterizerv1::Print(const Option_t *)const { // Print clusterizer parameters diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h index 6f6bf73190c..9908d622bb6 100644 --- a/PHOS/AliPHOSClusterizerv1.h +++ b/PHOS/AliPHOSClusterizerv1.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version 1 of the clusterization algorithm // Performs clusterization (collects neighbouring active cells) and @@ -60,7 +65,7 @@ public: virtual void Exec(Option_t *option); // Does the job - void Print()const ; + void Print(const Option_t * = "")const ; void SetEmcMinE(Float_t e){fEmcMinE = e ;} void SetCpvMinE(Float_t e){fCpvMinE = e ;} diff --git a/PHOS/AliPHOSConTableDB.cxx b/PHOS/AliPHOSConTableDB.cxx index 933a293423b..176b05bb755 100644 --- a/PHOS/AliPHOSConTableDB.cxx +++ b/PHOS/AliPHOSConTableDB.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Class provides correspondence between "raw numbers" i.e. number of crustall // in prototype and PHOT AbsId numer, used in reconstruction. @@ -191,7 +196,7 @@ Int_t AliPHOSConTableDB::Raw2AbsId(Int_t rawId)const{ return 0 ; } //____________________________________________________________________________ -void AliPHOSConTableDB::Print()const { +void AliPHOSConTableDB::Print(const Option_t *)const { //prints configuraion TString message ; diff --git a/PHOS/AliPHOSConTableDB.h b/PHOS/AliPHOSConTableDB.h index ef21364d067..85f23b72f2d 100644 --- a/PHOS/AliPHOSConTableDB.h +++ b/PHOS/AliPHOSConTableDB.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Class for PHOS connection table, i.e. correspondence between // "cable number" and PHOS AbsId number. @@ -53,7 +58,7 @@ public: //Transforms AbsId number in PHOS into channel number in prototype Int_t AbsId2Raw(Int_t AbsId)const ; - virtual void Print() const ; + virtual void Print(const Option_t * = "") const ; AliPHOSConTableDB& operator=(const AliPHOSConTableDB& cdb) ; diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx index bd8aadb0b83..6a7f9277596 100644 --- a/PHOS/AliPHOSCpvRecPoint.cxx +++ b/PHOS/AliPHOSCpvRecPoint.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // RecPoint implementation for PHOS-CPV // An CpvRecPoint is a cluster of digits @@ -131,7 +136,7 @@ Int_t AliPHOSCpvRecPoint::Compare(const TObject * obj) const } //______________________________________________________________________________ -void AliPHOSCpvRecPoint::ExecuteEvent(Int_t, Int_t, Int_t ) const +void AliPHOSCpvRecPoint::ExecuteEvent(Int_t, Int_t, Int_t ) /*const*/ { // // Execute action corresponding to one event // // This member function is called when a AliPHOSRecPoint is clicked with the locator @@ -341,7 +346,7 @@ void AliPHOSCpvRecPoint::EvalClusterLengths(TClonesArray * digits) //____________________________________________________________________________ -void AliPHOSCpvRecPoint::Print() +void AliPHOSCpvRecPoint::Print(const Option_t *) const { // Print the list of digits belonging to the cluster diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h index b1f75ce898a..dea15b2a3b4 100644 --- a/PHOS/AliPHOSCpvRecPoint.h +++ b/PHOS/AliPHOSCpvRecPoint.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // RecPoint implementation for PHOS-CPV // An CpvRecPoint is a cluster of digits @@ -41,13 +46,13 @@ public: void EvalLocalPosition(Float_t logWeight,TClonesArray * digits ) ; void EvalClusterLengths(TClonesArray * digits) ; - virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) const ; + virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) /*const*/ ; void GetClusterLengths(Int_t &lengX, Int_t &lengZ) const {lengX = fLengX ;lengZ = fLengZ ;} Bool_t IsEmc(void) const {return kFALSE ; } // tells that this is not a EMC Bool_t IsCPV(void) const {return kTRUE ; } // true if the recpoint is in CPV Bool_t IsSortable() const { return kTRUE ; } // tells that this is a sortable object - void Print() ; + void Print(const Option_t * = "") const ; AliPHOSCpvRecPoint & operator = (const AliPHOSCpvRecPoint & /*rvalue*/) { Fatal("operator =", "not implemented") ; return *this ; diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx index c39203b062b..19bbf04e461 100644 --- a/PHOS/AliPHOSDigit.cxx +++ b/PHOS/AliPHOSDigit.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // PHOS digit: Id // energy @@ -136,7 +141,7 @@ Int_t AliPHOSDigit::GetPrimary(Int_t index) const } //____________________________________________________________________________ -void AliPHOSDigit::Print() const +void AliPHOSDigit::Print(const Option_t *) const { // Print the digit together with list of primaries printf("PHOS digit: Amp=%d, Id=%d, Time=%e, TimeR=%e, NPrim=%d ",fAmp,fId,fTime,fTimeR,fNprimary); diff --git a/PHOS/AliPHOSDigit.h b/PHOS/AliPHOSDigit.h index 106719c6981..e4aa8351f50 100644 --- a/PHOS/AliPHOSDigit.h +++ b/PHOS/AliPHOSDigit.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // PHOS digit: Id // energy @@ -47,7 +52,7 @@ class AliPHOSDigit : public AliDigitNew { Float_t GetTime(void) const {return fTime ;} Float_t GetTimeR(void) const {return fTimeR ;} Bool_t IsSortable() const { return kTRUE ; } - void Print() const; + void Print(const Option_t * = "") const; void SetAmp(Int_t Amp) { fAmp=Amp ; } void SetTime(Float_t time) {fTime = time ;} void SetTimeR(Float_t time) {fTimeR = time ;} diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index af59e7f0db7..bb3b29b441f 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -15,6 +15,10 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ //_________________________________________________________________________ //*-- Author : Dmitri Peressounko (SUBATECH & Kurchatov Institute) @@ -600,7 +604,7 @@ void AliPHOSDigitizer::MixWith(TString alirunFileName, TString eventFolderName) } //__________________________________________________________________ -void AliPHOSDigitizer::Print()const +void AliPHOSDigitizer::Print(const Option_t *)const { // Print Digitizer's parameters AliInfo(Form("\n------------------- %s -------------", GetName() )) ; diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h index 080d4ad2fa6..da440984721 100644 --- a/PHOS/AliPHOSDigitizer.h +++ b/PHOS/AliPHOSDigitizer.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Task Class for making SDigits in PHOS // Class performs digitization of Summable digits (in the PHOS case this is just @@ -71,7 +76,8 @@ public: Int_t GetDigitsInRun() const { return fDigitsInRun ;} void MixWith(TString alirunFileName, TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; // Add another one file to mix - void Print()const ; + + void Print(const Option_t * = "")const ; AliPHOSDigitizer & operator = (const AliPHOSDigitizer & /*rvalue*/) { // assignement operator requested by coding convention but not needed diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx index 40ec5a98064..5dcb9051b14 100644 --- a/PHOS/AliPHOSEmcRecPoint.cxx +++ b/PHOS/AliPHOSEmcRecPoint.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // RecPoint implementation for PHOS-EMC // An EmcRecPoint is a cluster of digits @@ -207,7 +212,7 @@ Int_t AliPHOSEmcRecPoint::Compare(const TObject * obj) const return rv ; } //______________________________________________________________________________ -void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) const +void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) /*const*/ { // Execute action corresponding to one event diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h index fd3c7a1ac3b..6e9239910a8 100644 --- a/PHOS/AliPHOSEmcRecPoint.h +++ b/PHOS/AliPHOSEmcRecPoint.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // RecPoint implementation for PHOS-EMC // An EmcRecPoint is a cluster of digits @@ -30,12 +35,17 @@ public: virtual ~AliPHOSEmcRecPoint() ; + //This virtual function has signature different from AliPHOSRecPoint::AddDigit + //it hides, not overrides. using - declaration should fix the problem, at least for + //g++ + using AliPHOSRecPoint::AddDigit; virtual void AddDigit(AliPHOSDigit & digit, Float_t Energy) ; // add a digit to the digits list Int_t Compare(const TObject * obj) const; // method for sorting virtual void EvalAll(Float_t logWeight,TClonesArray * digits) ; - virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) const; + //in base class this functions is non-const + virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) /*const*/; Float_t GetCoreEnergy()const {return fCoreEnergy ;} virtual Float_t GetDispersion()const {return fDispersion ;} diff --git a/PHOS/AliPHOSFastRecParticle.cxx b/PHOS/AliPHOSFastRecParticle.cxx index 1cb9a809927..0c5c366bf0c 100644 --- a/PHOS/AliPHOSFastRecParticle.cxx +++ b/PHOS/AliPHOSFastRecParticle.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // A Particle modified by PHOS response and produced by AliPHOSvFast // To become a general class of AliRoot ? @@ -489,7 +494,7 @@ void AliPHOSFastRecParticle::Paint(Option_t *) } //____________________________________________________________________________ -void AliPHOSFastRecParticle::Print()const +void AliPHOSFastRecParticle::Print(const Option_t *)const { // Print the type, energy and momentum of the reconstructed particle diff --git a/PHOS/AliPHOSFastRecParticle.h b/PHOS/AliPHOSFastRecParticle.h index 7163863809e..ae9ffff743d 100644 --- a/PHOS/AliPHOSFastRecParticle.h +++ b/PHOS/AliPHOSFastRecParticle.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // A Particle modified by PHOS response and produced by AliPHOSvFast // This is also a base class for AliPHOSRecParticle produced by AliPHOSPIDv1 @@ -74,7 +79,7 @@ class AliPHOSFastRecParticle : public TParticle { TString Name() const ; virtual void Paint(Option_t * option=""); - virtual void Print() const ; + virtual void Print(const Option_t * = "") const ; void SetTof(Float_t tof) { fTof = tof ; } Float_t ToF() const { return fTof ; } diff --git a/PHOS/AliPHOSGammaJet.cxx b/PHOS/AliPHOSGammaJet.cxx index 24a9b1203da..b6c19a33e97 100644 --- a/PHOS/AliPHOSGammaJet.cxx +++ b/PHOS/AliPHOSGammaJet.cxx @@ -14,6 +14,11 @@ **************************************************************************/ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Class for the analysis of gamma-jet correlations // Basically it seaches for a prompt photon in the PHOS acceptance, @@ -2537,7 +2542,7 @@ void AliPHOSGammaJet::Plot(TString what, Option_t * option) const } //____________________________________________________________________________ -void AliPHOSGammaJet::Print(char * opt) +void AliPHOSGammaJet::Print(const Option_t * opt) const { //Print some relevant parameters set for the analysis diff --git a/PHOS/AliPHOSGammaJet.h b/PHOS/AliPHOSGammaJet.h index 8fddafdbd80..ebe3bfbfebc 100644 --- a/PHOS/AliPHOSGammaJet.h +++ b/PHOS/AliPHOSGammaJet.h @@ -4,6 +4,11 @@ * See cxx source for full Copyright notice */ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Class for the analysis of gamma-jet correlations. // Basically it seaches for a prompt photon in the PHOS acceptance, @@ -69,7 +74,7 @@ public: Bool_t IsOnlyCharged() const {return fOnlyCharged ; } void Plot(TString what="all", Option_t *option="") const; - void Print(char * opt); + void Print(const Option_t * opt)const; void SetAngleMaxParam(Int_t i, Double_t par) {fAngleMaxParam.AddAt(par,i) ; } diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h index 4ada0735c0d..ec57b5546c5 100644 --- a/PHOS/AliPHOSGetter.h +++ b/PHOS/AliPHOSGetter.h @@ -76,6 +76,7 @@ public: Option_t * openingOption = "READ" ) ; static AliPHOSGetter * Instance() ; + void Print(const Option_t *)const{} static void Print() ; //=========== General information about run ============== diff --git a/PHOS/AliPHOSGridFile.cxx b/PHOS/AliPHOSGridFile.cxx index 36773a5a51b..34081910749 100644 --- a/PHOS/AliPHOSGridFile.cxx +++ b/PHOS/AliPHOSGridFile.cxx @@ -14,6 +14,11 @@ **************************************************************************/ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // To navigate in the Grid catalogue (very elementary) // check here : /afs/cern.ch/user/p/peters/public/README.ALIEN @@ -86,9 +91,11 @@ TString AliPHOSGridFile::GetLFN() const } //____________________________________________________________________________ -void AliPHOSGridFile::Copy(AliPHOSGridFile & lfn) +void AliPHOSGridFile::Copy(TObject & obj)const { //Copy method used by the Copy ctor + AliPHOSGridFile &lfn = static_cast(obj); + /* incorrect Copy, destination is OBJ, not this. fRoot = lfn.fRoot ; fYear = lfn.fYear ; fProd = lfn.fProd ; @@ -97,6 +104,15 @@ void AliPHOSGridFile::Copy(AliPHOSGridFile & lfn) fRun = lfn.fRun ; fEvt = lfn.fEvt ; TObject::Copy(lfn) ; + */ + lfn.fRoot = fRoot ; + lfn.fYear = fYear ; + lfn.fProd = fProd ; + lfn.fVers = fVers ; + lfn.fType = fType ; + lfn.fRun = fRun ; + lfn.fEvt = fEvt ; + TObject::Copy(lfn) ; } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSGridFile.h b/PHOS/AliPHOSGridFile.h index 619f1577e78..260e5188c8e 100644 --- a/PHOS/AliPHOSGridFile.h +++ b/PHOS/AliPHOSGridFile.h @@ -3,6 +3,11 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Description of logical filename in Grid catalogue // check here : /afs/cern.ch/user/p/peters/public/README.GRID @@ -25,7 +30,8 @@ class AliPHOSGridFile : public TObject { lfn.Copy(*this) ; } virtual ~AliPHOSGridFile(void) ; - virtual void Copy(AliPHOSGridFile & lfn) ; + + virtual void Copy(TObject & obj) const; void ListEvents() const ; void ListRuns() const ; diff --git a/PHOS/AliPHOSImpact.cxx b/PHOS/AliPHOSImpact.cxx index 313907a3631..e8a7d60257b 100644 --- a/PHOS/AliPHOSImpact.cxx +++ b/PHOS/AliPHOSImpact.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Hit impact class for PHOS // A hit impact in PHOS is a set of parameters of a track which @@ -70,7 +75,7 @@ AliPHOSImpact::AliPHOSImpact(Int_t shunt, Int_t primary, Int_t track, Int_t pid, } //____________________________________________________________________________ -void AliPHOSImpact::Print() +void AliPHOSImpact::Print(const Option_t *)const { // Prints particle info printf("Impact Pid=%4d, p=(%6.2f,%6.2f,%6.2f,%6.2f) GeV, x=(%6.1f,%6.1f,%6.1f) cm\n", diff --git a/PHOS/AliPHOSImpact.h b/PHOS/AliPHOSImpact.h index 2c61b535fe8..d3b025b94e4 100644 --- a/PHOS/AliPHOSImpact.h +++ b/PHOS/AliPHOSImpact.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Hit impact class for PHOS // A hit impact in PHOS is a set of parameters of a track which @@ -47,7 +52,7 @@ public: // returns momentum of the particle which initiated this hit return fMomentum; } - void Print(); + void Print(const Option_t * = "")const; private: diff --git a/PHOS/AliPHOSJet.cxx b/PHOS/AliPHOSJet.cxx index a1b2b3dd937..b5880776e8d 100644 --- a/PHOS/AliPHOSJet.cxx +++ b/PHOS/AliPHOSJet.cxx @@ -282,7 +282,7 @@ void AliPHOSJet::CalculateAll(void){ fSumPhi = 0. ; } //____________________________________________________________________________ -void AliPHOSJet::Print(){ +void AliPHOSJet::Print(const Option_t *) const { //Print jet parameters printf("-------------- AliPHOSJet ------------\n") ; printf(" Energy............. %f \n",fEnergy) ; diff --git a/PHOS/AliPHOSJet.h b/PHOS/AliPHOSJet.h index 80eefb1a4e3..42246dfa35d 100644 --- a/PHOS/AliPHOSJet.h +++ b/PHOS/AliPHOSJet.h @@ -60,7 +60,7 @@ public: else return fSumPhi/fSumEnergy ;} Int_t GetNJetParticles(void)const{return fNpart;} - void Print() ; + void Print(const Option_t * = "") const ; AliPHOSJet & operator = (const AliPHOSJet & /*rvalue*/) { // assignement operator requested by coding convention but not needed Fatal("operator =", "not implemented") ; return *this ; diff --git a/PHOS/AliPHOSJetFinder.cxx b/PHOS/AliPHOSJetFinder.cxx index ed4933aacee..dd14f16514b 100644 --- a/PHOS/AliPHOSJetFinder.cxx +++ b/PHOS/AliPHOSJetFinder.cxx @@ -21,6 +21,13 @@ //*-- Author : D.Peressounko after UA1 coll. etc ////////////////////////////////////////////////////////////////////////////// +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + // --- ROOT system --- #include "TClonesArray.h" // #include "TIter.h" @@ -328,7 +335,7 @@ void AliPHOSJetFinder::CalculateEEtaPhi(const AliPHOSDigit * d,Double_t &e, Doub phi = pos.Phi() ; } //____________________________________________________________________________ -void AliPHOSJetFinder::Print(){ +void AliPHOSJetFinder::Print(const Option_t *) const { //Print parameters of the found jet printf("\n --------------- AliPHOSJetFinder --------------- \n") ; printf(" Jets found .........%d \n",fNJets) ; diff --git a/PHOS/AliPHOSJetFinder.h b/PHOS/AliPHOSJetFinder.h index e3505070068..bab15b18775 100644 --- a/PHOS/AliPHOSJetFinder.h +++ b/PHOS/AliPHOSJetFinder.h @@ -3,6 +3,13 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // //*-- Author: D.Peressounko @@ -31,7 +38,7 @@ public: void FindJetsFromParticles(const TClonesArray * plist,TObjArray * jetslist) ; //Do the job void FindJetsFromDigits(const TClonesArray * digits,TObjArray * jetslist) ; //Do the job - void Print() ; + void Print(const Option_t * = "") const ; void SetEtSeed(Double_t etseed){fEtSeed = etseed ;} ; void SetEtMin(Double_t etmin){fEtMin = etmin ;} ; diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx index c8e8bd105fc..542d5208d60 100644 --- a/PHOS/AliPHOSLoader.cxx +++ b/PHOS/AliPHOSLoader.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // A singleton. This class should be used in the analysis stage to get // reconstructed objects: Digits, RecPoints, TrackSegments and RecParticles, @@ -288,8 +293,10 @@ Int_t AliPHOSLoader::LoadRecParticles(Option_t* opt) } //____________________________________________________________________________ - -Int_t AliPHOSLoader::PostHits() +//PostHits etc. PostXXX must be const - not to hide virtual functions +//from base class AliLoader, but they call non-constant functions ReadXXX +//so I have to const_cast this pointer +Int_t AliPHOSLoader::PostHits()const { // -------------- Hits ------------------------------------------- Int_t reval = AliLoader::PostHits(); @@ -298,11 +305,12 @@ Int_t AliPHOSLoader::PostHits() AliError("returned error"); return reval; } - return ReadHits(); + + return const_cast(this)->ReadHits(); } //____________________________________________________________________________ -Int_t AliPHOSLoader::PostSDigits() +Int_t AliPHOSLoader::PostSDigits()const { // -------------- SDigits ------------------------------------------- Int_t reval = AliLoader::PostSDigits(); @@ -311,11 +319,11 @@ Int_t AliPHOSLoader::PostSDigits() AliError("returned error"); return reval; } - return ReadSDigits(); + return const_cast(this)->ReadSDigits(); } //____________________________________________________________________________ -Int_t AliPHOSLoader::PostDigits() +Int_t AliPHOSLoader::PostDigits()const { // -------------- Digits ------------------------------------------- Int_t reval = AliLoader::PostDigits(); @@ -324,11 +332,11 @@ Int_t AliPHOSLoader::PostDigits() AliError("returned error"); return reval; } - return ReadDigits(); + return const_cast(this)->ReadDigits(); } //____________________________________________________________________________ -Int_t AliPHOSLoader::PostRecPoints() +Int_t AliPHOSLoader::PostRecPoints()const { // -------------- RecPoints ------------------------------------------- Int_t reval = AliLoader::PostRecPoints(); @@ -337,12 +345,12 @@ Int_t AliPHOSLoader::PostRecPoints() AliError("returned error"); return reval; } - return ReadRecPoints(); + return const_cast(this)->ReadRecPoints(); } //____________________________________________________________________________ -Int_t AliPHOSLoader::PostRecParticles() +Int_t AliPHOSLoader::PostRecParticles()const { // -------------- RecParticles ------------------------------------------- Int_t reval = AliLoader::PostRecParticles(); @@ -351,11 +359,11 @@ Int_t AliPHOSLoader::PostRecParticles() AliError("returned error"); return reval; } - return ReadRecParticles(); + return const_cast(this)->ReadRecParticles(); } //____________________________________________________________________________ -Int_t AliPHOSLoader::PostTracks() +Int_t AliPHOSLoader::PostTracks()const { // -------------- Tracks ------------------------------------------- Int_t reval = AliLoader::PostTracks(); @@ -364,7 +372,7 @@ Int_t AliPHOSLoader::PostTracks() AliError("returned error"); return reval; } - return ReadTracks(); + return const_cast(this)->ReadTracks(); } //____________________________________________________________________________ @@ -765,55 +773,57 @@ void AliPHOSLoader::SetBranchTitle(const TString& btitle) fBranchTitle = btitle; ReloadAll(); } + //____________________________________________________________________________ - -void AliPHOSLoader::CleanHits() +//Again, must be const not to hide virtual functions from AliLoader +//but there are calls to non-const functions, so I have to const_cast this pointer +void AliPHOSLoader::CleanHits()const { // Clean Hits array AliLoader::CleanHits(); //Clear an array - TClonesArray* hits = Hits(); + TClonesArray* hits = const_cast(this)->Hits(); if (hits) hits->Clear(); } //____________________________________________________________________________ -void AliPHOSLoader::CleanSDigits() +void AliPHOSLoader::CleanSDigits()const { // Clean SDigits array AliLoader::CleanSDigits(); - TClonesArray* sdigits = SDigits(); + TClonesArray* sdigits = const_cast(this)->SDigits(); if (sdigits) sdigits->Clear(); } //____________________________________________________________________________ -void AliPHOSLoader::CleanDigits() +void AliPHOSLoader::CleanDigits()const { // Clean Digits array AliLoader::CleanDigits(); - TClonesArray* digits = Digits(); + TClonesArray* digits = const_cast(this)->Digits(); if (digits) digits->Clear(); } //____________________________________________________________________________ -void AliPHOSLoader::CleanRecPoints() +void AliPHOSLoader::CleanRecPoints()const { // Clean RecPoints array AliLoader::CleanRecPoints(); - TObjArray* recpoints = EmcRecPoints(); + TObjArray* recpoints = const_cast(this)->EmcRecPoints(); if (recpoints) recpoints->Clear(); - recpoints = CpvRecPoints(); + recpoints = const_cast(this)->CpvRecPoints(); if (recpoints) recpoints->Clear(); } //____________________________________________________________________________ -void AliPHOSLoader::CleanTracks() +void AliPHOSLoader::CleanTracks()const { //Cleans Tracks stuff AliLoader::CleanTracks();//tree //and clear the array - TClonesArray* tracks = TrackSegments(); + TClonesArray* tracks = const_cast(this)->TrackSegments(); if (tracks) tracks->Clear(); } diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h index 6b85599405a..d60517bd511 100644 --- a/PHOS/AliPHOSLoader.h +++ b/PHOS/AliPHOSLoader.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // A singleton that returns various objects // Should be used on the analysis stage to avoid confusing between different @@ -72,20 +77,20 @@ public: Int_t LoadTracks(Option_t* opt=""); //reads Tracks from disk and sends them to folder; array as well as tree Int_t LoadRecParticles(Option_t* opt=""); - Int_t PostHits(); //Posts the - Int_t PostSDigits(); - Int_t PostDigits(); - Int_t PostRecPoints(); - Int_t PostTracks(); - Int_t PostRecParticles(); + Int_t PostHits()const; //Posts the + Int_t PostSDigits()const; + Int_t PostDigits()const; + Int_t PostRecPoints()const; + Int_t PostTracks()const; + Int_t PostRecParticles()const; void CleanFolders();//cleans all the stuff loaded by this detector + calls AliLoader::Clean - void CleanHits(); - void CleanSDigits(); - void CleanDigits(); - void CleanRecPoints(); - void CleanTracks(); + void CleanHits()const; + void CleanSDigits()const; + void CleanDigits()const; + void CleanRecPoints()const; + void CleanTracks()const; void CleanRecParticles(); //up to now it is only here -> no definition about global/incremental tracking/PID diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h index 23ce334477a..899782dabc9 100644 --- a/PHOS/AliPHOSPID.h +++ b/PHOS/AliPHOSPID.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Algorithm class for the identification of particles detected in PHOS // base class @@ -37,7 +42,7 @@ class AliPHOSPID : public TTask { virtual ~AliPHOSPID() ; // dtor virtual Int_t GetRecParticlesInRun() const { Warning("GetRecParticlesInRun", "not defined" ) ; return 0 ;} - virtual void Print() const { Warning("Print", "not defined" ) ;} + virtual void Print(const Option_t * = "") const { Warning("Print", "not defined" ) ;} void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } void SetEventFolderName(TString name) { fEventFolderName = name ; } virtual const char * Version() const { Warning("Version", "not defined" ) ; return 0 ; } diff --git a/PHOS/AliPHOSPIDv0.cxx b/PHOS/AliPHOSPIDv0.cxx index d7e7958de7f..2516937dbeb 100644 --- a/PHOS/AliPHOSPIDv0.cxx +++ b/PHOS/AliPHOSPIDv0.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version v0 of the PHOS particle identifier // Particle identification based on the @@ -342,7 +347,7 @@ void AliPHOSPIDv0::MakeRecParticles() } //____________________________________________________________________________ -void AliPHOSPIDv0:: Print() const +void AliPHOSPIDv0:: Print(const Option_t *) const { // Print the parameters used for the particle type identification TString message ; diff --git a/PHOS/AliPHOSPIDv0.h b/PHOS/AliPHOSPIDv0.h index e6850dd9649..3918fc070d5 100644 --- a/PHOS/AliPHOSPIDv0.h +++ b/PHOS/AliPHOSPIDv0.h @@ -5,6 +5,10 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ //_________________________________________________________________________ // Implementation version v0 of the PHOS particle identifier @@ -38,7 +42,7 @@ public: virtual Int_t GetRecParticlesInRun() const {return fRecParticlesInRun ;} virtual void PlotDispersionCuts()const ; - virtual void Print()const ; + virtual void Print(const Option_t * = "")const ; virtual void SetIdentificationMethod(const char * option = "CPV DISP" ){fIDOptions = option ;} virtual void SetShowerProfileCut(const char * formula = "0.35*0.35 - (x-1.386)*(x-1.386) - 1.707*1.707*(y-1.008)*(y-1.008)") ; virtual void SetDispersionCut(Float_t cut){fDispersion = cut ; } diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx index ffe8b275ab5..25079b84f35 100644 --- a/PHOS/AliPHOSPIDv1.cxx +++ b/PHOS/AliPHOSPIDv1.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version v1 of the PHOS particle identifier // Particle identification based on the @@ -1359,7 +1364,7 @@ void AliPHOSPIDv1::MakeRecParticles() } //____________________________________________________________________________ -void AliPHOSPIDv1::Print() const +void AliPHOSPIDv1::Print(const Option_t *) const { // Print the parameters used for the particle type identification diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h index 284b6984951..5192cf6f286 100644 --- a/PHOS/AliPHOSPIDv1.h +++ b/PHOS/AliPHOSPIDv1.h @@ -5,6 +5,10 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ //_________________________________________________________________________ // Implementation version v1 of the PHOS particle identifier @@ -89,7 +93,7 @@ public: //Switch to "on flyght" mode, without writing to TreeR and file void SetWriting(Bool_t toWrite = kFALSE){fWrite = toWrite;} - void Print() const ; + void Print(const Option_t * = "") const ; virtual const char * Version() const { return "pid-v1" ; } diff --git a/PHOS/AliPHOSRaw2Digits.cxx b/PHOS/AliPHOSRaw2Digits.cxx index 48dd02c5e68..219797a7a59 100644 --- a/PHOS/AliPHOSRaw2Digits.cxx +++ b/PHOS/AliPHOSRaw2Digits.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Class designed to convert raw data to aliroot format. We assume, that // prototype is situated in the center of 3 PHOS module and convert prototype @@ -166,7 +171,7 @@ AliPHOSRaw2Digits::~AliPHOSRaw2Digits() } //____________________________________________________________________________ -void AliPHOSRaw2Digits::Exec(){ +void AliPHOSRaw2Digits::Exec(const Option_t *){ //This is steering method performing all the conversion if(!fIsInitialized) //need initialization @@ -633,7 +638,7 @@ void AliPHOSRaw2Digits::WriteDigits(void){ gAlice->TreeE()->Fill(); } //____________________________________________________________________________ -void AliPHOSRaw2Digits::Print()const{ +void AliPHOSRaw2Digits::Print(const Option_t *)const{ //prints current configuration and status. printf("----------AliPHOSRaw2Digits---------- \n") ; diff --git a/PHOS/AliPHOSRaw2Digits.h b/PHOS/AliPHOSRaw2Digits.h index 017d3f8d417..771fc40c77a 100644 --- a/PHOS/AliPHOSRaw2Digits.h +++ b/PHOS/AliPHOSRaw2Digits.h @@ -3,7 +3,12 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $id */ +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ //_________________________________________________________________________ // Base Class for PHOS @@ -31,7 +36,7 @@ public: AliPHOSRaw2Digits(AliPHOSRaw2Digits & r2d) ; // cpy ctor virtual ~AliPHOSRaw2Digits() ; // dtor - void Exec() ; + void Exec(const Option_t * = "") ; void SetBeamEnergy(Float_t energy){fBeamEnergy = energy ;} void SetInputFile(TString inname="Run_1234.fz"){fInName=inname ; } @@ -46,7 +51,7 @@ public: {for(Int_t i=0;i<3;i++)fTarget[i]=pos[i] ;} void SetConTableDB(AliPHOSConTableDB * ctdb){fctdb = ctdb ;} void SetMaxEventsPerFile(Int_t nev=20000){fMaxPerFile = nev ;} - void Print()const ; + void Print(const Option_t * = "")const ; AliPHOSRaw2Digits & operator = ( AliPHOSRaw2Digits & /*r2d*/ ) { return *this ; } private: diff --git a/PHOS/AliPHOSReconstructor.h b/PHOS/AliPHOSReconstructor.h index b46762a6331..f1bef35d1bc 100644 --- a/PHOS/AliPHOSReconstructor.h +++ b/PHOS/AliPHOSReconstructor.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Wrapping class for reconstruction //*-- @@ -43,7 +48,9 @@ public: static void ResetDebug() { fgDebug = kFALSE ; } static Bool_t Debug() { return fgDebug ; } AliTracker *CreateTracker(AliRunLoader* runLoader) const; + using AliReconstructor::FillESD; virtual void FillESD(AliRunLoader* runLoader, AliESD* esd) const ; + using AliReconstructor::Reconstruct; virtual void Reconstruct(AliRunLoader* runLoader) const ; virtual void Reconstruct(AliRunLoader* runLoader, AliRawReader * rawreader) const ; diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx index cd106de44ec..65a73193f25 100644 --- a/PHOS/AliPHOSSDigitizer.cxx +++ b/PHOS/AliPHOSSDigitizer.cxx @@ -16,6 +16,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // This is a TTask that makes SDigits out of Hits // The name of the TTask is also the title of the branch that will contain @@ -273,7 +278,7 @@ void AliPHOSSDigitizer::Exec(Option_t *option) } //__________________________________________________________________ -void AliPHOSSDigitizer::Print()const +void AliPHOSSDigitizer::Print(const Option_t *)const { // Prints parameters of SDigitizer Info("Print", "\n------------------- %s -------------", GetName() ) ; diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h index ad0e7c50a6b..11267c587ca 100644 --- a/PHOS/AliPHOSSDigitizer.h +++ b/PHOS/AliPHOSSDigitizer.h @@ -6,6 +6,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Task Class for making SDigits in PHOS // A Summable Digits is the sum of all hits originating @@ -34,7 +39,7 @@ public: Int_t Digitize(Float_t Energy)const { return (Int_t ) ( fA + Energy*fB); } virtual void Exec(Option_t *option); Int_t GetSDigitsInRun() const {return fSDigitsInRun ;} - virtual void Print() const ; + virtual void Print(const Option_t * = "") const ; void SetEventFolderName(TString name) { fEventFolderName = name ; } void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx index 3319bd48268..fa359cd0821 100644 --- a/PHOS/AliPHOSTrackSegment.cxx +++ b/PHOS/AliPHOSTrackSegment.cxx @@ -13,6 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ /* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Track segment in PHOS // Can be : 1 EmcRecPoint @@ -87,7 +93,7 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( const AliPHOSTrackSegment & ts) //____________________________________________________________________________ -void AliPHOSTrackSegment::Copy(TObject & obj) +void AliPHOSTrackSegment::Copy(TObject & obj) const { // Copy of a track segment into another track segment @@ -100,7 +106,7 @@ void AliPHOSTrackSegment::Copy(TObject & obj) //____________________________________________________________________________ -void AliPHOSTrackSegment::Print() const +void AliPHOSTrackSegment::Print(const Option_t *) const { // Print all information on this track Segment diff --git a/PHOS/AliPHOSTrackSegment.h b/PHOS/AliPHOSTrackSegment.h index 5ca84e5588a..f88e0d44f9a 100644 --- a/PHOS/AliPHOSTrackSegment.h +++ b/PHOS/AliPHOSTrackSegment.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Track segment in PHOS // Can be : 1 EmcRecPoint @@ -37,14 +42,14 @@ public: AliPHOSTrackSegment(const AliPHOSTrackSegment & ts) ; // ctor virtual ~AliPHOSTrackSegment() { } - void Copy(TObject & obj) ; + void Copy(TObject & obj) const; Int_t GetIndexInList() const { return fIndexInList ; } Int_t GetEmcIndex() const { return fEmcRecPoint ; } Int_t GetCpvIndex() const { return fCpvRecPoint; } Int_t GetTrackIndex() const { return fTrack; } - virtual void Print() const; + virtual void Print(const Option_t * = "") const; void SetIndexInList(Int_t val){ fIndexInList = val ; } void SetCpvRecPoint(AliPHOSRecPoint * CpvRecPoint ); //sets CPV Rec Point diff --git a/PHOS/AliPHOSTrackSegmentMaker.cxx b/PHOS/AliPHOSTrackSegmentMaker.cxx index 0f3ea3b29be..28505e3577b 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.cxx +++ b/PHOS/AliPHOSTrackSegmentMaker.cxx @@ -13,6 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ /* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Algorithm Base class to construct PHOS track segments // Associates EMC and PPSD clusters diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h index 8a5a5cc56fe..3a5aac85130 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.h +++ b/PHOS/AliPHOSTrackSegmentMaker.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Algorithm Base class to construct PHOS track segments // Associates EMC and CPV clusters @@ -38,7 +43,7 @@ public: virtual Int_t GetTrackSegmentsInRun() const {Warning("GetTrackSegmentsInRun", "Not Defined" ) ; return 0 ; } - virtual void Print()const {Warning("Print", "Not Defined" ) ; } + virtual void Print(const Option_t * = "")const {Warning("Print", "Not Defined" ) ; } void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } void SetEventFolderName(TString name) { fEventFolderName = name ; } void SetESD(AliESD *esd) { fESD = esd; } diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index 25c19c41303..c8f6b66db0b 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -13,6 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ /* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version 1 of algorithm class to construct PHOS track segments // Track segment for PHOS is list of @@ -456,7 +462,7 @@ void AliPHOSTrackSegmentMakerv1::Unload() } //____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv1::Print()const +void AliPHOSTrackSegmentMakerv1::Print(const Option_t *)const { // Print TrackSegmentMaker parameters diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h index c2623229174..4a6fc6243da 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.h +++ b/PHOS/AliPHOSTrackSegmentMakerv1.h @@ -4,6 +4,10 @@ * See cxx source for full Copyright notice */ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ //_________________________________________________________________________ // Implementation version 1 of algorithm class to construct PHOS track segments @@ -45,7 +49,7 @@ public: void MakeLinks() const; //Evaluates distances(links) between EMC and CPV void MakePairs() ; //Finds pairs(triplets) with smallest link - virtual void Print() const ; + virtual void Print(const Option_t * = "") const ; //Switch to "on flyght" mode, without writing to TreeR and file void SetWriting(Bool_t toWrite = kFALSE){fWrite = toWrite;} virtual void SetMaxEmcCPVDistance(Float_t r){ fRcpv = r ;} //Maximal distance (in PHOS plane) diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx index b2ad372cabc..0ef81c46998 100644 --- a/PHOS/AliPHOSv0.cxx +++ b/PHOS/AliPHOSv0.cxx @@ -14,6 +14,11 @@ **************************************************************************/ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version v0 of PHOS Manager class // An object of this class does not produce hits nor digits @@ -58,7 +63,7 @@ AliPHOSv0::AliPHOSv0(const char *name, const char *title): } //____________________________________________________________________________ -void AliPHOSv0::Copy(AliPHOSv0 & phos) +void AliPHOSv0::Copy(TObject & phos) const { TObject::Copy(phos) ; AliPHOS::Copy(phos) ; diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h index 7bce39f721f..675f1013930 100644 --- a/PHOS/AliPHOSv0.h +++ b/PHOS/AliPHOSv0.h @@ -3,6 +3,13 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version v0 of PHOS Manager class // Layout EMC + CPV has name IHEP @@ -29,9 +36,12 @@ class AliPHOSv0 : public AliPHOS { virtual ~AliPHOSv0(void){ // dtor } - virtual void Copy(AliPHOSv0 & phos) ; + virtual void Copy(TObject &phos) const; // virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) { + //this function is not a final-overrider for AliPHOS::AddHit, to + //supress warning, I use using-declaration :) + using AliPHOS::AddHit; virtual void AddHit( Int_t, Int_t, Int_t, Int_t, Float_t*) { // useless since there are no hits Fatal("AddHit", "not to be used with v0") ; diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx index 3aea965ae92..d4f8de8f633 100644 --- a/PHOS/AliPHOSv1.cxx +++ b/PHOS/AliPHOSv1.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version v1 of PHOS Manager class //--- @@ -117,10 +122,11 @@ AliPHOSv1::~AliPHOSv1() } //____________________________________________________________________________ -void AliPHOSv1::Copy(AliPHOSv1 & phos) +void AliPHOSv1::Copy(TObject & base)const { - TObject::Copy(phos) ; - AliPHOSv0::Copy(phos) ; + TObject::Copy(base) ; + AliPHOSv0::Copy(base) ; + AliPHOSv1 &phos = static_cast(base); phos.fLightYieldMean = fLightYieldMean ; phos.fIntrinsicPINEfficiency = fIntrinsicPINEfficiency ; phos.fLightYieldAttenuation = fLightYieldAttenuation ; diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h index a847c82f6d0..3f07a56a047 100644 --- a/PHOS/AliPHOSv1.h +++ b/PHOS/AliPHOSv1.h @@ -3,6 +3,13 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version v1 of PHOS Manager class // Layout EMC + CPV has name IHEP @@ -28,7 +35,9 @@ public: } virtual ~AliPHOSv1(void) ; - virtual void Copy(AliPHOSv1 & phos) ; + virtual void Copy(TObject &phos) const; + + using AliPHOSv0::AddHit; virtual void AddHit( Int_t shunt, Int_t primary, Int_t id, Float_t *hits) ; virtual void FinishEvent() ; virtual void FinishPrimary() ; diff --git a/PHOS/AliPHOSv2.cxx b/PHOS/AliPHOSv2.cxx index cd3b69859af..84dbb11754c 100644 --- a/PHOS/AliPHOSv2.cxx +++ b/PHOS/AliPHOSv2.cxx @@ -13,6 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ /* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Version of AliPHOSv1 which keeps all hits in TreeH // AddHit, StepManager,and FinishEvent are redefined @@ -57,7 +63,7 @@ AliPHOSv2::~AliPHOSv2() } //____________________________________________________________________________ -void AliPHOSv2::Copy(AliPHOSv2 & phos) +void AliPHOSv2::Copy(TObject & phos)const { TObject::Copy(phos) ; AliPHOSv1::Copy(phos) ; diff --git a/PHOS/AliPHOSv2.h b/PHOS/AliPHOSv2.h index 8cdc2dedaf9..4602b87b12d 100644 --- a/PHOS/AliPHOSv2.h +++ b/PHOS/AliPHOSv2.h @@ -2,6 +2,14 @@ #define ALIPHOSV2_H /* Copyright(c) 1998-1999-2000, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ + +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Version of AliPHOSv0 which keeps all hits in TreeH // I mean real hits not cumulated hits @@ -25,7 +33,7 @@ public: } virtual ~AliPHOSv2(void) ; - virtual void Copy(AliPHOSv2 & phos) ; + virtual void Copy(TObject &phos) const; virtual void AddHit( Int_t shunt, Int_t primary, Int_t id, Float_t *hits); virtual Int_t IsVersion(void) const { // Gives the version number diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx index 816cb09ceba..f511821923c 100644 --- a/PHOS/AliPHOSvFast.cxx +++ b/PHOS/AliPHOSvFast.cxx @@ -15,6 +15,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation of the PHOS manager class for fast simulations // Tracks particles until the reach a grossly designed PHOS module @@ -104,10 +109,11 @@ AliPHOSvFast::~AliPHOSvFast() } //____________________________________________________________________________ -void AliPHOSvFast::Copy(AliPHOSvFast & fast) +void AliPHOSvFast::Copy(TObject & base)const { - TObject::Copy(fast) ; - AliPHOS::Copy(fast) ; + TObject::Copy(base) ; + AliPHOS::Copy(base) ; + AliPHOSvFast &fast = static_cast(base); fast.fBigBoxX = fBigBoxX ; fast.fBigBoxY = fBigBoxY ; fast.fBigBoxZ = fBigBoxZ ; diff --git a/PHOS/AliPHOSvFast.h b/PHOS/AliPHOSvFast.h index 739bb16323a..9b29db1e165 100644 --- a/PHOS/AliPHOSvFast.h +++ b/PHOS/AliPHOSvFast.h @@ -5,6 +5,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation of the PHOS manager class for fast simulations // Tracks particles until the reach a grossly designed PHOS module @@ -37,7 +42,7 @@ public: } virtual ~AliPHOSvFast(void) ; - virtual void Copy(AliPHOSvFast & fast) ; + virtual void Copy(TObject &fast) const; void AddRecParticle(const AliPHOSFastRecParticle & rp) ; // adds primary particle to the RecParticles list virtual void BuildGeometry(void) ; // creates the geometry for the ROOT display virtual void CreateGeometry(void) ; // creates the geometry for GEANT diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx index 2669b48cf73..921597d6bf3 100644 --- a/PHOS/AliPHOSvImpacts.cxx +++ b/PHOS/AliPHOSvImpacts.cxx @@ -16,6 +16,11 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version vImpacts of PHOS Manager class. // This class inherits from v1 and adds impacts storing. @@ -117,7 +122,7 @@ AliPHOSvImpacts::~AliPHOSvImpacts() } //____________________________________________________________________________ -void AliPHOSvImpacts::Copy(AliPHOSvImpacts & phos) +void AliPHOSvImpacts::Copy(TObject & phos) const { TObject::Copy(phos) ; AliPHOS::Copy(phos) ; diff --git a/PHOS/AliPHOSvImpacts.h b/PHOS/AliPHOSvImpacts.h index 5eac3e04dc7..cf8c57b5608 100644 --- a/PHOS/AliPHOSvImpacts.h +++ b/PHOS/AliPHOSvImpacts.h @@ -3,6 +3,13 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +/* $Id$ */ + +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version vImpacts of PHOS Manager class. // This class inherits from v1 and adds impacts storing. @@ -32,7 +39,7 @@ public: } virtual ~AliPHOSvImpacts(void) ; - virtual void Copy(AliPHOSvImpacts & phos) ; + virtual void Copy(TObject & phos) const; virtual void AddImpact(const char* detector, Int_t shunt, Int_t primary, Int_t track, Int_t module, Int_t pid, TLorentzVector p, Float_t *xyz) ; virtual void MakeBranch(Option_t *opt=" "); @@ -42,7 +49,7 @@ public: return 1 ; } virtual void StepManager(void) ; - virtual TString Version(void){ + virtual const TString Version(void)const{ // returns the version number return TString("vImpacts") ; } -- 2.43.0