From: masera Date: Sat, 8 Mar 2008 14:16:44 +0000 (+0000) Subject: Changes to remove compilation warnings X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=85f5e9c29e4177e131aa6144b4a79d117f0a61a5 Changes to remove compilation warnings --- diff --git a/ITS/AliITSAlignMille.cxx b/ITS/AliITSAlignMille.cxx index 9de58c7336e..88c8cac0c63 100644 --- a/ITS/AliITSAlignMille.cxx +++ b/ITS/AliITSAlignMille.cxx @@ -419,7 +419,7 @@ void AliITSAlignMille::SetCurrentModule(Int_t index) { } } -void AliITSAlignMille::Print() { +void AliITSAlignMille::Print(Option_t* /* opt */) const { /// printf("*** AliMillepede for ITS ***\n"); printf(" number of defined modules: %d\n",fNModules); diff --git a/ITS/AliITSAlignMille.h b/ITS/AliITSAlignMille.h index 202d998e643..3303f00d6bc 100644 --- a/ITS/AliITSAlignMille.h +++ b/ITS/AliITSAlignMille.h @@ -46,7 +46,7 @@ public: { fGeometryFileName = filename; } const Char_t* GetGeometryFileName() {return fGeometryFileName.Data();} void PrintCurrentModuleInfo(); - void Print(); + virtual void Print(Option_t* /* opt */) const; // fitting methods void SetMinNPtsPerTrack(Int_t pts=3) {fMinNPtsPerTrack=pts;} diff --git a/ITS/AliITSPlaneEff.h b/ITS/AliITSPlaneEff.h index e370a5f4b93..849476b2ff1 100644 --- a/ITS/AliITSPlaneEff.h +++ b/ITS/AliITSPlaneEff.h @@ -29,7 +29,7 @@ class AliITSPlaneEff : public AliPlaneEff { // copy constructor. See detector specific implementation. AliITSPlaneEff(const AliITSPlaneEff &source); // Assignment operator. See detector specific implementation. - virtual AliITSPlaneEff& operator=(const AliITSPlaneEff &source); + AliITSPlaneEff& operator=(const AliITSPlaneEff &source); // Simple way to add another class (i.e. statistics). //AliITSPlaneEff& operator +=( const AliITSPlaneEff &){return *this}; // Average Plane efficiency (including dead/noisy) diff --git a/ITS/AliITSPlaneEffSDD.cxx b/ITS/AliITSPlaneEffSDD.cxx index 5494b365b46..83e9331c227 100644 --- a/ITS/AliITSPlaneEffSDD.cxx +++ b/ITS/AliITSPlaneEffSDD.cxx @@ -209,6 +209,7 @@ void AliITSPlaneEffSDD::CopyHistos(AliITSPlaneEffSDD &target) const { } return; } +/* Commented out by M.Masera 8/3/08 //______________________________________________________________________ AliITSPlaneEff& AliITSPlaneEffSDD::operator=(const AliITSPlaneEff &s){ @@ -224,6 +225,7 @@ AliITSPlaneEff& AliITSPlaneEffSDD::operator=(const AliError("operator=: Not allowed to make a =, use default creater instead"); return *this; } +*/ //_______________________________________________________________________ Int_t AliITSPlaneEffSDD::GetMissingTracksForGivenEff(Double_t eff, Double_t RelErr, UInt_t im, UInt_t ic, UInt_t iw, UInt_t is) const { diff --git a/ITS/AliITSPlaneEffSDD.h b/ITS/AliITSPlaneEffSDD.h index c51db7ccb8b..3c00943232e 100644 --- a/ITS/AliITSPlaneEffSDD.h +++ b/ITS/AliITSPlaneEffSDD.h @@ -25,7 +25,7 @@ class AliITSPlaneEffSDD : public AliITSPlaneEff { AliITSPlaneEffSDD(const AliITSPlaneEffSDD &source); // ass. operator AliITSPlaneEffSDD& operator=(const AliITSPlaneEffSDD &s); - virtual AliITSPlaneEff& operator=(const AliITSPlaneEff &source); + // virtual AliITSPlaneEff& operator=(const AliITSPlaneEff &source); // Simple way to add another class (i.e. statistics). AliITSPlaneEffSDD& operator +=( const AliITSPlaneEffSDD &add); // Getters for average Plane efficiency (icluding dead/noisy) diff --git a/ITS/AliITSPlaneEffSPD.cxx b/ITS/AliITSPlaneEffSPD.cxx index 425e207a033..37e3dc8eb63 100644 --- a/ITS/AliITSPlaneEffSPD.cxx +++ b/ITS/AliITSPlaneEffSPD.cxx @@ -226,6 +226,7 @@ void AliITSPlaneEffSPD::CopyHistos(AliITSPlaneEffSPD &target) const { } return; } +/* commented out by M.Masera 8/3/08 //______________________________________________________________________ AliITSPlaneEff& AliITSPlaneEffSPD::operator=(const AliITSPlaneEff &s){ @@ -241,6 +242,7 @@ AliITSPlaneEff& AliITSPlaneEffSPD::operator=(const AliError("operator=: Not allowed to make a =, use default creater instead"); return *this; } +*/ //_______________________________________________________________________ Int_t AliITSPlaneEffSPD::GetMissingTracksForGivenEff(Double_t eff, Double_t RelErr, UInt_t im, UInt_t ic) const { diff --git a/ITS/AliITSPlaneEffSPD.h b/ITS/AliITSPlaneEffSPD.h index 748adad50ad..869f6ee46b6 100644 --- a/ITS/AliITSPlaneEffSPD.h +++ b/ITS/AliITSPlaneEffSPD.h @@ -25,7 +25,7 @@ class AliITSPlaneEffSPD : public AliITSPlaneEff { AliITSPlaneEffSPD(const AliITSPlaneEffSPD &source); // ass. operator AliITSPlaneEffSPD& operator=(const AliITSPlaneEffSPD &s); - AliITSPlaneEff& operator=(const AliITSPlaneEff &source); + // AliITSPlaneEff& operator=(const AliITSPlaneEff &source); // Simple way to add another class (i.e. statistics). AliITSPlaneEffSPD& operator +=( const AliITSPlaneEffSPD &add); // Getters for average Plane efficiency (including dead/noisy) diff --git a/ITS/AliITSPlaneEffSSD.cxx b/ITS/AliITSPlaneEffSSD.cxx index 878270b0f45..9c2aaf4049e 100644 --- a/ITS/AliITSPlaneEffSSD.cxx +++ b/ITS/AliITSPlaneEffSSD.cxx @@ -160,6 +160,7 @@ void AliITSPlaneEffSSD::CopyHistos(AliITSPlaneEffSSD &target) const { } return; } +/* Commented out by M.Masera 8/3/08 //______________________________________________________________________ AliITSPlaneEff& AliITSPlaneEffSSD::operator=(const AliITSPlaneEff &s){ @@ -175,6 +176,7 @@ AliITSPlaneEff& AliITSPlaneEffSSD::operator=(const AliError("operator=: Not allowed to make a =, use default creater instead"); return *this; } +*/ //_______________________________________________________________________ Int_t AliITSPlaneEffSSD::GetMissingTracksForGivenEff(Double_t eff, Double_t RelErr, UInt_t im) const { diff --git a/ITS/AliITSPlaneEffSSD.h b/ITS/AliITSPlaneEffSSD.h index a12764d09b7..f86c023b4ef 100644 --- a/ITS/AliITSPlaneEffSSD.h +++ b/ITS/AliITSPlaneEffSSD.h @@ -25,7 +25,7 @@ class AliITSPlaneEffSSD : public AliITSPlaneEff { AliITSPlaneEffSSD(const AliITSPlaneEffSSD &source); // ass. operator AliITSPlaneEffSSD& operator=(const AliITSPlaneEffSSD &s); - virtual AliITSPlaneEff& operator=(const AliITSPlaneEff &source); + // virtual AliITSPlaneEff& operator=(const AliITSPlaneEff &source); // Simple way to add another class (i.e. statistics). AliITSPlaneEffSSD& operator +=( const AliITSPlaneEffSSD &add); // Getters for average Plane efficiency (icluding dead/noisy) diff --git a/ITS/AliITSQADataMakerSim.cxx b/ITS/AliITSQADataMakerSim.cxx index 6e19521d2d7..f5a74d3d00f 100644 --- a/ITS/AliITSQADataMakerSim.cxx +++ b/ITS/AliITSQADataMakerSim.cxx @@ -70,7 +70,7 @@ AliITSQADataMakerSim& AliITSQADataMakerSim::operator = (const AliITSQADataMakerS } //____________________________________________________________________________ -void AliITSQADataMakerSim::StartOfDetectorCycle() const +void AliITSQADataMakerSim::StartOfDetectorCycle() { //Detector specific actions at start of cycle AliDebug(1,"AliITSQADM::Start of ITS Cycle\n"); diff --git a/ITS/AliITSQADataMakerSim.h b/ITS/AliITSQADataMakerSim.h index 9d15cb75f27..92ccb90fbf2 100644 --- a/ITS/AliITSQADataMakerSim.h +++ b/ITS/AliITSQADataMakerSim.h @@ -31,7 +31,7 @@ public: AliITSQADataMakerSim(Int_t /* ldc */, Bool_t /* kMode = kFALSE */); AliITSQADataMakerSim(const AliITSQADataMakerSim& qadm); AliITSQADataMakerSim& operator = (const AliITSQADataMakerSim& qac); - virtual void StartOfDetectorCycle() const; + virtual void StartOfDetectorCycle(); virtual void EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * list); virtual ~AliITSQADataMakerSim() {;} // dtor diff --git a/ITS/AliITSResidualsAnalysis.cxx b/ITS/AliITSResidualsAnalysis.cxx index 44a56eff3a8..1a3269a7faf 100644 --- a/ITS/AliITSResidualsAnalysis.cxx +++ b/ITS/AliITSResidualsAnalysis.cxx @@ -376,7 +376,7 @@ AliITSResidualsAnalysis::AliITSResidualsAnalysis(TArrayI *volIDs,AliTrackPointAr } //____________________________________________________________________________ -AliITSResidualsAnalysis::AliITSResidualsAnalysis(const AliITSResidualsAnalysis& obj): +AliITSResidualsAnalysis::AliITSResidualsAnalysis(const AliITSResidualsAnalysis& /* obj */): AliAlignmentTracks(), fnHist(0), fnPhi(0), @@ -425,7 +425,7 @@ AliITSResidualsAnalysis::AliITSResidualsAnalysis(const AliITSResidualsAnalysis& } //____________________________________________________________________________ -AliITSResidualsAnalysis& AliITSResidualsAnalysis::operator = (const AliITSResidualsAnalysis& obj) { +AliITSResidualsAnalysis& AliITSResidualsAnalysis::operator = (const AliITSResidualsAnalysis& /* obj */) { // assignment operator. This is not allowed AliFatal("Assignment operator not allowed\n"); return *this; diff --git a/ITS/AliITSResidualsAnalysis.h b/ITS/AliITSResidualsAnalysis.h index d46c2594489..60198bb03a2 100644 --- a/ITS/AliITSResidualsAnalysis.h +++ b/ITS/AliITSResidualsAnalysis.h @@ -32,8 +32,7 @@ class AliITSResidualsAnalysis : public AliAlignmentTracks { AliITSResidualsAnalysis(); AliITSResidualsAnalysis(const TString aliTrackPoints,const TString geom); AliITSResidualsAnalysis(const TArrayI *volIDs); - AliITSResidualsAnalysis(TArrayI *volIDs,AliTrackPointArray **tracksClustArray,AliTrackPointArray **tracksFitPointsArray); - //AliITSResidualsAnalysis(const AliITSResidualsAnalysis &res); + AliITSResidualsAnalysis(TArrayI *volIDs,AliTrackPointArray **tracksClustArray,AliTrackPointArray **tracksFitPointsArray); ~AliITSResidualsAnalysis(); @@ -83,7 +82,7 @@ class AliITSResidualsAnalysis : public AliAlignmentTracks { protected: - AliITSResidualsAnalysis(const AliITSResidualsAnalysis& obj); + AliITSResidualsAnalysis(const AliITSResidualsAnalysis& /* obj */); AliITSResidualsAnalysis& operator = (const AliITSResidualsAnalysis& obj); Int_t fnHist; // number of histogram = number of alignable volumes considered diff --git a/ITS/AliITSgeomSSD.cxx b/ITS/AliITSgeomSSD.cxx index 8bd452a1b74..e61cb495506 100644 --- a/ITS/AliITSgeomSSD.cxx +++ b/ITS/AliITSgeomSSD.cxx @@ -310,7 +310,7 @@ istream &operator>>(istream &is,AliITSgeomSSD175 &r){ r.Read(&is); return is; } -AliITSgeomSSD& AliITSgeomSSD175::operator=(const AliITSgeomSSD &source) { +AliITSgeomSSD175& AliITSgeomSSD175::operator=(const AliITSgeomSSD175 &source) { //////////////////////////////////////////////////////////////////////// // assignment operator //////////////////////////////////////////////////////////////////////// @@ -369,6 +369,7 @@ AliITSgeomSSD275and75::AliITSgeomSSD275and75(Int_t npar,Float_t *par) : delete [] leA; delete [] leC; } + //________________________________________________________________________ ostream &operator<<(ostream &os,AliITSgeomSSD275and75 &p){ //////////////////////////////////////////////////////////////////////// @@ -387,7 +388,7 @@ istream &operator>>(istream &is,AliITSgeomSSD275and75 &r){ r.Read(&is); return is; } -AliITSgeomSSD& AliITSgeomSSD275and75::operator=(const AliITSgeomSSD &source) { +AliITSgeomSSD275and75& AliITSgeomSSD275and75::operator=(const AliITSgeomSSD275and75 &source) { //////////////////////////////////////////////////////////////////////// // assignment operator //////////////////////////////////////////////////////////////////////// @@ -464,7 +465,7 @@ istream &operator>>(istream &is,AliITSgeomSSD75and275 &r){ r.Read(&is); return is; } -AliITSgeomSSD& AliITSgeomSSD75and275::operator=(const AliITSgeomSSD &source) { +AliITSgeomSSD75and275& AliITSgeomSSD75and275::operator=(const AliITSgeomSSD75and275 &source) { //////////////////////////////////////////////////////////////////////// // assignment operator //////////////////////////////////////////////////////////////////////// diff --git a/ITS/AliITSgeomSSD.h b/ITS/AliITSgeomSSD.h index 3f13f973a92..9300cbcea19 100644 --- a/ITS/AliITSgeomSSD.h +++ b/ITS/AliITSgeomSSD.h @@ -25,7 +25,7 @@ class AliITSgeomSSD : public TObject { Int_t np,Float_t *p,Int_t nn,Float_t *n); // Constructor virtual ~AliITSgeomSSD(); // Destructor AliITSgeomSSD(const AliITSgeomSSD &source);// copy constructor - virtual AliITSgeomSSD& operator=(const AliITSgeomSSD &source); // = opt. + AliITSgeomSSD& operator=(const AliITSgeomSSD &source); // = opt. void ResetSSD(const Float_t *box,Float_t ap,Float_t an, Int_t np,Float_t *p,Int_t nn,Float_t *n); // Filler virtual TShape *GetShape() const {return new TBRIK(fName.Data(), @@ -111,7 +111,7 @@ class AliITSgeomSSD175 : public AliITSgeomSSD { public: AliITSgeomSSD175(); - virtual AliITSgeomSSD& operator=(const AliITSgeomSSD &source); + AliITSgeomSSD175& operator=(const AliITSgeomSSD175 &source); // This clas now has version 0 so that it will not be written to a root // file. This is good since there are no longer any data members to this @@ -144,7 +144,7 @@ class AliITSgeomSSD275and75 : public AliITSgeomSSD { public: AliITSgeomSSD275and75(); AliITSgeomSSD275and75(Int_t npar,Float_t *par); - virtual AliITSgeomSSD& operator=(const AliITSgeomSSD &source); + AliITSgeomSSD275and75& operator=(const AliITSgeomSSD275and75 &source); // This clas now has version 0 so that it will not be // This clas now has version 0 so that it will not be written to a root @@ -177,7 +177,7 @@ class AliITSgeomSSD75and275 : public AliITSgeomSSD { public: AliITSgeomSSD75and275(); AliITSgeomSSD75and275(Int_t npar,Float_t *par); - virtual AliITSgeomSSD& operator=(const AliITSgeomSSD &source); + virtual AliITSgeomSSD75and275& operator=(const AliITSgeomSSD75and275 &source); // This clas now has version 0 so that it will not be // This clas now has version 0 so that it will not be written to a root diff --git a/ITS/AliITSsimulation.h b/ITS/AliITSsimulation.h index 86c00cb9b03..bf7fc53fc4e 100644 --- a/ITS/AliITSsimulation.h +++ b/ITS/AliITSsimulation.h @@ -41,7 +41,7 @@ class AliITSsimulation : public TObject { // copy constructor. See detector specific implementation. AliITSsimulation(const AliITSsimulation &source); // Assignment opporator. See detector specific implementation. - virtual AliITSsimulation& operator=(const AliITSsimulation &source); + AliITSsimulation& operator=(const AliITSsimulation &source); // Initialize simulation virtual void Init() {}; diff --git a/ITS/AliITSsimulationFastPoints.h b/ITS/AliITSsimulationFastPoints.h index 2bd321ca05c..7eb74979653 100644 --- a/ITS/AliITSsimulationFastPoints.h +++ b/ITS/AliITSsimulationFastPoints.h @@ -23,7 +23,7 @@ class AliITSsimulationFastPoints : public AliITSsimulation public: AliITSsimulationFastPoints(); // default constructor virtual ~AliITSsimulationFastPoints() {;} - virtual AliITSsimulation& operator=(const AliITSsimulation&){return *this;} + // virtual AliITSsimulation& operator=(const AliITSsimulation&){return *this;} void CreateFastRecPoints(AliITSmodule *mod,Int_t module,TRandom *rndm, TClonesArray* recp); void CreateFastRecPoints(Int_t module,TClonesArray* recp); diff --git a/ITS/AliITSsimulationFastPointsV0.h b/ITS/AliITSsimulationFastPointsV0.h index da09e1f9b5d..8ae1cbf90ff 100644 --- a/ITS/AliITSsimulationFastPointsV0.h +++ b/ITS/AliITSsimulationFastPointsV0.h @@ -18,8 +18,8 @@ public: AliITSsimulationFastPointsV0(const char *dataType); // standard constructor AliITSsimulationFastPointsV0(const AliITSsimulationFastPointsV0 &rec); AliITSsimulationFastPointsV0 & operator=(const AliITSsimulationFastPointsV0 &); - virtual AliITSsimulation& operator=(const AliITSsimulation &) - {return *this;}; + // virtual AliITSsimulation& operator=(const AliITSsimulation &) + // {return *this;}; virtual ~AliITSsimulationFastPointsV0(); void CreateFastRecPoints(AliITSmodule *mod,Int_t module,TRandom *rndm, diff --git a/ITS/AliITSsimulationSDD.cxx b/ITS/AliITSsimulationSDD.cxx index bddc8383275..27680a5c92c 100644 --- a/ITS/AliITSsimulationSDD.cxx +++ b/ITS/AliITSsimulationSDD.cxx @@ -192,6 +192,7 @@ AliITSsimulationSDD& AliITSsimulationSDD::operator=(const AliITSsimulationSDD &s "AliITSsimulationSDD Using default creater instead"); return *this ; } +/* //______________________________________________________________________ AliITSsimulation& AliITSsimulationSDD::operator=(const AliITSsimulation &src){ // Assignment operator to satify Coding roules only. @@ -201,7 +202,7 @@ AliITSsimulation& AliITSsimulationSDD::operator=(const AliITSsimulation &src){ "AliITSsimulationSDD Using default creater instead"); return *this ; } - +*/ //______________________________________________________________________ AliITSsimulationSDD::AliITSsimulationSDD(AliITSDetTypeSim* dettyp): AliITSsimulation(dettyp), diff --git a/ITS/AliITSsimulationSDD.h b/ITS/AliITSsimulationSDD.h index 661ff2b0adc..eeb6794a273 100644 --- a/ITS/AliITSsimulationSDD.h +++ b/ITS/AliITSsimulationSDD.h @@ -38,7 +38,7 @@ class AliITSsimulationSDD : public AliITSsimulation { virtual ~AliITSsimulationSDD(); // Destructor // = operator AliITSsimulationSDD& operator=(const AliITSsimulationSDD &source); - virtual AliITSsimulation& operator=(const AliITSsimulation &source); + // virtual AliITSsimulation& operator=(const AliITSsimulation &source); // Initilize variables for this simulation void Init(); diff --git a/ITS/AliITSsimulationSPD.cxx b/ITS/AliITSsimulationSPD.cxx index 5561132c9d8..7b32e622878 100644 --- a/ITS/AliITSsimulationSPD.cxx +++ b/ITS/AliITSsimulationSPD.cxx @@ -14,7 +14,7 @@ **************************************************************************/ /* -$Id:$ +$Id$ */ #include @@ -210,6 +210,7 @@ AliITSsimulationSPD& AliITSsimulationSPD::operator=(const fTanLorAng = s.fTanLorAng; return *this; } +/* //______________________________________________________________________ AliITSsimulation& AliITSsimulationSPD::operator=(const AliITSsimulation &s){ @@ -227,6 +228,7 @@ AliITSsimulation& AliITSsimulationSPD::operator=(const return *this; } +*/ //______________________________________________________________________ void AliITSsimulationSPD::InitSimulationModule(Int_t module, Int_t event){ // This function creates maps to build the list of tracks for each diff --git a/ITS/AliITSsimulationSPD.h b/ITS/AliITSsimulationSPD.h index bf1e549202a..2638b801b3f 100644 --- a/ITS/AliITSsimulationSPD.h +++ b/ITS/AliITSsimulationSPD.h @@ -4,7 +4,7 @@ /* Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id:$ */ +/* $Id$ */ //////////////////////////////////////////////////////////// // Simulation class for SPD // @@ -31,7 +31,7 @@ class AliITSsimulationSPD : public AliITSsimulation { AliITSsimulationSPD(const AliITSsimulationSPD &source); // ass. operator AliITSsimulationSPD& operator=(const AliITSsimulationSPD &s); - virtual AliITSsimulation& operator=(const AliITSsimulation &source); + // virtual AliITSsimulation& operator=(const AliITSsimulation &source); // Initilizes the variables void Init(); diff --git a/ITS/AliITSsimulationSSD.cxx b/ITS/AliITSsimulationSSD.cxx index 8904fc0a3a4..1f7a3bdf30a 100644 --- a/ITS/AliITSsimulationSSD.cxx +++ b/ITS/AliITSsimulationSSD.cxx @@ -113,6 +113,7 @@ AliITSsimulationSSD& AliITSsimulationSSD::operator=( this->fDriftVel[1] = s.fDriftVel[1]; return *this; } +/* //______________________________________________________________________ AliITSsimulation& AliITSsimulationSSD::operator=( const AliITSsimulation &s){ @@ -124,6 +125,7 @@ AliITSsimulation& AliITSsimulationSSD::operator=( return *this; } +*/ //______________________________________________________________________ AliITSsimulationSSD::AliITSsimulationSSD(const AliITSsimulationSSD &source): AliITSsimulation(source), diff --git a/ITS/AliITSsimulationSSD.h b/ITS/AliITSsimulationSSD.h index 532050710df..b2ec98ff016 100644 --- a/ITS/AliITSsimulationSSD.h +++ b/ITS/AliITSsimulationSSD.h @@ -26,7 +26,7 @@ class AliITSsimulationSSD: public AliITSsimulation { AliITSsimulationSSD(const AliITSsimulationSSD &source); // copy constructor // operator = AliITSsimulationSSD& operator=(const AliITSsimulationSSD &source); - virtual AliITSsimulation& operator=(const AliITSsimulation &source); + // virtual AliITSsimulation& operator=(const AliITSsimulation &source); //Standard Constructor AliITSsimulationSSD(AliITSDetTypeSim* dettyp); //Destructor