From 64b63904f02f177243dd24e2efa52421769e9bd9 Mon Sep 17 00:00:00 2001 From: nick Date: Tue, 25 Apr 2006 14:20:57 +0000 Subject: [PATCH] 20-apr-2006 NvE Several small modifications to prevent gcc warnings. 21-apr-2006 NvE TFile.h included in header files of IceCalibrate and IceXtalk to prevent compiler error with new ROOT 5.11 version. --- RALICE/AliAttribObj.cxx | 4 ++-- RALICE/AliAttribObj.h | 12 ++++++------ RALICE/AliCalmodule.h | 4 +++- RALICE/AliCalorimeter.h | 3 ++- RALICE/AliEvent.h | 3 ++- RALICE/AliJet.cxx | 5 ++++- RALICE/AliVertex.cxx | 3 +++ RALICE/AliVertex.h | 3 ++- RALICE/history.txt | 1 + RALICE/icepack/IceCalibrate.h | 3 ++- RALICE/icepack/IceXtalk.h | 3 ++- RALICE/icepack/history.txt | 2 ++ 12 files changed, 31 insertions(+), 15 deletions(-) diff --git a/RALICE/AliAttribObj.cxx b/RALICE/AliAttribObj.cxx index 6ee55c3506e..86ad11424e9 100644 --- a/RALICE/AliAttribObj.cxx +++ b/RALICE/AliAttribObj.cxx @@ -68,12 +68,12 @@ AliAttribObj::~AliAttribObj() // Destructor to delete dynamically allocated memory } /////////////////////////////////////////////////////////////////////////// -AliAttribObj::AliAttribObj(AliAttribObj& a) : TObject(a),AliAttrib(a) +AliAttribObj::AliAttribObj(const AliAttribObj& a) : TObject(a),AliAttrib(a) { // Copy constructor } /////////////////////////////////////////////////////////////////////////// -TObject* AliAttribObj::Clone(const char* name) +TObject* AliAttribObj::Clone(const char* name) const { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliAttribObj.h b/RALICE/AliAttribObj.h index 453301dfef5..fbcd67dca95 100644 --- a/RALICE/AliAttribObj.h +++ b/RALICE/AliAttribObj.h @@ -12,12 +12,12 @@ class AliAttribObj : public TObject,public AliAttrib { public: - AliAttribObj(); // Default constructor - AliAttribObj(AliAttrib& a); // Constructor - virtual ~AliAttribObj(); // Destructor - AliAttribObj(AliAttribObj& a); // Copy constructor - virtual TObject* Clone(const char* name=""); // Make a deep copy and provide its pointer + AliAttribObj(); // Default constructor + AliAttribObj(AliAttrib& a); // Constructor + virtual ~AliAttribObj(); // Destructor + AliAttribObj(const AliAttribObj& a); // Copy constructor + virtual TObject* Clone(const char* name="") const; // Make a deep copy and provide its pointer - ClassDef(AliAttribObj,3) // Generic handling of detector signal (calibration) attributes. + ClassDef(AliAttribObj,4) // Generic handling of detector signal (calibration) attributes. }; #endif diff --git a/RALICE/AliCalmodule.h b/RALICE/AliCalmodule.h index b22d795e9e6..135770862ff 100644 --- a/RALICE/AliCalmodule.h +++ b/RALICE/AliCalmodule.h @@ -15,7 +15,9 @@ class AliCalmodule : public AliSignal AliCalmodule(const AliCalmodule& m); // Copy constructor AliCalmodule(Int_t row,Int_t col,Double_t sig); // Create a module and initialise data virtual TObject* Clone(const char* name="") const; // Make a deep copy and provide its pointer + using AliSignal::SetSignal; virtual void SetSignal(Double_t sig,Int_t j=1); // Set or change data for certain module + using AliSignal::AddSignal; virtual void AddSignal(Double_t sig,Int_t j=1); // Add signal to a certain module void SetRow(Int_t i); // Set the row number of the module void SetColumn(Int_t i); // Set the column number of the module @@ -29,6 +31,6 @@ class AliCalmodule : public AliSignal Int_t fCol; // The current column number Float_t fSigc; // The signal after clustering - ClassDef(AliCalmodule,8) // Description of a module in a calorimeter system. + ClassDef(AliCalmodule,9) // Description of a module in a calorimeter system. }; #endif diff --git a/RALICE/AliCalorimeter.h b/RALICE/AliCalorimeter.h index ecae8ff9756..b69aceeae80 100644 --- a/RALICE/AliCalorimeter.h +++ b/RALICE/AliCalorimeter.h @@ -36,6 +36,7 @@ class AliCalorimeter : public AliDevice void AddSignal(AliCalmodule* m); // Add module signal to current calorimeter void Reset(Int_t row,Int_t col); // Reset signal for a certain module virtual void Reset(Int_t mode=0); // Reset the complete calorimeter + using AliDevice::GetSignal; virtual Float_t GetSignal(Int_t row,Int_t col=0) { return GetSignal(row,col,0); } Float_t GetSignal(Int_t row,Int_t col,Int_t mode); // Provide signal of a certain module Int_t GetNsignals() const; // Return number of modules with a signal @@ -101,6 +102,6 @@ class AliCalorimeter : public AliDevice AliObjMatrix* fPositions; //! Matrix dbase of module position pointers void LoadMatrix(); // Loading of matrix lookup table from the linear hit array - ClassDef(AliCalorimeter,10) // Description of a modular calorimeter system. + ClassDef(AliCalorimeter,11) // Description of a modular calorimeter system. }; #endif diff --git a/RALICE/AliEvent.h b/RALICE/AliEvent.h index 1165fe24925..dbf91caf6a9 100644 --- a/RALICE/AliEvent.h +++ b/RALICE/AliEvent.h @@ -43,6 +43,7 @@ class AliEvent : public AliVertex,public AliTimestamp Int_t GetRunNumber() const; // Provide the run number Int_t GetEventNumber() const; // Provide the event number virtual void HeaderData(); // Print the event header information + using AliVertex::Data; virtual void Data(TString f="car",TString u="rad"); // Print the event info within frame f and ang units u void SetDevCopy(Int_t j); // (De)activate creation of private copies of the devices Int_t GetDevCopy() const; // Provide DevCopy flag value @@ -87,6 +88,6 @@ class AliEvent : public AliVertex,public AliTimestamp TObject* fDisplay; //! Temp. pointer to hold objects which serve event displays TObjArray* fDevs; //! Temp. array to hold references to user selected devices - ClassDef(AliEvent,21) // Creation and investigation of an Alice physics event. + ClassDef(AliEvent,22) // Creation and investigation of an Alice physics event. }; #endif diff --git a/RALICE/AliJet.cxx b/RALICE/AliJet.cxx index c0c34324a0e..0c3a103988e 100644 --- a/RALICE/AliJet.cxx +++ b/RALICE/AliJet.cxx @@ -1002,7 +1002,10 @@ TObjArray* AliJet::SortTracks(Int_t mode,TObjArray* tracks) fSelected->AddAt(tx,j); // add track at the end break; // go for next track } - + + val1=0; + val2=0; + switch (abs(mode)) { case 1: diff --git a/RALICE/AliVertex.cxx b/RALICE/AliVertex.cxx index e4cbcd39c2e..1446c583248 100644 --- a/RALICE/AliVertex.cxx +++ b/RALICE/AliVertex.cxx @@ -1092,6 +1092,9 @@ TObjArray* AliVertex::SortJets(Int_t mode,TObjArray* jets) fSelected->AddAt(jx,j); // add jet at the end break; // go for next jet } + + val1=0; + val2=0; switch (abs(mode)) { diff --git a/RALICE/AliVertex.h b/RALICE/AliVertex.h index 12ff83a6c7c..4905bc5a2f2 100644 --- a/RALICE/AliVertex.h +++ b/RALICE/AliVertex.h @@ -29,6 +29,7 @@ class AliVertex : public AliJet,public AliPosition void AddVertex(AliVertex& v,Int_t connect=1); // Add (and connect) a (sec.) vertex to the current vertex void AddJet(AliJet* j,Int_t tracks=1) { AddJet(*j,tracks); } void AddVertex(AliVertex* v,Int_t connect=1) { AddVertex(*v,connect); } + using AliPosition::Data; virtual void Data(TString f="car",TString u="rad"); // Print the vertex info within frame f and ang units u virtual void List(TString f="car",TString u="rad"); // Vertex prim. track info for frame f and ang units u virtual void ListAll(TString f="car",TString u="rad");// Prim.+sec. vtx full track info for frame f and ang units u @@ -67,6 +68,6 @@ class AliVertex : public AliJet,public AliPosition private: void Dumps(AliVertex* v,Int_t n,TString f,TString u); // Recursively print all sec. vertices - ClassDef(AliVertex,11) // Creation and investigation of an AliVertex. + ClassDef(AliVertex,12) // Creation and investigation of an AliVertex. }; #endif diff --git a/RALICE/history.txt b/RALICE/history.txt index 9c4d5288b20..8ac4a54485e 100644 --- a/RALICE/history.txt +++ b/RALICE/history.txt @@ -685,3 +685,4 @@ 18-mar-2006 NvE Support for display of selected track array introduced in AliHelix. Also copy ctor of AliHelix made complete for new datamembers. 22-mar-2006 NvE Line attribute selections for displays extended in AliHelix. +20-apr-2006 NvE Several small modifications to prevent gcc warnings. diff --git a/RALICE/icepack/IceCalibrate.h b/RALICE/icepack/IceCalibrate.h index ca29f3dd495..244b1eb0aa5 100644 --- a/RALICE/icepack/IceCalibrate.h +++ b/RALICE/icepack/IceCalibrate.h @@ -9,6 +9,7 @@ #include "TROOT.h" #include "TTask.h" #include "TString.h" +#include "TFile.h" #include "AliJob.h" #include "IceEvent.h" @@ -27,6 +28,6 @@ class IceCalibrate : public TTask TFile* fCalfile; // The (optional) calibration input file in ROOT format AliObjMatrix* fOmdb; // The OM database object - ClassDef(IceCalibrate,1) // TTask derived class to perform the various calibrations + ClassDef(IceCalibrate,2) // TTask derived class to perform the various calibrations }; #endif diff --git a/RALICE/icepack/IceXtalk.h b/RALICE/icepack/IceXtalk.h index 0f4d5e63023..626ddcf4e78 100644 --- a/RALICE/icepack/IceXtalk.h +++ b/RALICE/icepack/IceXtalk.h @@ -9,6 +9,7 @@ #include "TROOT.h" #include "TTask.h" #include "TString.h" +#include "TFile.h" #include "AliJob.h" #include "IceEvent.h" @@ -31,6 +32,6 @@ class IceXtalk : public TTask Float_t fPmin; // The minimal probability to induce cross talk Float_t fPe; // The nominal Xtalk signal in photo-electron equivalent - ClassDef(IceXtalk,1) // TTask derived class to perform cross talk hit correction + ClassDef(IceXtalk,2) // TTask derived class to perform cross talk hit correction }; #endif diff --git a/RALICE/icepack/history.txt b/RALICE/icepack/history.txt index e7786be9eaa..460d9b46767 100644 --- a/RALICE/icepack/history.txt +++ b/RALICE/icepack/history.txt @@ -63,3 +63,5 @@ 29-mar-2006 NvE Modified numerical evaluation of pandel value in IcePandel to extend validity range (by George and Dipo). Also new memberfunction SetPenalty() introduced in IcePandel. +21-apr-2006 NvE TFile.h included in header files of IceCalibrate and IceXtalk to prevent + compiler error with new ROOT 5.11 version. -- 2.39.3