diff --git a/base/inc/TAttAxis.h b/base/inc/TAttAxis.h
index 4700a2268c738045b0b46f7746c9230f7e15c287..f62b83d927b47e13226211a7a5cb175fe0c4c7a9 100644
--- a/base/inc/TAttAxis.h
+++ b/base/inc/TAttAxis.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TAttAxis.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TAttAxis.h,v 1.2 2000/11/21 16:01:30 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -55,17 +55,17 @@ public:
TAttAxis();
virtual ~TAttAxis();
void Copy(TAttAxis &attaxis);
- virtual Int_t GetNdivisions() {return fNdivisions;}
- virtual Color_t GetAxisColor() {return fAxisColor;}
- virtual Color_t GetLabelColor() {return fLabelColor;}
- virtual Style_t GetLabelFont() {return fLabelFont;}
- virtual Float_t GetLabelOffset() {return fLabelOffset;}
- virtual Float_t GetLabelSize() {return fLabelSize;}
- virtual Float_t GetTitleOffset() {return fTitleOffset;}
- virtual Float_t GetTitleSize() {return fTitleSize;}
- virtual Float_t GetTickLength() {return fTickLength;}
- virtual Color_t GetTitleColor() {return fTitleColor;}
- virtual Style_t GetTitleFont() {return fTitleFont;}
+ virtual Int_t GetNdivisions() const {return fNdivisions;}
+ virtual Color_t GetAxisColor() const {return fAxisColor;}
+ virtual Color_t GetLabelColor() const {return fLabelColor;}
+ virtual Style_t GetLabelFont() const {return fLabelFont;}
+ virtual Float_t GetLabelOffset() const {return fLabelOffset;}
+ virtual Float_t GetLabelSize() const {return fLabelSize;}
+ virtual Float_t GetTitleOffset() const {return fTitleOffset;}
+ virtual Float_t GetTitleSize() const {return fTitleSize;}
+ virtual Float_t GetTickLength() const {return fTickLength;}
+ virtual Color_t GetTitleColor() const {return fTitleColor;}
+ virtual Style_t GetTitleFont() const {return fTitleFont;}
virtual void ResetAttAxis(Option_t *option="");
virtual void SaveAttributes(ofstream &out, const char *name, const char *subname);
virtual void SetNdivisions(Int_t n=510); // *MENU*
diff --git a/base/inc/TAttFill.h b/base/inc/TAttFill.h
index 5dd8e26cf737e45bb38701ab4157eecbfdaae08c..104f4857657b8260e907c7b68e018c0698f33c6d 100644
--- a/base/inc/TAttFill.h
+++ b/base/inc/TAttFill.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TAttFill.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -37,8 +37,8 @@ public:
TAttFill(Color_t fcolor,Style_t fstyle);
virtual ~TAttFill();
void Copy(TAttFill &attfill);
- Color_t GetFillColor() { return fFillColor; }
- Style_t GetFillStyle() { return fFillStyle; }
+ Color_t GetFillColor() const { return fFillColor; }
+ Style_t GetFillStyle() const { return fFillStyle; }
Bool_t IsTransparent() const;
virtual void Modify();
virtual void ResetAttFill(Option_t *option="");
diff --git a/base/inc/TAttLine.h b/base/inc/TAttLine.h
index 04c8c64d2db4e3c9cf1e5fa9299c2d63d54ac776..9aec6fe2147da7cae9fe97ae4d3bb6826bad6fa0 100644
--- a/base/inc/TAttLine.h
+++ b/base/inc/TAttLine.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TAttLine.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TAttLine.h,v 1.2 2000/06/13 12:27:30 brun Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -39,9 +39,9 @@ public:
virtual ~TAttLine();
void Copy(TAttLine &attline);
Int_t DistancetoLine(Int_t px, Int_t py, Double_t xp1, Double_t yp1, Double_t xp2, Double_t yp2 );
- Color_t GetLineColor() {return fLineColor;}
- Style_t GetLineStyle() {return fLineStyle;}
- Width_t GetLineWidth() {return fLineWidth;}
+ Color_t GetLineColor() const {return fLineColor;}
+ Style_t GetLineStyle() const {return fLineStyle;}
+ Width_t GetLineWidth() const {return fLineWidth;}
virtual void Modify();
virtual void ResetAttLine(Option_t *option="");
virtual void SaveLineAttributes(ofstream &out, const char *name, Int_t coldef=1, Int_t stydef=1, Int_t widdef=1);
diff --git a/base/inc/TAttMarker.h b/base/inc/TAttMarker.h
index c59123955fc4c2fef7c88a6e134584974fcbb082..431928f7f7ed6e16d7fe9d13d7eae31de210a0d8 100644
--- a/base/inc/TAttMarker.h
+++ b/base/inc/TAttMarker.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TAttMarker.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 12/05/95
/*************************************************************************
@@ -41,9 +41,9 @@ public:
TAttMarker(Color_t color, Style_t style, Size_t msize);
virtual ~TAttMarker();
void Copy(TAttMarker &attmarker);
- virtual Color_t GetMarkerColor() {return fMarkerColor;}
- virtual Style_t GetMarkerStyle() {return fMarkerStyle;}
- virtual Size_t GetMarkerSize() {return fMarkerSize;}
+ virtual Color_t GetMarkerColor() const {return fMarkerColor;}
+ virtual Style_t GetMarkerStyle() const {return fMarkerStyle;}
+ virtual Size_t GetMarkerSize() const {return fMarkerSize;}
virtual void Modify();
virtual void ResetAttMarker(Option_t *toption="");
virtual void SaveMarkerAttributes(ofstream &out, const char *name, Int_t coldef=1, Int_t stydef=1, Int_t sizdef=1);
diff --git a/base/inc/TAttPad.h b/base/inc/TAttPad.h
index ed188c4d610ec1c13660a7093bef4cbffa85afa6..bd6748b2e16133306de3ee6a4aac2f897309320c 100644
--- a/base/inc/TAttPad.h
+++ b/base/inc/TAttPad.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TAttPad.h,v 1.2 2000/06/13 12:35:10 brun Exp $
+// @(#)root/base:$Name: $:$Id: TAttPad.h,v 1.3 2000/11/21 16:02:05 brun Exp $
// Author: Rene Brun 04/01/95
/*************************************************************************
@@ -54,24 +54,24 @@ public:
TAttPad();
virtual ~TAttPad();
virtual void Copy(TAttPad &attpad);
- Float_t GetBottomMargin() { return fBottomMargin;}
- Float_t GetLeftMargin() { return fLeftMargin;}
- Float_t GetRightMargin() { return fRightMargin;}
- Float_t GetTopMargin() { return fTopMargin;}
- Float_t GetAfile() { return fAfile;}
- Float_t GetXfile() { return fXfile;}
- Float_t GetYfile() { return fYfile;}
- Float_t GetAstat() { return fAstat;}
- Float_t GetXstat() { return fXstat;}
- Float_t GetYstat() { return fYstat;}
- Color_t GetFrameFillColor() {return fFrameFillColor;}
- Color_t GetFrameLineColor() {return fFrameLineColor;}
- Style_t GetFrameFillStyle() {return fFrameFillStyle;}
- Style_t GetFrameLineStyle() {return fFrameLineStyle;}
- Width_t GetFrameLineWidth() {return fFrameLineWidth;}
- Width_t GetFrameBorderSize() {return fFrameBorderSize;}
- Int_t GetFrameBorderMode() {return fFrameBorderMode;}
- virtual void Print(Option_t *option="");
+ Float_t GetBottomMargin() const { return fBottomMargin;}
+ Float_t GetLeftMargin() const { return fLeftMargin;}
+ Float_t GetRightMargin() const { return fRightMargin;}
+ Float_t GetTopMargin() const { return fTopMargin;}
+ Float_t GetAfile() const { return fAfile;}
+ Float_t GetXfile() const { return fXfile;}
+ Float_t GetYfile() const { return fYfile;}
+ Float_t GetAstat() const { return fAstat;}
+ Float_t GetXstat() const { return fXstat;}
+ Float_t GetYstat() const { return fYstat;}
+ Color_t GetFrameFillColor() const {return fFrameFillColor;}
+ Color_t GetFrameLineColor() const {return fFrameLineColor;}
+ Style_t GetFrameFillStyle() const {return fFrameFillStyle;}
+ Style_t GetFrameLineStyle() const {return fFrameLineStyle;}
+ Width_t GetFrameLineWidth() const {return fFrameLineWidth;}
+ Width_t GetFrameBorderSize() const {return fFrameBorderSize;}
+ Int_t GetFrameBorderMode() const {return fFrameBorderMode;}
+ virtual void Print(Option_t *option="") const;
virtual void ResetAttPad(Option_t *option="");
virtual void SetBottomMargin(Float_t bottommargin);
virtual void SetLeftMargin(Float_t leftmargin);
diff --git a/base/inc/TAttText.h b/base/inc/TAttText.h
index 851f27725c59b24f6f0d2f2cc8fa6399ef98d18f..aac549a50321ad0e41b19dd9456aace66b991fbe 100644
--- a/base/inc/TAttText.h
+++ b/base/inc/TAttText.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TAttText.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -43,11 +43,11 @@ public:
TAttText(Int_t align, Float_t angle, Color_t color, Style_t font, Float_t tsize);
virtual ~TAttText();
void Copy(TAttText &atttext);
- Short_t GetTextAlign() {return fTextAlign;}
- Float_t GetTextAngle() {return fTextAngle;}
- Color_t GetTextColor() {return fTextColor;}
- Font_t GetTextFont() {return fTextFont;}
- Float_t GetTextSize() {return fTextSize;}
+ Short_t GetTextAlign() const {return fTextAlign;}
+ Float_t GetTextAngle() const {return fTextAngle;}
+ Color_t GetTextColor() const {return fTextColor;}
+ Font_t GetTextFont() const {return fTextFont;}
+ Float_t GetTextSize() const {return fTextSize;}
virtual void Modify();
virtual void ResetAttText(Option_t *toption="");
virtual void SaveTextAttributes(ofstream &out, const char *name, Int_t alidef=12, Float_t angdef=0, Int_t coldef=1, Int_t fondef=61, Float_t sizdef=1);
diff --git a/base/inc/TBenchmark.h b/base/inc/TBenchmark.h
index 64c66c58356b5dce81c5fc0dd33fff5e0519f672..4d1c1cb49d735f9d409096bf945f8ea587613f37 100644
--- a/base/inc/TBenchmark.h
+++ b/base/inc/TBenchmark.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TBenchmark.h,v 1.2 2000/06/13 12:34:39 brun Exp $
+// @(#)root/base:$Name: $:$Id: TBenchmark.h,v 1.3 2000/11/21 16:04:34 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -44,10 +44,10 @@ protected:
public:
TBenchmark();
virtual ~TBenchmark();
- Int_t GetBench(const char *name);
+ Int_t GetBench(const char *name) const;
Float_t GetCpuTime(const char *name);
Float_t GetRealTime(const char *name);
- virtual void Print(Option_t *name);
+ virtual void Print(Option_t *name) const;
virtual void Reset();
virtual void Show(const char *name);
virtual void Start(const char *name);
diff --git a/base/inc/TColor.h b/base/inc/TColor.h
index 601d49ddd80ce6604d08b1a618c890eead9bf800..8c8d8277f0754248a1e5beeb7dcc38358f8814ed 100644
--- a/base/inc/TColor.h
+++ b/base/inc/TColor.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TColor.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -42,19 +42,19 @@ public:
TColor(const TColor &color);
virtual ~TColor();
void Copy(TObject &color);
- virtual void GetRGB(Float_t &r, Float_t &g, Float_t &b) {r = fRed; g = fGreen; b = fBlue;}
- virtual void GetHLS(Float_t &h, Float_t &l, Float_t &s) {h = fHue; l = fLight; s = fSaturation;}
- Int_t GetNumber() {return fNumber;}
- Float_t GetRed() {return fRed;}
- Float_t GetGreen() {return fGreen;}
- Float_t GetBlue() {return fBlue;}
- Float_t GetHue() {return fHue;}
- Float_t GetLight() {return fLight;}
- Float_t GetSaturation() {return fSaturation;}
+ virtual void GetRGB(Float_t &r, Float_t &g, Float_t &b) const {r = fRed; g = fGreen; b = fBlue;}
+ virtual void GetHLS(Float_t &h, Float_t &l, Float_t &s) const {h = fHue; l = fLight; s = fSaturation;}
+ Int_t GetNumber() const {return fNumber;}
+ Float_t GetRed() const {return fRed;}
+ Float_t GetGreen() const {return fGreen;}
+ Float_t GetBlue() const {return fBlue;}
+ Float_t GetHue() const {return fHue;}
+ Float_t GetLight() const {return fLight;}
+ Float_t GetSaturation() const {return fSaturation;}
virtual void HLStoRGB(Float_t h, Float_t l, Float_t s, Float_t &r, Float_t &g, Float_t &b);
Float_t HLStoRGB1(Float_t rn1, Float_t rn2, Float_t huei);
- virtual void ls(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
+ virtual void Print(Option_t *option="") const;
virtual void RGBtoHLS(Float_t r, Float_t g, Float_t b, Float_t &h, Float_t &l, Float_t &s);
virtual void SetNumber(Int_t number) {fNumber = number;}
virtual void SetRGB(Float_t r, Float_t g, Float_t b);
diff --git a/base/inc/TDatime.h b/base/inc/TDatime.h
index d08c3192bec6aa016afbe5de2b1e5e51849af5b3..017cb964cad0aeb9fe8ee8b2a179db00cf1825c9 100644
--- a/base/inc/TDatime.h
+++ b/base/inc/TDatime.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TDatime.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 05/01/95
/*************************************************************************
@@ -47,10 +47,10 @@ public:
UInt_t Convert() const;
void Copy(TDatime &datime);
UInt_t Get() const { return fDatime; }
- Int_t GetDate();
- Int_t GetTime();
+ Int_t GetDate() const;
+ Int_t GetTime() const;
void FillBuffer(char *&buffer);
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
void ReadBuffer(char *&buffer);
void Set();
void Set(Int_t date, Int_t time);
diff --git a/base/inc/TDirectory.h b/base/inc/TDirectory.h
index 774c46d4cc972ba6fab1d548421254fbb78ccaf7..d8e94e1bb28dee907fd824ffb3e5e52e6fe1a9f3 100644
--- a/base/inc/TDirectory.h
+++ b/base/inc/TDirectory.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TDirectory.h,v 1.4 2000/09/06 14:13:10 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TDirectory.h,v 1.5 2000/09/08 07:40:59 brun Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -78,25 +78,25 @@ public:
virtual void Draw(Option_t *option="");
virtual void FillBuffer(char *&buffer);
virtual TObject *FindObject(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
virtual TObject *Get(const char *namecycle);
- virtual TFile *GetFile() {return fFile;}
+ virtual TFile *GetFile() const {return fFile;}
virtual TKey *GetKey(const char *name, const Short_t cycle=9999);
TList *GetList() const { return fList; }
TList *GetListOfKeys() const { return fKeys; }
TObject *GetMother() const { return fMother; }
- virtual Int_t GetNkeys() {return fKeys->GetSize();}
- virtual Seek_t GetSeekDir() { return fSeekDir; }
- virtual Seek_t GetSeekParent() { return fSeekParent; }
- virtual Seek_t GetSeekKeys() { return fSeekKeys; }
+ virtual Int_t GetNkeys() const {return fKeys->GetSize();}
+ virtual Seek_t GetSeekDir() const { return fSeekDir; }
+ virtual Seek_t GetSeekParent() const { return fSeekParent; }
+ virtual Seek_t GetSeekKeys() const { return fSeekKeys; }
virtual const char *GetPath() const;
Bool_t IsFolder() const { return kTRUE; }
Bool_t IsModified() const { return fModified; }
Bool_t IsWritable() const { return fWritable; }
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual TDirectory *mkdir(const char *name, const char *title="");
virtual void Paint(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void Purge(Short_t nkeep=1);
virtual void pwd() const;
virtual void ReadAll(Option_t *option="");
@@ -105,7 +105,7 @@ public:
virtual void Save();
virtual void SaveSelf(Bool_t force = kFALSE);
void SetModified() {fModified = kTRUE;}
- void SetMother(TObject *mother) {fMother = mother;}
+ void SetMother(const TObject *mother) {fMother = (TObject*)mother;}
virtual Int_t Sizeof() const;
virtual Int_t Write(const char *name=0, Int_t opt=0, Int_t bufsiz=0);
virtual void WriteDirHeader();
diff --git a/base/inc/TEnv.h b/base/inc/TEnv.h
index 89a7cb4be8b057bf4e5465841e8ef1faf7ea46c4..27d3919124248bd5f37348d5c4b79282bc9c758a 100644
--- a/base/inc/TEnv.h
+++ b/base/inc/TEnv.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TEnv.h,v 1.2 2000/05/24 10:31:47 brun Exp $
+// @(#)root/base:$Name: $:$Id: TEnv.h,v 1.3 2000/06/16 17:08:11 rdm Exp $
// Author: Fons Rademakers 22/09/95
/*************************************************************************
@@ -103,6 +103,7 @@ private:
TEnvRec(const char *n, const char *v, const char *t, EEnvLevel l);
TEnvRec(const char *n, const TString &v, const char *t, EEnvLevel l);
+ Int_t Compare(const TObject *obj) const;
void ChangeValue(const char *v, const char *t, EEnvLevel l);
void ChangeValue(const TString &v, const char *t, EEnvLevel l);
TString ExpandValue(const char *v);
@@ -111,7 +112,6 @@ private:
void Write(TObject *obj);
Int_t Write(const char *name=0, Int_t opt=0, Int_t bufs=0)
{ return TObject::Write(name, opt, bufs); }
- Int_t Compare(TObject *obj);
};
//////////////////////////////////////////////////////////////////////////
@@ -132,7 +132,7 @@ public:
TEnv(const char *name="");
virtual ~TEnv();
- TOrdCollection *GetTable() { return fTable; }
+ TOrdCollection *GetTable() const { return fTable; }
Bool_t Defined(const char *name)
{ return Getvalue(name) != 0; }
@@ -153,8 +153,8 @@ public:
virtual void ReadFile(const char *fname, EEnvLevel level);
virtual void Save();
virtual void SaveLevel(EEnvLevel level);
- virtual void Print(Option_t *option="");
- virtual void PrintEnv(EEnvLevel level = kEnvAll);
+ virtual void Print(Option_t *option="") const;
+ virtual void PrintEnv(EEnvLevel level = kEnvAll) const;
ClassDef(TEnv,0) //Handle ROOT configuration resources
};
diff --git a/base/inc/TFile.h b/base/inc/TFile.h
index 191e4fbfbab607186877ae004e4c8a404df40410..284387b6bb09dfe4bb0fd6eac340dfc0a4fe6d3b 100644
--- a/base/inc/TFile.h
+++ b/base/inc/TFile.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFile.h,v 1.3 2000/11/21 16:11:53 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFile.h,v 1.4 2000/12/04 16:48:08 brun Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -82,26 +82,26 @@ public:
virtual void Draw(Option_t *option="");
virtual void FillBuffer(char *&buffer);
virtual void Flush();
- Int_t GetBestBuffer();
- TArrayC *GetClassIndex() {return fClassIndex;}
- Int_t GetCompressionLevel() {return fCompress;}
+ Int_t GetBestBuffer() const;
+ TArrayC *GetClassIndex() const {return fClassIndex;}
+ Int_t GetCompressionLevel() const {return fCompress;}
Float_t GetCompressionFactor();
- virtual Seek_t GetEND() {return fEND;}
+ virtual Seek_t GetEND() const {return fEND;}
Int_t GetFd() const { return fD; }
- TList *GetListOfFree() {return fFree;}
- virtual Int_t GetNfree() {return fFree->GetSize();}
+ TList *GetListOfFree() const {return fFree;}
+ virtual Int_t GetNfree() const {return fFree->GetSize();}
Option_t *GetOption() const { return fOption.Data();}
Double_t GetBytesRead() const { return fBytesRead; }
Double_t GetBytesWritten() const { return fBytesWrite; }
Int_t GetVersion() const { return fVersion; }
Int_t GetRecordHeader(char *buf, Seek_t first, Int_t maxbytes, Int_t &nbytes, Int_t &objlen, Int_t &keylen);
virtual Bool_t IsOpen() const;
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void MakeFree(Seek_t first, Seek_t last);
virtual void MakeProject(const char *dirname, const char *classes="*", Option_t *option="new"); // *MENU*
virtual void Map(); // *MENU*
virtual void Paint(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual Bool_t ReadBuffer(char *buf, int len);
virtual void ReadFree();
virtual void ReadStreamerInfo();
diff --git a/base/inc/TFolder.h b/base/inc/TFolder.h
index 9b8185c09f033aa189c3f0afee8245e666de80e0..2ec5f682060401fd1a36708655fd6ab4b4a21d71 100644
--- a/base/inc/TFolder.h
+++ b/base/inc/TFolder.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFolder.h,v 1.6 2000/09/11 06:19:57 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFolder.h,v 1.7 2000/09/13 12:36:07 brun Exp $
// Author: Rene Brun 02/09/2000
/*************************************************************************
@@ -47,14 +47,14 @@ public:
virtual void Clear(Option_t *option="");
virtual void Copy(TObject &) { MayNotUse("Copy(TObject &)"); }
virtual const char *FindFullPathName(const char *name) const;
- virtual const char *FindFullPathName(TObject *obj) const;
+ virtual const char *FindFullPathName(const TObject *obj) const;
virtual TObject *FindObject(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
virtual TObject *FindObjectAny(const char *name) const;
TCollection *GetListOfFolders() const { return fFolders; }
Bool_t IsFolder() const { return kTRUE; }
Bool_t IsOwner() const { return fIsOwner; }
- virtual void ls(Option_t *option="*"); // *MENU*
+ virtual void ls(Option_t *option="*") const; // *MENU*
virtual void RecursiveRemove(TObject *obj);
virtual void Remove(TObject *obj);
virtual void SetOwner(Bool_t owner=kTRUE) {fIsOwner = owner;}
diff --git a/base/inc/TFree.h b/base/inc/TFree.h
index f80c08632842a3b50ac91950852c82a9faf48bf9..c0417f1d98bee378d2afd9606513544d4fa8e04f 100644
--- a/base/inc/TFree.h
+++ b/base/inc/TFree.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFree.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TFree.h,v 1.2 2000/11/21 16:15:29 brun Exp $
// Author: Rene Brun 28/12/94
/*************************************************************************
@@ -39,8 +39,8 @@ public:
TFree *AddFree(TList *lfree, Seek_t first, Seek_t last);
virtual void FillBuffer(char *&buffer);
TFree *GetBestFree(TList *lfree, Int_t nbytes);
- Seek_t GetFirst() {return fFirst;}
- Seek_t GetLast() {return fLast;}
+ Seek_t GetFirst() const {return fFirst;}
+ Seek_t GetLast() const {return fLast;}
virtual void ReadBuffer(char *&buffer);
void SetFirst(Seek_t first) {fFirst=first;}
void SetLast(Seek_t last) {fLast=last;}
diff --git a/base/inc/TInetAddress.h b/base/inc/TInetAddress.h
index 076d1e9fabb73fe8f09616b1a37b211d986ff974..eccad40268dd87c87ce7da64e4c2dcee1f8d5ccf 100644
--- a/base/inc/TInetAddress.h
+++ b/base/inc/TInetAddress.h
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name$:$Id$
+// @(#)root/net:$Name: $:$Id: TInetAddress.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 16/12/96
/*************************************************************************
@@ -63,7 +63,7 @@ public:
Int_t GetFamily() const { return fFamily; }
Int_t GetPort() const { return fPort; }
Bool_t IsValid() const { return fFamily == -1 ? kFALSE : kTRUE; }
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
ClassDef(TInetAddress,1) //Represents an Internet Protocol (IP) address
};
diff --git a/base/inc/TKey.h b/base/inc/TKey.h
index 79e567923cfb599f11476811797b1393514fb8fd..12be9377f1dc4c787611cccc08569409994ddbb6 100644
--- a/base/inc/TKey.h
+++ b/base/inc/TKey.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TKey.h,v 1.2 2000/05/24 10:31:47 brun Exp $
+// @(#)root/base:$Name: $:$Id: TKey.h,v 1.3 2000/09/05 09:21:22 brun Exp $
// Author: Rene Brun 28/12/94
/*************************************************************************
@@ -65,20 +65,20 @@ public:
virtual void DeleteBuffer();
virtual void FillBuffer(char *&buffer);
virtual const char *GetClassName() const {return fClassName.Data();}
- virtual char *GetBuffer() {return fBuffer+fKeylen;}
- TBuffer *GetBufferRef() {return fBufferRef;}
- Short_t GetCycle();
- Short_t GetKeep();
- Int_t GetKeylen() {return fKeylen;}
- Int_t GetNbytes() {return fNbytes;}
- Int_t GetObjlen() {return fObjlen;}
- Int_t GetVersion() {return fVersion;}
- virtual Seek_t GetSeekKey() {return fSeekKey;}
- virtual Seek_t GetSeekPdir() {return fSeekPdir;}
+ virtual char *GetBuffer() const {return fBuffer+fKeylen;}
+ TBuffer *GetBufferRef() const {return fBufferRef;}
+ Short_t GetCycle() const ;
+ Short_t GetKeep() const;
+ Int_t GetKeylen() const {return fKeylen;}
+ Int_t GetNbytes() const {return fNbytes;}
+ Int_t GetObjlen() const {return fObjlen;}
+ Int_t GetVersion() const {return fVersion;}
+ virtual Seek_t GetSeekKey() const {return fSeekKey;}
+ virtual Seek_t GetSeekPdir() const {return fSeekPdir;}
Bool_t IsFolder() const;
virtual void Keep();
- virtual void ls(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
+ virtual void Print(Option_t *option="") const;
virtual Int_t Read(TObject *obj);
virtual TObject *ReadObj();
virtual void ReadBuffer(char *&buffer);
diff --git a/base/inc/TMapFile.h b/base/inc/TMapFile.h
index 880176f9cab298ae199507d0f74b50035bff148e..96c6a2076fde58e267b5e060605e836c7324e5bc 100644
--- a/base/inc/TMapFile.h
+++ b/base/inc/TMapFile.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TMapFile.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TMapFile.h,v 1.2 2000/09/05 09:21:22 brun Exp $
// Author: Fons Rademakers 08/07/97
/*************************************************************************
@@ -110,7 +110,7 @@ public:
void Close(Option_t *option = "");
void *GetBaseAddr() const { return (void *)fBaseAddr; }
void *GetBreakval() const;
- TDirectory *GetDirectory() {return fDirectory;}
+ TDirectory *GetDirectory() const {return fDirectory;}
Int_t GetFd() const { return fFd; }
void *GetMmallocDesc() const { return fMmallocDesc; }
const char *GetName() const { return fName; }
@@ -122,11 +122,11 @@ public:
Bool_t IsFolder() const;
Bool_t IsWritable() const { return fWritable; }
void *OrgAddress(void *addr) const { return (void *)((Long_t)addr - fOffset); }
- void Print(Option_t *option="");
- void ls(Option_t *option="");
+ void Print(Option_t *option="") const;
+ void ls(Option_t *option="") const;
Bool_t cd(const char *path = 0);
- void Add(TObject *obj, const char *name = "");
+ void Add(const TObject *obj, const char *name = "");
void Update(TObject *obj = 0);
TObject *Remove(TObject *obj) { return Remove(obj, kTRUE); }
TObject *Remove(const char *name) { return Remove(name, kTRUE); }
@@ -164,7 +164,7 @@ private:
TMapRec *fNext; // next MapRec in list
public:
- TMapRec(const char *name, TObject *obj, Int_t size, void *buf);
+ TMapRec(const char *name, const TObject *obj, Int_t size, void *buf);
~TMapRec();
const char *GetName(Long_t offset = 0) const { return (char *)((Long_t) fName + offset); }
const char *GetClassName(Long_t offset = 0) const { return (char *)((Long_t) fClassName + offset); }
diff --git a/base/inc/TMessageHandler.h b/base/inc/TMessageHandler.h
index d59b9c6a3e99c32bd083a3fe64d3900ceab39b29..6b39cd3655d66b8c15ca8fb922a4805abbfecddb 100644
--- a/base/inc/TMessageHandler.h
+++ b/base/inc/TMessageHandler.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TMessageHandler.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 11/11/99
/*************************************************************************
@@ -35,16 +35,16 @@
class TMessageHandler : public TNamed {
protected:
- TClass *fClass; // class for which message has to be handled
- TObject *fMessObj; // object generating message
- Int_t fMessId; // message id (often matching specific enum in fClass)
- Int_t fSize; // number of different messages handled
- Int_t *fCnts; // count per message
- Int_t *fMessIds; // message ids
- Bool_t fDerived; // if true handle messages also for derived classes
+ const TClass *fClass; // class for which message has to be handled
+ const TObject *fMessObj; // object generating message
+ Int_t fMessId; // message id (often matching specific enum in fClass)
+ Int_t fSize; // number of different messages handled
+ Int_t *fCnts; // count per message
+ Int_t *fMessIds; // message ids
+ Bool_t fDerived; // if true handle messages also for derived classes
public:
- TMessageHandler(TClass *cl, Bool_t derived = kTRUE);
+ TMessageHandler(const TClass *cl, Bool_t derived = kTRUE);
TMessageHandler(const char *cl, Bool_t derived = kTRUE);
virtual ~TMessageHandler();
@@ -54,11 +54,11 @@ public:
virtual Int_t GetMessageCount(Int_t messId) const;
virtual Int_t GetTotalMessageCount() const;
Bool_t HandleDerived() const { return fDerived; }
- virtual void HandleMessage(Int_t id, TObject *obj);
+ virtual void HandleMessage(Int_t id, const TObject *obj);
virtual Bool_t Notify();
- virtual void Print(Option_t *option= "");
+ virtual void Print(Option_t *option= "") const;
virtual void Remove();
ClassDef(TMessageHandler,0) // Generic message handler
diff --git a/base/inc/TNamed.h b/base/inc/TNamed.h
index 98f60c440d4f88231da2a3596511eadd47c6bc09..b52a0dca381c22e55186877fcfdf56d522d9fe07 100644
--- a/base/inc/TNamed.h
+++ b/base/inc/TNamed.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TNamed.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -46,18 +46,18 @@ public:
TNamed(const TNamed &named);
TNamed& operator=(const TNamed& rhs);
virtual ~TNamed() { }
- virtual Int_t Compare(TObject *obj);
+ virtual Int_t Compare(const TObject *obj) const;
virtual void Copy(TObject &named);
virtual void FillBuffer(char *&buffer);
virtual const char *GetName() const {return fName.Data();}
virtual const char *GetTitle() const {return fTitle.Data();}
- virtual ULong_t Hash() { return fName.Hash(); }
+ virtual ULong_t Hash() const { return fName.Hash(); }
virtual Bool_t IsSortable() const { return kTRUE; }
virtual void SetName(const char *name); // *MENU*
virtual void SetObject(const char *name, const char *title);
virtual void SetTitle(const char *title=""); // *MENU*
- virtual void ls(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
+ virtual void Print(Option_t *option="") const;
virtual Int_t Sizeof() const;
ClassDef(TNamed,1) //The basis for a named object (name, title)
diff --git a/base/inc/TObjPtr.h b/base/inc/TObjPtr.h
index 01f30ae0ee8437d57a93f85fe263409b4cf41b1c..041fd038fc392c393b9b8c2b0e029a089f08f329 100644
--- a/base/inc/TObjPtr.h
+++ b/base/inc/TObjPtr.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TObjPtr.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Fons Rademakers 04/05/96
/*************************************************************************
@@ -36,10 +36,10 @@ public:
TObjPtr(const void *p = 0) : fPtr(p) { }
TObjPtr(const TObjPtr &p) : fPtr(p.fPtr) { }
~TObjPtr() { }
- Int_t Compare(TObject *obj);
- ULong_t Hash() { return (ULong_t) fPtr >> 2; }
+ Int_t Compare(const TObject *obj) const;
+ ULong_t Hash() const { return (ULong_t) fPtr >> 2; }
Bool_t IsSortable() const { return kTRUE; }
- Bool_t IsEqual(TObject *obj) { return fPtr == obj; }
+ Bool_t IsEqual(const TObject *obj) const { return fPtr == obj; }
void *Ptr() const { return (void *)fPtr; }
//ClassDef(TObjPtr,1) //Collectable generic pointer class
diff --git a/base/inc/TObjString.h b/base/inc/TObjString.h
index 959682e2b2a85a4b08a854566e692e1fe5c671c0..681253f6e3c98e7fb482ad4302e1becce98aeae0 100644
--- a/base/inc/TObjString.h
+++ b/base/inc/TObjString.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TObjString.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Fons Rademakers 12/11/95
/*************************************************************************
@@ -38,13 +38,13 @@ public:
TObjString(const char *s = "") : fString(s) { }
TObjString(const TObjString &s) : fString(s.fString) { }
~TObjString() { }
- Int_t Compare(TObject *obj);
+ Int_t Compare(const TObject *obj) const;
const char *GetName() const { return fString.Data(); }
- ULong_t Hash() { return fString.Hash(); }
+ ULong_t Hash() const { return fString.Hash(); }
void FillBuffer(char *&buffer) { fString.FillBuffer(buffer); }
- void Print(Option_t *) { Printf("TObjString = %s", (const char*)fString); }
+ void Print(Option_t *) const { Printf("TObjString = %s", (const char*)fString); }
Bool_t IsSortable() const { return kTRUE; }
- Bool_t IsEqual(TObject *obj);
+ Bool_t IsEqual(const TObject *obj) const;
void ReadBuffer(char *&buffer) { fString.ReadBuffer(buffer); }
void SetString(char *s) { fString = s; }
TString GetString() const { return fString; }
diff --git a/base/inc/TObject.h b/base/inc/TObject.h
index a299a68c2b9d9365114f64e76a5527345d5f4521..e7b0d83b2562a1714392b63fbf702ddca8ef0e29 100644
--- a/base/inc/TObject.h
+++ b/base/inc/TObject.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TObject.h,v 1.6 2000/09/08 16:07:33 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TObject.h,v 1.7 2000/11/21 16:17:42 brun Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -112,42 +112,42 @@ public:
virtual void Browse(TBrowser *b);
virtual const char *ClassName() const;
virtual void Clear(Option_t * /*option*/ ="") { }
- virtual TObject *Clone();
- virtual Int_t Compare(TObject *obj);
+ virtual TObject *Clone() const;
+ virtual Int_t Compare(const TObject *obj) const;
virtual void Copy(TObject &object);
virtual void Delete(Option_t *option=""); // *MENU*
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void Draw(Option_t *option="");
- virtual void DrawClass(); // *MENU*
- virtual void DrawClone(Option_t *option=""); // *MENU*
- virtual void Dump(); // *MENU*
+ virtual void DrawClass() const; // *MENU*
+ virtual void DrawClone(Option_t *option="") const; // *MENU*
+ virtual void Dump() const; // *MENU*
virtual void Execute(const char *method, const char *params);
virtual void Execute(TMethod *method, TObjArray *params);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual TObject *FindObject(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
virtual Option_t *GetDrawOption() const;
virtual UInt_t GetUniqueID() const;
virtual const char *GetName() const;
virtual const char *GetIconName() const;
virtual Option_t *GetOption() const { return ""; }
- virtual char *GetObjectInfo(Int_t px, Int_t py);
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
virtual const char *GetTitle() const;
virtual Bool_t HandleTimer(TTimer *timer);
- virtual ULong_t Hash();
+ virtual ULong_t Hash() const;
virtual Bool_t InheritsFrom(const char *classname) const;
virtual Bool_t InheritsFrom(const TClass *cl) const;
- virtual void Inspect(); // *MENU*
+ virtual void Inspect() const; // *MENU*
virtual Bool_t IsFolder() const;
- virtual Bool_t IsEqual(TObject *obj);
+ virtual Bool_t IsEqual(const TObject *obj) const;
virtual Bool_t IsSortable() const { return kFALSE; }
Bool_t IsOnHeap() const { return TestBit(kIsOnHeap); }
Bool_t IsZombie() const { return TestBit(kZombie); }
virtual Bool_t Notify();
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void Pop();
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual Int_t Read(const char *name);
virtual void RecursiveRemove(TObject *obj);
virtual void SavePrimitive(ofstream &out, Option_t *option);
diff --git a/base/inc/TQConnection.h b/base/inc/TQConnection.h
index 6ee540ab60c16834e36ac7ce3421b9dc51324f48..5bdd4f28fe0db935096bf3a6a11e8d3049f1b3ec 100644
--- a/base/inc/TQConnection.h
+++ b/base/inc/TQConnection.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name:$:$Id:$
+// @(#)root/base:$Name: $:$Id: TQConnection.h,v 1.1 2000/10/17 12:19:18 rdm Exp $
// Author: Valeriy Onuchin & Fons Rademakers 15/10/2000
/*************************************************************************
@@ -60,8 +60,8 @@ public:
void ExecuteMethod(Double_t param);
void ExecuteMethod(Long_t *params);
void ExecuteMethod(const char *params);
- void ls(Option_t *option="");
- void Print(Option_t *option="");
+ void ls(Option_t *option="") const;
+ void Print(Option_t *option="") const;
ClassDef(TQConnection,0) // Internal class used in the object communication mechanism
};
diff --git a/base/inc/TROOT.h b/base/inc/TROOT.h
index 235dca0ae1715f693fcb9e11df94ec4e77d0dda1..76eab16f1e5bc1ad16a1537b2aab333825426640 100644
--- a/base/inc/TROOT.h
+++ b/base/inc/TROOT.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TROOT.h,v 1.10 2000/11/27 10:42:27 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TROOT.h,v 1.11 2000/12/02 15:47:42 rdm Exp $
// Author: Rene Brun 08/12/94
/*************************************************************************
@@ -114,60 +114,60 @@ public:
void Browse(TBrowser *b);
Bool_t ClassSaved(TClass *cl);
virtual TObject *FindObject(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
virtual TObject *FindObjectAny(const char *name) const;
TObject *FindSpecialObject(const char *name, void *&where);
const char *FindObjectClassName(const char *name) const;
- const char *FindObjectPathName(TObject *obj) const;
+ const char *FindObjectPathName(const TObject *obj) const;
void ForceStyle(Bool_t force=kTRUE) {fForceStyle = force;}
Bool_t FromPopUp() {return fFromPopUp;}
TApplication *GetApplication() {return fApplication;}
- TClass *GetClass(const char *name, Bool_t load=kTRUE);
- TColor *GetColor(Int_t color);
+ TClass *GetClass(const char *name, Bool_t load=kTRUE) const;
+ TColor *GetColor(Int_t color) const;
const char *GetCutClassName() const {return fCutClassName.Data();}
const char *GetDefCanvasName() const {return fDefCanvasName.Data();}
- Bool_t GetEditHistograms() {return fEditHistograms;}
- Int_t GetEditorMode() {return fEditorMode;}
- Bool_t GetForceStyle() {return fForceStyle;}
- VoidFuncPtr_t GetMakeDefCanvas();
- Int_t GetVersionDate() {return fVersionDate;}
- Int_t GetVersionTime() {return fVersionTime;}
- Int_t GetVersionInt() {return fVersionInt;}
+ Bool_t GetEditHistograms() const {return fEditHistograms;}
+ Int_t GetEditorMode() const {return fEditorMode;}
+ Bool_t GetForceStyle() const {return fForceStyle;}
+ VoidFuncPtr_t GetMakeDefCanvas() const;
+ Int_t GetVersionDate() const {return fVersionDate;}
+ Int_t GetVersionTime() const {return fVersionTime;}
+ Int_t GetVersionInt() const {return fVersionInt;}
const char *GetVersion() const {return fVersion.Data();}
- TSeqCollection *GetListOfClasses() {return fClasses;}
- TSeqCollection *GetListOfColors() {return fColors;}
+ TSeqCollection *GetListOfClasses() const {return fClasses;}
+ TSeqCollection *GetListOfColors() const {return fColors;}
TSeqCollection *GetListOfTypes(Bool_t load = kFALSE);
TSeqCollection *GetListOfGlobals(Bool_t load = kFALSE);
TSeqCollection *GetListOfGlobalFunctions(Bool_t load = kFALSE);
- TSeqCollection *GetListOfFiles() {return fFiles;}
- TSeqCollection *GetListOfMappedFiles(){return fMappedFiles;}
- TSeqCollection *GetListOfSockets() {return fSockets;}
- TSeqCollection *GetListOfCanvases() {return fCanvases;}
- TSeqCollection *GetListOfStyles() {return fStyles;}
- TSeqCollection *GetListOfFunctions() {return fFunctions;}
- TSeqCollection *GetListOfGeometries() {return fGeometries;}
- TSeqCollection *GetListOfBrowsers() {return fBrowsers;}
- TSeqCollection *GetListOfSpecials() {return fSpecials;}
- TSeqCollection *GetListOfTasks() {return fTasks;}
- TSeqCollection *GetListOfCleanups() {return fCleanups;}
- TSeqCollection *GetListOfStreamerInfo() {return fStreamerInfo;}
- TSeqCollection *GetListOfMessageHandlers() {return fMessageHandlers;}
- TList *GetListOfBrowsables() {return fBrowsables;}
+ TSeqCollection *GetListOfFiles() const {return fFiles;}
+ TSeqCollection *GetListOfMappedFiles() const{return fMappedFiles;}
+ TSeqCollection *GetListOfSockets() const {return fSockets;}
+ TSeqCollection *GetListOfCanvases() const {return fCanvases;}
+ TSeqCollection *GetListOfStyles() const {return fStyles;}
+ TSeqCollection *GetListOfFunctions() const {return fFunctions;}
+ TSeqCollection *GetListOfGeometries() const {return fGeometries;}
+ TSeqCollection *GetListOfBrowsers() const {return fBrowsers;}
+ TSeqCollection *GetListOfSpecials() const {return fSpecials;}
+ TSeqCollection *GetListOfTasks() const {return fTasks;}
+ TSeqCollection *GetListOfCleanups() const {return fCleanups;}
+ TSeqCollection *GetListOfStreamerInfo() const {return fStreamerInfo;}
+ TSeqCollection *GetListOfMessageHandlers() const {return fMessageHandlers;}
+ TList *GetListOfBrowsables() const {return fBrowsables;}
TDataType *GetType(const char *name, Bool_t load = kFALSE);
- TFile *GetFile() {return fFile;}
- TFile *GetFile(const char *name);
- TStyle *GetStyle(const char *name);
- TObject *GetFunction(const char *name);
+ TFile *GetFile() const {return fFile;}
+ TFile *GetFile(const char *name) const;
+ TStyle *GetStyle(const char *name) const;
+ TObject *GetFunction(const char *name) const;
TGlobal *GetGlobal(const char *name, Bool_t load = kFALSE);
- TGlobal *GetGlobal(TObject *obj, Bool_t load = kFALSE);
+ TGlobal *GetGlobal(const TObject *obj, Bool_t load = kFALSE);
TFunction *GetGlobalFunction(const char *name, const char *params = 0, Bool_t load = kFALSE);
TFunction *GetGlobalFunctionWithPrototype(const char *name, const char *proto = 0, Bool_t load = kFALSE);
- TObject *GetGeometry(const char *name);
- TObject *GetSelectedPrimitive() {return fPrimitive;}
- TVirtualPad *GetSelectedPad() {return fSelectPad;}
- Int_t GetNclasses() {return fClasses->GetSize();}
- Int_t GetNtypes() {return fTypes->GetSize();}
- TFolder *GetRootFolder() {return fRootFolder;}
+ TObject *GetGeometry(const char *name) const;
+ TObject *GetSelectedPrimitive() const {return fPrimitive;}
+ TVirtualPad *GetSelectedPad() const {return fSelectPad;}
+ Int_t GetNclasses() const {return fClasses->GetSize();}
+ Int_t GetNtypes() const {return fTypes->GetSize();}
+ TFolder *GetRootFolder() const {return fRootFolder;}
void Idle(UInt_t idleTimeInSec, const char *command=0);
Int_t IgnoreInclude(const char *fname, const char *expandedfname);
Bool_t IsBatch() const { return fBatch; }
@@ -175,11 +175,11 @@ public:
Bool_t IsInterrupted() const { return fInterrupt; }
Bool_t IsLineProcessing() const { return fLineIsProcessing; }
Bool_t IsProofServ() const { return fName == "Proofserv" ? kTRUE : kFALSE; }
- void ls(Option_t *option="");
+ void ls(Option_t *option="") const;
Int_t LoadClass(const char *classname, const char *libname);
void LoadMacro(const char *filename);
Int_t Macro(const char *filename);
- void Message(Int_t id, TObject *obj);
+ void Message(Int_t id, const TObject *obj);
Bool_t MustClean() {return fMustClean;}
void ProcessLine(const char *line);
void ProcessLineSync(const char *line);
@@ -200,7 +200,7 @@ public:
void SetLineHasBeenProcessed() {if (fLineIsProcessing) fLineIsProcessing--;}
void SetReadingObject(Bool_t flag=kTRUE) {fReadingObject = flag;}
void SetMustClean(Bool_t flag=kTRUE) { fMustClean=flag; }
- void SetSelectedPrimitive(TObject *obj) { fPrimitive = obj; }
+ void SetSelectedPrimitive(const TObject *obj) { fPrimitive = (TObject*)obj; }
void SetSelectedPad(TVirtualPad *pad) { fSelectPad = pad; }
void SetStyle(const char *stylename="Default");
void Time(Int_t casetime=1) { fTimer = casetime; }
diff --git a/base/inc/TStopwatch.h b/base/inc/TStopwatch.h
index 4c7f431388c67cc3ed4ba7d8598e6d3f8c7befa7..7fff3ff011a3e87293cba330ad05ce5c20286088 100644
--- a/base/inc/TStopwatch.h
+++ b/base/inc/TStopwatch.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TStopwatch.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Fons Rademakers 11/10/95
/*************************************************************************
@@ -52,7 +52,7 @@ public:
void ResetCpuTime(Double_t time = 0) { Stop(); fTotalCpuTime = time; }
void ResetRealTime(Double_t time = 0) { Stop(); fTotalRealTime = time; }
Double_t CpuTime();
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
static Double_t GetRealTime();
static Double_t GetCPUTime();
diff --git a/base/inc/TStyle.h b/base/inc/TStyle.h
index 69619b5e03ca2997f6f6d1e3a3fe7ffc0ebae8d4..715b005d6f3726500a879d90cf743e652b966a57 100644
--- a/base/inc/TStyle.h
+++ b/base/inc/TStyle.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TStyle.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -140,106 +140,106 @@ public:
TStyle(const char *name, const char *title);
TStyle(const TStyle &style);
virtual ~TStyle();
- Int_t AxisChoice(Option_t *axis);
+ Int_t AxisChoice(Option_t *axis) const;
virtual void Browse(TBrowser *b);
static void BuildStyles();
virtual void Copy(TObject &style);
virtual void cd();
- Int_t GetNdivisions(Option_t *axis="X");
+ Int_t GetNdivisions(Option_t *axis="X") const;
TAttText *GetAttDate() {return &fAttDate;}
- Color_t GetAxisColor(Option_t *axis="X");
- Color_t GetLabelColor(Option_t *axis="X");
- Style_t GetLabelFont(Option_t *axis="X");
- Float_t GetLabelOffset(Option_t *axis="X");
- Float_t GetLabelSize(Option_t *axis="X");
- Float_t GetTitleOffset(Option_t *axis="X"); //return axis title offset
- Float_t GetTitleSize(Option_t *axis="X"); //return axis title size
- Float_t GetTickLength(Option_t *axis="X");
+ Color_t GetAxisColor(Option_t *axis="X") const;
+ Color_t GetLabelColor(Option_t *axis="X") const;
+ Style_t GetLabelFont(Option_t *axis="X") const;
+ Float_t GetLabelOffset(Option_t *axis="X") const;
+ Float_t GetLabelSize(Option_t *axis="X") const;
+ Float_t GetTitleOffset(Option_t *axis="X") const; //return axis title offset
+ Float_t GetTitleSize(Option_t *axis="X") const; //return axis title size
+ Float_t GetTickLength(Option_t *axis="X") const;
- Float_t GetBarOffset() {return fBarOffset;}
- Float_t GetBarWidth() {return fBarWidth;}
- Int_t GetDrawBorder() {return fDrawBorder;}
- Int_t GetErrorMarker() {return fErrorMarker;}
- Float_t GetErrorMsize() {return fErrorMsize;}
- Float_t GetErrorX() {return fErrorX;}
- Color_t GetCanvasColor() {return fCanvasColor;}
- Width_t GetCanvasBorderSize() {return fCanvasBorderSize;}
- Int_t GetCanvasBorderMode() {return fCanvasBorderMode;}
- Int_t GetCanvasDefH() {return fCanvasDefH;}
- Int_t GetCanvasDefW() {return fCanvasDefW;}
- Int_t GetCanvasDefX() {return fCanvasDefX;}
- Int_t GetCanvasDefY() {return fCanvasDefY;}
- Int_t GetColorPalette(Int_t i);
- Float_t GetDateX() {return fDateX;}
- Float_t GetDateY() {return fDateY;}
+ Float_t GetBarOffset() const {return fBarOffset;}
+ Float_t GetBarWidth() const {return fBarWidth;}
+ Int_t GetDrawBorder() const {return fDrawBorder;}
+ Int_t GetErrorMarker() const {return fErrorMarker;}
+ Float_t GetErrorMsize() const {return fErrorMsize;}
+ Float_t GetErrorX() const {return fErrorX;}
+ Color_t GetCanvasColor() const {return fCanvasColor;}
+ Width_t GetCanvasBorderSize() const {return fCanvasBorderSize;}
+ Int_t GetCanvasBorderMode() const {return fCanvasBorderMode;}
+ Int_t GetCanvasDefH() const {return fCanvasDefH;}
+ Int_t GetCanvasDefW() const {return fCanvasDefW;}
+ Int_t GetCanvasDefX() const {return fCanvasDefX;}
+ Int_t GetCanvasDefY() const {return fCanvasDefY;}
+ Int_t GetColorPalette(Int_t i) const;
+ Float_t GetDateX() const {return fDateX;}
+ Float_t GetDateY() const {return fDateY;}
const char *GetFitFormat() const {return fFitFormat.Data();}
- Int_t GetNumberOfColors() {return fPalette.fN;}
- Color_t GetPadColor() {return fPadColor;}
- Width_t GetPadBorderSize() {return fPadBorderSize;}
- Int_t GetPadBorderMode() {return fPadBorderMode;}
- Float_t GetPadBottomMargin() {return fPadBottomMargin;}
- Float_t GetPadTopMargin() {return fPadTopMargin;}
- Float_t GetPadLeftMargin() {return fPadLeftMargin;}
- Float_t GetPadRightMargin() {return fPadRightMargin;}
- Bool_t GetPadGridX() {return fPadGridX;}
- Bool_t GetPadGridY() {return fPadGridY;}
- Int_t GetPadTickX() {return fPadTickX;}
- Int_t GetPadTickY() {return fPadTickY;}
- Color_t GetFuncColor() {return fFuncColor;}
- Style_t GetFuncStyle() {return fFuncStyle;}
- Width_t GetFuncWidth() {return fFuncWidth;}
- Color_t GetFrameFillColor() {return fFrameFillColor;}
- Color_t GetFrameLineColor() {return fFrameLineColor;}
- Style_t GetFrameFillStyle() {return fFrameFillStyle;}
- Style_t GetFrameLineStyle() {return fFrameLineStyle;}
- Width_t GetFrameLineWidth() {return fFrameLineWidth;}
- Width_t GetFrameBorderSize() {return fFrameBorderSize;}
- Int_t GetFrameBorderMode() {return fFrameBorderMode;}
- Color_t GetHistFillColor() {return fHistFillColor;}
- Color_t GetHistLineColor() {return fHistLineColor;}
- Style_t GetHistFillStyle() {return fHistFillStyle;}
- Style_t GetHistLineStyle() {return fHistLineStyle;}
- Width_t GetHistLineWidth() {return fHistLineWidth;}
- Float_t GetLegoInnerR() {return fLegoInnerR;}
- Int_t GetOptDate() {return fOptDate;}
- Int_t GetOptFile() {return fOptFile;}
- Int_t GetOptFit() {return fOptFit;}
- Int_t GetOptStat() {return fOptStat;}
- Int_t GetOptTitle() {return fOptTitle;}
- Int_t GetOptLogx() {return fOptLogx;}
- Int_t GetOptLogy() {return fOptLogy;}
- Int_t GetOptLogz() {return fOptLogz;}
+ Int_t GetNumberOfColors() const {return fPalette.fN;}
+ Color_t GetPadColor() const {return fPadColor;}
+ Width_t GetPadBorderSize() const {return fPadBorderSize;}
+ Int_t GetPadBorderMode() const {return fPadBorderMode;}
+ Float_t GetPadBottomMargin() const {return fPadBottomMargin;}
+ Float_t GetPadTopMargin() const {return fPadTopMargin;}
+ Float_t GetPadLeftMargin() const {return fPadLeftMargin;}
+ Float_t GetPadRightMargin() const {return fPadRightMargin;}
+ Bool_t GetPadGridX() const {return fPadGridX;}
+ Bool_t GetPadGridY() const {return fPadGridY;}
+ Int_t GetPadTickX() const {return fPadTickX;}
+ Int_t GetPadTickY() const {return fPadTickY;}
+ Color_t GetFuncColor() const {return fFuncColor;}
+ Style_t GetFuncStyle() const {return fFuncStyle;}
+ Width_t GetFuncWidth() const {return fFuncWidth;}
+ Color_t GetFrameFillColor() const {return fFrameFillColor;}
+ Color_t GetFrameLineColor() const {return fFrameLineColor;}
+ Style_t GetFrameFillStyle() const {return fFrameFillStyle;}
+ Style_t GetFrameLineStyle() const {return fFrameLineStyle;}
+ Width_t GetFrameLineWidth() const {return fFrameLineWidth;}
+ Width_t GetFrameBorderSize() const {return fFrameBorderSize;}
+ Int_t GetFrameBorderMode() const {return fFrameBorderMode;}
+ Color_t GetHistFillColor() const {return fHistFillColor;}
+ Color_t GetHistLineColor() const {return fHistLineColor;}
+ Style_t GetHistFillStyle() const {return fHistFillStyle;}
+ Style_t GetHistLineStyle() const {return fHistLineStyle;}
+ Width_t GetHistLineWidth() const {return fHistLineWidth;}
+ Float_t GetLegoInnerR() const {return fLegoInnerR;}
+ Int_t GetOptDate() const {return fOptDate;}
+ Int_t GetOptFile() const {return fOptFile;}
+ Int_t GetOptFit() const {return fOptFit;}
+ Int_t GetOptStat() const {return fOptStat;}
+ Int_t GetOptTitle() const {return fOptTitle;}
+ Int_t GetOptLogx() const {return fOptLogx;}
+ Int_t GetOptLogy() const {return fOptLogy;}
+ Int_t GetOptLogz() const {return fOptLogz;}
void GetPaperSize(Float_t &xsize, Float_t &ysize);
- Int_t GetShowEventStatus(){return fShowEventStatus;}
- Float_t GetScreenFactor() {return fScreenFactor;}
- Color_t GetStatColor() {return fStatColor;}
- Color_t GetStatTextColor() {return fStatTextColor;}
- Width_t GetStatBorderSize() {return fStatBorderSize;}
- Style_t GetStatFont() {return fStatFont;}
- Style_t GetStatStyle() {return fStatStyle;}
+ Int_t GetShowEventStatus() const {return fShowEventStatus;}
+ Float_t GetScreenFactor() const {return fScreenFactor;}
+ Color_t GetStatColor() const {return fStatColor;}
+ Color_t GetStatTextColor() const {return fStatTextColor;}
+ Width_t GetStatBorderSize() const {return fStatBorderSize;}
+ Style_t GetStatFont() const {return fStatFont;}
+ Style_t GetStatStyle() const {return fStatStyle;}
const char *GetStatFormat() const {return fStatFormat.Data();}
- Float_t GetStatX() {return fStatX;}
- Float_t GetStatY() {return fStatY;}
- Float_t GetStatW() {return fStatW;}
- Float_t GetStatH() {return fStatH;}
- Double_t GetTimeOffset() {return fTimeOffset;} //return axis time offset
- Color_t GetTitleColor() {return fTitleColor;} //return histogram title fill area color
- Color_t GetTitleTextColor() {return fTitleTextColor;} //return histogram title text color
- Style_t GetTitleStyle() {return fTitleStyle;}
- Style_t GetTitleFont() {return fTitleFont;} //return histogram title font
- Width_t GetTitleBorderSize() {return fTitleBorderSize;} //return border size of histogram title TPaveLabel
- Float_t GetTitleXOffset() {return GetTitleOffset("X");} //return X axis title offset
- Float_t GetTitleXSize() {return GetTitleSize("X");} //return X axis title size
- Float_t GetTitleYOffset() {return GetTitleOffset("Y");} //return Y axis title offset
- Float_t GetTitleYSize() {return GetTitleSize("Y");} //return Y axis title size
- Float_t GetTitleX() {return fTitleX;} //return left X position of histogram title TPavelabel
- Float_t GetTitleY() {return fTitleY;} //return left bottom position of histogram title TPavelabel
- Float_t GetTitleW() {return fTitleW;} //return width of histogram title TPaveLabel
- Float_t GetTitleH() {return fTitleH;} //return height of histogram title TPavelabel
+ Float_t GetStatX() const {return fStatX;}
+ Float_t GetStatY() const {return fStatY;}
+ Float_t GetStatW() const {return fStatW;}
+ Float_t GetStatH() const {return fStatH;}
+ Double_t GetTimeOffset() const {return fTimeOffset;} //return axis time offset
+ Color_t GetTitleColor() const {return fTitleColor;} //return histogram title fill area color
+ Color_t GetTitleTextColor() const {return fTitleTextColor;} //return histogram title text color
+ Style_t GetTitleStyle() const {return fTitleStyle;}
+ Style_t GetTitleFont() const {return fTitleFont;} //return histogram title font
+ Width_t GetTitleBorderSize() const {return fTitleBorderSize;} //return border size of histogram title TPaveLabel
+ Float_t GetTitleXOffset() const {return GetTitleOffset("X");} //return X axis title offset
+ Float_t GetTitleXSize() const {return GetTitleSize("X");} //return X axis title size
+ Float_t GetTitleYOffset() const {return GetTitleOffset("Y");} //return Y axis title offset
+ Float_t GetTitleYSize() const {return GetTitleSize("Y");} //return Y axis title size
+ Float_t GetTitleX() const {return fTitleX;} //return left X position of histogram title TPavelabel
+ Float_t GetTitleY() const {return fTitleY;} //return left bottom position of histogram title TPavelabel
+ Float_t GetTitleW() const {return fTitleW;} //return width of histogram title TPaveLabel
+ Float_t GetTitleH() const {return fTitleH;} //return height of histogram title TPavelabel
const char *GetHeaderPS() const {return fHeaderPS.Data();}
const char *GetLineStyleString(Int_t i=1) const;
- Float_t GetLineScalePS() {return fLineScalePS;}
+ Float_t GetLineScalePS() const {return fLineScalePS;}
virtual void Reset(Option_t *option="");
void SetFitFormat(const char *format="5.4g") {fFitFormat = format;}
diff --git a/base/inc/TTask.h b/base/inc/TTask.h
index 50159cbb18e1b8c26cc6ff1dbd9ef6d02b225ea2..d787e8af0532805f80e889dca473b95e6f2f6ae8 100644
--- a/base/inc/TTask.h
+++ b/base/inc/TTask.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TTask.h,v 1.4 2000/09/06 09:29:20 brun Exp $
+// @(#)root/base:$Name: $:$Id: TTask.h,v 1.5 2000/09/06 14:20:10 rdm Exp $
// Author: Rene Brun 02/09/2000
/*************************************************************************
@@ -60,7 +60,7 @@ public:
Int_t GetBreakout() const {return fBreakout;}
Bool_t IsActive() const { return fActive; }
Bool_t IsFolder() const { return kTRUE; }
- virtual void ls(Option_t *option="*"); // *MENU*
+ virtual void ls(Option_t *option="*") const; // *MENU*
void SetActive(Bool_t active=kTRUE) {fActive=active;} // *TOGGLE*
void SetBreakin(Int_t breakin=1) {fBreakin = breakin;} // *TOGGLE*
void SetBreakout(Int_t breakout=1) {fBreakout=breakout;} // *TOGGLE*
diff --git a/base/inc/TUrl.h b/base/inc/TUrl.h
index c2d2bd322590d3a8e97a83d55592f7c443170c87..05e1264e9f5d2a87920ddb4b0f39bd2c46766621 100644
--- a/base/inc/TUrl.h
+++ b/base/inc/TUrl.h
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name$:$Id$
+// @(#)root/net:$Name: $:$Id: TUrl.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 17/01/97
/*************************************************************************
@@ -58,7 +58,7 @@ public:
const char *GetOptions() const { return fOptions.Data(); }
Int_t GetPort() const { return fPort; }
Bool_t IsValid() const { return fPort == -1 ? kFALSE : kTRUE; }
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
ClassDef(TUrl,1) //Represents an URL
};
diff --git a/base/inc/TVirtualFitter.h b/base/inc/TVirtualFitter.h
index ad5d75cebdd9235b1efa79c2e8d4917c90e863cc..d79ef9a90556c56800b1314ef0fcb9213ba09dd2 100644
--- a/base/inc/TVirtualFitter.h
+++ b/base/inc/TVirtualFitter.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TVirtualFitter.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 31/08/99
/*************************************************************************
@@ -42,11 +42,11 @@ public:
virtual Int_t ExecuteCommand(const char *command, Double_t *args, Int_t nargs) = 0;
virtual void FixParameter(Int_t ipar) = 0;
virtual Int_t GetErrors(Int_t ipar,Double_t &eplus, Double_t &eminus, Double_t &eparab, Double_t &globcc) = 0;
- virtual TObject *GetObjectFit() = 0;
+ virtual TObject *GetObjectFit() const = 0;
virtual Int_t GetParameter(Int_t ipar,char *name,Double_t &value,Double_t &verr,Double_t &vlow, Double_t &vhigh) = 0;
virtual Int_t GetStats(Double_t &amin, Double_t &edm, Double_t &errdef, Int_t &nvpar, Int_t &nparx) = 0;
virtual Double_t GetSumLog(Int_t i) = 0;
- virtual void PrintResults(Int_t level, Double_t amin) = 0;
+ virtual void PrintResults(Int_t level, Double_t amin) const = 0;
virtual void ReleaseParameter(Int_t ipar) = 0;
virtual void SetFCN(void *fcn) = 0;
virtual void SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Double_t *, Int_t)) = 0;
diff --git a/base/inc/TVirtualPad.h b/base/inc/TVirtualPad.h
index 08e891364ecfd01718eed17f94c5de226093afd3..3c5ba4a399a797e48199c711cf95bdff90ec3138 100644
--- a/base/inc/TVirtualPad.h
+++ b/base/inc/TVirtualPad.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TVirtualPad.h,v 1.5 2000/10/26 15:30:32 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TVirtualPad.h,v 1.6 2000/11/21 16:24:07 brun Exp $
// Author: Rene Brun 05/12/95
/*************************************************************************
@@ -78,17 +78,17 @@ public:
virtual void DeleteExec(const char *name) = 0;
virtual void Divide(Int_t nx=1, Int_t ny=1, Float_t xmargin=0.01, Float_t ymargin=0.01, Int_t color=0) = 0;
virtual void Draw(Option_t *option="") = 0;
- virtual void DrawClassObject(TObject *obj, Option_t *option="") = 0;
+ virtual void DrawClassObject(const TObject *obj, Option_t *option="") = 0;
virtual TH1F *DrawFrame(Double_t xmin, Double_t ymin, Double_t xmax, Double_t ymax, const char *title="") = 0;
virtual void DrawLine(Double_t x1, Double_t y1, Double_t x2, Double_t y2) = 0;
virtual void DrawLineNDC(Double_t u1, Double_t v1, Double_t u2, Double_t v2) = 0;
virtual void DrawText(Double_t x, Double_t y, const char *text) = 0;
virtual void DrawTextNDC(Double_t u, Double_t v, const char *text) = 0;
- virtual Short_t GetBorderMode() = 0;
- virtual Short_t GetBorderSize() = 0;
+ virtual Short_t GetBorderMode() const = 0;
+ virtual Short_t GetBorderSize() const = 0;
virtual Int_t GetCanvasID() const = 0;
- virtual TCanvas *GetCanvas() = 0;
- virtual TVirtualPad *GetVirtCanvas() = 0;
+ virtual TCanvas *GetCanvas() const = 0;
+ virtual TVirtualPad *GetVirtCanvas() const = 0;
virtual Int_t GetEvent() const = 0;
virtual Int_t GetEventX() const = 0;
virtual Int_t GetEventY() const = 0;
@@ -97,55 +97,55 @@ public:
virtual void GetRange(Double_t &x1, Double_t &y1, Double_t &x2, Double_t &y2) = 0;
virtual void GetRangeAxis(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax) = 0;
virtual void GetPadPar(Double_t &xlow, Double_t &ylow, Double_t &xup, Double_t &yup) = 0;
- virtual Double_t GetXlowNDC() = 0;
- virtual Double_t GetYlowNDC() = 0;
- virtual Double_t GetWNDC() = 0;
- virtual Double_t GetHNDC() = 0;
- virtual UInt_t GetWw() = 0;
- virtual UInt_t GetWh() = 0;
- virtual Double_t GetAbsXlowNDC() = 0;
- virtual Double_t GetAbsYlowNDC() = 0;
- virtual Double_t GetAbsWNDC() = 0;
- virtual Double_t GetAbsHNDC() = 0;
- virtual Double_t GetPhi() = 0;
- virtual Double_t GetTheta() = 0;
- virtual Double_t GetUxmin() = 0;
- virtual Double_t GetUymin() = 0;
- virtual Double_t GetUxmax() = 0;
- virtual Double_t GetUymax() = 0;
- virtual Bool_t GetGridx() = 0;
- virtual Bool_t GetGridy() = 0;
- virtual Int_t GetTickx() = 0;
- virtual Int_t GetTicky() = 0;
+ virtual Double_t GetXlowNDC() const = 0;
+ virtual Double_t GetYlowNDC() const = 0;
+ virtual Double_t GetWNDC() const = 0;
+ virtual Double_t GetHNDC() const = 0;
+ virtual UInt_t GetWw() const = 0;
+ virtual UInt_t GetWh() const = 0;
+ virtual Double_t GetAbsXlowNDC() const = 0;
+ virtual Double_t GetAbsYlowNDC() const = 0;
+ virtual Double_t GetAbsWNDC() const = 0;
+ virtual Double_t GetAbsHNDC() const = 0;
+ virtual Double_t GetPhi() const = 0;
+ virtual Double_t GetTheta() const = 0;
+ virtual Double_t GetUxmin() const = 0;
+ virtual Double_t GetUymin() const = 0;
+ virtual Double_t GetUxmax() const = 0;
+ virtual Double_t GetUymax() const = 0;
+ virtual Bool_t GetGridx() const = 0;
+ virtual Bool_t GetGridy() const = 0;
+ virtual Int_t GetTickx() const = 0;
+ virtual Int_t GetTicky() const = 0;
virtual Double_t GetX1() const = 0;
virtual Double_t GetX2() const = 0;
virtual Double_t GetY1() const = 0;
virtual Double_t GetY2() const = 0;
- virtual TList *GetListOfPrimitives() = 0;
- virtual TList *GetListOfExecs() = 0;
- virtual TObject *GetPrimitive(const char *name) = 0;
- virtual TObject *GetSelected() = 0;
- virtual TObject *GetPadPointer() = 0;
+ virtual TList *GetListOfPrimitives() const = 0;
+ virtual TList *GetListOfExecs() const = 0;
+ virtual TObject *GetPrimitive(const char *name) const = 0;
+ virtual TObject *GetSelected() const = 0;
+ virtual TObject *GetPadPointer() const = 0;
virtual TVirtualPad *GetPadSave() const = 0;
virtual TVirtualPad *GetSelectedPad() const = 0;
- virtual TView *GetView() = 0;
- virtual Int_t GetLogx() = 0;
- virtual Int_t GetLogy() = 0;
- virtual Int_t GetLogz() = 0;
- virtual TVirtualPad *GetMother() = 0;
+ virtual TView *GetView() const = 0;
+ virtual Int_t GetLogx() const = 0;
+ virtual Int_t GetLogy() const = 0;
+ virtual Int_t GetLogz() const = 0;
+ virtual TVirtualPad *GetMother() const = 0;
virtual const char *GetName() const = 0;
virtual const char *GetTitle() const = 0;
- virtual Int_t GetPadPaint() = 0;
- virtual Int_t GetPixmapID() = 0;
- virtual TPadView3D *GetView3D() = 0;
+ virtual Int_t GetPadPaint() const = 0;
+ virtual Int_t GetPixmapID() const = 0;
+ virtual TPadView3D *GetView3D() const = 0;
virtual Bool_t HasCrosshair() const = 0;
virtual void HighLight(Color_t col=kRed, Bool_t set=kTRUE) = 0;
- virtual Bool_t IsBatch() = 0;
+ virtual Bool_t IsBatch() const = 0;
Bool_t IsBeingResized() const { return fResizing; }
- virtual Bool_t IsEditable() = 0;
- virtual Bool_t IsModified() = 0;
- virtual Bool_t IsRetained() = 0;
- virtual void ls(Option_t *option="") = 0;
+ virtual Bool_t IsEditable() const = 0;
+ virtual Bool_t IsModified() const = 0;
+ virtual Bool_t IsRetained() const = 0;
+ virtual void ls(Option_t *option="") const = 0;
virtual void Modified(Bool_t flag=1) = 0;
virtual Bool_t OpaqueMoving() const = 0;
virtual Bool_t OpaqueResizing() const = 0;
@@ -173,7 +173,7 @@ public:
virtual Double_t PixeltoX(Int_t px) = 0;
virtual Double_t PixeltoY(Int_t py) = 0;
virtual void Pop() = 0;
- virtual void Print(const char *filename="") = 0;
+ virtual void Print(const char *filename="") const = 0;
virtual void Print(const char *filename, Option_t *option) = 0;
virtual void Range(Double_t x1, Double_t y1, Double_t x2, Double_t y2) = 0;
virtual void RangeAxis(Double_t xmin, Double_t ymin, Double_t xmax, Double_t ymax) = 0;
diff --git a/base/src/TAttPad.cxx b/base/src/TAttPad.cxx
index 55e32e35c8d906f69607fe9da6055e4af6595619..2f094f6b3b81837a2fcf1130f3b0b8ef039470e3 100644
--- a/base/src/TAttPad.cxx
+++ b/base/src/TAttPad.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TAttPad.cxx,v 1.1.1.1 2000/05/16 17:00:38 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TAttPad.cxx,v 1.2 2000/11/21 16:26:48 brun Exp $
// Author: Rene Brun 04/01/95
/*************************************************************************
@@ -57,7 +57,7 @@ void TAttPad::Copy(TAttPad &attpad)
}
//______________________________________________________________________________
-void TAttPad::Print(Option_t *)
+void TAttPad::Print(Option_t *) const
{
}
diff --git a/base/src/TBenchmark.cxx b/base/src/TBenchmark.cxx
index 93f25b20656971b871c858f5692c2d2578481707..f7c52836439455b5f23ae61d19f366af11082dd8 100644
--- a/base/src/TBenchmark.cxx
+++ b/base/src/TBenchmark.cxx
@@ -54,7 +54,7 @@ TBenchmark::~TBenchmark()
}
//______________________________________________________________________________
-Int_t TBenchmark::GetBench(const char *name)
+Int_t TBenchmark::GetBench(const char *name) const
{
//*-*-*-*-*-*-*-*-*-*-*Returns index of Benchmark name*-*-*-*-*-*-*-*
//*-* ===============================
@@ -88,7 +88,7 @@ Float_t TBenchmark::GetRealTime(const char *name)
}
//______________________________________________________________________________
-void TBenchmark::Print(const char *name)
+void TBenchmark::Print(const char *name) const
{
//*-*-*-*-*-*-*-*-*-*-*Prints parameters of Benchmark name*-*-*-*-*-*-*-*-*-*
//*-* ===================================
diff --git a/base/src/TColor.cxx b/base/src/TColor.cxx
index e2af8382067658792127f992800906b8e413d039..753fef92c2d91e44b5d6b14c63f6e27a93dbeadf 100644
--- a/base/src/TColor.cxx
+++ b/base/src/TColor.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TColor.cxx,v 1.1.1.1 2000/05/16 17:00:38 rdm Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -156,7 +156,7 @@ Float_t TColor::HLStoRGB1(Float_t rn1, Float_t rn2, Float_t huei)
}
//______________________________________________________________________________
-void TColor::ls(Option_t *)
+void TColor::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this color with its attributes*-*-*-*-*-*-*-*-*
//*-* ===================================
@@ -164,7 +164,7 @@ void TColor::ls(Option_t *)
}
//______________________________________________________________________________
-void TColor::Print(Option_t *)
+void TColor::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this color with its attributes*-*-*-*-*-*-*-*-*-*
//*-* ===================================
diff --git a/base/src/TDatime.cxx b/base/src/TDatime.cxx
index 0c29a1f63a0396e4e1b3a5a5d12952dc7fdfce42..466fd5accce5c91ce15414ad4bc6b294df15029b 100644
--- a/base/src/TDatime.cxx
+++ b/base/src/TDatime.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TDatime.cxx,v 1.1.1.1 2000/05/16 17:00:38 rdm Exp $
// Author: Rene Brun 05/01/95
/*************************************************************************
@@ -166,7 +166,7 @@ void TDatime::FillBuffer(char *&buffer)
}
//______________________________________________________________________________
-Int_t TDatime::GetDate()
+Int_t TDatime::GetDate() const
{
// Return date in form of 19971224 (i.e. 24/12/1997)
@@ -177,7 +177,7 @@ Int_t TDatime::GetDate()
}
//______________________________________________________________________________
-Int_t TDatime::GetTime()
+Int_t TDatime::GetTime() const
{
// Return time in form of 123623 (i.e. 12:36:23)
@@ -188,7 +188,7 @@ Int_t TDatime::GetTime()
}
//______________________________________________________________________________
-void TDatime::Print(Option_t *)
+void TDatime::Print(Option_t *) const
{
// Print date and time.
diff --git a/base/src/TDirectory.cxx b/base/src/TDirectory.cxx
index 1507c1ee3ddb99675d0dd22e56aa80fd965bb6d6..81ea15079f7da809e1e221909d051cd37cf3964d 100644
--- a/base/src/TDirectory.cxx
+++ b/base/src/TDirectory.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TDirectory.cxx,v 1.9 2000/11/27 10:43:37 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TDirectory.cxx,v 1.10 2000/11/27 12:04:01 brun Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -678,7 +678,7 @@ void TDirectory::FillBuffer(char *&buffer)
}
//______________________________________________________________________________
-TObject *TDirectory::FindObject(TObject *obj) const
+TObject *TDirectory::FindObject(const TObject *obj) const
{
// Find object in the list of memory objects.
@@ -842,7 +842,7 @@ TDirectory *TDirectory::mkdir(const char *name, const char *title)
}
//______________________________________________________________________________
-void TDirectory::ls(Option_t *option)
+void TDirectory::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List Directory contents*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =======================
@@ -911,7 +911,7 @@ void TDirectory::Paint(Option_t *option)
}
//______________________________________________________________________________
-void TDirectory::Print(Option_t *option)
+void TDirectory::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*Print all objects in the directory *-*-*-*-*-*-*-*
//*-* ==================================
diff --git a/base/src/TEnv.cxx b/base/src/TEnv.cxx
index 3604f289ee55f78d8d6a39ccf8c578f6137bf9bd..f3ad1ccf5e6928526e3a9479d18682709d86e28f 100644
--- a/base/src/TEnv.cxx
+++ b/base/src/TEnv.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TEnv.cxx,v 1.1.1.1 2000/05/16 17:00:38 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TEnv.cxx,v 1.2 2000/06/16 17:08:11 rdm Exp $
// Author: Fons Rademakers 22/09/95
/*************************************************************************
@@ -357,7 +357,7 @@ void TEnvRec::ChangeValue(const TString &v, const char *, EEnvLevel l)
}
//______________________________________________________________________________
-Int_t TEnvRec::Compare(TObject *op)
+Int_t TEnvRec::Compare(const TObject *op) const
{
// Comparison function for resources.
@@ -592,7 +592,7 @@ TEnvRec *TEnv::Lookup(const char *name)
}
//______________________________________________________________________________
-void TEnv::Print(Option_t *opt)
+void TEnv::Print(Option_t *opt) const
{
// Print all resources or the global, user or local resources separately.
@@ -610,7 +610,7 @@ void TEnv::Print(Option_t *opt)
}
//______________________________________________________________________________
-void TEnv::PrintEnv(EEnvLevel level)
+void TEnv::PrintEnv(EEnvLevel level) const
{
// Print all resources for a certain level (global, user, local).
diff --git a/base/src/TFile.cxx b/base/src/TFile.cxx
index fa7cef2430f3ed9cde0fabec2e54d1fe0ddd8c3f..95808db90250bf32123499359106c46c059caf46 100644
--- a/base/src/TFile.cxx
+++ b/base/src/TFile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.15 2000/12/04 16:48:08 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.16 2000/12/04 17:16:35 brun Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -557,7 +557,7 @@ void TFile::FillBuffer(char *&buffer)
}
//______________________________________________________________________________
-Int_t TFile::GetBestBuffer()
+Int_t TFile::GetBestBuffer() const
{
//*-*-*-*-*-*-*-*Return the best buffer size of objects on this file*-*-*-*-*-*
//*-* ===================================================
@@ -665,7 +665,7 @@ Int_t TFile::GetRecordHeader(char *buf, Seek_t first, Int_t maxbytes, Int_t &nby
}
//______________________________________________________________________________
-void TFile::ls(Option_t *option)
+void TFile::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List File contents*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==================
@@ -805,7 +805,7 @@ void TFile::Paint(Option_t *option)
}
//______________________________________________________________________________
-void TFile::Print(Option_t *option)
+void TFile::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*Print all objects in the file*-*-*-*-*-*-*-*-*-*-*
//*-* =============================
diff --git a/base/src/TFolder.cxx b/base/src/TFolder.cxx
index 0b9146e25a3a72e12eb8c84de42036a8c732a5ed..5f13772ffa52d605c4a8660dd849b312764c10c1 100644
--- a/base/src/TFolder.cxx
+++ b/base/src/TFolder.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFolder.cxx,v 1.7 2000/09/14 19:53:45 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFolder.cxx,v 1.8 2000/10/22 19:24:44 rdm Exp $
// Author: Rene Brun 02/09/2000
/*************************************************************************
@@ -222,7 +222,7 @@ const char *TFolder::FindFullPathName(const char *name) const
//______________________________________________________________________________
-const char *TFolder::FindFullPathName(TObject *obj) const
+const char *TFolder::FindFullPathName(const TObject *obj) const
{
// return the full pathname corresponding to subpath name
// The returned path will be re-used by the next call to GetPath().
@@ -232,7 +232,7 @@ const char *TFolder::FindFullPathName(TObject *obj) const
}
//______________________________________________________________________________
-TObject *TFolder::FindObject(TObject *) const
+TObject *TFolder::FindObject(const TObject *) const
{
// find object in an folder
@@ -305,7 +305,7 @@ TObject *TFolder::FindObjectAny(const char *name) const
}
//______________________________________________________________________________
-void TFolder::ls(Option_t *option)
+void TFolder::ls(Option_t *option) const
{
// List folder contents
// if option contains "dump", the Dump function of contained objects is called
diff --git a/base/src/TInetAddress.cxx b/base/src/TInetAddress.cxx
index 783619f943b295ecef9726699a7526d8c7404130..f10dbe0453a2adf411173c56ffaf3396a277bc31 100644
--- a/base/src/TInetAddress.cxx
+++ b/base/src/TInetAddress.cxx
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name$:$Id$
+// @(#)root/net:$Name: $:$Id: TInetAddress.cxx,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 16/12/96
/*************************************************************************
@@ -104,7 +104,7 @@ const char *TInetAddress::GetHostAddress() const
}
//______________________________________________________________________________
-void TInetAddress::Print(Option_t *)
+void TInetAddress::Print(Option_t *) const
{
// Print internet address as string.
diff --git a/base/src/TKey.cxx b/base/src/TKey.cxx
index 34edc2dd565942095a19b42d345d77541704cd11..c977ffe5ce848a8cdc78a47543c9e9ad2ee7d8d4 100644
--- a/base/src/TKey.cxx
+++ b/base/src/TKey.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TKey.cxx,v 1.6 2000/09/12 06:43:53 brun Exp $
+// @(#)root/base:$Name: $:$Id: TKey.cxx,v 1.7 2000/11/21 16:33:56 brun Exp $
// Author: Rene Brun 28/12/94
/*************************************************************************
@@ -309,7 +309,7 @@ void TKey::DeleteBuffer()
}
//______________________________________________________________________________
-Short_t TKey::GetCycle()
+Short_t TKey::GetCycle() const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*Return cycle number associated to this key*-*-*-*
//*-* ==========================================
@@ -317,7 +317,7 @@ Short_t TKey::GetCycle()
}
//______________________________________________________________________________
-Short_t TKey::GetKeep()
+Short_t TKey::GetKeep() const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*Returns the "KEEP" status*-*-*-*-*-*-*-*-*-*-*-*
//*-* =========================
@@ -372,7 +372,7 @@ void TKey::Keep()
}
//______________________________________________________________________________
-void TKey::ls(Option_t *)
+void TKey::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*List Key contents-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =================
@@ -381,7 +381,7 @@ void TKey::ls(Option_t *)
}
//______________________________________________________________________________
-void TKey::Print(Option_t *)
+void TKey::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*Print key contents*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==================
diff --git a/base/src/TMapFile.cxx b/base/src/TMapFile.cxx
index 9aee71ab5ed81951a091231bdf873f6d958ca07f..b0472a5987d8eb194fccca979c4412a9edbdc953 100644
--- a/base/src/TMapFile.cxx
+++ b/base/src/TMapFile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TMapFile.cxx,v 1.4 2000/09/05 09:21:22 brun Exp $
+// @(#)root/base:$Name: $:$Id: TMapFile.cxx,v 1.5 2000/09/13 07:03:00 brun Exp $
// Author: Fons Rademakers 08/07/97
/*************************************************************************
@@ -125,11 +125,11 @@ void *gMmallocDesc = 0;
//______________________________________________________________________________
-TMapRec::TMapRec(const char *name, TObject *obj, Int_t size, void *buf)
+TMapRec::TMapRec(const char *name, const TObject *obj, Int_t size, void *buf)
{
fName = StrDup(name);
fClassName = 0;
- fObject = obj;
+ fObject = (TObject*)obj;
fBuffer = buf;
fBufSize = size;
fNext = 0;
@@ -514,7 +514,7 @@ void TMapFile::InitDirectory()
}
//______________________________________________________________________________
-void TMapFile::Add(TObject *obj, const char *name)
+void TMapFile::Add(const TObject *obj, const char *name)
{
// Add an object to the list of objects to be stored in shared memory.
// To place the object actually into shared memory call Update().
@@ -924,7 +924,7 @@ TMapFile *TMapFile::FindShadowMapFile()
}
//______________________________________________________________________________
-void TMapFile::Print(Option_t *)
+void TMapFile::Print(Option_t *) const
{
// Print some info about the mapped file.
@@ -987,13 +987,13 @@ Bool_t TMapFile::cd(const char *path)
}
//______________________________________________________________________________
-void TMapFile::ls(Option_t *)
+void TMapFile::ls(Option_t *) const
{
// List contents of TMapFile.
if (fMmallocDesc) {
- AcquireSemaphore();
+ ((TMapFile*)this)->AcquireSemaphore();
Printf("%-20s %-20s %-10s", "Object", "Class", "Size");
if (!fFirst)
@@ -1006,7 +1006,7 @@ void TMapFile::ls(Option_t *)
mr = mr->GetNext(fOffset);
}
- ReleaseSemaphore();
+ ((TMapFile*)this)->ReleaseSemaphore();
}
}
diff --git a/base/src/TMessageHandler.cxx b/base/src/TMessageHandler.cxx
index 647fc5e0ef638836a493077321ba8c2c604ae964..88617789fe05b4a8631f228f56606693d8544163 100644
--- a/base/src/TMessageHandler.cxx
+++ b/base/src/TMessageHandler.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TMessageHandler.cxx,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Rene Brun 11/11/99
/*************************************************************************
@@ -36,7 +36,7 @@
ClassImp(TMessageHandler)
//______________________________________________________________________________
-TMessageHandler::TMessageHandler(TClass *cl, Bool_t derived)
+TMessageHandler::TMessageHandler(const TClass *cl, Bool_t derived)
{
// Create a new message handler for class cl and add it to the list
// of message handlers.
@@ -120,7 +120,7 @@ Int_t TMessageHandler::GetTotalMessageCount() const
}
//______________________________________________________________________________
-void TMessageHandler::HandleMessage(Int_t id, TObject *obj)
+void TMessageHandler::HandleMessage(Int_t id, const TObject *obj)
{
// Store message origin, keep statistics and call Notify().
@@ -186,14 +186,14 @@ Bool_t TMessageHandler::Notify()
}
//______________________________________________________________________________
-void TMessageHandler::Print(Option_t *option)
+void TMessageHandler::Print(Option_t *option) const
{
// Print statistics for this message handler.
printf("\n ****** Message Handler: %s has a total of %d messages\n",GetName(),GetTotalMessageCount());
if (fSize <= 0) return;
Int_t id, uid;
- TClass *cl;
+ const TClass *cl;
TIter next(gROOT->GetListOfClasses());
for (Int_t i=0;i<fSize;i++) {
id = fMessIds[i];
diff --git a/base/src/TNamed.cxx b/base/src/TNamed.cxx
index 72834181eb24c07af3abbd563a89f2a922d1c79e..5d5892fa7afd9bdc9af93e80010fffd68a5c773f 100644
--- a/base/src/TNamed.cxx
+++ b/base/src/TNamed.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TNamed.cxx,v 1.2 2000/09/05 09:21:22 brun Exp $
+// @(#)root/base:$Name: $:$Id: TNamed.cxx,v 1.3 2000/09/08 07:41:00 brun Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -57,7 +57,7 @@ TNamed& TNamed::operator=(const TNamed& rhs)
}
//______________________________________________________________________________
-Int_t TNamed::Compare(TObject *obj)
+Int_t TNamed::Compare(const TObject *obj) const
{
// Compare two TNamed objects. Returns 0 when equal, -1 when this is
// smaller and +1 when bigger (like strcmp).
@@ -86,7 +86,7 @@ void TNamed::FillBuffer(char *&buffer)
}
//______________________________________________________________________________
-void TNamed::ls(Option_t *)
+void TNamed::ls(Option_t *) const
{
// List TNamed name and title.
@@ -96,7 +96,7 @@ void TNamed::ls(Option_t *)
}
//______________________________________________________________________________
-void TNamed::Print(Option_t *)
+void TNamed::Print(Option_t *) const
{
// Print TNamed name and title.
diff --git a/base/src/TObjPtr.cxx b/base/src/TObjPtr.cxx
index ea366eb65c1a9eab51bb92b749b16b457a9cb963..2fe1c0e98e6517161e9b82c9f715d15e30630be1 100644
--- a/base/src/TObjPtr.cxx
+++ b/base/src/TObjPtr.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TObjPtr.cxx,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Fons Rademakers 04/05/96
/*************************************************************************
@@ -22,7 +22,7 @@
//ClassImp(TObjPtr)
-Int_t TObjPtr::Compare(TObject *obj)
+Int_t TObjPtr::Compare(const TObject *obj) const
{
if (fPtr == obj)
return 0;
diff --git a/base/src/TObjString.cxx b/base/src/TObjString.cxx
index 2ff40d76ebf563cc6b99d489257c72b98f036dc2..1d03c6c582f795d9ef15f49f8a8784cef05432b8 100644
--- a/base/src/TObjString.cxx
+++ b/base/src/TObjString.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name$:$Id$
+// @(#)root/base:$Name: $:$Id: TObjString.cxx,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
// Author: Fons Rademakers 12/11/95
/*************************************************************************
@@ -22,7 +22,7 @@
ClassImp(TObjString)
//______________________________________________________________________________
-Int_t TObjString::Compare(TObject *obj)
+Int_t TObjString::Compare(const TObject *obj) const
{
if (this == obj) return 0;
if (TObjString::Class() != obj->IsA()) return -1;
@@ -30,7 +30,7 @@ Int_t TObjString::Compare(TObject *obj)
}
//______________________________________________________________________________
-Bool_t TObjString::IsEqual(TObject *obj)
+Bool_t TObjString::IsEqual(const TObject *obj) const
{
if (this == obj) return kTRUE;
if (TObjString::Class() != obj->IsA()) return kFALSE;
diff --git a/base/src/TObject.cxx b/base/src/TObject.cxx
index 492964a5ef3b7bdaade2c8555fb672b353c13831..7f74de89651c94d3bde5e45a61244e4c8a68c578 100644
--- a/base/src/TObject.cxx
+++ b/base/src/TObject.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TObject.cxx,v 1.11 2000/10/19 12:45:51 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TObject.cxx,v 1.12 2000/11/21 16:35:47 brun Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -268,10 +268,10 @@ const char *TObject::ClassName() const
}
//______________________________________________________________________________
-TObject *TObject::Clone()
+TObject *TObject::Clone() const
{
// Make a clone of an object using the Streamer facility.
-
+
//create a buffer where the object will be streamed
TFile *filsav = gFile;
gFile = 0;
@@ -291,7 +291,7 @@ TObject *TObject::Clone()
}
//______________________________________________________________________________
-Int_t TObject::Compare(TObject *)
+Int_t TObject::Compare(const TObject *) const
{
// Compare abstract method. Must be overridden if a class wants to be able
// to compare itself with other objects. Must return -1 if this is smaller
@@ -337,7 +337,7 @@ void TObject::Draw(Option_t *option)
}
//______________________________________________________________________________
-void TObject::DrawClass()
+void TObject::DrawClass() const
{
// Draw class inheritance tree of the class to which this object belongs.
// If a class B inherits from a class A, description of B is drawn
@@ -355,7 +355,7 @@ void TObject::DrawClass()
}
//______________________________________________________________________________
-void TObject::DrawClone(Option_t *option)
+void TObject::DrawClone(Option_t *option) const
{
// Draw a clone of this object in the current pad
@@ -374,7 +374,7 @@ void TObject::DrawClone(Option_t *option)
}
//______________________________________________________________________________
-void TObject::Dump()
+void TObject::Dump() const
{
// Dump contents of object on stdout.
// Using the information in the object dictionary (class TClass)
@@ -400,7 +400,7 @@ void TObject::Dump()
char parent[256];
parent[0] = 0;
TDumpMembers dm;
- ShowMembers(dm, parent);
+ ((TObject*)this)->ShowMembers(dm, parent);
}
//______________________________________________________________________________
@@ -452,7 +452,7 @@ TObject *TObject::FindObject(const char *) const
}
//______________________________________________________________________________
-TObject *TObject::FindObject(TObject *) const
+TObject *TObject::FindObject(const TObject *) const
{
// must be redefined in derived classes
// this function is typycally used with TCollections, but can also be used
@@ -504,7 +504,7 @@ UInt_t TObject::GetUniqueID() const
}
//______________________________________________________________________________
-char *TObject::GetObjectInfo(Int_t px, Int_t py)
+char *TObject::GetObjectInfo(Int_t px, Int_t py) const
{
// Returns string containing info about the object at position (px,py).
// This method is typically overridden by classes of which the objects
@@ -540,7 +540,7 @@ Bool_t TObject::HandleTimer(TTimer *)
}
//______________________________________________________________________________
-ULong_t TObject::Hash()
+ULong_t TObject::Hash() const
{
// Return hash value for this object.
@@ -566,7 +566,7 @@ Bool_t TObject::InheritsFrom(const TClass *cl) const
}
//______________________________________________________________________________
-void TObject::Inspect()
+void TObject::Inspect() const
{
// Dump contents of this object in a graphics canvas.
// Same action as Dump but in a graphical form.
@@ -596,7 +596,7 @@ Bool_t TObject::IsFolder() const
}
//______________________________________________________________________________
-Bool_t TObject::IsEqual(TObject *obj)
+Bool_t TObject::IsEqual(const TObject *obj) const
{
// Default equal comparison (objects are equal if they have the same
// address in memory). More complicated classes might want to override
@@ -606,7 +606,7 @@ Bool_t TObject::IsEqual(TObject *obj)
}
//______________________________________________________________________________
-void TObject::ls(Option_t *)
+void TObject::ls(Option_t *) const
{
// The ls function lists the contents of a class on stdout. Ls output
// is typically much less verbose then Dump().
@@ -638,7 +638,7 @@ void TObject::Paint(Option_t *)
}
//______________________________________________________________________________
-void TObject::Pop()
+void TObject::Pop()
{
// Pop on object drawn in a pad to the top of the display list. I.e. it
// will be drawn last and on top of all other primitives.
@@ -652,7 +652,7 @@ void TObject::Pop()
while ((obj = next()))
if (obj == this) {
char *opt = StrDup(next.GetOption());
- gPad->GetListOfPrimitives()->Remove(this);
+ gPad->GetListOfPrimitives()->Remove((TObject*)this);
gPad->GetListOfPrimitives()->AddLast(this, opt);
gPad->Modified();
delete [] opt;
@@ -661,7 +661,7 @@ void TObject::Pop()
}
//______________________________________________________________________________
-void TObject::Print(Option_t *)
+void TObject::Print(Option_t *) const
{
// This method must be overridden when a class wants to print itself.
diff --git a/base/src/TQConnection.cxx b/base/src/TQConnection.cxx
index 64c7ceaab0d70146c5552ba201d4be520e4bab56..7f35739c6ad1b712fde24f45a0cebc77ba7cf842 100644
--- a/base/src/TQConnection.cxx
+++ b/base/src/TQConnection.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TQConnection.cxx,v 1.1 2000/10/17 12:19:19 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TQConnection.cxx,v 1.2 2000/10/22 19:21:29 rdm Exp $
// Author: Valeriy Onuchin & Fons Rademakers 15/10/2000
/*************************************************************************
@@ -360,17 +360,17 @@ void TQConnection::Destroyed()
}
//______________________________________________________________________________
-void TQConnection::ls(Option_t *option)
+void TQConnection::ls(Option_t *option) const
{
// List TQConnection full method name and list all signals
// connected to this connection.
cout << "\t" << IsA()->GetName() << "\t" << GetName() << endl;
- this->ForEach(TList,ls)(option);
+ ((TQConnection*)this)->ForEach(TList,ls)(option);
}
//______________________________________________________________________________
-void TQConnection::Print(Option_t *option)
+void TQConnection::Print(Option_t *option) const
{
// Print TQConnection full method name and print all
// signals connected to this connection.
diff --git a/base/src/TROOT.cxx b/base/src/TROOT.cxx
index 43954bb6167203267aeb70da3bb92a155d258a48..bc248b6bd39ce42132a26a1bbd9d9a1ff5f32c0c 100644
--- a/base/src/TROOT.cxx
+++ b/base/src/TROOT.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TROOT.cxx,v 1.19 2000/11/21 16:37:05 brun Exp $
+// @(#)root/base:$Name: $:$Id: TROOT.cxx,v 1.20 2000/12/02 15:47:42 rdm Exp $
// Author: Rene Brun 08/12/94
/*************************************************************************
@@ -439,7 +439,7 @@ Bool_t TROOT::ClassSaved(TClass *cl)
}
//______________________________________________________________________________
-TObject *TROOT::FindObject(TObject *) const
+TObject *TROOT::FindObject(const TObject *) const
{
// Find an object in one Root folder
@@ -611,7 +611,7 @@ const char *TROOT::FindObjectClassName(const char *name) const
}
//______________________________________________________________________________
-const char *TROOT::FindObjectPathName(TObject *obj) const
+const char *TROOT::FindObjectPathName(const TObject *obj) const
{
// Return path name of obj somewhere in the //root/.. path
// The function returns the first occurence of the object in the list of folders
@@ -624,7 +624,7 @@ const char *TROOT::FindObjectPathName(TObject *obj) const
}
//______________________________________________________________________________
-TClass *TROOT::GetClass(const char *name, Bool_t load)
+TClass *TROOT::GetClass(const char *name, Bool_t load) const
{
//*-*-*-*-*Return pointer to class with name*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =================================
@@ -654,7 +654,7 @@ TClass *TROOT::GetClass(const char *name, Bool_t load)
}
//______________________________________________________________________________
-TColor *TROOT::GetColor(Int_t color)
+TColor *TROOT::GetColor(Int_t color) const
{
//*-*-*-*-*-*-*-*Return address of color with index color*-*-*-*-*-*-*-*-*
//*-* ========================================
@@ -668,7 +668,7 @@ TColor *TROOT::GetColor(Int_t color)
}
//______________________________________________________________________________
-VoidFuncPtr_t TROOT::GetMakeDefCanvas()
+VoidFuncPtr_t TROOT::GetMakeDefCanvas() const
{
//*-*-*-*-*-*-*-*Return default canvas function*-*-*-*-*-*-*-*-*
//*-* ==============================
@@ -706,7 +706,7 @@ TDataType *TROOT::GetType(const char *name, Bool_t load)
}
//______________________________________________________________________________
-TFile *TROOT::GetFile(const char *name)
+TFile *TROOT::GetFile(const char *name) const
{
//*-*-*-*-*Return pointer to file with name*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ================================
@@ -715,7 +715,7 @@ TFile *TROOT::GetFile(const char *name)
}
//______________________________________________________________________________
-TStyle *TROOT::GetStyle(const char *name)
+TStyle *TROOT::GetStyle(const char *name) const
{
//*-*-*-*-*Return pointer to style with name*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =================================
@@ -724,7 +724,7 @@ TStyle *TROOT::GetStyle(const char *name)
}
//______________________________________________________________________________
-TObject *TROOT::GetFunction(const char *name)
+TObject *TROOT::GetFunction(const char *name) const
{
//*-*-*-*-*Return pointer to function with name*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ===================================
@@ -733,7 +733,7 @@ TObject *TROOT::GetFunction(const char *name)
if (f1) return f1;
if (!TClassTable::GetDict("TF1")) return 0;
- ProcessLineFast("TF1::InitStandardFunctions();");
+ ((TROOT*)this)->ProcessLineFast("TF1::InitStandardFunctions();");
return fFunctions->FindObject(name);
}
@@ -748,7 +748,7 @@ TGlobal *TROOT::GetGlobal(const char *name, Bool_t load)
}
//______________________________________________________________________________
-TGlobal *TROOT::GetGlobal(TObject *addr, Bool_t load)
+TGlobal *TROOT::GetGlobal(const TObject *addr, Bool_t load)
{
// Return pointer to global variable with address addr. If load is true
// force reading of all currently defined globals from CINT (more
@@ -833,7 +833,7 @@ TFunction *TROOT::GetGlobalFunctionWithPrototype(const char *function,
}
//______________________________________________________________________________
-TObject *TROOT::GetGeometry(const char *name)
+TObject *TROOT::GetGeometry(const char *name) const
{
//*-*-*-*-*Return pointer to Geometry with name*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ===================================
@@ -1064,7 +1064,7 @@ Int_t TROOT::LoadClass(const char *classname, const char *libname)
}
//______________________________________________________________________________
-void TROOT::ls(Option_t *option)
+void TROOT::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*To list all objects of the application*-*-*-*-*-*
//*-* ======================================
@@ -1121,7 +1121,7 @@ Int_t TROOT::Macro(const char *filename)
}
//______________________________________________________________________________
-void TROOT::Message(Int_t id, TObject *obj)
+void TROOT::Message(Int_t id, const TObject *obj)
{
// Process message id called by obj
diff --git a/base/src/TStopwatch.cxx b/base/src/TStopwatch.cxx
index 4bde3875bb407fcd50e98fb1b346d01eb5a3e131..ec97c88d786c7b004bcb582e14e3cb534b15e9e2 100644
--- a/base/src/TStopwatch.cxx
+++ b/base/src/TStopwatch.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TStopwatch.cxx,v 1.2 2000/06/22 14:34:08 brun Exp $
+// @(#)root/base:$Name: $:$Id: TStopwatch.cxx,v 1.3 2000/06/22 14:37:24 brun Exp $
// Author: Fons Rademakers 11/10/95
/*************************************************************************
@@ -233,13 +233,13 @@ Double_t TStopwatch::GetCPUTime(){
}
//______________________________________________________________________________
-void TStopwatch::Print(Option_t *)
+void TStopwatch::Print(Option_t *) const
{
// Print the real and cpu time passed between the start and stop events.
// and the number of times (slices) this TStopwatch was called
// (if this number > 1)
- Double_t realt = RealTime();
+ Double_t realt = ((TStopwatch*)this)->RealTime();
Int_t hours = Int_t(realt / 3600);
realt -= hours * 3600;
@@ -248,8 +248,8 @@ void TStopwatch::Print(Option_t *)
Int_t sec = Int_t(realt);
Int_t counter = Counter();
if (counter <= 1 )
- Printf("Real time %d:%d:%d, CP time %.3f", hours, min, sec, CpuTime());
+ Printf("Real time %d:%d:%d, CP time %.3f", hours, min, sec, ((TStopwatch*)this)->CpuTime());
else
- Printf("Real time %d:%d:%d, CP time %.3f, %d slices", hours, min, sec, CpuTime(),counter);
+ Printf("Real time %d:%d:%d, CP time %.3f, %d slices", hours, min, sec, ((TStopwatch*)this)->CpuTime(),counter);
}
diff --git a/base/src/TStyle.cxx b/base/src/TStyle.cxx
index 3d26de92bb8006f6e63cf6f9c400e350bd1109e0..3a19ea1ff942194433a48ea475553e56c9f8e6c1 100644
--- a/base/src/TStyle.cxx
+++ b/base/src/TStyle.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TStyle.cxx,v 1.3 2000/10/13 06:55:30 brun Exp $
+// @(#)root/base:$Name: $:$Id: TStyle.cxx,v 1.4 2000/10/19 20:09:42 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -401,7 +401,7 @@ void TStyle::Reset(Option_t *)
}
//______________________________________________________________________________
-Int_t TStyle::AxisChoice( Option_t *axis)
+Int_t TStyle::AxisChoice( Option_t *axis) const
{
char achoice = toupper(axis[0]);
if (achoice == 'Y') return 2;
@@ -410,7 +410,7 @@ Int_t TStyle::AxisChoice( Option_t *axis)
}
//______________________________________________________________________________
-Int_t TStyle::GetNdivisions( Option_t *axis)
+Int_t TStyle::GetNdivisions( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetNdivisions();
@@ -420,7 +420,7 @@ Int_t TStyle::GetNdivisions( Option_t *axis)
}
//______________________________________________________________________________
-Color_t TStyle::GetAxisColor( Option_t *axis)
+Color_t TStyle::GetAxisColor( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetAxisColor();
@@ -430,7 +430,7 @@ Color_t TStyle::GetAxisColor( Option_t *axis)
}
//______________________________________________________________________________
-Int_t TStyle::GetColorPalette(Int_t i)
+Int_t TStyle::GetColorPalette(Int_t i) const
// return color number i in current palette
{
Int_t ncolors = GetNumberOfColors();
@@ -441,7 +441,7 @@ Int_t TStyle::GetColorPalette(Int_t i)
}
//______________________________________________________________________________
-Color_t TStyle::GetLabelColor( Option_t *axis)
+Color_t TStyle::GetLabelColor( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelColor();
@@ -451,7 +451,7 @@ Color_t TStyle::GetLabelColor( Option_t *axis)
}
//______________________________________________________________________________
-Style_t TStyle::GetLabelFont( Option_t *axis)
+Style_t TStyle::GetLabelFont( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelFont();
@@ -461,7 +461,7 @@ Style_t TStyle::GetLabelFont( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TStyle::GetLabelOffset( Option_t *axis)
+Float_t TStyle::GetLabelOffset( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelOffset();
@@ -471,7 +471,7 @@ Float_t TStyle::GetLabelOffset( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TStyle::GetLabelSize( Option_t *axis)
+Float_t TStyle::GetLabelSize( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelSize();
@@ -501,7 +501,7 @@ void TStyle::GetPaperSize(Float_t &xsize, Float_t &ysize)
}
//______________________________________________________________________________
-Float_t TStyle::GetTickLength( Option_t *axis)
+Float_t TStyle::GetTickLength( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetTickLength();
@@ -511,7 +511,7 @@ Float_t TStyle::GetTickLength( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TStyle::GetTitleOffset( Option_t *axis)
+Float_t TStyle::GetTitleOffset( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetTitleOffset();
@@ -521,7 +521,7 @@ Float_t TStyle::GetTitleOffset( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TStyle::GetTitleSize( Option_t *axis)
+Float_t TStyle::GetTitleSize( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetTitleSize();
diff --git a/base/src/TTask.cxx b/base/src/TTask.cxx
index 191e159a1203afa76223ad57bb23e2417188f41a..3237aa5b6e53c4080176122e510bc6edd50716d5 100644
--- a/base/src/TTask.cxx
+++ b/base/src/TTask.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TTask.cxx,v 1.4 2000/09/06 09:29:20 brun Exp $
+// @(#)root/base:$Name: $:$Id: TTask.cxx,v 1.5 2000/09/06 14:20:10 rdm Exp $
// Author: Rene Brun 02/09/2000
/*************************************************************************
@@ -281,7 +281,7 @@ void TTask::ExecuteTasks(Option_t *option) {
}
//______________________________________________________________________________
-void TTask::ls(Option_t *option)
+void TTask::ls(Option_t *option) const
{
// list the tree of tasks
// Indentation is used to identify the task tree
diff --git a/base/src/TUrl.cxx b/base/src/TUrl.cxx
index d1629f1f84a583f52b28e22528f42de6ed9e3132..2850787c74539112875e37e7a4df4b1384078fb8 100644
--- a/base/src/TUrl.cxx
+++ b/base/src/TUrl.cxx
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name: $:$Id: TUrl.cxx,v 1.3 2000/07/29 11:04:37 rdm Exp $
+// @(#)root/net:$Name: $:$Id: TUrl.cxx,v 1.4 2000/12/02 15:51:07 rdm Exp $
// Author: Fons Rademakers 17/01/97
/*************************************************************************
@@ -262,12 +262,12 @@ const char *TUrl::GetUrl()
}
//______________________________________________________________________________
-void TUrl::Print(Option_t *)
+void TUrl::Print(Option_t *) const
{
// Print URL on stdout.
if (fPort == -1)
Printf("Illegal URL");
- Printf("%s", GetUrl());
+ Printf("%s", ((TUrl*)this)->GetUrl());
}
diff --git a/cont/inc/TBtree.h b/cont/inc/TBtree.h
index 4d27780aa020de375248cf4184a42b276b260d46..8411fbc043d1ba01894e76c3962a0790297e0320 100644
--- a/cont/inc/TBtree.h
+++ b/cont/inc/TBtree.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TBtree.h,v 1.1.1.1 2000/05/16 17:00:40 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: TBtree.h,v 1.2 2000/11/21 16:41:30 brun Exp $
// Author: Fons Rademakers 10/10/95
/*************************************************************************
@@ -79,7 +79,7 @@ public:
void Clear(Option_t *option="");
void Delete(Option_t *option="");
TObject *FindObject(const char *name) const;
- TObject *FindObject(TObject *obj) const;
+ TObject *FindObject(const TObject *obj) const;
TIterator *MakeIterator(Bool_t dir = kIterForward) const;
void Add(TObject *obj);
diff --git a/cont/inc/TCollection.h b/cont/inc/TCollection.h
index d6e7878f896d8d062b88984e3dd5ab25838a7aab..3fba8e9b87eb390a6df426a51ad468f4688dad5a 100644
--- a/cont/inc/TCollection.h
+++ b/cont/inc/TCollection.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TCollection.h,v 1.3 2000/09/05 09:21:22 brun Exp $
+// @(#)root/cont:$Name: $:$Id: TCollection.h,v 1.4 2000/09/08 16:11:02 rdm Exp $
// Author: Fons Rademakers 13/08/95
/*************************************************************************
@@ -74,17 +74,17 @@ public:
Int_t Capacity() const { return fSize; }
virtual void Clear(Option_t *option="") = 0;
Bool_t Contains(const char *name) const { return FindObject(name) != 0; }
- Bool_t Contains(TObject *obj) const { return FindObject(obj) != 0; }
+ Bool_t Contains(const TObject *obj) const { return FindObject(obj) != 0; }
virtual void Delete(Option_t *option="") = 0;
virtual void Draw(Option_t *option="");
virtual void Dump();
virtual TObject *FindObject(const char *name) const;
TObject *operator()(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
virtual const char *GetName() const { return fName.Data(); }
virtual Int_t GetSize() const { return fSize; }
virtual Int_t GrowBy(Int_t delta) const;
- Bool_t IsArgNull(const char *where, TObject *obj) const;
+ Bool_t IsArgNull(const char *where, const TObject *obj) const;
virtual Bool_t IsEmpty() const { return GetSize() <= 0; }
Bool_t IsFolder() const { return kTRUE; }
virtual void ls(Option_t *option="");
diff --git a/cont/inc/THashList.h b/cont/inc/THashList.h
index 9995fee4ee94629d2e0a71d3ba624ce3849d3a24..5078310286c19c3cb0b5d6e1f18d6e4b851ac826 100644
--- a/cont/inc/THashList.h
+++ b/cont/inc/THashList.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: THashList.h,v 1.2 2000/09/08 16:11:02 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: THashList.h,v 1.3 2000/09/08 16:41:25 rdm Exp $
// Author: Fons Rademakers 10/08/95
/*************************************************************************
@@ -47,7 +47,7 @@ public:
void Delete(Option_t *option="");
TObject *FindObject(const char *name) const;
- TObject *FindObject(TObject *obj) const;
+ TObject *FindObject(const TObject *obj) const;
void AddFirst(TObject *obj);
void AddFirst(TObject *obj, Option_t *opt);
diff --git a/cont/inc/THashTable.h b/cont/inc/THashTable.h
index 245c71ef469fe101dda43865fce2d84944b51e6c..2eb4043a864421d0f3b83f44ab3be2fee6d2ac44 100644
--- a/cont/inc/THashTable.h
+++ b/cont/inc/THashTable.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name$:$Id$
+// @(#)root/cont:$Name: $:$Id: THashTable.h,v 1.1.1.1 2000/05/16 17:00:40 rdm Exp $
// Author: Fons Rademakers 27/09/95
/*************************************************************************
@@ -46,7 +46,7 @@ private:
Int_t fUsedSlots; //Number of used slots
Int_t fRehashLevel; //Average collision rate which triggers rehash
- Int_t GetHashValue(TObject *obj) const;
+ Int_t GetHashValue(const TObject *obj) const;
Int_t GetHashValue(TString &s) { return s.Hash() % fSize; }
Int_t GetHashValue(const char *str) const
{ TString s = str; return s.Hash() % fSize; }
@@ -61,7 +61,7 @@ public:
Int_t Collisions(TObject *obj) const;
void Delete(Option_t *option="");
TObject *FindObject(const char *name) const;
- TObject *FindObject(TObject *obj) const;
+ TObject *FindObject(const TObject *obj) const;
Int_t GetSize() const { return fEntries; }
TIterator *MakeIterator(Bool_t dir = kIterForward) const;
void Rehash(Int_t newCapacity, Bool_t checkObjValidity = kTRUE);
@@ -78,7 +78,7 @@ inline Float_t THashTable::AverageCollisions() const
return 0.0;
}
-inline Int_t THashTable::GetHashValue(TObject *obj) const
+inline Int_t THashTable::GetHashValue(const TObject *obj) const
{
Int_t i = Int_t(obj->Hash() % fSize); // need intermediary i for Linux g++
return i;
diff --git a/cont/inc/TList.h b/cont/inc/TList.h
index 7872b7ac8e9bd2c5b69c2d123312cc7233a92a6c..f66cdde45675df077e41d385cd90a52641a8d23e 100644
--- a/cont/inc/TList.h
+++ b/cont/inc/TList.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TList.h,v 1.3 2000/09/08 16:41:25 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: TList.h,v 1.4 2000/11/21 16:43:22 brun Exp $
// Author: Fons Rademakers 10/08/95
/*************************************************************************
@@ -47,7 +47,7 @@ protected:
Bool_t fAscending; //! sorting order (when calling Sort() or for TSortedList)
TObjLink *LinkAt(Int_t idx) const;
- TObjLink *FindLink(TObject *obj, Int_t &idx) const;
+ TObjLink *FindLink(const TObject *obj, Int_t &idx) const;
TObjLink **DoSort(TObjLink **head, Int_t n);
Bool_t LnkCompare(TObjLink *l1, TObjLink *l2);
virtual TObjLink *NewLink(TObject *obj, TObjLink *prev = 0);
@@ -61,7 +61,7 @@ public:
virtual void Clear(Option_t *option="");
virtual void Delete(Option_t *option="");
virtual TObject *FindObject(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
virtual TIterator *MakeIterator(Bool_t dir = kIterForward) const;
virtual void Add(TObject *obj) { AddLast(obj); }
diff --git a/cont/inc/TMap.h b/cont/inc/TMap.h
index ab33e8b6515402c404a958229db655670b822215..7cf7014261ddd736cea78f0acb38cf5d221a9683 100644
--- a/cont/inc/TMap.h
+++ b/cont/inc/TMap.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TMap.h,v 1.2 2000/09/05 09:21:22 brun Exp $
+// @(#)root/cont:$Name: $:$Id: TMap.h,v 1.3 2000/09/08 16:11:02 rdm Exp $
// Author: Fons Rademakers 12/11/95
/*************************************************************************
@@ -55,7 +55,7 @@ public:
void Delete(Option_t *option="");
void DeleteAll();
TObject *FindObject(const char *keyname) const;
- TObject *FindObject(TObject *key) const;
+ TObject *FindObject(const TObject *key) const;
TObject *GetValue(TObject *key) const;
TIterator *MakeIterator(Bool_t dir = kIterForward) const;
void Rehash(Int_t newCapacity, Bool_t checkObjValidity = kTRUE);
diff --git a/cont/src/TBtree.cxx b/cont/src/TBtree.cxx
index 9b20232db1cbd674fc0a9a1968feeb544ab3ddd8..98895d72189f7b7de5d8ec1d685adf0f4d34fa76 100644
--- a/cont/src/TBtree.cxx
+++ b/cont/src/TBtree.cxx
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TBtree.cxx,v 1.2 2000/09/08 16:11:02 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: TBtree.cxx,v 1.3 2000/10/31 11:19:34 brun Exp $
// Author: Fons Rademakers 10/10/95
/*************************************************************************
@@ -285,7 +285,7 @@ TObject *TBtree::FindObject(const char *name) const
}
//______________________________________________________________________________
-TObject *TBtree::FindObject(TObject *obj) const
+TObject *TBtree::FindObject(const TObject *obj) const
{
// Find object using the objects Compare() member function.
diff --git a/cont/src/TCollection.cxx b/cont/src/TCollection.cxx
index 6e44bf2d7014616a8a6f42431074c8697fa459fa..dfb8c34bed78feb767bb24db5f635a1a77640355 100644
--- a/cont/src/TCollection.cxx
+++ b/cont/src/TCollection.cxx
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TCollection.cxx,v 1.7 2000/10/14 09:41:27 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: TCollection.cxx,v 1.8 2000/10/31 11:19:19 brun Exp $
// Author: Fons Rademakers 13/08/95
/*************************************************************************
@@ -157,7 +157,7 @@ TObject *TCollection::operator()(const char *name) const
}
//______________________________________________________________________________
-TObject *TCollection::FindObject(TObject *obj) const
+TObject *TCollection::FindObject(const TObject *obj) const
{
// Find an object in this collection using the object's IsEqual()
// member function. Requires a sequential scan till the object has
@@ -186,7 +186,7 @@ Int_t TCollection::GrowBy(Int_t delta) const
}
//______________________________________________________________________________
-Bool_t TCollection::IsArgNull(const char *where, TObject *obj) const
+Bool_t TCollection::IsArgNull(const char *where, const TObject *obj) const
{
// Returns true if object is a null pointer.
diff --git a/cont/src/THashList.cxx b/cont/src/THashList.cxx
index 3406482fc3e9fc6021def19bf9a5b69bde14d3b1..b647b2b0064187f84eb70cc77120914fbd83adbb 100644
--- a/cont/src/THashList.cxx
+++ b/cont/src/THashList.cxx
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: THashList.cxx,v 1.2 2000/09/08 16:11:03 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: THashList.cxx,v 1.3 2000/09/08 16:41:26 rdm Exp $
// Author: Fons Rademakers 10/08/95
/*************************************************************************
@@ -200,7 +200,7 @@ TObject *THashList::FindObject(const char *name) const
}
//______________________________________________________________________________
-TObject *THashList::FindObject(TObject *obj) const
+TObject *THashList::FindObject(const TObject *obj) const
{
// Find object using its hash value (returned by its Hash() member).
diff --git a/cont/src/THashTable.cxx b/cont/src/THashTable.cxx
index 91caa679355d9067e970060db7611763aae7a599..ff536a8eb95e378029b6dd6d8444283efaa78d07 100644
--- a/cont/src/THashTable.cxx
+++ b/cont/src/THashTable.cxx
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: THashTable.cxx,v 1.1.1.1 2000/05/16 17:00:40 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: THashTable.cxx,v 1.2 2000/09/08 16:11:03 rdm Exp $
// Author: Fons Rademakers 27/09/95
/*************************************************************************
@@ -171,7 +171,7 @@ TObject *THashTable::FindObject(const char *name) const
}
//______________________________________________________________________________
-TObject *THashTable::FindObject(TObject *obj) const
+TObject *THashTable::FindObject(const TObject *obj) const
{
// Find object using its hash value (returned by its Hash() member).
diff --git a/cont/src/TList.cxx b/cont/src/TList.cxx
index 6fff9a0fb172e52017b3014fc93a502ea4253c54..09f2a1ffdd1af79d9c8985a36794e925ca151fab 100644
--- a/cont/src/TList.cxx
+++ b/cont/src/TList.cxx
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TList.cxx,v 1.5 2000/09/27 10:05:23 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: TList.cxx,v 1.6 2000/11/21 16:49:40 brun Exp $
// Author: Fons Rademakers 10/08/95
/*************************************************************************
@@ -420,7 +420,7 @@ TObject *TList::FindObject(const char *name) const
}
//______________________________________________________________________________
-TObject *TList::FindObject(TObject *obj) const
+TObject *TList::FindObject(const TObject *obj) const
{
// Find an object in this list using the object's IsEqual()
// member function. Requires a sequential scan till the object has
@@ -439,7 +439,7 @@ TObject *TList::FindObject(TObject *obj) const
}
//______________________________________________________________________________
-TObjLink *TList::FindLink(TObject *obj, Int_t &idx) const
+TObjLink *TList::FindLink(const TObject *obj, Int_t &idx) const
{
// Returns the TObjLink object that contains object obj. In idx it returns
// the position of the object in the list.
diff --git a/cont/src/TMap.cxx b/cont/src/TMap.cxx
index a80630531f972b3ee7f53d7a1ef4d1d451d9275b..68a03bf1bd1a4eef15342397e7457ba916df4ba9 100644
--- a/cont/src/TMap.cxx
+++ b/cont/src/TMap.cxx
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: TMap.cxx,v 1.2 2000/09/08 16:11:03 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: TMap.cxx,v 1.3 2000/10/31 11:19:02 brun Exp $
// Author: Fons Rademakers 12/11/95
/*************************************************************************
@@ -172,7 +172,7 @@ TObject *TMap::FindObject(const char *keyname) const
}
//______________________________________________________________________________
-TObject *TMap::FindObject(TObject *key) const
+TObject *TMap::FindObject(const TObject *key) const
{
// Check if a (key,value) pair exists with key as key.
// Returns a TAssoc* (need to downcast from TObject). Use Key() and
diff --git a/eg/inc/TAttParticle.h b/eg/inc/TAttParticle.h
index ccee667cd413ee855e8a3453a33fd1b1dbcf5aa0..60c42ba33d8268c4cc0d875330d0f257e6742f64 100644
--- a/eg/inc/TAttParticle.h
+++ b/eg/inc/TAttParticle.h
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name$:$Id$
+// @(#)root/eg:$Name: $:$Id: TAttParticle.h,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
// Author: Ola Nordmann 29/09/95
/*************************************************************************
@@ -55,20 +55,20 @@ class TAttParticle : public TNamed {
static THashList *fgList;
static Int_t ConvertISAtoPDG(Int_t isaNumber);
static void DefinePDG();
- virtual Double_t GetCharge() { return fPDGCharge; }
- virtual Double_t GetEnergyCut() { return fEnergyCut; }
- virtual Double_t GetEnergyLimit() { return fEnergyLimit; }
- virtual Double_t GetGranularity() { return fGranularity; }
- virtual Double_t GetDecayWidth() { return fPDGDecayWidth; }
- virtual Double_t GetMass() { return fPDGMass; }
- virtual Int_t GetMCNumber() { return fMCnumberOfPDG; }
+ virtual Double_t GetCharge() const { return fPDGCharge; }
+ virtual Double_t GetEnergyCut() const { return fEnergyCut; }
+ virtual Double_t GetEnergyLimit() const { return fEnergyLimit; }
+ virtual Double_t GetGranularity() const { return fGranularity; }
+ virtual Double_t GetDecayWidth() const { return fPDGDecayWidth; }
+ virtual Double_t GetMass() const { return fPDGMass; }
+ virtual Int_t GetMCNumber() const { return fMCnumberOfPDG; }
static TAttParticle *GetParticle(const char *name);
static TAttParticle *GetParticle(Int_t mcnumber);
virtual const char *GetParticleType() const { return fParticleType.Data(); }
- virtual Bool_t GetStable() { return fPDGStable; }
- virtual void Print(Option_t *option="");
- virtual Double_t SampleMass();
- virtual Double_t SampleMass(Double_t widthcut);
+ virtual Bool_t GetStable() const { return fPDGStable; }
+ virtual void Print(Option_t *option="") const ;
+ virtual Double_t SampleMass() const ;
+ virtual Double_t SampleMass(Double_t widthcut) const ;
ClassDef(TAttParticle,1) //Particle definition
};
diff --git a/eg/inc/TDatabasePDG.h b/eg/inc/TDatabasePDG.h
index 2dd082c0ce3174d9c0b075bb302f78fb02d83705..7d63d23873130dd569e467efd49836024e7fe37a 100644
--- a/eg/inc/TDatabasePDG.h
+++ b/eg/inc/TDatabasePDG.h
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name$:$Id$
+// @(#)root/eg:$Name: $:$Id: TDatabasePDG.h,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
// Author: Pasha Murat 12/02/99
/*************************************************************************
@@ -41,12 +41,12 @@ public:
virtual Int_t ConvertIsajetToPdg(Int_t isaNumber);
- TParticlePDG *GetParticle(Int_t pdgCode);
- TParticlePDG *GetParticle(const char *name);
+ TParticlePDG *GetParticle(Int_t pdgCode) const;
+ TParticlePDG *GetParticle(const char *name) const;
virtual void Init(); // function which does the real job of initializing the database
const THashList *ParticleList() const { return fParticleList; }
- virtual void Print(Option_t *opt = "");
+ virtual void Print(Option_t *opt = "") const;
virtual void ReadPDGTable(const char *filename);
static TDatabasePDG *Instance();
diff --git a/eg/inc/TGenerator.h b/eg/inc/TGenerator.h
index 7cb11a2cb2e18a7003304103a2632ae5309a35bb..7defb69751a227a58b9d5044f63f7934758d1433 100644
--- a/eg/inc/TGenerator.h
+++ b/eg/inc/TGenerator.h
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name: $:$Id: TGenerator.h,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
+// @(#)root/eg:$Name: $:$Id: TGenerator.h,v 1.2 2000/11/21 16:52:19 brun Exp $
// Author: Ola Nordmann 21/09/95
/*************************************************************************
@@ -55,11 +55,11 @@ class TGenerator : public TNamed {
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual Int_t ImportParticles(TClonesArray *particles, Option_t *option="");
virtual TObjArray *ImportParticles(Option_t *option="");
- virtual TParticle *GetParticle(Int_t i);
- Int_t GetNumberOfParticles() {return fParticles->GetLast()+1;}
- virtual TObjArray *GetListOfParticles() {return fParticles;}
+ virtual TParticle *GetParticle(Int_t i) const;
+ Int_t GetNumberOfParticles() const {return fParticles->GetLast()+1;}
+ virtual TObjArray *GetListOfParticles() const {return fParticles;}
virtual TObjArray *GetPrimaries(Option_t *option="") {return ImportParticles(option);}
- Float_t GetPtCut() {return fPtCut;}
+ Float_t GetPtCut() const {return fPtCut;}
virtual void Paint(Option_t *option="");
virtual void SetPtCut(Float_t ptcut=0); // *MENU*
virtual void SetViewRadius(Float_t rbox = 1000); // *MENU*
diff --git a/eg/inc/TParticle.h b/eg/inc/TParticle.h
index 78dd87cec75e16ee81014bb405bb010738949a80..248b33f31f7d20e7c3d2621a40d771651994f093 100644
--- a/eg/inc/TParticle.h
+++ b/eg/inc/TParticle.h
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name: $:$Id: TParticle.h,v 1.2 2000/06/06 13:07:28 brun Exp $
+// @(#)root/eg:$Name: $:$Id: TParticle.h,v 1.3 2000/11/21 20:09:46 brun Exp $
// Author: Rene Brun , Federico Carminati 26/04/99
/*************************************************************************
@@ -168,7 +168,7 @@ public:
// ****** overloaded functions of TObject
virtual void Paint(Option_t *option = "");
- virtual void Print(Option_t *option = "");
+ virtual void Print(Option_t *option = "") const;
virtual void Sizeof3D() const;
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
diff --git a/eg/inc/TParticlePDG.h b/eg/inc/TParticlePDG.h
index 39ad3ef24e310f62381dd242f924734437b173c8..d95afe89590790e4358bb2953c99205e9242d18b 100644
--- a/eg/inc/TParticlePDG.h
+++ b/eg/inc/TParticlePDG.h
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name$:$Id$
+// @(#)root/eg:$Name: $:$Id: TParticlePDG.h,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
// Author: Pasha Murat 12/02/99
/*************************************************************************
@@ -77,7 +77,7 @@ public:
TObjArray* DecayList () { return fDecayList; }
- virtual void Print(Option_t* opt);
+ virtual void Print(Option_t* opt) const;
ClassDef(TParticlePDG,1) //PDG static particle definition
};
diff --git a/eg/inc/TPrimary.h b/eg/inc/TPrimary.h
index 61e03ef055572760d714b1ce99168b360db0679d..dc54f0c2fbebf76a650d66502b03686f7d245d26 100644
--- a/eg/inc/TPrimary.h
+++ b/eg/inc/TPrimary.h
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name$:$Id$
+// @(#)root/eg:$Name: $:$Id: TPrimary.h,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
// Author: Ola Nordmann 21/09/95
/*************************************************************************
@@ -66,21 +66,21 @@ class TPrimary : public TObject, public TAttLine, public TAtt3D {
virtual const TAttParticle *GetParticle() const;
virtual const char *GetName() const;
virtual const char *GetTitle() const;
- virtual Int_t GetFirstMother() { return fFirstMother; }
- virtual Int_t GetSecondMother() { return fSecondMother; }
- virtual Int_t GetGeneration() { return fGeneration; }
- virtual Double_t GetXMomentum() { return fPx; }
- virtual Double_t GetYMomentum() { return fPy; }
- virtual Double_t GetZMomentum() { return fPz; }
- virtual Double_t GetTotalEnergy() { return fEtot; }
- virtual Double_t GetXPosition() { return fVx; }
- virtual Double_t GetYPosition() { return fVy; }
- virtual Double_t GetZPosition() { return fVz; }
- virtual Double_t GetTime() { return fTime; }
- virtual Double_t GetTimeEnd() { return fTimeEnd; }
+ virtual Int_t GetFirstMother() const { return fFirstMother; }
+ virtual Int_t GetSecondMother() const { return fSecondMother; }
+ virtual Int_t GetGeneration() const { return fGeneration; }
+ virtual Double_t GetXMomentum() const { return fPx; }
+ virtual Double_t GetYMomentum() const { return fPy; }
+ virtual Double_t GetZMomentum() const { return fPz; }
+ virtual Double_t GetTotalEnergy() const { return fEtot; }
+ virtual Double_t GetXPosition() const { return fVx; }
+ virtual Double_t GetYPosition() const { return fVy; }
+ virtual Double_t GetZPosition() const { return fVz; }
+ virtual Double_t GetTime() const { return fTime; }
+ virtual Double_t GetTimeEnd() const { return fTimeEnd; }
virtual const char *GetType() const { return fType.Data(); }
virtual void Paint(Option_t *option = "");
- virtual void Print(Option_t *option = "");
+ virtual void Print(Option_t *option = "") const;
virtual void Sizeof3D() const;
ClassDef(TPrimary,1) //TPrimary vertex particle information
diff --git a/eg/src/TAttParticle.cxx b/eg/src/TAttParticle.cxx
index f80fd7bbe91e634bc4db623cfe7c0a41b7501e70..42de1897e49abb3903f4dc398f0ef2de8bec32f5 100644
--- a/eg/src/TAttParticle.cxx
+++ b/eg/src/TAttParticle.cxx
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name$:$Id$
+// @(#)root/eg:$Name: $:$Id: TAttParticle.cxx,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
// Author: Ola Nordmann 29/09/95
/*************************************************************************
@@ -1512,7 +1512,7 @@ TAttParticle* TAttParticle::GetParticle(const char *name)
}
//______________________________________________________________________________
-TAttParticle* TAttParticle::GetParticle(Int_t mcnumber)
+TAttParticle* TAttParticle::GetParticle(Int_t mcnumber)
{
//
// Get a pointer to the particle object according to the MC code number
@@ -1527,7 +1527,7 @@ TAttParticle* TAttParticle::GetParticle(Int_t mcnumber)
}
//______________________________________________________________________________
-void TAttParticle::Print(Option_t *)
+void TAttParticle::Print(Option_t *) const
{
//
// Print the entire information of this kind of particle
@@ -1548,7 +1548,7 @@ void TAttParticle::Print(Option_t *)
}
//______________________________________________________________________________
-Double_t TAttParticle::SampleMass()
+Double_t TAttParticle::SampleMass() const
{
//
// Samples a mass according to the Breit-Wigner resonance distribution
@@ -1563,7 +1563,7 @@ Double_t TAttParticle::SampleMass()
}
//______________________________________________________________________________
-Double_t TAttParticle::SampleMass(Double_t widthcut)
+Double_t TAttParticle::SampleMass(Double_t widthcut) const
{
//
// Samples a mass in the interval:
diff --git a/eg/src/TDatabasePDG.cxx b/eg/src/TDatabasePDG.cxx
index 2487142dcd62f5b903e24b2bc23c4b1208748c8f..0737b957759c6cdb584ab69f1fb5ee6998a60069 100644
--- a/eg/src/TDatabasePDG.cxx
+++ b/eg/src/TDatabasePDG.cxx
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name: $:$Id: TDatabasePDG.cxx,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
+// @(#)root/eg:$Name: $:$Id: TDatabasePDG.cxx,v 1.2 2000/05/18 17:14:47 brun Exp $
// Author: Pasha Murat 12/02/99
#include "TDatabasePDG.h"
@@ -1664,13 +1664,13 @@ TDatabasePDG *TDatabasePDG::Instance()
}
//______________________________________________________________________________
-TParticlePDG *TDatabasePDG::GetParticle(const char *name)
+TParticlePDG *TDatabasePDG::GetParticle(const char *name) const
{
//
// Get a pointer to the particle object according to the name given
//
- if (fParticleList == 0) Init();
+ if (fParticleList == 0) ((TDatabasePDG*)this)->Init();
TParticlePDG *def = (TParticlePDG *)fParticleList->FindObject(name);
if (!def) {
Error("GetParticle","No match for %s exists!",name);
@@ -1679,13 +1679,13 @@ TParticlePDG *TDatabasePDG::GetParticle(const char *name)
}
//______________________________________________________________________________
-TParticlePDG *TDatabasePDG::GetParticle(Int_t PDGcode)
+TParticlePDG *TDatabasePDG::GetParticle(Int_t PDGcode) const
{
//
// Get a pointer to the particle object according to the MC code number
//
- if (fParticleList == 0) Init();
+ if (fParticleList == 0) ((TDatabasePDG*)this)->Init();
TIter next(fParticleList);
TParticlePDG *p;
while ((p = (TParticlePDG *)next())) {
@@ -1696,11 +1696,11 @@ TParticlePDG *TDatabasePDG::GetParticle(Int_t PDGcode)
}
//______________________________________________________________________________
-void TDatabasePDG::Print(Option_t *option)
+void TDatabasePDG::Print(Option_t *option) const
{
// Print contents of PDG database.
- if (fParticleList == 0) Init();
+ if (fParticleList == 0) ((TDatabasePDG*)this)->Init();
TIter next(fParticleList);
TParticlePDG *p;
while ((p = (TParticlePDG *)next())) {
diff --git a/eg/src/TGenerator.cxx b/eg/src/TGenerator.cxx
index e02bd9939f5e0cc2957822c5e049e34711a45d38..3eb9ff2f65daeb3591dfc4a76263ed7dfca35520 100644
--- a/eg/src/TGenerator.cxx
+++ b/eg/src/TGenerator.cxx
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name: $:$Id: TGenerator.cxx,v 1.2 2000/10/30 08:01:09 brun Exp $
+// @(#)root/eg:$Name: $:$Id: TGenerator.cxx,v 1.3 2000/11/21 20:10:18 brun Exp $
// Author: Ola Nordmann 21/09/95
/*************************************************************************
@@ -377,7 +377,7 @@ void TGenerator::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-TParticle *TGenerator::GetParticle(Int_t i)
+TParticle *TGenerator::GetParticle(Int_t i) const
{
//
// Returns pointer to primary number i;
diff --git a/eg/src/TParticle.cxx b/eg/src/TParticle.cxx
index 6f25b341ea6220bf7a6186431c0e39356bd1396f..28c413bc55ee37306f9e26a29671703946152434 100644
--- a/eg/src/TParticle.cxx
+++ b/eg/src/TParticle.cxx
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name: $:$Id: TParticle.cxx,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
+// @(#)root/eg:$Name: $:$Id: TParticle.cxx,v 1.2 2000/11/21 20:10:42 brun Exp $
// Author: Rene Brun , Federico Carminati 26/04/99
#include "TView.h"
@@ -219,12 +219,12 @@ void TParticle::Paint(Option_t *option)
}
//______________________________________________________________________________
-void TParticle::Print(Option_t *)
+void TParticle::Print(Option_t *) const
{
//
// Print the internals of the primary vertex particle
//
- TParticlePDG* pdg = this->GetPDG();
+ TParticlePDG* pdg = ((TParticle*)this)->GetPDG();
Printf("TParticle: %-13s p: %8f %8f %8f Vertex: %8e %8e %8e %5d %5d %s",
GetName(),Px(),Py(),Pz(),Vx(),Vy(),Vz(),
fMother[0],fMother[1],pdg->Type());
diff --git a/eg/src/TParticlePDG.cxx b/eg/src/TParticlePDG.cxx
index e2f4c1a9f5fd9b588e446ed48c2c5e518237cc05..ef462cf9e2ae2110607a5adc6b2800c27291c893 100644
--- a/eg/src/TParticlePDG.cxx
+++ b/eg/src/TParticlePDG.cxx
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name$:$Id$
+// @(#)root/eg:$Name: $:$Id: TParticlePDG.cxx,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
// Author: Pasha Murat 12/02/99
#include "TParticlePDG.h"
@@ -45,7 +45,7 @@ TParticlePDG::~TParticlePDG()
}
//______________________________________________________________________________
-void TParticlePDG::Print(Option_t *)
+void TParticlePDG::Print(Option_t *) const
{
//
// Print the entire information of this kind of particle
diff --git a/eg/src/TPrimary.cxx b/eg/src/TPrimary.cxx
index f10e413fb20236cb4b127dfd82c9de1b2bdf9996..0913d9d5f4ac7d74182f4451b89b7e83dfd80a9b 100644
--- a/eg/src/TPrimary.cxx
+++ b/eg/src/TPrimary.cxx
@@ -1,4 +1,4 @@
-// @(#)root/eg:$Name$:$Id$
+// @(#)root/eg:$Name: $:$Id: TPrimary.cxx,v 1.1.1.1 2000/05/16 17:00:47 rdm Exp $
// Author: Ola Nordmann 21/09/95
/*************************************************************************
@@ -172,7 +172,7 @@ void TPrimary::Paint(Option_t *option)
}
//______________________________________________________________________________
-void TPrimary::Print(Option_t *)
+void TPrimary::Print(Option_t *) const
{
//
// Print the internals of the primary vertex particle
diff --git a/g3d/inc/TAxis3D.h b/g3d/inc/TAxis3D.h
index 4e7010ad1a9870fb851a4f2c337b88e5d8806f96..acbec13fd12bc9e53d712e527b8a5dbe5c846bc5 100644
--- a/g3d/inc/TAxis3D.h
+++ b/g3d/inc/TAxis3D.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TAxis3D.h,v 1.3 2000/09/05 09:21:22 brun Exp $
+// @(#)root/g3d:$Name: $:$Id: TAxis3D.h,v 1.4 2000/11/21 20:11:23 brun Exp $
// Author: Valery Fine(fine@mail.cern.ch) 07/01/2000
/*************************************************************************
@@ -10,7 +10,7 @@
*************************************************************************/
#ifndef ROOT_TAxis3D
#define ROOT_TAxis3D
-// $Id: TAxis3D.h,v 1.3 2000/09/05 09:21:22 brun Exp $
+// $Id: TAxis3D.h,v 1.4 2000/11/21 20:11:23 brun Exp $
// ***********************************************************************
// * C++ class library to paint axis "arround" TView object
// * Copyright(c) 1997~1999 [BNL] Brookhaven National Laboratory, STAR, All rights reserved
@@ -51,7 +51,7 @@ class TView;
class TAxis3D : public TNamed {
private:
- Int_t AxisChoice(Option_t *axis);
+ Int_t AxisChoice(Option_t *axis) const;
void Build();
protected:
@@ -76,21 +76,21 @@ public:
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- virtual Int_t GetNdivisions(Option_t *axis="X");
- virtual Color_t GetAxisColor(Option_t *axis="X");
- virtual Color_t GetLabelColor(Option_t *axis="X");
- virtual Style_t GetLabelFont(Option_t *axis="X");
- virtual Float_t GetLabelOffset(Option_t *axis="X");
- virtual Float_t GetLabelSize(Option_t *axis="X");
+ virtual Int_t GetNdivisions(Option_t *axis="X") const;
+ virtual Color_t GetAxisColor(Option_t *axis="X") const;
+ virtual Color_t GetLabelColor(Option_t *axis="X") const;
+ virtual Style_t GetLabelFont(Option_t *axis="X") const;
+ virtual Float_t GetLabelOffset(Option_t *axis="X") const;
+ virtual Float_t GetLabelSize(Option_t *axis="X") const;
static TAxis3D *GetPadAxis(TVirtualPad *pad=0);
- virtual Float_t GetTitleOffset(Option_t *axis="X");
- virtual Float_t GetTickLength(Option_t *axis="X");
+ virtual Float_t GetTitleOffset(Option_t *axis="X") const;
+ virtual Float_t GetTickLength(Option_t *axis="X") const;
- virtual void GetCenter(Axis_t *center){fAxis[0].GetCenter(center);}
+ virtual void GetCenter(Axis_t *center) {fAxis[0].GetCenter(center);}
- virtual void GetLowEdge(Axis_t *edge){fAxis[0].GetLowEdge(edge);}
+ virtual void GetLowEdge(Axis_t *edge) {fAxis[0].GetLowEdge(edge);}
- virtual char *GetObjectInfo(Int_t px, Int_t py);
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
Option_t *GetOption() const {return fOption.Data();}
diff --git a/g3d/inc/TBRIK.h b/g3d/inc/TBRIK.h
index adcd7d3a375b54775cdf335d770b54bb4d9992b6..ba6a52306f55a0a754092e4c0a9c4798cdc0d2ac 100644
--- a/g3d/inc/TBRIK.h
+++ b/g3d/inc/TBRIK.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TBRIK.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 17/09/95
/*************************************************************************
@@ -38,9 +38,9 @@ class TBRIK : public TShape {
virtual ~TBRIK();
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
- Float_t GetDx() {return fDx;}
- Float_t GetDy() {return fDy;}
- Float_t GetDz() {return fDz;}
+ Float_t GetDx() const {return fDx;}
+ Float_t GetDy() const {return fDy;}
+ Float_t GetDz() const {return fDz;}
virtual void Paint(Option_t *option);
virtual void PaintGLPoints(Float_t *buff);
virtual void SetPoints(Float_t *buff);
diff --git a/g3d/inc/TCONE.h b/g3d/inc/TCONE.h
index c5cfc806551711d6fe204d032075d97ea81d1eea..0e37ab34a339654a8a5537be9b6c3d7c342161ce 100644
--- a/g3d/inc/TCONE.h
+++ b/g3d/inc/TCONE.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TCONE.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 18/09/95
/*************************************************************************
@@ -40,8 +40,8 @@ class TCONE : public TTUBE {
TCONE(const char *name, const char *title, const char *material, Float_t dz, Float_t rmax1, Float_t rmax2 =0);
virtual ~TCONE();
- Float_t GetRmin2() {return fRmin2;}
- Float_t GetRmax2() {return fRmax2;}
+ Float_t GetRmin2() const {return fRmin2;}
+ Float_t GetRmax2() const {return fRmax2;}
virtual void SetPoints(Float_t *buff);
ClassDef(TCONE,1) //CONE shape
diff --git a/g3d/inc/TCONS.h b/g3d/inc/TCONS.h
index 69455782ec47960ceee047c0a91acc8c0c7b7b93..65c06893ed370c72eb5bacd9d433c578f3b5a9e0 100644
--- a/g3d/inc/TCONS.h
+++ b/g3d/inc/TCONS.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TCONS.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 18/09/95
/*************************************************************************
@@ -40,8 +40,8 @@ class TCONS : public TTUBS {
, Float_t phi1, Float_t phi2, Float_t rmax2 = 0);
virtual ~TCONS();
- virtual Float_t GetRmin2() {return fRmin2;}
- virtual Float_t GetRmax2() {return fRmax2;}
+ virtual Float_t GetRmin2() const {return fRmin2;}
+ virtual Float_t GetRmax2() const {return fRmax2;}
virtual void SetPoints(Float_t *buff);
ClassDef(TCONS,1) //CONS shape
diff --git a/g3d/inc/TGTRA.h b/g3d/inc/TGTRA.h
index 57eae4613f5520f1ab67eea019a9450cb751f0ba..80d6a702da83bf48f85b2422c7d855abf6d612fa 100644
--- a/g3d/inc/TGTRA.h
+++ b/g3d/inc/TGTRA.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TGTRA.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 19/09/95
/*************************************************************************
@@ -46,15 +46,15 @@ class TGTRA : public TBRIK {
Float_t alpha2);
virtual ~TGTRA();
- Float_t GetTwist() {return fTwist;}
- Float_t GetH1() {return fH1;}
- Float_t GetBl1() {return fBl1;}
- Float_t GetTl1() {return fTl1;}
- Float_t GetAlpha1() {return fAlpha1;}
- Float_t GetH2() {return fH2;}
- Float_t GetBl2() {return fBl2;}
- Float_t GetTl2() {return fTl2;}
- Float_t GetAlpha2() {return fAlpha2;}
+ Float_t GetTwist() const {return fTwist;}
+ Float_t GetH1() const {return fH1;}
+ Float_t GetBl1() const {return fBl1;}
+ Float_t GetTl1() const {return fTl1;}
+ Float_t GetAlpha1() const {return fAlpha1;}
+ Float_t GetH2() const {return fH2;}
+ Float_t GetBl2() const {return fBl2;}
+ Float_t GetTl2() const {return fTl2;}
+ Float_t GetAlpha2() const {return fAlpha2;}
virtual void SetPoints(Float_t *buff);
diff --git a/g3d/inc/TGeometry.h b/g3d/inc/TGeometry.h
index 8772c55a86807aa14603dfea4101b6316c674b6c..bf37cd8c4e6dc755acb521a8a696600c6af46481 100644
--- a/g3d/inc/TGeometry.h
+++ b/g3d/inc/TGeometry.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TGeometry.h,v 1.3 2000/09/08 07:36:57 brun Exp $
+// @(#)root/g3d:$Name: $:$Id: TGeometry.h,v 1.4 2000/11/21 20:12:04 brun Exp $
// Author: Rene Brun 22/09/95
/*************************************************************************
@@ -70,7 +70,7 @@ public:
virtual void cd(const char *path=0);
virtual void Draw(Option_t *option="");
virtual TObject *FindObject(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
Float_t GetBomb() const {return fBomb;}
Int_t GeomLevel() const {return fGeomLevel;}
THashList *GetListOfShapes() const {return fShapes;}
@@ -78,13 +78,13 @@ public:
THashList *GetListOfMaterials() const {return fMaterials;}
THashList *GetListOfMatrices() const {return fMatrices;}
TNode *GetCurrentNode() const {return fCurrentNode;}
- TMaterial *GetMaterial(const char *name);
- TMaterial *GetMaterialByNumber(Int_t number);
- TNode *GetNode(const char *name);
- TShape *GetShape(const char *name);
- TShape *GetShapeByNumber(Int_t number);
- TRotMatrix *GetRotMatrix(const char *name);
- TRotMatrix *GetRotMatrixByNumber(Int_t number);
+ TMaterial *GetMaterial(const char *name) const;
+ TMaterial *GetMaterialByNumber(Int_t number) const;
+ TNode *GetNode(const char *name) const;
+ TShape *GetShape(const char *name) const;
+ TShape *GetShapeByNumber(Int_t number) const;
+ TRotMatrix *GetRotMatrix(const char *name) const;
+ TRotMatrix *GetRotMatrixByNumber(Int_t number) const;
TRotMatrix *GetCurrentMatrix() const;
TRotMatrix *GetCurrentPosition(Double_t *x,Double_t *y,Double_t *z) const;
TRotMatrix *GetCurrentPosition(Float_t *x,Float_t *y,Float_t *z) const;
@@ -92,7 +92,7 @@ public:
Bool_t IsFolder() const {return kTRUE;}
virtual void Local2Master(Double_t *local, Double_t *master);
virtual void Local2Master(Float_t *local, Float_t *master);
- virtual void ls(Option_t *option="rsn2");
+ virtual void ls(Option_t *option="rsn2") const;
virtual void Master2Local(Double_t *master, Double_t *local);
virtual void Master2Local(Float_t *master, Float_t *local);
virtual void Node(const char *name, const char *title, const char *shapename, Double_t x=0, Double_t y=0, Double_t z=0
diff --git a/g3d/inc/THYPE.h b/g3d/inc/THYPE.h
index fce9b65aa00bebf54c363f21028a85308a2c6eb8..650d6bcf431fc065f5815e91fad5a3dae3cee1e6 100644
--- a/g3d/inc/THYPE.h
+++ b/g3d/inc/THYPE.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: THYPE.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 08/12/98
/*************************************************************************
@@ -8,7 +8,7 @@
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: THYPE.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 18/09/95
#ifndef ROOT_THYPE
@@ -38,7 +38,7 @@ class THYPE : public TTUBE {
Float_t phi);
virtual ~THYPE();
- virtual Float_t GetPhi() {return fPhi;}
+ virtual Float_t GetPhi() const {return fPhi;}
ClassDef(THYPE,1) //HYPE shape
};
diff --git a/g3d/inc/THelix.h b/g3d/inc/THelix.h
index aa6540350cfa6e876b155d07e6bba81303b45d9f..1d1c642ec1045aa53f584a102b69f30ca8858818 100644
--- a/g3d/inc/THelix.h
+++ b/g3d/inc/THelix.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: THelix.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: THelix.h,v 1.2 2000/11/21 20:12:22 brun Exp $
// Author: Ping Yeh 19/12/97
/*************************************************************************
@@ -73,10 +73,10 @@ public:
// virtual void DrawHelix(Int_t n, Float_t *p, Option_t *option="");
// virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
Option_t *GetOption() const {return fOption.Data();}
-// virtual void ls(Option_t *option="");
+// virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="") { TPolyLine3D::Paint(option); }
// virtual void PaintPolyLine(Int_t n, Float_t *p, Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetOption(Option_t *option="") {fOption = option;}
virtual void SetAxis(Double_t * axis); //Define new axis
diff --git a/g3d/inc/TMarker3DBox.h b/g3d/inc/TMarker3DBox.h
index 8830e3c18b38c1d70d0f5c1e0507004bd6a0cbed..d795134a117a0096a7bd8dcdd30c9785ba09909b 100644
--- a/g3d/inc/TMarker3DBox.h
+++ b/g3d/inc/TMarker3DBox.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TMarker3DBox.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TMarker3DBox.h,v 1.2 2000/11/21 20:12:39 brun Exp $
// Author: "Valery fine" 31/10/97
/*************************************************************************
@@ -73,10 +73,10 @@ public:
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- TObject *GetRefObject() {return fRefObject;}
- virtual void GetDirection(Float_t &theta, Float_t &phi) {theta = fTheta; phi = fPhi;}
- virtual void GetPosition(Float_t &x, Float_t &y, Float_t &z) {x=fX; y=fY, z=fZ;}
- virtual void GetSize(Float_t &dx, Float_t &dy, Float_t &dz) {dx=fDx; dy=fDy; dz=fDz;}
+ TObject *GetRefObject() const {return fRefObject;}
+ virtual void GetDirection(Float_t &theta, Float_t &phi) const {theta = fTheta; phi = fPhi;}
+ virtual void GetPosition(Float_t &x, Float_t &y, Float_t &z) const {x=fX; y=fY, z=fZ;}
+ virtual void GetSize(Float_t &dx, Float_t &dy, Float_t &dz) const {dx=fDx; dy=fDy; dz=fDz;}
virtual void Paint(Option_t *option);
static void PaintH3(TH1 *h, Option_t *option);
diff --git a/g3d/inc/TMaterial.h b/g3d/inc/TMaterial.h
index 4767f4ddf57fa0eddcaed11c9bf657b3bcea6aed..50f4f0eb810d1f338bd5d4682ffda3df8f4dbbdb 100644
--- a/g3d/inc/TMaterial.h
+++ b/g3d/inc/TMaterial.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TMaterial.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 03/10/95
/*************************************************************************
@@ -43,12 +43,12 @@ class TMaterial : public TNamed, public TAttFill {
TMaterial(const char *name, const char *title, Float_t a, Float_t z, Float_t density);
TMaterial(const char *name, const char *title, Float_t a, Float_t z, Float_t density, Float_t radl, Float_t inter);
virtual ~TMaterial();
- virtual Int_t GetNumber() {return fNumber;}
- virtual Float_t GetA() {return fA;}
- virtual Float_t GetZ() {return fZ;}
- virtual Float_t GetDensity() {return fDensity;}
- virtual Float_t GetRadLength() {return fRadLength;}
- virtual Float_t GetInterLength() {return fInterLength;}
+ virtual Int_t GetNumber() const {return fNumber;}
+ virtual Float_t GetA() const {return fA;}
+ virtual Float_t GetZ() const {return fZ;}
+ virtual Float_t GetDensity() const {return fDensity;}
+ virtual Float_t GetRadLength() const {return fRadLength;}
+ virtual Float_t GetInterLength() const {return fInterLength;}
ClassDef(TMaterial,3) //Materials used in the Geometry Shapes
};
diff --git a/g3d/inc/TMixture.h b/g3d/inc/TMixture.h
index a8aa9789df48452287560eda4c3b8d4a897aae0f..225addaa127fd2b069b5ca115b5bd133873a784a 100644
--- a/g3d/inc/TMixture.h
+++ b/g3d/inc/TMixture.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TMixture.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 03/10/95
/*************************************************************************
@@ -37,11 +37,11 @@ class TMixture : public TMaterial {
TMixture();
TMixture(const char *name, const char *title, Int_t nmixt);
virtual ~TMixture();
- virtual void DefineElement(Int_t n, Float_t a, Float_t z, Float_t w);
- Int_t GetNmixt() {return fNmixt;}
- Float_t *GetAmixt() {return fAmixt;}
- Float_t *GetZmixt() {return fZmixt;}
- Float_t *GetWmixt() {return fWmixt;}
+ virtual void DefineElement(Int_t n, Float_t a, Float_t z, Float_t w);
+ Int_t GetNmixt() const {return fNmixt;}
+ Float_t *GetAmixt() const {return fAmixt;}
+ Float_t *GetZmixt() const {return fZmixt;}
+ Float_t *GetWmixt() const {return fWmixt;}
ClassDef(TMixture,1) //Mixtures used in the Geometry Shapes
};
diff --git a/g3d/inc/TNode.h b/g3d/inc/TNode.h
index 0499c84d7fc834c355e67e93929af6caa4bbe855..48023dd08de6732f03307bbff44c71a0b01f2064 100644
--- a/g3d/inc/TNode.h
+++ b/g3d/inc/TNode.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TNode.h,v 1.2 2000/09/05 09:21:22 brun Exp $
+// @(#)root/g3d:$Name: $:$Id: TNode.h,v 1.3 2000/11/21 20:13:10 brun Exp $
// Author: Rene Brun 14/09/95
/*************************************************************************
@@ -69,22 +69,22 @@ protected:
virtual void Draw(Option_t *option=""); // *MENU*
virtual void DrawOnly(Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- TList *GetListOfNodes() {return fNodes;}
- virtual TRotMatrix *GetMatrix() {return fMatrix;}
- virtual TNode *GetNode(const char *name);
- virtual char *GetObjectInfo(Int_t px, Int_t py);
- const Option_t *GetOption() const { return fOption.Data();}
- virtual TNode *GetParent() {return fParent;}
- TShape *GetShape() {return fShape;}
- Int_t GetVisibility() {return fVisibility;}
- virtual Double_t GetX() {return fX;}
- virtual Double_t GetY() {return fY;}
- virtual Double_t GetZ() {return fZ;}
+ TList *GetListOfNodes() const {return fNodes;}
+ virtual TRotMatrix *GetMatrix() const {return fMatrix;}
+ virtual TNode *GetNode(const char *name) const;
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
+ const Option_t *GetOption() const { return fOption.Data();}
+ virtual TNode *GetParent() const {return fParent;}
+ TShape *GetShape() const {return fShape;}
+ Int_t GetVisibility() const {return fVisibility;}
+ virtual Double_t GetX() const {return fX;}
+ virtual Double_t GetY() const {return fY;}
+ virtual Double_t GetZ() const {return fZ;}
virtual void ImportShapeAttributes();
Bool_t IsFolder() const;
virtual void Local2Master(Double_t *local, Double_t *master);
virtual void Local2Master(Float_t *local, Float_t *master);
- virtual void ls(Option_t *option="2"); // *MENU*
+ virtual void ls(Option_t *option="2") const; // *MENU*
virtual void Master2Local(Double_t *master, Double_t *local);
virtual void Master2Local(Float_t *master, Float_t *local);
virtual void Paint(Option_t *option="");
diff --git a/g3d/inc/TPARA.h b/g3d/inc/TPARA.h
index 9bff1b1acfddb41a52b049c563706b57d4741f60..c17806efe1a9bc3f5a4624ed2ab0d23bf2f1a6ea 100644
--- a/g3d/inc/TPARA.h
+++ b/g3d/inc/TPARA.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TPARA.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 19/09/95
/*************************************************************************
@@ -42,9 +42,9 @@ class TPARA : public TBRIK {
Float_t alpha, Float_t theta, Float_t phi);
virtual ~TPARA();
- virtual Float_t GetAlpha() {return fAlpha;}
- virtual Float_t GetTheta() {return fTheta;}
- virtual Float_t GetPhi() {return fPhi;}
+ virtual Float_t GetAlpha() const {return fAlpha;}
+ virtual Float_t GetTheta() const {return fTheta;}
+ virtual Float_t GetPhi() const {return fPhi;}
virtual void SetPoints (Float_t *buff);
ClassDef(TPARA,1) //PARA shape
diff --git a/g3d/inc/TPCON.h b/g3d/inc/TPCON.h
index 41528a5961b9a8d3fbe139bc993d87d5ace003e9..4c04a852b3422dba716072eca1e04fecc6682f7b 100644
--- a/g3d/inc/TPCON.h
+++ b/g3d/inc/TPCON.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TPCON.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TPCON.h,v 1.2 2000/11/21 20:13:28 brun Exp $
// Author: Nenad Buncic 29/09/95
/*************************************************************************
@@ -59,13 +59,13 @@ class TPCON : public TShape {
virtual void DefineSection(Int_t secNum, Float_t z, Float_t rmin, Float_t rmax);
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual Int_t GetNumberOfDivisions () const {if (fNdiv) return fNdiv; else return kDiv;}
- virtual Float_t GetPhi1() {return fPhi1;}
- virtual Float_t GetDhi1() {return fDphi1;}
- virtual Int_t GetNz() {return fNz;}
- virtual Float_t *GetRmin() {return fRmin;}
- virtual Float_t *GetRmax() {return fRmax;}
- virtual Float_t *GetDz() {return fDz;}
- virtual Int_t GetNdiv() {return fNdiv;}
+ virtual Float_t GetPhi1() const {return fPhi1;}
+ virtual Float_t GetDhi1() const {return fDphi1;}
+ virtual Int_t GetNz() const {return fNz;}
+ virtual Float_t *GetRmin() const {return fRmin;}
+ virtual Float_t *GetRmax() const {return fRmax;}
+ virtual Float_t *GetDz() const {return fDz;}
+ virtual Int_t GetNdiv() const {return fNdiv;}
virtual void Paint(Option_t *option);
virtual void SetNumberOfDivisions (Int_t p);
virtual void SetPoints(Float_t *buff);
diff --git a/g3d/inc/TPadOpenGLView.h b/g3d/inc/TPadOpenGLView.h
index edaae662e5ed9137d0177b32b6749e432d7bc809..6084130a8da6b2ace6b812d78209851e6807f248 100644
--- a/g3d/inc/TPadOpenGLView.h
+++ b/g3d/inc/TPadOpenGLView.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TPadOpenGLView.h,v 1.2 2000/06/05 07:28:47 brun Exp $
+// @(#)root/g3d:$Name: $:$Id: TPadOpenGLView.h,v 1.3 2000/11/21 20:13:47 brun Exp $
// Author: Valery Fine(fine@vxcern.cern.ch) 08/05/97
/*************************************************************************
@@ -74,10 +74,10 @@ class TPadOpenGLView : public TPadView3D
TPadOpenGLView(TVirtualPad *pad);
virtual ~TPadOpenGLView();
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Int_t GetGLList() {return fGLList ? fGLList+1 : 0;}
+ Int_t GetGLList() const {return fGLList ? fGLList+1 : 0;}
UInt_t GetNextGLList() {return fGLList ? ++fGLLastList : 0;}
- Float_t GetSpeedMove() { return fSpeedMove;}
- virtual void GetSteps(Float_t *steps) {if (steps) {steps[0] = fStep[0]; steps[1] = fStep[1]; steps[2] = fStep[2];}; }
+ Float_t GetSpeedMove() const { return fSpeedMove;}
+ virtual void GetSteps(Float_t *steps) const {if (steps) {steps[0] = fStep[0]; steps[1] = fStep[1]; steps[2] = fStep[2];}; }
virtual void Paint(Option_t *option="");
virtual void Size(Int_t width, Int_t height);
UInt_t ReleaseLastGLList() {return fGLList ? --fGLLastList : 0;}
diff --git a/g3d/inc/TPolyLine3D.h b/g3d/inc/TPolyLine3D.h
index 30bcaeefd2c7474c8d6897e5e4fd7e6b73ba7f99..aa0eb60406c8d8e77973c701dc4b7858ca30f6c0 100644
--- a/g3d/inc/TPolyLine3D.h
+++ b/g3d/inc/TPolyLine3D.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TPolyLine3D.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TPolyLine3D.h,v 1.2 2000/06/13 12:21:21 brun Exp $
// Author: Nenad Buncic 17/08/95
/*************************************************************************
@@ -66,15 +66,15 @@ public:
static void DrawOutlineCube(TList *outline, Double_t *rmin, Double_t *rmax);
virtual void DrawPolyLine(Int_t n, Float_t *p, Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Int_t GetLastPoint() {return fLastPoint;}
- Int_t GetN() {return fN;}
- Float_t *GetP() {return fP;}
+ Int_t GetLastPoint() const {return fLastPoint;}
+ Int_t GetN() const {return fN;}
+ Float_t *GetP() const {return fP;}
Option_t *GetOption() const {return fOption.Data();}
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintPolyLine(Int_t n, Float_t *p, Option_t *option="");
virtual void PaintPolyLine(Int_t n, Double_t *p, Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual Int_t SetNextPoint(Double_t x, Double_t y, Double_t z); // *MENU*
virtual void SetOption(Option_t *option="") {fOption = option;}
diff --git a/g3d/inc/TPolyMarker3D.h b/g3d/inc/TPolyMarker3D.h
index 22df8aab9f93cdc6722f9c1167e68146c75cba9e..3f47d7212cf09670ab6eb28bb8e50d8d3ceb2645 100644
--- a/g3d/inc/TPolyMarker3D.h
+++ b/g3d/inc/TPolyMarker3D.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TPolyMarker3D.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TPolyMarker3D.h,v 1.2 2000/06/13 12:22:49 brun Exp $
// Author: Nenad Buncic 21/08/95
/*************************************************************************
@@ -58,14 +58,14 @@ public:
virtual void Draw(Option_t *option="");
virtual void DrawPolyMarker(Int_t n, Float_t *p, Marker_t marker, Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- virtual Int_t GetN(){ return fN;}
- virtual Float_t *GetP(){ return fP;}
+ virtual Int_t GetN() const { return fN;}
+ virtual Float_t *GetP() const { return fP;}
Option_t *GetOption() const {return fOption.Data();}
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
static void PaintH3(TH1 *h, Option_t *option);
virtual void PaintPolyMarker(Int_t n, Float_t *p, Marker_t marker, Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
void SetPoint(Int_t n, Double_t x, Double_t y, Double_t z); // *MENU*
virtual void SetPolyMarker(Int_t n, Float_t *p, Marker_t marker, Option_t *option="");
diff --git a/g3d/inc/TSPHE.h b/g3d/inc/TSPHE.h
index 52798317cae5a49ec9499ea4450400212c591cd6..d5195303f3a8d539ccdac65ae36f5ca5c02764e6 100644
--- a/g3d/inc/TSPHE.h
+++ b/g3d/inc/TSPHE.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TSPHE.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TSPHE.h,v 1.2 2000/11/21 20:14:24 brun Exp $
// Author: Rene Brun 13/06/97
/*************************************************************************
@@ -61,13 +61,13 @@ class TSPHE : public TShape {
TSPHE(const char *name, const char *title, const char *material, Float_t rmax);
virtual ~TSPHE();
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
- virtual Float_t GetRmin() {return fRmin;}
- virtual Float_t GetRmax() {return fRmax;}
- virtual Float_t GetThemin() {return fThemin;}
- virtual Float_t GetThemax() {return fThemax;}
- virtual Float_t GetPhimin() {return fPhimin;}
- virtual Float_t GetPhimax() {return fPhimax;}
- virtual Float_t GetAspectRatio(){ return fAspectRatio;}
+ virtual Float_t GetRmin() const {return fRmin;}
+ virtual Float_t GetRmax() const {return fRmax;}
+ virtual Float_t GetThemin() const {return fThemin;}
+ virtual Float_t GetThemax() const {return fThemax;}
+ virtual Float_t GetPhimin() const {return fPhimin;}
+ virtual Float_t GetPhimax() const {return fPhimax;}
+ virtual Float_t GetAspectRatio() const { return fAspectRatio;}
virtual Int_t GetNumberOfDivisions () const {if (fNdiv) return fNdiv; else return 0; /*kDiv;*/}
virtual void Paint(Option_t *option);
virtual void SetAspectRatio(Float_t factor=1.0){ fAspectRatio = factor; MakeTableOfCoSin();}
diff --git a/g3d/inc/TShape.h b/g3d/inc/TShape.h
index 866f739640e876b68699dbe94faad82b1ed082c2..a7f42870da34b9a6ac4b0b47039f5d93e6c7f61b 100644
--- a/g3d/inc/TShape.h
+++ b/g3d/inc/TShape.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TShape.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TShape.h,v 1.2 2000/11/21 20:14:43 brun Exp $
// Author: Nenad Buncic 17/09/95
/*************************************************************************
@@ -65,9 +65,9 @@ public:
TShape();
TShape(const char *name, const char *title, const char *material);
virtual ~TShape();
- TMaterial *GetMaterial() {return fMaterial;}
- virtual Int_t GetNumber() {return fNumber;}
- Int_t GetVisibility() {return fVisibility;}
+ TMaterial *GetMaterial() const {return fMaterial;}
+ virtual Int_t GetNumber() const {return fNumber;}
+ Int_t GetVisibility() const {return fVisibility;}
virtual void Paint(Option_t *option="");
virtual void PaintGLPoints(Float_t *vertex);
virtual void PaintShape(X3DBuffer *buff, Bool_t rangeView=kFALSE);
diff --git a/g3d/inc/TTRAP.h b/g3d/inc/TTRAP.h
index 664a483eb5991d5647133e8625b786552facf50f..ad8687dd4bf8447feebfd7bfb340e01eb8e60c1c 100644
--- a/g3d/inc/TTRAP.h
+++ b/g3d/inc/TTRAP.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TTRAP.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 19/09/95
/*************************************************************************
@@ -51,14 +51,14 @@ class TTRAP : public TBRIK {
Float_t alpha2);
virtual ~TTRAP();
- virtual Float_t GetH1() {return fH1;}
- virtual Float_t GetBl1() {return fBl1;}
- virtual Float_t GetTl1() {return fTl1;}
- virtual Float_t GetAlpha1() {return fAlpha1;}
- virtual Float_t GetH2() {return fH2;}
- virtual Float_t GetBl2() {return fBl2;}
- virtual Float_t GetTl2() {return fTl2;}
- virtual Float_t GetAlpha2() {return fAlpha2;}
+ virtual Float_t GetH1() const {return fH1;}
+ virtual Float_t GetBl1() const {return fBl1;}
+ virtual Float_t GetTl1() const {return fTl1;}
+ virtual Float_t GetAlpha1() const {return fAlpha1;}
+ virtual Float_t GetH2() const {return fH2;}
+ virtual Float_t GetBl2() const {return fBl2;}
+ virtual Float_t GetTl2() const {return fTl2;}
+ virtual Float_t GetAlpha2() const {return fAlpha2;}
virtual void SetPoints(Float_t *buff);
ClassDef(TTRAP,1) //TRAP shape
diff --git a/g3d/inc/TTRD1.h b/g3d/inc/TTRD1.h
index 8113e5a71cba6d333ef49777eb8245c7dd98f215..e4ff42b616daae40a8884a1789a76769e34770df 100644
--- a/g3d/inc/TTRD1.h
+++ b/g3d/inc/TTRD1.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TTRD1.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 17/09/95
/*************************************************************************
@@ -37,7 +37,7 @@ class TTRD1 : public TBRIK {
TTRD1(const char *name, const char *title, const char *material, Float_t dx1, Float_t dx2, Float_t dy, Float_t dz);
virtual ~TTRD1();
- virtual Float_t GetDx2() {return fDx2;}
+ virtual Float_t GetDx2() const {return fDx2;}
virtual void SetPoints(Float_t *buff);
ClassDef(TTRD1,1) //TRD1 shape
diff --git a/g3d/inc/TTRD2.h b/g3d/inc/TTRD2.h
index 31c7362bf225dd196b4f7ef6885132de8b1fa3ac..20fc73b5e4221e64dba19a334a89017781d83495 100644
--- a/g3d/inc/TTRD2.h
+++ b/g3d/inc/TTRD2.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TTRD2.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 13/09/95
/*************************************************************************
@@ -41,8 +41,8 @@ class TTRD2 : public TBRIK {
Float_t dy1, Float_t dy2, Float_t dz);
virtual ~TTRD2();
- Float_t GetDx2() {return fDx2;}
- Float_t GetDy2() {return fDy2;}
+ Float_t GetDx2() const {return fDx2;}
+ Float_t GetDy2() const {return fDy2;}
virtual void SetPoints(Float_t *buff);
ClassDef(TTRD2,1) //TRD2 shape
diff --git a/g3d/inc/TTUBS.h b/g3d/inc/TTUBS.h
index 27235722921231f78f75e06fd1601a70e7bf04e1..277cd3596a7fa46ce80032762d438b020889148d 100644
--- a/g3d/inc/TTUBS.h
+++ b/g3d/inc/TTUBS.h
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name$:$Id$
+// @(#)root/g3d:$Name: $:$Id: TTUBS.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Nenad Buncic 18/09/95
/*************************************************************************
@@ -45,8 +45,8 @@ class TTUBS : public TTUBE {
virtual ~TTUBS();
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
- virtual Float_t GetPhi1() {return fPhi1;}
- virtual Float_t GetPhi2() {return fPhi2;}
+ virtual Float_t GetPhi1() const {return fPhi1;}
+ virtual Float_t GetPhi2() const {return fPhi2;}
virtual void Paint(Option_t *option);
virtual void SetPoints(Float_t *buff);
virtual void Sizeof3D() const;
diff --git a/g3d/inc/TXTRU.h b/g3d/inc/TXTRU.h
index d51c85e737a4376dbe23883de12a6aa86466215f..360963597407fc39f063eb800ee96139ffaaa58f 100644
--- a/g3d/inc/TXTRU.h
+++ b/g3d/inc/TXTRU.h
@@ -1,8 +1,8 @@
-//@@(#)root/g3d:$Name: $:$Id: TXTRU.h,v 1.1 2000/09/14 06:30:18 brun Exp $
+//@@(#)root/g3d:$Name: $:$Id: TXTRU.h,v 1.2 2000/09/14 07:03:44 brun Exp $
// Author: Robert Hatcher (rhatcher@fnal.gov) 2000.09.06
////////////////////////////////////////////////////////////////////////////
-// $Id: TXTRU.h,v 1.1 2000/09/14 06:30:18 brun Exp $
+// $Id: TXTRU.h,v 1.2 2000/09/14 07:03:44 brun Exp $
//
// TXTRU
//
@@ -44,15 +44,15 @@ class TXTRU : public TShape {
virtual Float_t GetSectionY0(Int_t secNum) const;
virtual Float_t GetSectionScale(Int_t secNum) const;
virtual Float_t GetSectionZ(Int_t secNum) const;
- virtual Float_t *GetXvtx() {return fXvtx; }
- virtual Float_t *GetYvtx() {return fYvtx; }
- virtual Float_t *GetZ() {return fZ; }
- virtual Float_t *GetScale() {return fScale; }
- virtual Float_t *GetX0() {return fX0; }
- virtual Float_t *GetY0() {return fY0; }
+ virtual Float_t *GetXvtx() const {return fXvtx; }
+ virtual Float_t *GetYvtx() const {return fYvtx; }
+ virtual Float_t *GetZ() const {return fZ; }
+ virtual Float_t *GetScale() const {return fScale; }
+ virtual Float_t *GetX0() const {return fX0; }
+ virtual Float_t *GetY0() const {return fY0; }
virtual void Paint(Option_t *option);
virtual void PaintGLPoints(Float_t *buff);
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SetPoints(Float_t *buff);
virtual void Sizeof3D() const;
void SplitConcavePolygon(Bool_t split = kTRUE);
diff --git a/g3d/src/TAxis3D.cxx b/g3d/src/TAxis3D.cxx
index a9cd57f2d4b56f155a7824342e1e596800924779..1050322de09eb4fa1da1542acc444a6c7649dad1 100644
--- a/g3d/src/TAxis3D.cxx
+++ b/g3d/src/TAxis3D.cxx
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TAxis3D.cxx,v 1.2 2000/06/13 12:18:42 brun Exp $
+// @(#)root/g3d:$Name: $:$Id: TAxis3D.cxx,v 1.3 2000/09/08 07:41:00 brun Exp $
// Author: Valery Fine(fine@mail.cern.ch) 07/01/2000
// ***********************************************************************
// * C++ class library to paint 3D axice "arround" TView object
@@ -280,7 +280,7 @@ void TAxis3D::ExecuteEvent(Int_t event, Int_t px, Int_t py)
//______________________________________________________________________________
-char *TAxis3D::GetObjectInfo(Int_t , Int_t )
+char *TAxis3D::GetObjectInfo(Int_t , Int_t ) const
{
// Dummy method
// returns the const char * to "axis3d"
@@ -491,7 +491,7 @@ void TAxis3D::UseCurrentStyle()
}
//______________________________________________________________________________
-Int_t TAxis3D::AxisChoice( Option_t *axis)
+Int_t TAxis3D::AxisChoice( Option_t *axis) const
{
// Return the axis index by its name
char achoice = toupper(axis[0]);
@@ -502,56 +502,56 @@ Int_t TAxis3D::AxisChoice( Option_t *axis)
}
//______________________________________________________________________________
-Int_t TAxis3D::GetNdivisions( Option_t *axis)
+Int_t TAxis3D::GetNdivisions( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
return fAxis[ax].GetNdivisions();
}
//______________________________________________________________________________
-Color_t TAxis3D::GetAxisColor( Option_t *axis)
+Color_t TAxis3D::GetAxisColor( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
return fAxis[ax].GetAxisColor();
}
//______________________________________________________________________________
-Color_t TAxis3D::GetLabelColor( Option_t *axis)
+Color_t TAxis3D::GetLabelColor( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
return fAxis[ax].GetLabelColor();
}
//______________________________________________________________________________
-Style_t TAxis3D::GetLabelFont( Option_t *axis)
+Style_t TAxis3D::GetLabelFont( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
return fAxis[ax].GetLabelFont();
}
//______________________________________________________________________________
-Float_t TAxis3D::GetLabelOffset( Option_t *axis)
+Float_t TAxis3D::GetLabelOffset( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
return fAxis[ax].GetLabelOffset();
}
//______________________________________________________________________________
-Float_t TAxis3D::GetLabelSize( Option_t *axis)
+Float_t TAxis3D::GetLabelSize( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
return fAxis[ax].GetLabelSize();
}
//______________________________________________________________________________
-Float_t TAxis3D::GetTickLength( Option_t *axis)
+Float_t TAxis3D::GetTickLength( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
return fAxis[ax].GetTickLength();
}
//______________________________________________________________________________
-Float_t TAxis3D::GetTitleOffset( Option_t *axis)
+Float_t TAxis3D::GetTitleOffset( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
fAxis[ax].GetTitleOffset();
diff --git a/g3d/src/TGeometry.cxx b/g3d/src/TGeometry.cxx
index 378b63a095d9da870dd1ebb73fdf09b3fde8875c..0244e38f9dbd335535af79c1662d9e491878fdfa 100644
--- a/g3d/src/TGeometry.cxx
+++ b/g3d/src/TGeometry.cxx
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TGeometry.cxx,v 1.3 2000/09/08 16:05:21 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TGeometry.cxx,v 1.4 2000/11/21 20:15:52 brun Exp $
// Author: Rene Brun 22/09/95
/*************************************************************************
@@ -188,7 +188,7 @@ void TGeometry::Draw(Option_t *option)
}
//______________________________________________________________________________
-TObject *TGeometry::FindObject(TObject *) const
+TObject *TGeometry::FindObject(const TObject *) const
{
// find object in a geometry node, material, etc
@@ -248,7 +248,7 @@ TObjArray *TGeometry::Get(const char *name)
}
//______________________________________________________________________________
-TMaterial *TGeometry::GetMaterial(const char *name)
+TMaterial *TGeometry::GetMaterial(const char *name) const
{
//*-*-*-*-*-*-*-*-*Return pointer to Material with name*-*-*-*-*-*-*-*-*
//*-* ====================================
@@ -257,7 +257,7 @@ TMaterial *TGeometry::GetMaterial(const char *name)
}
//______________________________________________________________________________
-TMaterial *TGeometry::GetMaterialByNumber(Int_t number)
+TMaterial *TGeometry::GetMaterialByNumber(Int_t number) const
{
//*-*-*-*-*-*-*-*-*Return pointer to Material with number*-*-*-*-*-*-*-*-*
//*-* ======================================
@@ -273,7 +273,7 @@ TMaterial *TGeometry::GetMaterialByNumber(Int_t number)
}
//______________________________________________________________________________
-TNode *TGeometry::GetNode(const char *name)
+TNode *TGeometry::GetNode(const char *name) const
{
//*-*-*-*-*-*-*Return pointer to node with name in the geometry tree*-*-*-*-*
//*-* =====================================================
@@ -285,7 +285,7 @@ TNode *TGeometry::GetNode(const char *name)
}
//______________________________________________________________________________
-TRotMatrix *TGeometry::GetRotMatrix(const char *name)
+TRotMatrix *TGeometry::GetRotMatrix(const char *name) const
{
//*-*-*-*-*-*-*-*-*Return pointer to RotMatrix with name*-*-*-*-*-*-*-*-*-*
//*-* =====================================
@@ -294,7 +294,7 @@ TRotMatrix *TGeometry::GetRotMatrix(const char *name)
}
//______________________________________________________________________________
-TRotMatrix *TGeometry::GetRotMatrixByNumber(Int_t number)
+TRotMatrix *TGeometry::GetRotMatrixByNumber(Int_t number) const
{
//*-*-*-*-*-*-*-*-*Return pointer to RotMatrix with number*-*-*-*-*-*-*-*-*-*
//*-* =======================================
@@ -309,7 +309,7 @@ TRotMatrix *TGeometry::GetRotMatrixByNumber(Int_t number)
}
//______________________________________________________________________________
-TShape *TGeometry::GetShape(const char *name)
+TShape *TGeometry::GetShape(const char *name) const
{
//*-*-*-*-*-*-*-*-*Return pointer to Shape with name*-*-*-*-*-*-*-*-*-*
//*-* =================================
@@ -318,7 +318,7 @@ TShape *TGeometry::GetShape(const char *name)
}
//______________________________________________________________________________
-TShape *TGeometry::GetShapeByNumber(Int_t number)
+TShape *TGeometry::GetShapeByNumber(Int_t number) const
{
//*-*-*-*-*-*-*-*-*Return pointer to Shape with number*-*-*-*-*-*-*-*-*-*
//*-* ===================================
@@ -409,7 +409,7 @@ void TGeometry::Local2Master(Float_t *local, Float_t *master)
}
//______________________________________________________________________________
-void TGeometry::ls(Option_t *option)
+void TGeometry::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this geometry*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ===================
diff --git a/g3d/src/THelix.cxx b/g3d/src/THelix.cxx
index 0fc4710ab5e87ec2204d4144adc374a7e1d8efbe..18349fda92d9e4d17879cde6e0cc688225dfd13a 100644
--- a/g3d/src/THelix.cxx
+++ b/g3d/src/THelix.cxx
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: THelix.cxx,v 1.1.1.1 2000/05/16 17:00:42 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: THelix.cxx,v 1.2 2000/11/21 20:16:13 brun Exp $
// Author: Ping Yeh 19/12/97
/*************************************************************************
@@ -263,7 +263,7 @@ void THelix::Draw(Option_t *option)
}
//______________________________________________________________________________
-void THelix::Print(Option_t *option)
+void THelix::Print(Option_t *option) const
{
// Dump this helix with its attributes.
diff --git a/g3d/src/TNode.cxx b/g3d/src/TNode.cxx
index 46e1354619325f468b8a663295f6b950ddc6b167..8ff743a1c5f1dd549e1d3a162ede356f848d1809 100644
--- a/g3d/src/TNode.cxx
+++ b/g3d/src/TNode.cxx
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TNode.cxx,v 1.3 2000/09/08 16:05:21 rdm Exp $
+// @(#)root/g3d:$Name: $:$Id: TNode.cxx,v 1.4 2000/11/21 20:16:54 brun Exp $
// Author: Rene Brun 14/09/95
/*************************************************************************
@@ -352,12 +352,12 @@ void TNode::ExecuteEvent(Int_t, Int_t, Int_t)
}
//______________________________________________________________________________
-TNode *TNode::GetNode(const char *name)
+TNode *TNode::GetNode(const char *name) const
{
//*-*-*-*-*-*-*Return pointer to node with name in the node tree*-*-*-*-*
//*-* =================================================
- if (!strcmp(name, GetName())) return this;
+ if (!strcmp(name, GetName())) return (TNode*)this;
TNode *node, *nodefound;
TObject *obj;
if (!fNodes) return 0;
@@ -372,7 +372,7 @@ TNode *TNode::GetNode(const char *name)
}
//______________________________________________________________________________
-char *TNode::GetObjectInfo(Int_t, Int_t)
+char *TNode::GetObjectInfo(Int_t, Int_t) const
{
const char *snull = "";
if (!gPad) return (char*)snull;
@@ -485,7 +485,7 @@ void TNode::Local2Master(Float_t *local, Float_t *master)
}
//______________________________________________________________________________
-void TNode::ls(Option_t *option)
+void TNode::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List Referenced object with current parameters*-*-*-*
//*-* ===============================================
@@ -538,7 +538,7 @@ void TNode::ls(Option_t *option)
}
//______________________________________________________________________________
-void TNode::Master2Local(Double_t *master, Double_t *local)
+void TNode::Master2Local(Double_t *master, Double_t *local)
{
//*-*-*-*-*Convert one point from master system to local reference system*-*-*
//*-* ==============================================================
diff --git a/g3d/src/TPolyLine3D.cxx b/g3d/src/TPolyLine3D.cxx
index f8744f9897a1c19a0b18ed94bc9a95db04a53ae9..e9ec3dbef828edbf1013db5ae38d8a86299d7570 100644
--- a/g3d/src/TPolyLine3D.cxx
+++ b/g3d/src/TPolyLine3D.cxx
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TPolyLine3D.cxx,v 1.2 2000/06/13 12:21:21 brun Exp $
+// @(#)root/g3d:$Name: $:$Id: TPolyLine3D.cxx,v 1.3 2000/09/05 09:21:22 brun Exp $
// Author: Nenad Buncic 17/08/95
/*************************************************************************
@@ -411,7 +411,7 @@ void TPolyLine3D::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TPolyLine3D::ls(Option_t *option)
+void TPolyLine3D::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*List this 3-D polyline with its attributes*-*-*-*-*-*-*
//*-* ==========================================
@@ -518,7 +518,7 @@ void TPolyLine3D::PaintPolyLine(Int_t n, Double_t *p, Option_t *)
}
//______________________________________________________________________________
-void TPolyLine3D::Print(Option_t *option)
+void TPolyLine3D::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*Dump this 3-D polyline with its attributes*-*-*-*-*-*-*-*-*
//*-* ==========================================
diff --git a/g3d/src/TPolyMarker3D.cxx b/g3d/src/TPolyMarker3D.cxx
index a0ee22200030ea8c2e8451b097f61681eb41d104..f9222d00d5265bce074e72b521b339ce24a80cce 100644
--- a/g3d/src/TPolyMarker3D.cxx
+++ b/g3d/src/TPolyMarker3D.cxx
@@ -1,4 +1,4 @@
-// @(#)root/g3d:$Name: $:$Id: TPolyMarker3D.cxx,v 1.3 2000/06/30 12:10:55 brun Exp $
+// @(#)root/g3d:$Name: $:$Id: TPolyMarker3D.cxx,v 1.4 2000/09/05 09:21:22 brun Exp $
// Author: Nenad Buncic 21/08/95
/*************************************************************************
@@ -271,7 +271,7 @@ void TPolyMarker3D::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TPolyMarker3D::ls(Option_t *option)
+void TPolyMarker3D::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*List PolyMarker's contents*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==========================
@@ -487,7 +487,7 @@ void TPolyMarker3D::PaintPolyMarker(Int_t n, Float_t *p, Marker_t, Option_t *)
//______________________________________________________________________________
-void TPolyMarker3D::Print(Option_t *option)
+void TPolyMarker3D::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*Print PolyMarker Info*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =====================
diff --git a/g3d/src/TXTRU.cxx b/g3d/src/TXTRU.cxx
index 10f097c8be69c1f842770d5d2a32f481f4de56ce..a3a9b514ee6002a524efbabe7e45e32dc1bea329 100644
--- a/g3d/src/TXTRU.cxx
+++ b/g3d/src/TXTRU.cxx
@@ -1,4 +1,4 @@
-// @@(#)root/g3d:$Name: $:$Id: TXTRU.cxx,v 1.1 2000/09/14 06:30:19 brun Exp $
+// @@(#)root/g3d:$Name: $:$Id: TXTRU.cxx,v 1.2 2000/09/14 07:03:44 brun Exp $
// Author: Robert Hatcher (rhatcher@fnal.gov) 2000.09.06
#include "TXTRU.h"
@@ -581,7 +581,7 @@ void TXTRU::PaintGLPoints(Float_t *vertex)
}
//______________________________________________________________________________
-void TXTRU::Print(Option_t *option)
+void TXTRU::Print(Option_t *option) const
{
// Dump the info of this TXTRU shape
// Option: "xy" to get x-y information
diff --git a/gpad/inc/TAttCanvas.h b/gpad/inc/TAttCanvas.h
index 5ebe5c304c3ff45288d0fc0154f90119521f86cb..ed867cd1430e5207e2c19114bdf2440923171921 100644
--- a/gpad/inc/TAttCanvas.h
+++ b/gpad/inc/TAttCanvas.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TAttCanvas.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/gpad:$Name: $:$Id: TAttCanvas.h,v 1.2 2000/06/13 12:16:22 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -43,13 +43,13 @@ public:
TAttCanvas();
virtual ~TAttCanvas();
virtual void Copy(TAttCanvas &attcanvas);
- Float_t GetAdate() { return fAdate;}
- Float_t GetTitleFromTop() { return fTitleFromTop;}
- Float_t GetXBetween() { return fXBetween;}
- Float_t GetXdate() { return fXdate;}
- Float_t GetYBetween() { return fYBetween;}
- Float_t GetYdate() { return fYdate;}
- virtual void Print(Option_t *option="");
+ Float_t GetAdate() const { return fAdate;}
+ Float_t GetTitleFromTop() const { return fTitleFromTop;}
+ Float_t GetXBetween() const { return fXBetween;}
+ Float_t GetXdate() const { return fXdate;}
+ Float_t GetYBetween() const { return fYBetween;}
+ Float_t GetYdate() const { return fYdate;}
+ virtual void Print(Option_t *option="") const;
virtual void ResetAttCanvas(Option_t *option="");
virtual void SetAdate(Float_t adate) { fAdate=adate;}
virtual void SetTitleFromTop(Float_t titlefromtop)
diff --git a/gpad/inc/TCanvas.h b/gpad/inc/TCanvas.h
index 53e4eb63989e6f9921316a069d6b37d924209310..caa648d63be3aff817a7716b343b3964f10f2fde 100644
--- a/gpad/inc/TCanvas.h
+++ b/gpad/inc/TCanvas.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TCanvas.h,v 1.6 2000/10/26 15:32:04 rdm Exp $
+// @(#)root/gpad:$Name: $:$Id: TCanvas.h,v 1.7 2000/11/21 20:20:07 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -117,7 +117,7 @@ public:
void Clear(Option_t *option="");
void Close(Option_t *option="");
virtual void Draw(Option_t *option="");
- virtual void DrawClone(Option_t *option=""); // *MENU*
+ virtual void DrawClone(Option_t *option="") const; // *MENU*
virtual void DrawClonePad(); // *MENU*
virtual void EditorBar();
void EnterLeave(TPad *prevSelPad, TObject *prevSelObj);
@@ -126,40 +126,40 @@ public:
void UseCurrentStyle(); // *MENU*
void ForceUpdate() { fCanvasImp->ForceUpdate(); }
const char *GetDISPLAY() const {return fDISPLAY.Data();}
- TContextMenu *GetContextMenu(){return fContextMenu;};
- Int_t GetDoubleBuffer() {return fDoubleBuffer;}
- TControlBar *GetEditorBar() {return fEditorBar;}
+ TContextMenu *GetContextMenu() const {return fContextMenu;};
+ Int_t GetDoubleBuffer() const {return fDoubleBuffer;}
+ TControlBar *GetEditorBar() const {return fEditorBar;}
Int_t GetEvent() const { return fEvent; }
Int_t GetEventX() const { return fEventX; }
Int_t GetEventY() const { return fEventY; }
Color_t GetHighLightColor() const { return fHighLightColor; }
virtual void *GetPadDivision(Int_t xdivision=1, Int_t ydivision=1);
TVirtualPad *GetPadSave() const { return fPadSave; }
- TObject *GetSelected() {return fSelected;}
+ TObject *GetSelected() const {return fSelected;}
Option_t *GetSelectedOpt() const {return fSelectedOpt.Data();}
TVirtualPad *GetSelectedPad() const { return fSelectedPad; }
Bool_t GetShowEventStatus() { return fShowEventStatus; }
Bool_t GetAutoExec() const { return fAutoExec; }
- Size_t GetXsizeUser() {return fXsizeUser;}
- Size_t GetYsizeUser() {return fYsizeUser;}
- Size_t GetXsizeReal() {return fXsizeReal;}
- Size_t GetYsizeReal() {return fYsizeReal;}
+ Size_t GetXsizeUser() const {return fXsizeUser;}
+ Size_t GetYsizeUser() const {return fYsizeUser;}
+ Size_t GetXsizeReal() const {return fXsizeReal;}
+ Size_t GetYsizeReal() const {return fYsizeReal;}
Int_t GetCanvasID() const {return fCanvasID;}
- TCanvasImp *GetCanvasImp() {return fCanvasImp;}
+ TCanvasImp *GetCanvasImp() const {return fCanvasImp;}
Int_t GetWindowTopX();
Int_t GetWindowTopY();
UInt_t GetWindowWidth() const { return fWindowWidth; }
UInt_t GetWindowHeight() const { return fWindowHeight; }
- UInt_t GetWw() { return fCw; }
- UInt_t GetWh() { return fCh; }
+ UInt_t GetWw() const { return fCw; }
+ UInt_t GetWh() const { return fCh; }
virtual void GetCanvasPar(Int_t &wtopx, Int_t &wtopy, UInt_t &ww, UInt_t &wh)
{wtopx=GetWindowTopX(); wtopy=fWindowTopY; ww=fWindowWidth; wh=fWindowHeight;}
virtual void HandleInput(EEventType button, Int_t x, Int_t y);
Bool_t HasMenuBar() const { return fMenuBar; }
void Iconify() { fCanvasImp->Iconify(); }
- Bool_t IsBatch() { return fBatch; }
- Bool_t IsRetained() { return fRetained; }
- virtual void ls(Option_t *option="");
+ Bool_t IsBatch() const { return fBatch; }
+ Bool_t IsRetained() const { return fRetained; }
+ virtual void ls(Option_t *option="") const;
void MoveOpaque(Int_t set=1);
Bool_t OpaqueMoving() const { return fMoveOpaque; }
Bool_t OpaqueResizing() const { return fResizeOpaque; }
diff --git a/gpad/inc/TClassTree.h b/gpad/inc/TClassTree.h
index 32f8a8c59ed87c0ee5ccbcec54eae47904b9eaec..a469b8d9ffb41066a863e5259e9666cffca1e3f2 100644
--- a/gpad/inc/TClassTree.h
+++ b/gpad/inc/TClassTree.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TClassTree.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/gpad:$Name: $:$Id: TClassTree.h,v 1.2 2000/11/21 20:20:30 brun Exp $
// Author: Rene Brun 01/12/98
/*************************************************************************
@@ -70,7 +70,7 @@ public:
virtual Int_t FindClass(const char *classname);
const char *GetClasses() const {return fClasses.Data();}
virtual const char *GetSourceDir() const {return fSourceDir.Data();}
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void SaveAs(const char *filename="");
virtual void SetClasses(const char *classes, Option_t *option="ID");
diff --git a/gpad/inc/TControlBar.h b/gpad/inc/TControlBar.h
index cf658d4a570a87901fda8b215a3e1052406f66a5..413033fdab2658b8bb36970aaff38ff1be58b10a 100644
--- a/gpad/inc/TControlBar.h
+++ b/gpad/inc/TControlBar.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name$:$Id$
+// @(#)root/gpad:$Name: $:$Id: TControlBar.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
// Author: Nenad Buncic 20/02/96
/*************************************************************************
@@ -57,23 +57,23 @@ public:
TControlBar(const char *orientation, const char *title, Int_t x, Int_t y);
virtual ~TControlBar();
- void AddButton(TControlBarButton *button);
- void AddButton(TControlBarButton &button);
- void AddButton(const char *label, const char *action, const char *hint="", const char *type="button");
- void AddControlBar(TControlBar *controlBar);
- void AddControlBar(TControlBar &controlBar);
- void AddSeparator();
- TControlBarImp *GetControlBarImp() { return fControlBarImp; }
- TList *GetListOfButtons() { return fButtons; }
- Int_t GetNumberOfColumns() { return fNoroc; }
- Int_t GetNumberOfRows() { return fNoroc; }
- Int_t GetOrientation() { return fOrientation; }
- void Hide();
- void SetNumberOfColumns(Int_t n) { fNoroc = n; }
- void SetNumberOfRows(Int_t n) { fNoroc = n; }
- void SetOrientation(const char *o);
- void SetOrientation(Int_t o);
- void Show();
+ void AddButton(TControlBarButton *button);
+ void AddButton(TControlBarButton &button);
+ void AddButton(const char *label, const char *action, const char *hint="", const char *type="button");
+ void AddControlBar(TControlBar *controlBar);
+ void AddControlBar(TControlBar &controlBar);
+ void AddSeparator();
+ TControlBarImp *GetControlBarImp() const { return fControlBarImp; }
+ TList *GetListOfButtons() const { return fButtons; }
+ Int_t GetNumberOfColumns() const { return fNoroc; }
+ Int_t GetNumberOfRows() const { return fNoroc; }
+ Int_t GetOrientation() const { return fOrientation; }
+ void Hide();
+ void SetNumberOfColumns(Int_t n) { fNoroc = n; }
+ void SetNumberOfRows(Int_t n) { fNoroc = n; }
+ void SetOrientation(const char *o);
+ void SetOrientation(Int_t o);
+ void Show();
ClassDef(TControlBar,0) //Control bar
};
diff --git a/gpad/inc/TDialogCanvas.h b/gpad/inc/TDialogCanvas.h
index 1ccc55f53ac1baae091e0f56235774f7a1fa1438..3fa2705c3ae57b0b76dd4fac12dd1d83707dd027 100644
--- a/gpad/inc/TDialogCanvas.h
+++ b/gpad/inc/TDialogCanvas.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TDialogCanvas.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/gpad:$Name: $:$Id: TDialogCanvas.h,v 1.2 2000/06/13 12:16:22 brun Exp $
// Author: Rene Brun 03/07/96
/*************************************************************************
@@ -41,8 +41,8 @@ public:
virtual void Apply(const char *action="");
virtual void BuildStandardButtons();
virtual void Divide(Int_t nx=1, Int_t ny=1, Float_t xmargin=0.01, Float_t ymargin=0.01, Int_t color=0);
- TObject *GetRefObject() { return fRefObject; }
- TPad *GetRefPad() { return fRefPad; }
+ TObject *GetRefObject() const { return fRefObject; }
+ TPad *GetRefPad() const { return fRefPad; }
virtual void Range(Double_t x1, Double_t y1, Double_t x2, Double_t y2);
virtual void RecursiveRemove(TObject *obj);
virtual void SetBorderMode(Short_t bordermode){ fBorderMode = bordermode; }
diff --git a/gpad/inc/TDrawPanelHist.h b/gpad/inc/TDrawPanelHist.h
index 22f37d11b43900133ab50cda6c71cadd62f76faf..0da7e81e0a1f23262e4c5814b7805f30a7d68ac1 100644
--- a/gpad/inc/TDrawPanelHist.h
+++ b/gpad/inc/TDrawPanelHist.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name$:$Id$
+// @(#)root/gpad:$Name: $:$Id: TDrawPanelHist.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
// Author: Rene Brun 26/11/96
/*************************************************************************
@@ -45,7 +45,7 @@ public:
virtual void Apply(const char *action="");
virtual void BuildStandardButtons();
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- TObject *GetHistogram() {return fHistogram;}
+ TObject *GetHistogram() const {return fHistogram;}
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetDefaults();
virtual void SetSame();
diff --git a/gpad/inc/TFitPanel.h b/gpad/inc/TFitPanel.h
index b42684a97a04d9cd9f4dcaa51cdbd94f5a605308..d0f28e9010d69f244a26314f54ba7b1d4d46a16e 100644
--- a/gpad/inc/TFitPanel.h
+++ b/gpad/inc/TFitPanel.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name$:$Id$
+// @(#)root/gpad:$Name: $:$Id: TFitPanel.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
// Author: Rene Brun 24/11/96
/*************************************************************************
@@ -47,7 +47,7 @@ public:
virtual void Apply(const char *action="");
virtual void BuildStandardButtons();
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- TObject *GetObjectFit() {return fObjectFit;}
+ TObject *GetObjectFit() const {return fObjectFit;}
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetDefaults();
virtual void SetFunction(const char *function);
diff --git a/gpad/inc/TInspectCanvas.h b/gpad/inc/TInspectCanvas.h
index 8e04afdca7c9e529b70d6c2f52bfa2bae1a4278e..4a2e5635ee7b614a104453ead267a04919271b26 100644
--- a/gpad/inc/TInspectCanvas.h
+++ b/gpad/inc/TInspectCanvas.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name$:$Id$
+// @(#)root/gpad:$Name: $:$Id: TInspectCanvas.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
// Author: Rene Brun 08/01/2000
/*************************************************************************
@@ -43,10 +43,10 @@ public:
TInspectCanvas();
TInspectCanvas(UInt_t ww, UInt_t wh);
virtual ~TInspectCanvas();
- TButton *GetBackward() {return fBackward;}
- TButton *GetForward() {return fForward;}
- TObject *GetCurObject() {return fCurObject;}
- TList *GetObjects() {return fObjects;}
+ TButton *GetBackward() const {return fBackward;}
+ TButton *GetForward() const {return fForward;}
+ TObject *GetCurObject() const {return fCurObject;}
+ TList *GetObjects() const {return fObjects;}
static void GoBackward();
static void GoForward();
static void Inspector(TObject *obj);
diff --git a/gpad/inc/TPad.h b/gpad/inc/TPad.h
index 6b13a7cac6ccd18bf88b3d5e37d04d37d5d7dfbe..7ac4fa8a5da8b6a4b90decced5590e571018aae1 100644
--- a/gpad/inc/TPad.h
+++ b/gpad/inc/TPad.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TPad.h,v 1.6 2000/09/29 08:23:08 brun Exp $
+// @(#)root/gpad:$Name: $:$Id: TPad.h,v 1.7 2000/11/21 20:21:00 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -158,7 +158,7 @@ public:
virtual void DeleteExec(const char *name);
virtual void Divide(Int_t nx=1, Int_t ny=1, Float_t xmargin=0.01, Float_t ymargin=0.01, Int_t color=0); // *MENU*
virtual void Draw(Option_t *option="");
- virtual void DrawClassObject(TObject *obj, Option_t *option="");
+ virtual void DrawClassObject(const TObject *obj, Option_t *option="");
static void DrawColorTable();
virtual void DrawCrosshair();
TH1F *DrawFrame(Double_t xmin, Double_t ymin, Double_t xmax, Double_t ymax, const char *title="");
@@ -167,10 +167,10 @@ public:
void DrawText(Double_t x, Double_t y, const char *text);
void DrawTextNDC(Double_t u, Double_t v, const char *text);
virtual TObject *FindObject(const char *name) const;
- virtual TObject *FindObject(TObject *obj) const;
+ virtual TObject *FindObject(const TObject *obj) const;
virtual void UseCurrentStyle(); // *MENU*
- virtual Short_t GetBorderMode() { return fBorderMode;}
- virtual Short_t GetBorderSize() { return fBorderSize;}
+ virtual Short_t GetBorderMode() const { return fBorderMode;}
+ virtual Short_t GetBorderSize() const { return fBorderSize;}
Int_t GetCrosshair() const {return fCrosshair;}
virtual Int_t GetCanvasID() const;
TFrame *GetFrame();
@@ -181,58 +181,58 @@ public:
virtual void GetRange(Double_t &x1, Double_t &y1, Double_t &x2, Double_t &y2);
virtual void GetRangeAxis(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax);
virtual void GetPadPar(Double_t &xlow, Double_t &ylow, Double_t &xup, Double_t &yup);
- Double_t GetXlowNDC() {return fXlowNDC;}
- Double_t GetYlowNDC() {return fYlowNDC;}
- Double_t GetWNDC() {return fWNDC;}
- Double_t GetHNDC() {return fHNDC;}
- virtual UInt_t GetWw();
- virtual UInt_t GetWh();
- Double_t GetAbsXlowNDC() {return fAbsXlowNDC;}
- Double_t GetAbsYlowNDC() {return fAbsYlowNDC;}
- Double_t GetAbsWNDC() {return fAbsWNDC;}
- Double_t GetAbsHNDC() {return fAbsHNDC;}
- Double_t GetPhi() {return fPhi;}
- Double_t GetTheta() {return fTheta;}
- Double_t GetUxmin() {return fUxmin;}
- Double_t GetUymin() {return fUymin;}
- Double_t GetUxmax() {return fUxmax;}
- Double_t GetUymax() {return fUymax;}
- Bool_t GetGridx() {return fGridx;}
- Bool_t GetGridy() {return fGridy;}
- Int_t GetNumber() {return fNumber;}
- Int_t GetTickx() {return fTickx;}
- Int_t GetTicky() {return fTicky;}
+ Double_t GetXlowNDC() const {return fXlowNDC;}
+ Double_t GetYlowNDC() const {return fYlowNDC;}
+ Double_t GetWNDC() const {return fWNDC;}
+ Double_t GetHNDC() const {return fHNDC;}
+ virtual UInt_t GetWw() const;
+ virtual UInt_t GetWh() const;
+ Double_t GetAbsXlowNDC() const {return fAbsXlowNDC;}
+ Double_t GetAbsYlowNDC() const {return fAbsYlowNDC;}
+ Double_t GetAbsWNDC() const {return fAbsWNDC;}
+ Double_t GetAbsHNDC() const {return fAbsHNDC;}
+ Double_t GetPhi() const {return fPhi;}
+ Double_t GetTheta() const {return fTheta;}
+ Double_t GetUxmin() const {return fUxmin;}
+ Double_t GetUymin() const {return fUymin;}
+ Double_t GetUxmax() const {return fUxmax;}
+ Double_t GetUymax() const {return fUymax;}
+ Bool_t GetGridx() const {return fGridx;}
+ Bool_t GetGridy() const {return fGridy;}
+ Int_t GetNumber() const {return fNumber;}
+ Int_t GetTickx() const {return fTickx;}
+ Int_t GetTicky() const {return fTicky;}
Double_t GetX1() const { return fX1; }
Double_t GetX2() const { return fX2; }
Double_t GetY1() const { return fY1; }
Double_t GetY2() const { return fY2; }
- TList *GetListOfPrimitives() {return fPrimitives;}
- TList *GetListOfExecs() {return fExecs;}
- virtual TObject *GetPrimitive(const char *name); //obsolete, use FindObject instead
- virtual TObject *GetSelected();
- virtual TObject *GetPadPointer() {return fPadPointer;}
+ TList *GetListOfPrimitives() const {return fPrimitives;}
+ TList *GetListOfExecs() const {return fExecs;}
+ virtual TObject *GetPrimitive(const char *name) const; //obsolete, use FindObject instead
+ virtual TObject *GetSelected() const;
+ virtual TObject *GetPadPointer() const {return fPadPointer;}
TVirtualPad *GetPadSave() const;
TVirtualPad *GetSelectedPad() const;
- TView *GetView() {return fView;}
- TPadView3D *GetView3D(){return fPadView3D;}// Return 3D View of this TPad
- Int_t GetLogx() {return fLogx;}
- Int_t GetLogy() {return fLogy;}
- Int_t GetLogz() {return fLogz;}
- virtual TVirtualPad *GetMother() {return fMother;}
+ TView *GetView() const {return fView;}
+ TPadView3D *GetView3D() const {return fPadView3D;}// Return 3D View of this TPad
+ Int_t GetLogx() const {return fLogx;}
+ Int_t GetLogy() const {return fLogy;}
+ Int_t GetLogz() const {return fLogz;}
+ virtual TVirtualPad *GetMother() const {return fMother;}
const char *GetName() const {return fName.Data();}
const char *GetTitle() const {return fTitle.Data();}
- virtual TCanvas *GetCanvas() { return fCanvas; }
- virtual TVirtualPad *GetVirtCanvas();
- Int_t GetPadPaint() {return fPadPaint;}
- Int_t GetPixmapID() {return fPixmapID;}
+ virtual TCanvas *GetCanvas() const { return fCanvas; }
+ virtual TVirtualPad *GetVirtCanvas() const ;
+ Int_t GetPadPaint() const {return fPadPaint;}
+ Int_t GetPixmapID() const {return fPixmapID;}
virtual Bool_t HasCrosshair() const {return (Bool_t)fCrosshair;}
void HighLight(Color_t col=kRed, Bool_t set=kTRUE);
- virtual Bool_t IsBatch();
- virtual Bool_t IsEditable() {return fEditable;}
+ virtual Bool_t IsBatch() const;
+ virtual Bool_t IsEditable() const {return fEditable;}
Bool_t IsFolder() const {return kTRUE;}
- Bool_t IsModified() {return fModified;}
- virtual Bool_t IsRetained();
- virtual void ls(Option_t *option="");
+ Bool_t IsModified() const {return fModified;}
+ virtual Bool_t IsRetained() const;
+ virtual void ls(Option_t *option="") const;
void Modified(Bool_t flag=1) { fModified = flag; }
virtual Bool_t OpaqueMoving() const;
virtual Bool_t OpaqueResizing() const;
@@ -261,7 +261,7 @@ public:
Double_t PixeltoY(Int_t py);
virtual void PixeltoXY(Int_t xpixel, Int_t ypixel, Double_t &x, Double_t &y);
virtual void Pop();
- virtual void Print(const char *filename="");
+ virtual void Print(const char *filename="") const;
virtual void Print(const char *filename, Option_t *option);
virtual void Range(Double_t x1, Double_t y1, Double_t x2, Double_t y2); // *MENU* *ARGS={x1=>fX1,y1=>fY1,x2=>fX2,y2=>fY2}
virtual void RangeAxis(Double_t xmin, Double_t ymin, Double_t xmax, Double_t ymax);
diff --git a/gpad/inc/TPaveClass.h b/gpad/inc/TPaveClass.h
index 63930cb1e843e7d181a178e0145fb2822fc71c9c..c0be2fd374e25e8995d4719231a6348d170a14d8 100644
--- a/gpad/inc/TPaveClass.h
+++ b/gpad/inc/TPaveClass.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TPaveClass.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/gpad:$Name: $:$Id: TPaveClass.h,v 1.2 2000/06/13 11:35:11 brun Exp $
// Author: Rene Brun 06/08/99
/*************************************************************************
@@ -40,7 +40,7 @@ public:
virtual ~TPaveClass();
void Copy(TObject &PaveVar);
virtual void DrawClasses(const char *classes="this"); // *MENU*
- TClassTree *GetClassTree() {return fClassTree;}
+ TClassTree *GetClassTree() const {return fClassTree;}
virtual void SaveAs(const char *filename=""); // *MENU*
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetClasses(const char *classes="this", Option_t *option="ID"); // *MENU*
diff --git a/gpad/inc/TSlider.h b/gpad/inc/TSlider.h
index 94b621dac8ba95a764a79e014ea8edfa83314d72..b06631b5463a7ff9270ea97ae73e52d5943e514a 100644
--- a/gpad/inc/TSlider.h
+++ b/gpad/inc/TSlider.h
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TSlider.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/gpad:$Name: $:$Id: TSlider.h,v 1.2 2000/06/13 12:13:48 brun Exp $
// Author: Rene Brun 23/11/96
/*************************************************************************
@@ -44,9 +44,9 @@ public:
TSlider();
TSlider(const char *name, const char *title, Double_t x1, Double_t y1,Double_t x2 ,Double_t y2, Color_t color=16, Short_t bordersize=2, Short_t bordermode =-1);
virtual ~TSlider();
- TObject *GetObject() {return fObject;}
- Double_t GetMinimum() {return fMinimum;}
- Double_t GetMaximum() {return fMaximum;}
+ TObject *GetObject() const {return fObject;}
+ Double_t GetMinimum() const {return fMinimum;}
+ Double_t GetMaximum() const {return fMaximum;}
virtual const char *GetMethod() const { return fMethod.Data(); }
virtual void Paint(Option_t *option="");
virtual void SavePrimitive(ofstream &out, Option_t *option);
diff --git a/gpad/src/TAttCanvas.cxx b/gpad/src/TAttCanvas.cxx
index ad7d968ef2f09402503de7fc48a5d0575dc0c122..66709b9bdd101d0f36e2fa7c75b4773b25ede319 100644
--- a/gpad/src/TAttCanvas.cxx
+++ b/gpad/src/TAttCanvas.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name$:$Id$
+// @(#)root/gpad:$Name: $:$Id: TAttCanvas.cxx,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -43,7 +43,7 @@ void TAttCanvas::Copy(TAttCanvas &attcanvas)
}
//______________________________________________________________________________
-void TAttCanvas::Print(Option_t *)
+void TAttCanvas::Print(Option_t *) const
{
}
diff --git a/gpad/src/TCanvas.cxx b/gpad/src/TCanvas.cxx
index 0602f2bc3133a77d27c3ebb0e180d54dabb25a85..a06cccf9b69ff67e8232d1dc24db4842c2a854c8 100644
--- a/gpad/src/TCanvas.cxx
+++ b/gpad/src/TCanvas.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TCanvas.cxx,v 1.17 2000/10/08 16:00:33 rdm Exp $
+// @(#)root/gpad:$Name: $:$Id: TCanvas.cxx,v 1.18 2000/10/26 15:32:04 rdm Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -650,7 +650,7 @@ void TCanvas::Draw(Option_t *)
}
//______________________________________________________________________________
-void TCanvas::DrawClone(Option_t *option)
+void TCanvas::DrawClone(Option_t *option) const
{
// Draw a clone of this canvas
// A new canvas is created that is a clone of this canvas
@@ -1134,7 +1134,7 @@ void TCanvas::HandleInput(EEventType event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TCanvas::ls(Option_t *option)
+void TCanvas::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*List all pads*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =============
diff --git a/gpad/src/TClassTree.cxx b/gpad/src/TClassTree.cxx
index 8cc2af1d6a68c906a6859612d7a395237da6cf22..02e621d8fc45ddff65f47c3e37b4d4d004095d7e 100644
--- a/gpad/src/TClassTree.cxx
+++ b/gpad/src/TClassTree.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name$:$Id$
+// @(#)root/gpad:$Name: $:$Id: TClassTree.cxx,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
// Author: Rene Brun 01/12/98
/*************************************************************************
@@ -428,7 +428,7 @@ void TClassTree::Init()
}
//_____________________________________________________________________________
-void TClassTree::ls(Option_t *)
+void TClassTree::ls(Option_t *) const
{
// list classes names and titles
char line[500];
diff --git a/gpad/src/TPad.cxx b/gpad/src/TPad.cxx
index a7d2fb981b971d2dc59e46122ef90cab067afdaa..e593a433fcc2d816a659da4f02f5fdb59dee05ed 100644
--- a/gpad/src/TPad.cxx
+++ b/gpad/src/TPad.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TPad.cxx,v 1.22 2000/11/21 20:21:54 brun Exp $
+// @(#)root/gpad:$Name: $:$Id: TPad.cxx,v 1.23 2000/12/02 16:36:33 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -1241,7 +1241,7 @@ void TPad::Draw(Option_t *option)
}
//______________________________________________________________________________
-void TPad::DrawClassObject(TObject *classobj, Option_t *option)
+void TPad::DrawClassObject(const TObject *classobj, Option_t *option)
{
// Draw class inheritance tree of the class to which obj belongs.
// If a class B inherits from a class A, description of B is drawn
@@ -2060,7 +2060,7 @@ TObject *TPad::FindObject(const char *name) const
}
//______________________________________________________________________________
-TObject *TPad::FindObject(TObject *) const
+TObject *TPad::FindObject(const TObject *) const
{
//not implemented yet
return 0;
@@ -2091,7 +2091,7 @@ Int_t TPad::GetEventY() const
}
//______________________________________________________________________________
-TVirtualPad *TPad::GetVirtCanvas()
+TVirtualPad *TPad::GetVirtCanvas() const
{
return (TVirtualPad*) fCanvas;
}
@@ -2103,7 +2103,7 @@ Color_t TPad::GetHighLightColor() const
}
//______________________________________________________________________________
-TObject *TPad::GetSelected()
+TObject *TPad::GetSelected() const
{
return fCanvas->GetSelected();
}
@@ -2121,13 +2121,13 @@ TVirtualPad *TPad::GetPadSave() const
}
//______________________________________________________________________________
-UInt_t TPad::GetWh()
+UInt_t TPad::GetWh() const
{
return fCanvas->GetWh();
}
//______________________________________________________________________________
-UInt_t TPad::GetWw()
+UInt_t TPad::GetWw() const
{
return fCanvas->GetWw();
}
@@ -2144,13 +2144,13 @@ void TPad::HideToolTip(Int_t event)
}
//______________________________________________________________________________
-Bool_t TPad::IsBatch()
+Bool_t TPad::IsBatch() const
{
return fCanvas->IsBatch();
}
//______________________________________________________________________________
-Bool_t TPad::IsRetained()
+Bool_t TPad::IsRetained() const
{
return fCanvas->IsRetained();
}
@@ -2225,7 +2225,7 @@ TFrame *TPad::GetFrame()
}
//______________________________________________________________________________
-TObject *TPad::GetPrimitive(const char *name)
+TObject *TPad::GetPrimitive(const char *name) const
{
if (fPrimitives) return fPrimitives->FindObject(name);
return 0;
@@ -2283,7 +2283,7 @@ void TPad::HighLight(Color_t color, Bool_t set)
}
//______________________________________________________________________________
-void TPad::ls(Option_t *option)
+void TPad::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*List all primitives in pad*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==========================
@@ -3310,13 +3310,13 @@ void TPad::Pop()
//______________________________________________________________________________
-void TPad::Print(const char *filename)
+void TPad::Print(const char *filename) const
{
//*-*-*-*-*Old interface. Use SaveAs instead*-*-*-*-*-*
//*-* =================================
//
- SaveAs(filename);
+ ((TPad*)this)->SaveAs(filename);
}
diff --git a/graf/inc/TArrow.h b/graf/inc/TArrow.h
index c75cbf166e3bc705ff26f4eeabf62642db9ab919..67cf3b10531cbd0147f6d06288fd4083729f3d69 100644
--- a/graf/inc/TArrow.h
+++ b/graf/inc/TArrow.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TArrow.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TArrow.h,v 1.2 2000/06/13 10:43:51 brun Exp $
// Author: Rene Brun 17/10/95
/*************************************************************************
@@ -48,8 +48,8 @@ public:
virtual void Draw(Option_t *option="");
virtual void DrawArrow(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2
,Float_t arrowsize=0.05 ,Option_t *option=">");
- Float_t GetAngle() {return fAngle;}
- Float_t GetArrowSize() {return fArrowSize;}
+ Float_t GetAngle() const {return fAngle;}
+ Float_t GetArrowSize() const {return fArrowSize;}
Option_t *GetOption() const { return fOption.Data();}
virtual void Paint(Option_t *option="");
virtual void PaintArrow(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2
diff --git a/graf/inc/TBox.h b/graf/inc/TBox.h
index e9c6624be6a6d6448e06f091c66d8fe11ba38153..93c3dcea0da5e259c57945b65285886bfd01a42e 100644
--- a/graf/inc/TBox.h
+++ b/graf/inc/TBox.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TBox.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TBox.h,v 1.2 2000/06/13 10:45:49 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -59,10 +59,10 @@ public:
Double_t GetY1() const { return fY1; }
Double_t GetY2() const { return fY2; }
virtual void HideToolTip(Int_t event);
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintBox(Double_t x1, Double_t y1, Double_t x2, Double_t y2, Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetX1(Double_t x1) {fX1=x1;}
virtual void SetX2(Double_t x2) {fX2=x2;}
diff --git a/graf/inc/TCurlyArc.h b/graf/inc/TCurlyArc.h
index 6394265aaab6f39a78a06d09c99147976abfe6c4..296f187785fe3b07b9d2ad91ec2c0ea3742676b3 100644
--- a/graf/inc/TCurlyArc.h
+++ b/graf/inc/TCurlyArc.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TCurlyArc.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TCurlyArc.h,v 1.2 2000/06/13 10:47:27 brun Exp $
// Author: Otto Schaile 20/11/99
/*************************************************************************
@@ -34,13 +34,13 @@ public:
virtual void Build();
Int_t DistancetoPrimitive(Int_t px, Int_t py);
void ExecuteEvent(Int_t event, Int_t px, Int_t py);
+ Double_t GetRadius() const {return fR1;}
+ Double_t GetPhimin() const {return fPhimin;}
+ Double_t GetPhimax() const {return fPhimax;}
virtual void SetCenter(Double_t x1, Double_t y1); // *MENU* *ARGS={x1=>fX1,y1=>fY1}
virtual void SetRadius(Double_t radius); // *MENU* *ARGS={radius=>fR1}
virtual void SetPhimin(Double_t phimin); // *MENU* *ARGS={phimin=>fPhimin}
virtual void SetPhimax(Double_t phimax); // *MENU* *ARGS={phimax=>fPhimax}
- Double_t GetRadius() {return fR1;}
- Double_t GetPhimin() {return fPhimin;}
- Double_t GetPhimax() {return fPhimax;}
virtual void SavePrimitive(ofstream &out, Option_t *);
ClassDef(TCurlyArc,2) // a curly arc
diff --git a/graf/inc/TCurlyLine.h b/graf/inc/TCurlyLine.h
index 67d93f32d529205fefae49105ff7077730c56e24..edc8b766ddf0bfde34fbbb4ee59e7d17a9e1b923 100644
--- a/graf/inc/TCurlyLine.h
+++ b/graf/inc/TCurlyLine.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TCurlyLine.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TCurlyLine.h,v 1.2 2000/06/13 10:49:14 brun Exp $
// Author: Otto Schaile 20/11/99
/*************************************************************************
@@ -49,19 +49,19 @@ public:
virtual void Build();
Int_t DistancetoPrimitive(Int_t px, Int_t py);
void ExecuteEvent(Int_t event, Int_t px, Int_t py);
+ Bool_t GetCurly() const {return fIsCurly;}
+ Double_t GetWaveLength() const{return fWaveLength;}
+ Double_t GetAmplitude() const {return fAmplitude;}
+ Double_t GetStartX() const {return fX1;}
+ Double_t GetEndX() const {return fX2;}
+ Double_t GetStartY() const {return fY1;}
+ Double_t GetEndY() const {return fY2;}
virtual void SetCurly(); // *MENU*
virtual void SetWavy(); // *MENU*
virtual void SetWaveLength(Double_t WaveLength); // *MENU* *ARGS={WaveLength=>fWaveLength}
virtual void SetAmplitude(Double_t x); // *MENU* *ARGS={x=>fAmplitude}
virtual void SetStartPoint(Double_t x1, Double_t y1);
virtual void SetEndPoint (Double_t x2, Double_t y2);
- Bool_t GetCurly() {return fIsCurly;}
- Double_t GetWaveLength(){return fWaveLength;}
- Double_t GetAmplitude() {return fAmplitude;}
- Double_t GetStartX() {return fX1;}
- Double_t GetEndX() {return fX2;}
- Double_t GetStartY() {return fY1;}
- Double_t GetEndY() {return fY2;}
virtual void SavePrimitive(ofstream &out, Option_t *);
ClassDef(TCurlyLine,2) // A curly polyline
diff --git a/graf/inc/TCutG.h b/graf/inc/TCutG.h
index 9950bc9b96a31efbd3bbc3491350340c3d11a891..dd5b03247dde156884b5838dbed4339a884a4524 100644
--- a/graf/inc/TCutG.h
+++ b/graf/inc/TCutG.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TCutG.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TCutG.h,v 1.2 2000/06/13 10:51:17 brun Exp $
// Author: Rene Brun 16/05/97
/*************************************************************************
@@ -38,11 +38,11 @@ public:
TCutG(const char *name, Int_t n, Float_t *x, Float_t *y);
TCutG(const char *name, Int_t n, Double_t *x, Double_t *y);
virtual ~TCutG();
- TObject *GetObjectX() {return fObjectX;}
- TObject *GetObjectY() {return fObjectY;}
+ TObject *GetObjectX() const {return fObjectX;}
+ TObject *GetObjectY() const {return fObjectY;}
const char *GetVarX() const {return fVarX.Data();}
const char *GetVarY() const {return fVarY.Data();}
- virtual Int_t IsInside(Double_t x, Double_t y);
+ virtual Int_t IsInside(Double_t x, Double_t y) const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetObjectX(TObject *obj) {fObjectX = obj;}
virtual void SetObjectY(TObject *obj) {fObjectY = obj;}
diff --git a/graf/inc/TEllipse.h b/graf/inc/TEllipse.h
index aca6022f3cce99937be06f13bad2e09d9109a0f4..e68e4215d3eece8f885b32fffd18b9de20d067dc 100644
--- a/graf/inc/TEllipse.h
+++ b/graf/inc/TEllipse.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TEllipse.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TEllipse.h,v 1.2 2000/06/13 10:54:57 brun Exp $
// Author: Rene Brun 16/10/95
/*************************************************************************
@@ -53,17 +53,17 @@ public:
virtual void Draw(Option_t *option="");
virtual void DrawEllipse(Double_t x1, Double_t y1, Double_t r1,Double_t r2,Double_t phimin, Double_t phimax,Double_t theta);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Double_t GetX1() {return fX1;}
- Double_t GetY1() {return fY1;}
- Double_t GetR1() {return fR1;}
- Double_t GetR2() {return fR2;}
- Double_t GetPhimin() {return fPhimin;}
- Double_t GetPhimax() {return fPhimax;}
- Double_t GetTheta() {return fTheta;}
- virtual void ls(Option_t *option="");
+ Double_t GetX1() const {return fX1;}
+ Double_t GetY1() const {return fY1;}
+ Double_t GetR1() const {return fR1;}
+ Double_t GetR2() const {return fR2;}
+ Double_t GetPhimin() const {return fPhimin;}
+ Double_t GetPhimax() const {return fPhimax;}
+ Double_t GetTheta() const {return fTheta;}
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintEllipse(Double_t x1, Double_t y1, Double_t r1,Double_t r2,Double_t phimin, Double_t phimax,Double_t theta);
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetPhimin(Double_t phi=0) {fPhimin=phi;} // *MENU*
virtual void SetPhimax(Double_t phi=360) {fPhimax=phi;} // *MENU*
diff --git a/graf/inc/TGaxis.h b/graf/inc/TGaxis.h
index 1b1f590f09219913d5b58eb377a3838e14f1f77c..165267f29a02110dd46d6f52e82c154ee8e5d1e3 100644
--- a/graf/inc/TGaxis.h
+++ b/graf/inc/TGaxis.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TGaxis.h,v 1.2 2000/06/13 10:56:59 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TGaxis.h,v 1.3 2000/11/21 20:22:50 brun Exp $
// Author: Rene Brun, Olivier Couet 12/12/94
/*************************************************************************
@@ -74,21 +74,21 @@ public:
virtual void DrawAxis(Double_t xmin,Double_t ymin,Double_t xmax,Double_t ymax,
Double_t wmin,Double_t wmax,Int_t ndiv=510, Option_t *chopt="",
Double_t gridlength = 0);
- Float_t GetGridLength() {return fGridLength;}
- TF1 *GetFunction() {return fFunction;}
- Int_t GetLabelColor() {return fLabelColor;}
- Int_t GetLabelFont() {return fLabelFont;}
- Float_t GetLabelOffset() {return fLabelOffset;}
- Float_t GetLabelSize() {return fLabelSize;}
- Float_t GetTitleOffset() {return fTitleOffset;}
- Float_t GetTitleSize() {return fTitleSize;}
+ Float_t GetGridLength() const {return fGridLength;}
+ TF1 *GetFunction() const {return fFunction;}
+ Int_t GetLabelColor() const {return fLabelColor;}
+ Int_t GetLabelFont() const {return fLabelFont;}
+ Float_t GetLabelOffset() const {return fLabelOffset;}
+ Float_t GetLabelSize() const {return fLabelSize;}
+ Float_t GetTitleOffset() const {return fTitleOffset;}
+ Float_t GetTitleSize() const {return fTitleSize;}
virtual const char *GetName() const {return fName.Data();}
virtual const char *GetOption() const {return fChopt.Data();}
virtual const char *GetTitle() const {return fTitle.Data();}
- Int_t GetNdiv() {return fNdiv;}
- Double_t GetWmin() {return fWmin;}
- Double_t GetWmax() {return fWmax;}
- Float_t GetTickSize() {return fTickSize;}
+ Int_t GetNdiv() const {return fNdiv;}
+ Double_t GetWmin() const {return fWmin;}
+ Double_t GetWmax() const {return fWmax;}
+ Float_t GetTickSize() const {return fTickSize;}
void LabelsLimits(const char *label, Int_t &first, Int_t &last);
virtual void Optimize(Double_t A1, Double_t A2, Int_t nold
,Double_t &BinLow, Double_t &BinHigh, Int_t &nbins, Double_t &BWID);
diff --git a/graf/inc/TGraph.h b/graf/inc/TGraph.h
index 79b9a2d107d5f8e59757c80727fb2cf6fa392a0d..5b8c76826c0e0bf787d8ed05b3aa29f0d63be6ea 100644
--- a/graf/inc/TGraph.h
+++ b/graf/inc/TGraph.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TGraph.h,v 1.6 2000/12/02 16:31:25 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TGraph.h,v 1.7 2000/12/08 16:00:33 brun Exp $
// Author: Rene Brun, Olivier Couet 12/12/94
/*************************************************************************
@@ -70,16 +70,16 @@ public:
virtual void Fit(const char *formula ,Option_t *option="" ,Option_t *goption=""); // *MENU*
virtual void Fit(TF1 *f1 ,Option_t *option="" ,Option_t *goption=""); // *MENU*
virtual void FitPanel(); // *MENU*
- virtual Double_t GetErrorX(Int_t bin);
- virtual Double_t GetErrorY(Int_t bin);
- TF1 *GetFunction(const char *name);
- TH1F *GetHistogram();
- TList *GetListOfFunctions() { return fFunctions; }
- Int_t GetN() {return fNpoints;}
- Double_t *GetX() {return fX;}
- Double_t *GetY() {return fY;}
- TAxis *GetXaxis();
- TAxis *GetYaxis();
+ virtual Double_t GetErrorX(Int_t bin) const;
+ virtual Double_t GetErrorY(Int_t bin) const;
+ TF1 *GetFunction(const char *name) const;
+ TH1F *GetHistogram() const;
+ TList *GetListOfFunctions() const { return fFunctions; }
+ Int_t GetN() const {return fNpoints;}
+ Double_t *GetX() const {return fX;}
+ Double_t *GetY() const {return fY;}
+ TAxis *GetXaxis() const ;
+ TAxis *GetYaxis() const ;
virtual void GetPoint(Int_t i, Double_t &x, Double_t &y);
virtual void InitExpo();
virtual void InitGaus();
@@ -87,7 +87,7 @@ public:
virtual void Paint(Option_t *chopt="");
virtual void PaintGraph(Int_t npoints, Double_t *x, Double_t *y, Option_t *option="");
virtual void PaintGrapHist(Int_t npoints, Double_t *x, Double_t *y, Option_t *option="");
- virtual void Print(Option_t *chopt="");
+ virtual void Print(Option_t *chopt="") const;
static void RemoveFunction(TGraph *gr, TObject *obj);
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetMaximum(Double_t maximum=-1111); // *MENU*
diff --git a/graf/inc/TGraphAsymmErrors.h b/graf/inc/TGraphAsymmErrors.h
index ee048526edf631878b6054fa42d47071d53da2cf..def0086d65393ce839b7775ed7335d79c1a9d1f3 100644
--- a/graf/inc/TGraphAsymmErrors.h
+++ b/graf/inc/TGraphAsymmErrors.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TGraphAsymmErrors.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TGraphAsymmErrors.h,v 1.2 2000/06/13 10:58:50 brun Exp $
// Author: Rene Brun 03/03/99
/*************************************************************************
@@ -40,14 +40,14 @@ public:
TGraphAsymmErrors(Int_t n, Double_t *x, Double_t *y, Double_t *exl=0, Double_t *exh=0, Double_t *eyl=0, Double_t *eyh=0);
virtual ~TGraphAsymmErrors();
virtual void ComputeRange(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax);
- Double_t GetErrorX(Int_t bin);
- Double_t GetErrorY(Int_t bin);
- Double_t *GetEXlow() {return fEXlow;}
- Double_t *GetEXhigh() {return fEXhigh;}
- Double_t *GetEYlow() {return fEYlow;}
- Double_t *GetEYhigh() {return fEYhigh;}
+ Double_t GetErrorX(Int_t bin) const;
+ Double_t GetErrorY(Int_t bin) const;
+ Double_t *GetEXlow() const {return fEXlow;}
+ Double_t *GetEXhigh() const {return fEXhigh;}
+ Double_t *GetEYlow() const {return fEYlow;}
+ Double_t *GetEYhigh() const {return fEYhigh;}
virtual void Paint(Option_t *chopt="");
- virtual void Print(Option_t *chopt="");
+ virtual void Print(Option_t *chopt="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetPoint(Int_t i, Double_t x, Double_t y);
virtual void SetPointError(Int_t i, Double_t exl, Double_t exh, Double_t eyl, Double_t eyh);
diff --git a/graf/inc/TGraphErrors.h b/graf/inc/TGraphErrors.h
index a50935b601174632f639fe3c64f617a4ba7a9cda..9302da6684c912e71684b20d88ce1a6655973cf4 100644
--- a/graf/inc/TGraphErrors.h
+++ b/graf/inc/TGraphErrors.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TGraphErrors.h,v 1.2 2000/06/13 10:58:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TGraphErrors.h,v 1.3 2000/08/31 17:05:44 brun Exp $
// Author: Rene Brun 15/09/96
/*************************************************************************
@@ -38,12 +38,12 @@ public:
TGraphErrors(Int_t n, Double_t *x, Double_t *y, Double_t *ex=0, Double_t *ey=0);
virtual ~TGraphErrors();
virtual void ComputeRange(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax);
- Double_t GetErrorX(Int_t bin);
- Double_t GetErrorY(Int_t bin);
- Double_t *GetEX() {return fEX;}
- Double_t *GetEY() {return fEY;}
+ Double_t GetErrorX(Int_t bin) const;
+ Double_t GetErrorY(Int_t bin) const;
+ Double_t *GetEX() const {return fEX;}
+ Double_t *GetEY() const {return fEY;}
virtual void Paint(Option_t *chopt="");
- virtual void Print(Option_t *chopt="");
+ virtual void Print(Option_t *chopt="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void Set(Int_t n);
virtual void SetPoint(Int_t i, Double_t x, Double_t y);
diff --git a/graf/inc/TLatex.h b/graf/inc/TLatex.h
index 0ff8bc195893460e51fc50da204d548094f680e2..1f49d0ff9f78db49a83234fc93fb8529c10ddb06 100644
--- a/graf/inc/TLatex.h
+++ b/graf/inc/TLatex.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TLatex.h,v 1.3 2000/06/05 10:13:37 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TLatex.h,v 1.4 2000/06/13 11:01:03 brun Exp $
// Author: Nicolas Brun 07/08/98
/*************************************************************************
@@ -112,8 +112,8 @@ public:
void Copy(TObject &text);
TLatex *DrawLatex(Double_t x, Double_t y, const char *text);
- Double_t GetHeight();
- virtual void GetTextExtent(UInt_t &w, UInt_t &h, const char *text);
+ Double_t GetHeight() const;
+ virtual void GetTextExtent(UInt_t &w, UInt_t &h, const char *text) const;
Double_t GetXsize();
Double_t GetYsize();
virtual void Paint(Option_t *option="");
diff --git a/graf/inc/TLegend.h b/graf/inc/TLegend.h
index dbf8f45aa3a1474535405dcddd7c82488c8f0e40..de799bfd4e428ee5caaa32eb0d1356f84875717e 100644
--- a/graf/inc/TLegend.h
+++ b/graf/inc/TLegend.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TLegend.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TLegend.h,v 1.2 2000/06/13 11:02:25 brun Exp $
// Author: Matthew.Adam.Dobbs 06/09/99
/*************************************************************************
@@ -49,16 +49,16 @@ class TLegend : public TPave , public TAttText {
virtual void EditEntryAttLine(); // *MENU*
virtual void EditEntryAttMarker(); // *MENU*
virtual void EditEntryAttText(); // *MENU*
- TLegendEntry *GetEntry();
- Float_t GetEntrySeparation() { return fEntrySeparation; }
- virtual const char *GetHeader();
- TList *GetListOfPrimitives() {return fPrimitives;}
- Float_t GetMargin() { return fMargin; }
+ TLegendEntry *GetEntry() const;
+ Float_t GetEntrySeparation() const { return fEntrySeparation; }
+ virtual const char *GetHeader() const;
+ TList *GetListOfPrimitives() const {return fPrimitives;}
+ Float_t GetMargin() const { return fMargin; }
virtual void InsertEntry( const char* objectName = "",const char* label = "",
Option_t* option = "lpf" ); // *MENU*
virtual void Paint( Option_t* option = "" );
virtual void PaintPrimitives();
- virtual void Print( Option_t* option = "" );
+ virtual void Print( Option_t* option = "" ) const;
virtual void SavePrimitive(ofstream &out, Option_t *option );
void SetDefaults() { fEntrySeparation = 0.1; fMargin = 0.25; }
virtual void SetEntryLabel( const char* label ); // *MENU*
diff --git a/graf/inc/TLegendEntry.h b/graf/inc/TLegendEntry.h
index dc822642e5e0a064bc6a4214731ad5b8d564a668..89c26785bb1282336dc6674a36183a8b3de50401 100644
--- a/graf/inc/TLegendEntry.h
+++ b/graf/inc/TLegendEntry.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name$:$Id$
+// @(#)root/graf:$Name: $:$Id: TLegendEntry.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
// Author: Matthew.Adam.Dobbs 06/09/99
/*************************************************************************
@@ -47,9 +47,9 @@ public:
virtual ~TLegendEntry();
virtual void Copy( TObject &obj );
virtual const char *GetLabel() const { return fLabel.Data(); }
- virtual TObject *GetObject() { return fObject; }
+ virtual TObject *GetObject() const { return fObject; }
virtual Option_t *GetOption() const { return fOption.Data(); }
- virtual void Print( Option_t *option = "" );
+ virtual void Print( Option_t *option = "" ) const;
virtual void SaveEntry( ofstream &out, const char *name );
virtual void SetLabel( const char *label = "" ) { fLabel = label; } // *MENU*
virtual void SetObject(TObject* obj );
diff --git a/graf/inc/TLine.h b/graf/inc/TLine.h
index 8d89c000ee07edd67490b425453690dd84053140..7bfffa230f8be89e79552797fa954a02e1c5e57e 100644
--- a/graf/inc/TLine.h
+++ b/graf/inc/TLine.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TLine.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TLine.h,v 1.2 2000/06/13 11:04:42 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -51,15 +51,15 @@ public:
virtual TLine *DrawLine(Double_t x1, Double_t y1,Double_t x2, Double_t y2);
virtual TLine *DrawLineNDC(Double_t x1, Double_t y1,Double_t x2, Double_t y2);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Double_t GetX1() {return fX1;}
- Double_t GetX2() {return fX2;}
- Double_t GetY1() {return fY1;}
- Double_t GetY2() {return fY2;}
- virtual void ls(Option_t *option="");
+ Double_t GetX1() const {return fX1;}
+ Double_t GetX2() const {return fX2;}
+ Double_t GetY1() const {return fY1;}
+ Double_t GetY2() const {return fY2;}
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintLine(Double_t x1, Double_t y1,Double_t x2, Double_t y2);
virtual void PaintLineNDC(Double_t u1, Double_t v1,Double_t u2, Double_t v2);
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetX1(Double_t x1) {fX1=x1;}
virtual void SetX2(Double_t x2) {fX2=x2;}
diff --git a/graf/inc/TMarker.h b/graf/inc/TMarker.h
index 9e76146ea57b7f72980dbe6f91273b143e8f0400..555bd0118722f4ba42f17c983d06ca0e1ae3c9ea 100644
--- a/graf/inc/TMarker.h
+++ b/graf/inc/TMarker.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TMarker.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TMarker.h,v 1.2 2000/06/13 11:07:15 brun Exp $
// Author: Rene Brun 12/05/95
/*************************************************************************
@@ -47,13 +47,13 @@ public:
virtual void Draw(Option_t *option="");
virtual void DrawMarker(Double_t x, Double_t y);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Double_t GetX() {return fX;}
- Double_t GetY() {return fY;}
- virtual void ls(Option_t *option="");
+ Double_t GetX() const {return fX;}
+ Double_t GetY() const {return fY;}
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintMarker(Double_t x, Double_t y);
virtual void PaintMarkerNDC(Double_t u, Double_t v);
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetX(Double_t x) { fX = x;} // *MENU*
virtual void SetY(Double_t y) { fY = y;} // *MENU*
diff --git a/graf/inc/TMultiGraph.h b/graf/inc/TMultiGraph.h
index ced38922a2003caefa5c2b6de278e0315618ecc4..81e1651032c80e31cdae50da36661fadb3b26c8c 100644
--- a/graf/inc/TMultiGraph.h
+++ b/graf/inc/TMultiGraph.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TMultiGraph.h,v 1.4 2000/10/12 10:00:59 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TMultiGraph.h,v 1.1 2000/10/12 13:27:23 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -48,12 +48,12 @@ public:
virtual void Browse(TBrowser *b);
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void Draw(Option_t *chopt="");
- TH1F *GetHistogram();
- TList *GetListOfGraphs() { return fGraphs; }
- TAxis *GetXaxis();
- TAxis *GetYaxis();
+ TH1F *GetHistogram() const;
+ TList *GetListOfGraphs() const { return fGraphs; }
+ TAxis *GetXaxis() const;
+ TAxis *GetYaxis() const;
virtual void Paint(Option_t *chopt="");
- virtual void Print(Option_t *chopt="");
+ virtual void Print(Option_t *chopt="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetMaximum(Double_t maximum=-1111);
virtual void SetMinimum(Double_t minimum=-1111);
diff --git a/graf/inc/TPave.h b/graf/inc/TPave.h
index 5cada36ecada4a07e8e4199f8e664b5c7f48bd16..8130791d9b7a9d4a9221f3b154970f1141d93d37 100644
--- a/graf/inc/TPave.h
+++ b/graf/inc/TPave.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPave.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TPave.h,v 1.2 2000/06/13 11:09:39 brun Exp $
// Author: Rene Brun 16/10/95
/*************************************************************************
@@ -62,17 +62,17 @@ public:
Double_t GetCornerRadius() {return fCornerRadius;}
Option_t *GetName() const {return fName.Data();}
Option_t *GetOption() const {return fOption.Data();}
- Double_t GetX1NDC() {return fX1NDC;}
- Double_t GetX2NDC() {return fX2NDC;}
- Double_t GetY1NDC() {return fY1NDC;}
- Double_t GetY2NDC() {return fY2NDC;}
- virtual void ls(Option_t *option="");
+ Double_t GetX1NDC() const {return fX1NDC;}
+ Double_t GetX2NDC() const {return fX2NDC;}
+ Double_t GetY1NDC() const {return fY1NDC;}
+ Double_t GetY2NDC() const {return fY2NDC;}
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintPave(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2,
Int_t bordersize=4 ,Option_t *option="br");
virtual void PaintPaveArc(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2,
Int_t bordersize=4 ,Option_t *option="br");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetBorderSize(Int_t bordersize=4) {fBorderSize = bordersize;} // *MENU*
virtual void SetCornerRadius(Double_t rad = 0.2) {fCornerRadius = rad;} // *MENU*
diff --git a/graf/inc/TPaveLabel.h b/graf/inc/TPaveLabel.h
index a26377337e2d6eb52d1162033b05f3ca7efb6ca6..36007fee620f22919ff4c089e30c22234e2ed14e 100644
--- a/graf/inc/TPaveLabel.h
+++ b/graf/inc/TPaveLabel.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPaveLabel.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TPaveLabel.h,v 1.2 2000/06/13 11:10:48 brun Exp $
// Author: Rene Brun 17/10/95
/*************************************************************************
@@ -48,7 +48,6 @@ public:
virtual void Paint(Option_t *option="");
virtual void PaintPaveLabel(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2,
const char *label, Option_t *option="");
- virtual void Print(Option_t *option="");
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetLabel(const char *label) {fLabel = label;} // *MENU*
diff --git a/graf/inc/TPaveStats.h b/graf/inc/TPaveStats.h
index 0ab9c316d3ca2ef9affff775ecc1e4af9f3dcdc5..3a467775e1acb59edb7f984756394e4a957c977b 100644
--- a/graf/inc/TPaveStats.h
+++ b/graf/inc/TPaveStats.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPaveStats.h,v 1.3 2000/06/13 13:23:10 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TPaveStats.h,v 1.4 2000/11/21 20:23:31 brun Exp $
// Author: Rene Brun 15/03/99
/*************************************************************************
@@ -43,8 +43,8 @@ public:
virtual void EditText() {;}
virtual const char *GetFitFormat() const {return fFitFormat.Data();}
virtual const char *GetStatFormat() const {return fStatFormat.Data();}
- Int_t GetOptFit() {return fOptFit;}
- Int_t GetOptStat() {return fOptStat;}
+ Int_t GetOptFit() const {return fOptFit;}
+ Int_t GetOptStat() const {return fOptStat;}
virtual void InsertText(const char *) {;}
virtual void ReadFile(const char *, Option_t *, Int_t, Int_t) {;}
virtual void SaveStyle(); // *MENU*
diff --git a/graf/inc/TPaveText.h b/graf/inc/TPaveText.h
index c7adad5e7cb3a7e1dd69cefdd98f9eca6b977681..a4d465fadfd4b54735b7f16f0a6984dd9656d293 100644
--- a/graf/inc/TPaveText.h
+++ b/graf/inc/TPaveText.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPaveText.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TPaveText.h,v 1.2 2000/06/13 11:13:27 brun Exp $
// Author: Rene Brun 20/10/95
/*************************************************************************
@@ -56,17 +56,17 @@ public:
virtual void DrawFile(const char *filename, Option_t *option="");
virtual void EditText(); // *MENU*
const char *GetLabel() const {return fLabel.Data();}
- virtual TText *GetLine(Int_t number);
- virtual TText *GetLineWith(const char *text);
- virtual TList *GetListOfLines() {return fLines;}
- Float_t GetMargin() {return fMargin;}
- virtual TObject *GetObject(Double_t &ymouse, Double_t &yobj);
- virtual Int_t GetSize();
+ virtual TText *GetLine(Int_t number) const;
+ virtual TText *GetLineWith(const char *text) const;
+ virtual TList *GetListOfLines() const {return fLines;}
+ Float_t GetMargin() const {return fMargin;}
+ virtual TObject *GetObject(Double_t &ymouse, Double_t &yobj) const;
+ virtual Int_t GetSize() const;
virtual void InsertLine(); // *MENU*
virtual void InsertText(const char *label); // *MENU*
virtual void Paint(Option_t *option="");
virtual void PaintPrimitives(Int_t mode);
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void ReadFile(const char *filename, Option_t *option="", Int_t nlines=50, Int_t fromline=0); // *MENU*
virtual void SaveLines(ofstream &out, const char *name);
virtual void SavePrimitive(ofstream &out, Option_t *option);
diff --git a/graf/inc/TPolyLine.h b/graf/inc/TPolyLine.h
index 0eb14199e077d69a25a4aea17eef85759746df2e..1a1095009e598d3b6ed5dfe8b93c578a235f5686 100644
--- a/graf/inc/TPolyLine.h
+++ b/graf/inc/TPolyLine.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPolyLine.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TPolyLine.h,v 1.2 2000/06/13 11:16:56 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -56,15 +56,15 @@ public:
virtual void Draw(Option_t *option="");
virtual void DrawPolyLine(Int_t n, Double_t *x, Double_t *y, Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Int_t GetN() {return fN;}
- Double_t *GetX() {return fX;}
- Double_t *GetY() {return fY;}
+ Int_t GetN() const {return fN;}
+ Double_t *GetX() const {return fX;}
+ Double_t *GetY() const {return fY;}
Option_t *GetOption() const {return fOption.Data();}
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintPolyLine(Int_t n, Double_t *x, Double_t *y, Option_t *option="");
virtual void PaintPolyLineNDC(Int_t n, Double_t *x, Double_t *y, Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetOption(Option_t *option="") {fOption = option;}
virtual void SetPoint(Int_t point, Double_t x, Double_t y); // *MENU*
diff --git a/graf/inc/TText.h b/graf/inc/TText.h
index 8eb5566f4eb15a701b2b824f6181a8c9a1c463c0..2d20aeef1c22fa659e4f951acec050473f279aa4 100644
--- a/graf/inc/TText.h
+++ b/graf/inc/TText.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TText.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TText.h,v 1.2 2000/06/13 11:20:32 brun Exp $
// Author: Nicolas Brun 12/12/94
/*************************************************************************
@@ -51,14 +51,14 @@ public:
virtual TText *DrawTextNDC(Double_t x, Double_t y, const char *text);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Double_t GetX() {return fX;}
- Double_t GetY() {return fY;}
+ Double_t GetX() const {return fX;}
+ Double_t GetY() const {return fY;}
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintText(Double_t x, Double_t y, const char *text);
virtual void PaintTextNDC(Double_t u, Double_t v, const char *text);
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetNDC(Bool_t isNDC=kTRUE);
virtual void SetText(Double_t x, Double_t y, const char *text) {fX=x; fY=y; SetTitle(text);} // *MENU* *ARGS={x=>fX,y=>fY,text=>fTitle}
diff --git a/graf/inc/TWbox.h b/graf/inc/TWbox.h
index 536a5c50a06686f0b251c6dd37dcf5d980157ec5..aaf6b8776feb2bb7334816413a2884267103abb3 100644
--- a/graf/inc/TWbox.h
+++ b/graf/inc/TWbox.h
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TWbox.h,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TWbox.h,v 1.2 2000/06/13 11:21:49 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -44,17 +44,16 @@ public:
virtual void DrawWbox(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2,
Color_t color=33 ,Short_t bordersize=5 ,Short_t bordermode=-1);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Short_t GetBorderMode() { return fBorderMode;}
- Short_t GetBorderSize() { return fBorderSize;}
- Int_t GetDarkColor() {return GetFillColor() + 100;}
- Int_t GetLightColor() {return GetFillColor() + 150;}
+ Short_t GetBorderMode() const { return fBorderMode;}
+ Short_t GetBorderSize() const { return fBorderSize;}
+ Int_t GetDarkColor() const {return GetFillColor() + 100;}
+ Int_t GetLightColor() const {return GetFillColor() + 150;}
virtual void Paint(Option_t *option="");
virtual void PaintFrame(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2,
Color_t color, Short_t bordersize, Short_t bordermode,
Bool_t tops);
virtual void PaintWbox(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2,
Color_t color=33, Short_t bordersize=5, Short_t bordermode=-1);
- virtual void Print(Option_t *option="");
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetBorderMode(Short_t bordermode) {fBorderMode = bordermode;} // *MENU*
virtual void SetBorderSize(Short_t bordersize) {fBorderSize = bordersize;} // *MENU*
diff --git a/graf/src/TBox.cxx b/graf/src/TBox.cxx
index cd690a30bbfa79671c79821bee9f979b8a4c310b..e364e264db30d516fe14bbc1b8bec43b38ea00da 100644
--- a/graf/src/TBox.cxx
+++ b/graf/src/TBox.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TBox.cxx,v 1.3 2000/09/05 09:21:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TBox.cxx,v 1.4 2000/11/21 20:23:49 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -514,7 +514,7 @@ void TBox::HideToolTip(Int_t event)
}
//______________________________________________________________________________
-void TBox::ls(Option_t *)
+void TBox::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this box with its attributes*-*-*-*-*-*-*-*-*
//*-* =================================
@@ -543,7 +543,7 @@ void TBox::PaintBox(Double_t x1, Double_t y1, Double_t x2, Double_t y2, Option_t
}
//______________________________________________________________________________
-void TBox::Print(Option_t *)
+void TBox::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this box with its attributes*-*-*-*-*-*-*-*-*-*
//*-* =================================
diff --git a/graf/src/TCutG.cxx b/graf/src/TCutG.cxx
index 3c5a3bcb14466313211a4abd5a41f967975d4c6a..e51427f51e883a4da345ae0c38fda8bfd818c4be 100644
--- a/graf/src/TCutG.cxx
+++ b/graf/src/TCutG.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TCutG.cxx,v 1.5 2000/11/28 07:26:58 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TCutG.cxx,v 1.6 2000/12/09 18:23:51 brun Exp $
// Author: Rene Brun 16/05/97
/*************************************************************************
@@ -178,7 +178,7 @@ TCutG::~TCutG()
}
//______________________________________________________________________________
-Int_t TCutG::IsInside(Double_t x, Double_t y)
+Int_t TCutG::IsInside(Double_t x, Double_t y) const
{
//*. Function which returns 1 if point x,y lies inside the
//*. polygon defined by the graph points
diff --git a/graf/src/TEllipse.cxx b/graf/src/TEllipse.cxx
index 444397f5941c426332cab1a40632371e3f1161a2..9d935c0c100255a84c0e7a239cdbb5b27e3b1b57 100644
--- a/graf/src/TEllipse.cxx
+++ b/graf/src/TEllipse.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TEllipse.cxx,v 1.3 2000/09/05 09:21:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TEllipse.cxx,v 1.4 2000/11/21 20:24:10 brun Exp $
// Author: Rene Brun 16/10/95
/*************************************************************************
@@ -406,7 +406,7 @@ void TEllipse::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TEllipse::ls(Option_t *)
+void TEllipse::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this ellipse with its attributes*-*-*-*-*-*-*-*
//*-* =====================================
@@ -459,7 +459,7 @@ void TEllipse::PaintEllipse(Double_t, Double_t, Double_t, Double_t, Double_t phi
}
//______________________________________________________________________________
-void TEllipse::Print(Option_t *)
+void TEllipse::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this ellipse with its attributes*-*-*-*-*-*-*-*-*
//*-* =====================================
diff --git a/graf/src/TGraph.cxx b/graf/src/TGraph.cxx
index 66ad1017d059d3b9ba606f9048f37c27ec32fce5..669eef3f6c08800a792ed376c1a8b7fbd9157425 100644
--- a/graf/src/TGraph.cxx
+++ b/graf/src/TGraph.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TGraph.cxx,v 1.22 2000/12/02 16:34:10 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TGraph.cxx,v 1.23 2000/12/08 16:00:33 brun Exp $
// Author: Rene Brun, Olivier Couet 12/12/94
/*************************************************************************
@@ -787,7 +787,7 @@ void TGraph::FitPanel()
}
//______________________________________________________________________________
-Double_t TGraph::GetErrorX(Int_t)
+Double_t TGraph::GetErrorX(Int_t) const
{
// This function is called by GraphFitChisquare.
// It always returns a negative value. Real implementation in TGraphErrors
@@ -797,7 +797,7 @@ Double_t TGraph::GetErrorX(Int_t)
}
//______________________________________________________________________________
-Double_t TGraph::GetErrorY(Int_t)
+Double_t TGraph::GetErrorY(Int_t) const
{
// This function is called by GraphFitChisquare.
// It always returns a negative value. Real implementation in TGraphErrors
@@ -807,7 +807,7 @@ Double_t TGraph::GetErrorY(Int_t)
}
//______________________________________________________________________________
-TF1 *TGraph::GetFunction(const char *name)
+TF1 *TGraph::GetFunction(const char *name) const
{
//*-*-*-*-*Return pointer to function with name*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ===================================
@@ -820,7 +820,7 @@ TF1 *TGraph::GetFunction(const char *name)
}
//______________________________________________________________________________
-TH1F *TGraph::GetHistogram()
+TH1F *TGraph::GetHistogram() const
{
// Returns a pointer to the histogram used to draw the axis
// Takes into account the two following cases.
@@ -849,7 +849,7 @@ void TGraph::GetPoint(Int_t i, Double_t &x, Double_t &y)
}
//______________________________________________________________________________
-TAxis *TGraph::GetXaxis()
+TAxis *TGraph::GetXaxis() const
{
// Get x axis of the graph.
@@ -858,7 +858,7 @@ TAxis *TGraph::GetXaxis()
}
//______________________________________________________________________________
-TAxis *TGraph::GetYaxis()
+TAxis *TGraph::GetYaxis() const
{
// Get y axis of the graph.
@@ -2433,7 +2433,7 @@ void TGraph::ComputeLogs(Int_t npoints, Int_t opt)
//______________________________________________________________________________
-void TGraph::Print(Option_t *)
+void TGraph::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Print graph values*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==================
diff --git a/graf/src/TGraphAsymmErrors.cxx b/graf/src/TGraphAsymmErrors.cxx
index 32303c8b673082947816224cb91bb55f4e3c9ab7..cb751324954f7ff390e4d11deb2a74282bebc0b5 100644
--- a/graf/src/TGraphAsymmErrors.cxx
+++ b/graf/src/TGraphAsymmErrors.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TGraphAsymmErrors.cxx,v 1.4 2000/10/13 07:32:07 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TGraphAsymmErrors.cxx,v 1.5 2000/11/21 20:25:49 brun Exp $
// Author: Rene Brun 03/03/99
/*************************************************************************
@@ -185,7 +185,7 @@ void TGraphAsymmErrors::ComputeRange(Double_t &xmin, Double_t &ymin, Double_t &x
}
//______________________________________________________________________________
-Double_t TGraphAsymmErrors::GetErrorX(Int_t i)
+Double_t TGraphAsymmErrors::GetErrorX(Int_t i) const
{
// This function is called by GraphFitChisquare.
// It returns the quadratic error along X at point i.
@@ -199,7 +199,7 @@ Double_t TGraphAsymmErrors::GetErrorX(Int_t i)
}
//______________________________________________________________________________
-Double_t TGraphAsymmErrors::GetErrorY(Int_t i)
+Double_t TGraphAsymmErrors::GetErrorY(Int_t i) const
{
// This function is called by GraphFitChisquare.
// It returns the quadratic error along Y at point i.
@@ -290,7 +290,7 @@ void TGraphAsymmErrors::Paint(Option_t *option)
//______________________________________________________________________________
-void TGraphAsymmErrors::Print(Option_t *)
+void TGraphAsymmErrors::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Print graph and errors values*-*-*-*-*-*-*-*-*-*-*-*
//*-* =============================
diff --git a/graf/src/TGraphErrors.cxx b/graf/src/TGraphErrors.cxx
index 30297e3c3259732ec8a20b380426e4ff82bf2f61..3fbc704b299df382d278d4623af318f583318334 100644
--- a/graf/src/TGraphErrors.cxx
+++ b/graf/src/TGraphErrors.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TGraphErrors.cxx,v 1.5 2000/10/13 07:32:07 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TGraphErrors.cxx,v 1.6 2000/11/21 20:26:07 brun Exp $
// Author: Rene Brun 15/09/96
/*************************************************************************
@@ -164,7 +164,7 @@ void TGraphErrors::ComputeRange(Double_t &xmin, Double_t &ymin, Double_t &xmax,
}
//______________________________________________________________________________
-Double_t TGraphErrors::GetErrorX(Int_t i)
+Double_t TGraphErrors::GetErrorX(Int_t i) const
{
// This function is called by GraphFitChisquare.
// It returns the error along X at point i.
@@ -175,7 +175,7 @@ Double_t TGraphErrors::GetErrorX(Int_t i)
}
//______________________________________________________________________________
-Double_t TGraphErrors::GetErrorY(Int_t i)
+Double_t TGraphErrors::GetErrorY(Int_t i) const
{
// This function is called by GraphFitChisquare.
// It returns the error along Y at point i.
@@ -265,7 +265,7 @@ void TGraphErrors::Paint(Option_t *option)
//______________________________________________________________________________
-void TGraphErrors::Print(Option_t *)
+void TGraphErrors::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Print graph and errors values*-*-*-*-*-*-*-*-*-*-*-*
//*-* =============================
diff --git a/graf/src/TLatex.cxx b/graf/src/TLatex.cxx
index 1a9754d91517e501db8968a5e17dbb07469f282d..c49075d108b38484842fa498ba5e695391cdab07 100644
--- a/graf/src/TLatex.cxx
+++ b/graf/src/TLatex.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TLatex.cxx,v 1.10 2000/08/10 10:29:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TLatex.cxx,v 1.11 2000/11/21 12:30:39 rdm Exp $
// Author: Nicolas Brun 07/08/98
/*************************************************************************
@@ -1755,7 +1755,7 @@ FormSize TLatex::FirstParse(Double_t angle, Double_t size, const Char_t *text) {
}
//______________________________________________________________________________
-Double_t TLatex::GetHeight()
+Double_t TLatex::GetHeight() const
{
// return height of current font in pixels
@@ -1868,7 +1868,7 @@ void TLatex::SetLimitIndiceSize(Int_t limitFactorSize)
fLimitFactorSize = limitFactorSize;
}
//______________________________________________________________________________
-void TLatex::GetTextExtent(UInt_t &w, UInt_t &h, const char *text)
+void TLatex::GetTextExtent(UInt_t &w, UInt_t &h, const char *text) const
{
// Return text extent for string text
// in w return total text width
diff --git a/graf/src/TLegend.cxx b/graf/src/TLegend.cxx
index 5d527b7f26ad8c77d9ae9e2392c043f8a652673f..c917bc1ca12c5370e945e1e811c17822430a7ab5 100644
--- a/graf/src/TLegend.cxx
+++ b/graf/src/TLegend.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TLegend.cxx,v 1.4 2000/09/08 07:41:00 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TLegend.cxx,v 1.5 2000/09/08 16:05:21 rdm Exp $
// Author: Matthew.Adam.Dobbs 06/09/99
/*************************************************************************
@@ -223,7 +223,7 @@ void TLegend::EditEntryAttText()
}
//____________________________________________________________________________
-TLegendEntry *TLegend::GetEntry()
+TLegendEntry *TLegend::GetEntry() const
{
// Get entry pointed to by the mouse
// This method is mostly a tool for other methods inside this class
@@ -245,7 +245,7 @@ TLegendEntry *TLegend::GetEntry()
}
//____________________________________________________________________________
-const char *TLegend::GetHeader()
+const char *TLegend::GetHeader() const
{
// returns the header, which is the title that appears at the top
// of the legend
@@ -502,7 +502,7 @@ void TLegend::PaintPrimitives()
}
//____________________________________________________________________________
-void TLegend::Print( Option_t* option )
+void TLegend::Print( Option_t* option ) const
{
// dump this TLegend and its contents
TPave::Print( option );
diff --git a/graf/src/TLegendEntry.cxx b/graf/src/TLegendEntry.cxx
index 2a1681583fe1d6799383f0839af49e9beb49ea33..603286b71c59ad5ca00e59a30782f3d4ed54aaba 100644
--- a/graf/src/TLegendEntry.cxx
+++ b/graf/src/TLegendEntry.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TLegendEntry.cxx,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TLegendEntry.cxx,v 1.2 2000/06/27 06:43:48 brun Exp $
// Author: Matthew.Adam.Dobbs 06/09/99
/*************************************************************************
@@ -83,7 +83,7 @@ void TLegendEntry::Copy( TObject &obj )
}
//____________________________________________________________________________
-void TLegendEntry::Print( Option_t *)
+void TLegendEntry::Print( Option_t *) const
{
// dump this TLegendEntry to cout
TString output;
diff --git a/graf/src/TLine.cxx b/graf/src/TLine.cxx
index 714ca824eef626ebb9a59fa672840af86d26eedb..6cd9d021519f739ab575fa878e950a9b4d37d4f1 100644
--- a/graf/src/TLine.cxx
+++ b/graf/src/TLine.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TLine.cxx,v 1.3 2000/09/05 09:21:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TLine.cxx,v 1.4 2000/11/21 20:26:24 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -258,7 +258,7 @@ void TLine::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TLine::ls(Option_t *)
+void TLine::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this line with its attributes*-*-*-*-*-*-*-*-*
//*-* ==================================
@@ -295,7 +295,7 @@ void TLine::PaintLineNDC(Double_t u1, Double_t v1, Double_t u2, Double_t v2)
}
//______________________________________________________________________________
-void TLine::Print(Option_t *)
+void TLine::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this line with its attributes*-*-*-*-*-*-*-*-*-*
//*-* ==================================
diff --git a/graf/src/TMarker.cxx b/graf/src/TMarker.cxx
index 626576bb07bd32bd850be3b26bd42f7d4169bc53..4b1b006e5414854d6f4a5f622893a8c975502f77 100644
--- a/graf/src/TMarker.cxx
+++ b/graf/src/TMarker.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TMarker.cxx,v 1.3 2000/09/05 09:21:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TMarker.cxx,v 1.4 2000/11/21 20:26:41 brun Exp $
// Author: Rene Brun 12/05/95
/*************************************************************************
@@ -195,7 +195,7 @@ void TMarker::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TMarker::ls(Option_t *)
+void TMarker::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this marker with its attributes*-*-*-*-*-*-*-*-*
//*-* ====================================
@@ -230,7 +230,7 @@ void TMarker::PaintMarkerNDC(Double_t, Double_t)
}
//______________________________________________________________________________
-void TMarker::Print(Option_t *)
+void TMarker::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this marker with its attributes*-*-*-*-*-*-*-*-*-*
//*-* ====================================
diff --git a/graf/src/TMultiGraph.cxx b/graf/src/TMultiGraph.cxx
index 7b8099d35ba4318323df80121db18a26c5fa62af..3edfea5e0cd9e4ac71c604c7ffb523d44749fbe2 100644
--- a/graf/src/TMultiGraph.cxx
+++ b/graf/src/TMultiGraph.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TMultiGraph.cxx,v 1.17 2000/10/12 10:39:48 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TMultiGraph.cxx,v 1.1 2000/10/12 13:27:23 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -125,7 +125,7 @@ void TMultiGraph::Draw(Option_t *option)
}
//______________________________________________________________________________
-TH1F *TMultiGraph::GetHistogram()
+TH1F *TMultiGraph::GetHistogram() const
{
// Returns a pointer to the histogram used to draw the axis
// Takes into account the two following cases.
@@ -142,7 +142,7 @@ TH1F *TMultiGraph::GetHistogram()
}
//______________________________________________________________________________
-TAxis *TMultiGraph::GetXaxis()
+TAxis *TMultiGraph::GetXaxis() const
{
// Get x axis of the graph.
@@ -151,7 +151,7 @@ TAxis *TMultiGraph::GetXaxis()
}
//______________________________________________________________________________
-TAxis *TMultiGraph::GetYaxis()
+TAxis *TMultiGraph::GetYaxis() const
{
// Get y axis of the graph.
@@ -264,7 +264,7 @@ void TMultiGraph::Paint(Option_t *option)
}
//______________________________________________________________________________
-void TMultiGraph::Print(Option_t *option)
+void TMultiGraph::Print(Option_t *option) const
{
// Print the list of graphs
diff --git a/graf/src/TPave.cxx b/graf/src/TPave.cxx
index 27c7d9aa40d2b2926fc5ca94afc732f27644f432..36f1dc2c7a81f1920d4308c9694652640bd786c0 100644
--- a/graf/src/TPave.cxx
+++ b/graf/src/TPave.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPave.cxx,v 1.5 2000/09/05 09:21:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TPave.cxx,v 1.6 2000/11/21 20:26:58 brun Exp $
// Author: Rene Brun 16/10/95
/*************************************************************************
@@ -207,7 +207,7 @@ void TPave::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TPave::ls(Option_t *)
+void TPave::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this pave with its attributes*-*-*-*-*-*-*-*-*
//*-* =================================
@@ -536,7 +536,7 @@ void TPave::PaintPaveArc(Double_t x1, Double_t y1, Double_t x2, Double_t y2,
}
//______________________________________________________________________________
-void TPave::Print(Option_t *option)
+void TPave::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this pave with its attributes*-*-*-*-*-*-*-*-*-*
//*-* ==================================
diff --git a/graf/src/TPaveLabel.cxx b/graf/src/TPaveLabel.cxx
index 409b17700264d6b844db9aa2625c95a2d92cdd87..6f2d4fee0a3018b6e56fb7e0584abfeacca28c93 100644
--- a/graf/src/TPaveLabel.cxx
+++ b/graf/src/TPaveLabel.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPaveLabel.cxx,v 1.3 2000/06/13 11:10:48 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TPaveLabel.cxx,v 1.4 2000/08/20 10:05:09 brun Exp $
// Author: Rene Brun 17/10/95
/*************************************************************************
@@ -180,14 +180,6 @@ void TPaveLabel::PaintPaveLabel(Double_t x1, Double_t y1,Double_t x2, Double_t
latex.PaintLatex(x, y, GetTextAngle(),labelsize,GetLabel());
}
-//______________________________________________________________________________
-void TPaveLabel::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Dump this pavelabel with its attributes*-*-*-*-*-*-*-*
-//*-* =======================================
- TPave::Print(option);
-}
-
//______________________________________________________________________________
void TPaveLabel::SavePrimitive(ofstream &out, Option_t *)
{
diff --git a/graf/src/TPaveText.cxx b/graf/src/TPaveText.cxx
index 801e79a702e536dd46bc5dbebc1ab2093dd9f36b..dad23e79943818a3744262ddb03b3205fb3d877f 100644
--- a/graf/src/TPaveText.cxx
+++ b/graf/src/TPaveText.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPaveText.cxx,v 1.4 2000/09/08 16:05:21 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TPaveText.cxx,v 1.5 2000/11/21 20:27:34 brun Exp $
// Author: Rene Brun 20/10/95
/*************************************************************************
@@ -222,7 +222,7 @@ void TPaveText::EditText()
}
//______________________________________________________________________________
-TText *TPaveText::GetLine(Int_t number)
+TText *TPaveText::GetLine(Int_t number) const
{
//*-*-*-*-*-*-*-*Get Pointer to line number in this pavetext*-*-*-*-*-*-*-*
//*-* ===========================================
@@ -238,7 +238,7 @@ TText *TPaveText::GetLine(Int_t number)
}
//______________________________________________________________________________
-TText *TPaveText::GetLineWith(const char *text)
+TText *TPaveText::GetLineWith(const char *text) const
{
//*-*-*-*-*Get Pointer to first containing string text in this pavetext*-*-*-*
//*-* ============================================================
@@ -253,7 +253,7 @@ TText *TPaveText::GetLineWith(const char *text)
}
//______________________________________________________________________________
-TObject *TPaveText::GetObject(Double_t &ymouse, Double_t &yobj)
+TObject *TPaveText::GetObject(Double_t &ymouse, Double_t &yobj) const
{
//*-*-*-*-*Get object pointed by the mouse in this pavetext*-*-*-*
//*-* ================================================
@@ -319,7 +319,7 @@ TObject *TPaveText::GetObject(Double_t &ymouse, Double_t &yobj)
}
//______________________________________________________________________________
-Int_t TPaveText::GetSize()
+Int_t TPaveText::GetSize() const
{
// return number of text lines (ignoring Tlines, etc)
@@ -556,7 +556,7 @@ void TPaveText::PaintPrimitives(Int_t mode)
}
//______________________________________________________________________________
-void TPaveText::Print(Option_t *option)
+void TPaveText::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this pavetext with its attributes*-*-*-*-*-*-*-*
//*-* =======================================
diff --git a/graf/src/TPolyLine.cxx b/graf/src/TPolyLine.cxx
index cb8d7ee10fe4235f42a76e4f379f4e2503bc9062..0ef9554d723b7b3718b0bd084631662bd4ba1804 100644
--- a/graf/src/TPolyLine.cxx
+++ b/graf/src/TPolyLine.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TPolyLine.cxx,v 1.3 2000/09/05 09:21:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TPolyLine.cxx,v 1.4 2000/11/21 20:27:54 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -355,7 +355,7 @@ void TPolyLine::ExecuteEvent(Int_t event, Int_t px, Int_t py)
//______________________________________________________________________________
-void TPolyLine::ls(Option_t *)
+void TPolyLine::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*List this polyline with its attributes*-*-*-*-*-*-*-*-*
//*-* ======================================
@@ -398,7 +398,7 @@ void TPolyLine::PaintPolyLineNDC(Int_t n, Double_t *x, Double_t *y, Option_t *op
}
//______________________________________________________________________________
-void TPolyLine::Print(Option_t *)
+void TPolyLine::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*Dump this polyline with its attributes*-*-*-*-*-*-*-*-*-*
//*-* ======================================
diff --git a/graf/src/TText.cxx b/graf/src/TText.cxx
index 75939138a309569eaf8c6327baf206f1f37d7c7a..5c7e398c782c846849b3e87eaf2b8fc4815d75d1 100644
--- a/graf/src/TText.cxx
+++ b/graf/src/TText.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TText.cxx,v 1.4 2000/09/05 09:21:23 brun Exp $
+// @(#)root/graf:$Name: $:$Id: TText.cxx,v 1.5 2000/11/21 20:28:13 brun Exp $
// Author: Nicolas Brun 12/12/94
/*************************************************************************
@@ -389,7 +389,7 @@ void TText::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TText::ls(Option_t *)
+void TText::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List this text with its attributes*-*-*-*-*-*-*-*-*
//*-* ==================================
@@ -431,7 +431,7 @@ void TText::PaintTextNDC(Double_t u, Double_t v, const char *text)
}
//______________________________________________________________________________
-void TText::Print(Option_t *)
+void TText::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this text with its attributes*-*-*-*-*-*-*-*-*-*
//*-* ==================================
diff --git a/graf/src/TWbox.cxx b/graf/src/TWbox.cxx
index 278b11fe2bcb15270ff203b183a360b77d0683bb..a5615f04b9f151993094d51913b2588da35d7fd3 100644
--- a/graf/src/TWbox.cxx
+++ b/graf/src/TWbox.cxx
@@ -1,4 +1,4 @@
-// @(#)root/graf:$Name: $:$Id: TWbox.cxx,v 1.1.1.1 2000/05/16 17:00:50 rdm Exp $
+// @(#)root/graf:$Name: $:$Id: TWbox.cxx,v 1.2 2000/06/13 11:21:49 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -208,14 +208,6 @@ void TWbox::PaintFrame(Double_t x1, Double_t y1,Double_t x2, Double_t y2,
GetDarkColor(), GetLightColor());
}
-//______________________________________________________________________________
-void TWbox::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Dump this wbox with its attributes*-*-*-*-*-*-*-*-*-*
-//*-* ==================================
- TBox::Print(option);
-}
-
//______________________________________________________________________________
void TWbox::SavePrimitive(ofstream &out, Option_t *)
{
diff --git a/gui/inc/TGGC.h b/gui/inc/TGGC.h
index ebc1c35faf83247e877608f23e4d047dc5de081a..df0c3fa6b2d500d9a850cefe431f0fc6218014ff 100644
--- a/gui/inc/TGGC.h
+++ b/gui/inc/TGGC.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGGC.h,v 1.1 2000/09/29 08:52:52 rdm Exp $
+// @(#)root/gui:$Name: $:$Id: TGGC.h,v 1.2 2000/10/02 15:46:49 rdm Exp $
// Author: Fons Rademakers 20/9/2000
/*************************************************************************
@@ -89,7 +89,7 @@ protected:
public:
TGGC *fContext;
~TGGCElement() { delete fContext; }
- Bool_t IsEqual(TObject *obj) { return fContext == obj; }
+ Bool_t IsEqual(const TObject *obj) const { return fContext == obj; }
};
TList *fList; // list of graphics contexts in pool
diff --git a/gui/inc/TGMimeTypes.h b/gui/inc/TGMimeTypes.h
index 95eeb1a24dafcd70aa98939ec6dd9f15811c9b32..d6a9cd73d1d7eadf7429a29c6c8a48ad40804c2d 100644
--- a/gui/inc/TGMimeTypes.h
+++ b/gui/inc/TGMimeTypes.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name$:$Id$
+// @(#)root/gui:$Name: $:$Id: TGMimeTypes.h,v 1.1.1.1 2000/05/16 17:00:42 rdm Exp $
// Author: Fons Rademakers 18/01/98
/*************************************************************************
@@ -67,7 +67,7 @@ public:
void SaveMimes();
Bool_t HasChanged() const { return fChanged; }
void AddType(const char *type, const char *pat, const char *icon, const char *sicon, const char *action);
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
Bool_t GetAction(const char *filename, char *action);
Bool_t GetType(const char *filename, char *type);
const TGPicture *GetIcon(const char *filename, Bool_t small_icon);
diff --git a/gui/inc/TGObject.h b/gui/inc/TGObject.h
index 7d86e646f77ede8028492880b6b705db57a6641c..e659f850275ebf1ba72b21af4c3fe8dbb4714819 100644
--- a/gui/inc/TGObject.h
+++ b/gui/inc/TGObject.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name$:$Id$
+// @(#)root/gui:$Name: $:$Id: TGObject.h,v 1.1.1.1 2000/05/16 17:00:42 rdm Exp $
// Author: Fons Rademakers 27/12/97
/*************************************************************************
@@ -44,8 +44,8 @@ public:
virtual ~TGObject() { }
Handle_t GetId() const { return fId; }
- ULong_t Hash() { return (ULong_t) fId >> 0; }
- Bool_t IsEqual(TObject *obj) { return fId == ((TGObject *) obj)->fId; }
+ ULong_t Hash() const { return (ULong_t) fId >> 0; }
+ Bool_t IsEqual(const TObject *obj) const { return fId == ((TGObject *) obj)->fId; }
ClassDef(TGObject,0) //ROOT GUI base class
};
diff --git a/gui/inc/TGPicture.h b/gui/inc/TGPicture.h
index a177cb38624aa68cce3a280f25c74aa819e16700..97fccd3fa8c953a8059e1f9cc8df2a6bda89e4fd 100644
--- a/gui/inc/TGPicture.h
+++ b/gui/inc/TGPicture.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGPicture.h,v 1.1.1.1 2000/05/16 17:00:42 rdm Exp $
+// @(#)root/gui:$Name: $:$Id: TGPicture.h,v 1.2 2000/09/29 08:57:05 rdm Exp $
// Author: Fons Rademakers 01/01/98
/*************************************************************************
@@ -77,7 +77,7 @@ public:
Pixmap_t GetPicture() const { return fPic; }
Pixmap_t GetMask() const { return fMask; }
Bool_t IsScaled() const { return fScaled; }
- ULong_t Hash() { return fName.Hash(); }
+ ULong_t Hash() const { return fName.Hash(); }
virtual void Draw(Handle_t id, GContext_t gc, Int_t x, Int_t y) const;
diff --git a/gui/inc/TGTextEdit.h b/gui/inc/TGTextEdit.h
index 16661b526c7ba7d58273ba09fc6a1f444f86cb79..e04beacaa2a7eb65f1d01bb3de003b7336b051ab 100644
--- a/gui/inc/TGTextEdit.h
+++ b/gui/inc/TGTextEdit.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGTextEdit.h,v 1.6 2000/08/30 16:57:20 rdm Exp $
+// @(#)root/gui:$Name: $:$Id: TGTextEdit.h,v 1.7 2000/10/22 19:28:58 rdm Exp $
// Author: Fons Rademakers 1/7/2000
/*************************************************************************
@@ -92,7 +92,7 @@ public:
virtual Bool_t Copy();
virtual Bool_t Cut();
virtual Bool_t Paste();
- virtual void Print(Option_t * = "");
+ virtual void Print(Option_t * = "") const;
virtual void Delete(Option_t * = "");
virtual Bool_t Search(const char *string, Bool_t direction, Bool_t caseSensitive);
virtual Bool_t Replace(TGLongPosition pos, const char *oldText, const char *newText,
diff --git a/gui/src/TGMimeTypes.cxx b/gui/src/TGMimeTypes.cxx
index 497cff1e0e9f2a6b4a539d5a3f20e8d479894b59..0abe020414de2d63722f0adfd8952a6f5acee373 100644
--- a/gui/src/TGMimeTypes.cxx
+++ b/gui/src/TGMimeTypes.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name$:$Id$
+// @(#)root/gui:$Name: $:$Id: TGMimeTypes.cxx,v 1.1.1.1 2000/05/16 17:00:42 rdm Exp $
// Author: Fons Rademakers 18/01/98
/*************************************************************************
@@ -218,7 +218,7 @@ Bool_t TGMimeTypes::GetType(const char *filename, char *type)
}
//______________________________________________________________________________
-void TGMimeTypes::Print(Option_t *)
+void TGMimeTypes::Print(Option_t *) const
{
// Print list of mime types.
diff --git a/gui/src/TGTextEdit.cxx b/gui/src/TGTextEdit.cxx
index 6c709b60cba0983d41cdd47f47644f1dc351834a..8e8148646767b60ee8bbb28fe691151cd345b95d 100644
--- a/gui/src/TGTextEdit.cxx
+++ b/gui/src/TGTextEdit.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGTextEdit.cxx,v 1.9 2000/08/30 16:57:20 rdm Exp $
+// @(#)root/gui:$Name: $:$Id: TGTextEdit.cxx,v 1.10 2000/10/22 19:28:58 rdm Exp $
// Author: Fons Rademakers 3/7/2000
/*************************************************************************
@@ -264,7 +264,7 @@ Bool_t TGTextEdit::Paste()
}
//______________________________________________________________________________
-void TGTextEdit::Print(Option_t *)
+void TGTextEdit::Print(Option_t *) const
{
// Send current buffer to printer.
diff --git a/hist/inc/TAxis.h b/hist/inc/TAxis.h
index b738c19f311cafb5ee644ec53f5c0e4e8da056e0..9d6443a3139162fed873f36f31f7efbaee515182 100644
--- a/hist/inc/TAxis.h
+++ b/hist/inc/TAxis.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TAxis.h,v 1.5 2000/11/06 07:18:50 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TAxis.h,v 1.6 2000/11/21 20:28:47 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -57,29 +57,29 @@ public:
TAxis(Int_t nbins, Axis_t *xbins);
TAxis(const TAxis &axis);
virtual ~TAxis();
- virtual void CenterTitle(Bool_t center=kTRUE); //*MENU*
+ virtual void CenterTitle(Bool_t center=kTRUE); // *MENU*
const char *ChooseTimeFormat(Double_t axislength=0);
virtual void Copy(TObject &axis);
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual Int_t FindBin(Axis_t x);
- virtual Int_t FindFixBin(Axis_t x);
- virtual Axis_t GetBinCenter(Int_t bin);
- virtual char *GetBinLabel(Int_t bin);
- virtual Axis_t GetBinLowEdge(Int_t bin);
- virtual Axis_t GetBinUpEdge(Int_t bin);
- virtual Axis_t GetBinWidth(Int_t bin);
+ virtual Int_t FindFixBin(Axis_t x) const;
+ virtual Axis_t GetBinCenter(Int_t bin) const;
+ virtual char *GetBinLabel(Int_t bin) const;
+ virtual Axis_t GetBinLowEdge(Int_t bin) const;
+ virtual Axis_t GetBinUpEdge(Int_t bin) const;
+ virtual Axis_t GetBinWidth(Int_t bin) const;
virtual void GetCenter(Axis_t *center);
virtual void GetLabel(char *label);
virtual void GetLowEdge(Axis_t *edge);
Int_t GetNbins() const { return fNbins; }
- virtual TObject *GetParent() {return fParent;}
- virtual Bool_t GetTimeDisplay() {return fTimeDisplay;}
+ virtual TObject *GetParent() const {return fParent;}
+ virtual Bool_t GetTimeDisplay() const {return fTimeDisplay;}
virtual const char *GetTimeFormat() const {return fTimeFormat.Data();}
const char *GetTitle() const {return fTitle.Data();}
TArrayD *GetXbins() {return &fXbins;}
- Int_t GetFirst();
- Int_t GetLast();
+ Int_t GetFirst() const;
+ Int_t GetLast() const;
Axis_t GetXmin() const {return fXmin;}
Axis_t GetXmax() const {return fXmax;}
virtual void RotateTitle(Bool_t rotate=kTRUE); // *MENU*
@@ -90,10 +90,10 @@ public:
virtual void SetLabel(const char *label);
virtual void SetLimits(Axis_t xmin, Axis_t xmax);
virtual void SetParent(TObject *obj) {fParent = obj;}
- virtual void SetRange(Int_t first=0, Int_t last=0); //*MENU*
- virtual void SetTimeDisplay(Int_t value) {fTimeDisplay = value;} //*TOGGLE*
- virtual void SetTimeFormat(const char *format=""); //*MENU*
- virtual void UnZoom(); //*MENU*
+ virtual void SetRange(Int_t first=0, Int_t last=0); // *MENU*
+ virtual void SetTimeDisplay(Int_t value) {fTimeDisplay = value;} // *TOGGLE*
+ virtual void SetTimeFormat(const char *format=""); // *MENU*
+ virtual void UnZoom(); // *MENU*
ClassDef(TAxis,6) //Axis class
};
diff --git a/hist/inc/TF1.h b/hist/inc/TF1.h
index bd5630788a8b573f00716507047b960ae34df913..90d72e3d0d74cba05ff4206f0cb6b3917cd4ea62 100644
--- a/hist/inc/TF1.h
+++ b/hist/inc/TF1.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TF1.h,v 1.3 2000/11/06 07:19:08 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TF1.h,v 1.4 2000/11/21 20:29:13 brun Exp $
// Author: Rene Brun 18/08/95
/*************************************************************************
@@ -86,24 +86,24 @@ public:
virtual Double_t Eval(Double_t x, Double_t y=0, Double_t z=0);
virtual Double_t EvalPar(Double_t *x, Double_t *params=0);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Double_t GetChisquare() {return fChisquare;}
- TH1 *GetHistogram();
- Int_t GetNDF() {return fNpfits-fNpar;}
- Int_t GetNpx() {return fNpx;}
- TMethodCall *GetMethodCall() {return fMethodCall;}
- Int_t GetNumberFitPoints() {return fNpfits;}
- virtual char *GetObjectInfo(Int_t px, Int_t py);
- TObject *GetParent() {return fParent;}
- Double_t GetParError(Int_t ipar) {return fParErrors[ipar];}
+ Double_t GetChisquare() const {return fChisquare;}
+ TH1 *GetHistogram() const;
+ Int_t GetNDF() const {return fNpfits-fNpar;}
+ Int_t GetNpx() const {return fNpx;}
+ TMethodCall *GetMethodCall() const {return fMethodCall;}
+ Int_t GetNumberFitPoints() const {return fNpfits;}
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
+ TObject *GetParent() const {return fParent;}
+ Double_t GetParError(Int_t ipar) const {return fParErrors[ipar];}
virtual void GetParLimits(Int_t ipar, Double_t &parmin, Double_t &parmax);
- virtual Double_t GetProb() {return TMath::Prob(fChisquare,fNpfits-fNpar);}
+ virtual Double_t GetProb() const {return TMath::Prob(fChisquare,fNpfits-fNpar);}
virtual Double_t GetRandom();
virtual void GetRange(Double_t &xmin, Double_t &xmax);
virtual void GetRange(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax);
virtual void GetRange(Double_t &xmin, Double_t &ymin, Double_t &zmin, Double_t &xmax, Double_t &ymax, Double_t &zmax);
virtual Double_t GetSave(Double_t *x);
- Double_t GetXmin() {return fXmin;}
- Double_t GetXmax() {return fXmax;}
+ Double_t GetXmin() const {return fXmin;}
+ Double_t GetXmax() const {return fXmax;}
virtual void InitArgs(Double_t *x, Double_t *params);
static void InitStandardFunctions();
virtual Double_t Integral(Double_t a, Double_t b, Double_t *params=0, Double_t epsilon=0.000001);
@@ -111,7 +111,7 @@ public:
virtual Double_t Integral(Double_t ax, Double_t bx, Double_t ay, Double_t by, Double_t az, Double_t bz, Double_t epsilon=0.000001);
virtual Double_t IntegralMultiple(Int_t n, Double_t *a, Double_t *b, Double_t epsilon, Double_t &relerr);
virtual void Paint(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void Save(Double_t xmin, Double_t xmax);
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetChisquare(Double_t chi2) {fChisquare = chi2;}
diff --git a/hist/inc/TF2.h b/hist/inc/TF2.h
index b0aaef77d2174304e1ece0a86bbfc541a64c9f1b..b88d445d8ce7aec6846ab1acbd369acb4f2739b1 100644
--- a/hist/inc/TF2.h
+++ b/hist/inc/TF2.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TF2.h,v 1.2 2000/06/13 10:37:48 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TF2.h,v 1.3 2000/11/21 20:29:29 brun Exp $
// Author: Rene Brun 23/08/95
/*************************************************************************
@@ -52,16 +52,16 @@ public:
virtual void DrawF2(const char *formula, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual Int_t GetContour(Double_t *levels=0);
- virtual Double_t GetContourLevel(Int_t level);
- Int_t GetNpy() {return fNpy;}
- virtual char *GetObjectInfo(Int_t px, Int_t py);
+ virtual Double_t GetContourLevel(Int_t level) const;
+ Int_t GetNpy() const {return fNpy;}
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
Double_t GetRandom();
virtual void GetRandom2(Double_t &xrandom, Double_t &yrandom);
virtual void GetRange(Double_t &xmin, Double_t &xmax) { TF1::GetRange(xmin, xmax); }
virtual void GetRange(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax);
virtual void GetRange(Double_t &xmin, Double_t &ymin, Double_t &zmin, Double_t &xmax, Double_t &ymax, Double_t &zmax);
- virtual Double_t GetYmin() {return fYmin;}
- virtual Double_t GetYmax() {return fYmax;}
+ virtual Double_t GetYmin() const {return fYmin;}
+ virtual Double_t GetYmax() const {return fYmax;}
virtual Double_t Integral(Double_t a, Double_t b, Double_t *params=0, Double_t epsil=0.000001) {return TF1::Integral(a,b,params,epsil);}
virtual Double_t Integral(Double_t ax, Double_t bx, Double_t ay, Double_t by, Double_t epsil=0.000001);
virtual Double_t Integral(Double_t ax, Double_t bx, Double_t ay, Double_t by, Double_t az, Double_t bz, Double_t epsil=0.000001)
diff --git a/hist/inc/TF3.h b/hist/inc/TF3.h
index 7a86a9f36a389249465e528852ead82616c560ff..636fbaacf0e86a2d427a5618545898e1d0719f8e 100644
--- a/hist/inc/TF3.h
+++ b/hist/inc/TF3.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TF3.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/hist:$Name: $:$Id: TF3.h,v 1.2 2000/06/13 10:38:11 brun Exp $
// Author: Rene Brun 27/10/95
/*************************************************************************
@@ -49,13 +49,13 @@ public:
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void Draw(Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- Int_t GetNpz() {return fNpz;}
+ Int_t GetNpz() const {return fNpz;}
virtual void GetRandom3(Double_t &xrandom, Double_t &yrandom, Double_t &zrandom);
virtual void GetRange(Double_t &xmin, Double_t &xmax);
virtual void GetRange(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax);
virtual void GetRange(Double_t &xmin, Double_t &ymin, Double_t &zmin, Double_t &xmax, Double_t &ymax, Double_t &zmax);
- virtual Double_t GetZmin() {return fZmin;}
- virtual Double_t GetZmax() {return fZmax;}
+ virtual Double_t GetZmin() const {return fZmin;}
+ virtual Double_t GetZmax() const {return fZmax;}
virtual Double_t Integral(Double_t a, Double_t b, Double_t *params=0, Double_t epsilon=0.000001) {return TF1::Integral(a,b,params,epsilon);}
virtual Double_t Integral(Double_t ax, Double_t bx, Double_t ay, Double_t by, Double_t epsilon=0.000001) {return TF1::Integral(ax,bx,ay,by,epsilon);}
virtual Double_t Integral(Double_t ax, Double_t bx, Double_t ay, Double_t by, Double_t az, Double_t bz, Double_t epsilon=0.000001);
diff --git a/hist/inc/TFormula.h b/hist/inc/TFormula.h
index 7b0a3fdf544f03e6ca68d7ac4843396e9a831d3e..affe8b466e9e96395f8c1a2dad5bd66045e3f11a 100644
--- a/hist/inc/TFormula.h
+++ b/hist/inc/TFormula.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TFormula.h,v 1.4 2000/11/21 20:29:46 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TFormula.h,v 1.5 2000/11/24 10:23:51 brun Exp $
// Author: Nicolas Brun 19/08/95
/*************************************************************************
@@ -59,15 +59,15 @@ public:
virtual Int_t DefinedVariable(TString &variable);
virtual Double_t Eval(Double_t x, Double_t y=0, Double_t z=0);
virtual Double_t EvalPar(Double_t *x, Double_t *params=0);
- Int_t GetNdim() {return fNdim;}
- Int_t GetNpar() {return fNpar;}
- Int_t GetNumber() {return fNumber;}
- Double_t GetParameter(Int_t ipar) {return fParams[ipar];}
- Double_t GetParameter(const char *name);
+ Int_t GetNdim() const {return fNdim;}
+ Int_t GetNpar() const {return fNpar;}
+ Int_t GetNumber() const {return fNumber;}
+ Double_t GetParameter(Int_t ipar) const {return fParams[ipar];}
+ Double_t GetParameter(const char *name) const;
virtual void GetParameters(Double_t *params){for(Int_t i=0;i<fNpar;i++) params[i] = fParams[i];}
virtual const char *GetParName(Int_t ipar) const;
- Int_t GetParNumber(const char *name);
- virtual void Print(Option_t *option=""); // *MENU*
+ Int_t GetParNumber(const char *name) const;
+ virtual void Print(Option_t *option="") const; // *MENU*
virtual void SetNumber(Int_t number) {fNumber = number;}
virtual void SetParameter(Int_t ipar, Double_t parvalue);
virtual void SetParameters(Double_t *params);
diff --git a/hist/inc/TH1.h b/hist/inc/TH1.h
index 105aef0504c9352d82c9810c6940b48251b85773..1719bcbf983ac877d18ec047d40f4312b0fc434b 100644
--- a/hist/inc/TH1.h
+++ b/hist/inc/TH1.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TH1.h,v 1.10 2000/11/27 15:36:45 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TH1.h,v 1.11 2000/12/02 11:11:05 brun Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -88,7 +88,7 @@ protected:
TVirtualHistPainter *fPainter; //!pointer to histogram painter
static Bool_t fgAddDirectory; //!flag to add histograms to the directory
private:
- Int_t AxisChoice(Option_t *axis);
+ Int_t AxisChoice(Option_t *axis) const;
void Build();
Int_t FitOptionsMake(Option_t *option);
@@ -139,59 +139,59 @@ public:
virtual void FitPanel(); // *MENU*
virtual Double_t *GetIntegral() {return fIntegral;}
- TList *GetListOfFunctions() { return fFunctions; }
-
- virtual Int_t GetNdivisions(Option_t *axis="X");
- virtual Color_t GetAxisColor(Option_t *axis="X");
- virtual Color_t GetLabelColor(Option_t *axis="X");
- virtual Style_t GetLabelFont(Option_t *axis="X");
- virtual Float_t GetLabelOffset(Option_t *axis="X");
- virtual Float_t GetLabelSize(Option_t *axis="X");
- virtual Float_t GetTitleOffset(Option_t *axis="X");
- virtual Float_t GetTitleSize(Option_t *axis="X");
- virtual Float_t GetTickLength(Option_t *axis="X");
- virtual Float_t GetBarOffset() {return Float_t(0.001*Float_t(fBarOffset));}
- virtual Float_t GetBarWidth() {return Float_t(0.001*Float_t(fBarWidth));}
+ TList *GetListOfFunctions() const { return fFunctions; }
+
+ virtual Int_t GetNdivisions(Option_t *axis="X") const;
+ virtual Color_t GetAxisColor(Option_t *axis="X") const;
+ virtual Color_t GetLabelColor(Option_t *axis="X") const;
+ virtual Style_t GetLabelFont(Option_t *axis="X") const;
+ virtual Float_t GetLabelOffset(Option_t *axis="X") const;
+ virtual Float_t GetLabelSize(Option_t *axis="X") const;
+ virtual Float_t GetTitleOffset(Option_t *axis="X") const;
+ virtual Float_t GetTitleSize(Option_t *axis="X") const;
+ virtual Float_t GetTickLength(Option_t *axis="X") const;
+ virtual Float_t GetBarOffset() const {return Float_t(0.001*Float_t(fBarOffset));}
+ virtual Float_t GetBarWidth() const {return Float_t(0.001*Float_t(fBarWidth));}
virtual Int_t GetContour(Double_t *levels=0);
- virtual Double_t GetContourLevel(Int_t level);
-
- virtual Int_t GetBin(Int_t binx, Int_t biny=0, Int_t binz=0);
- virtual Axis_t GetBinCenter(Int_t bin){return fXaxis.GetBinCenter(bin);}
- virtual Stat_t GetBinContent(Int_t bin);
- virtual Stat_t GetBinError(Int_t bin);
- virtual Axis_t GetBinLowEdge(Int_t bin){return fXaxis.GetBinLowEdge(bin);}
- virtual Axis_t GetBinWidth(Int_t bin){return fXaxis.GetBinWidth(bin);}
- virtual Stat_t GetCellContent(Int_t binx, Int_t biny);
- virtual Stat_t GetCellError(Int_t binx, Int_t biny);
- virtual void GetCenter(Axis_t *center){fXaxis.GetCenter(center);}
- TDirectory *GetDirectory() {return fDirectory;}
- virtual Stat_t GetEntries() {return fEntries;}
- virtual TF1 *GetFunction(const char *name);
+ virtual Double_t GetContourLevel(Int_t level) const;
+
+ virtual Int_t GetBin(Int_t binx, Int_t biny=0, Int_t binz=0) const;
+ virtual Axis_t GetBinCenter(Int_t bin) const {return fXaxis.GetBinCenter(bin);}
+ virtual Stat_t GetBinContent(Int_t bin) const;
+ virtual Stat_t GetBinError(Int_t bin) const;
+ virtual Axis_t GetBinLowEdge(Int_t bin) const {return fXaxis.GetBinLowEdge(bin);}
+ virtual Axis_t GetBinWidth(Int_t bin) const {return fXaxis.GetBinWidth(bin);}
+ virtual Stat_t GetCellContent(Int_t binx, Int_t biny) const;
+ virtual Stat_t GetCellError(Int_t binx, Int_t biny) const;
+ virtual void GetCenter(Axis_t *center) {fXaxis.GetCenter(center);}
+ TDirectory *GetDirectory() const {return fDirectory;}
+ virtual Stat_t GetEntries() const {return fEntries;}
+ virtual TF1 *GetFunction(const char *name) const;
virtual Int_t GetDimension() const { return fDimension; }
- virtual void GetLowEdge(Axis_t *edge){fXaxis.GetLowEdge(edge);}
- virtual Double_t GetMaximum();
- virtual Int_t GetMaximumBin();
- virtual Int_t GetMaximumBin(Int_t &locmax, Int_t &locmay, Int_t &locmaz);
- virtual Double_t GetMaximumStored() {return fMaximum;}
- virtual Double_t GetMinimum();
- virtual Int_t GetMinimumBin();
- virtual Int_t GetMinimumBin(Int_t &locmix, Int_t &locmiy, Int_t &locmiz);
- virtual Double_t GetMinimumStored() {return fMinimum;}
- virtual Stat_t GetMean(Int_t axis=1);
+ virtual void GetLowEdge(Axis_t *edge) {fXaxis.GetLowEdge(edge);}
+ virtual Double_t GetMaximum() const;
+ virtual Int_t GetMaximumBin() const;
+ virtual Int_t GetMaximumBin(Int_t &locmax, Int_t &locmay, Int_t &locmaz) const;
+ virtual Double_t GetMaximumStored() const {return fMaximum;}
+ virtual Double_t GetMinimum() const;
+ virtual Int_t GetMinimumBin() const;
+ virtual Int_t GetMinimumBin(Int_t &locmix, Int_t &locmiy, Int_t &locmiz) const;
+ virtual Double_t GetMinimumStored() const {return fMinimum;}
+ virtual Stat_t GetMean(Int_t axis=1) const;
virtual Int_t GetNbinsX() const {return fXaxis.GetNbins();}
virtual Int_t GetNbinsY() const {return fYaxis.GetNbins();}
virtual Int_t GetNbinsZ() const {return fZaxis.GetNbins();}
- virtual Double_t GetNormFactor() {return fNormFactor;}
- virtual char *GetObjectInfo(Int_t px, Int_t py);
+ virtual Double_t GetNormFactor() const {return fNormFactor;}
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
Option_t *GetOption() const {return fOption.Data();}
- TVirtualHistPainter *GetPainter() {return fPainter;}
+ TVirtualHistPainter *GetPainter() const {return fPainter;}
virtual Axis_t GetRandom();
- virtual void GetStats(Stat_t *stats);
- virtual Stat_t GetSumOfWeights();
- virtual Int_t GetSumw2N() {return fSumw2.fN;}
- virtual Stat_t GetRMS(Int_t axis=1);
+ virtual void GetStats(Stat_t *stats) const;
+ virtual Stat_t GetSumOfWeights() const;
+ virtual Int_t GetSumw2N() const {return fSumw2.fN;}
+ virtual Stat_t GetRMS(Int_t axis=1) const;
virtual TAxis *GetXaxis() {return &fXaxis;}
virtual TAxis *GetYaxis() {return &fYaxis;}
virtual TAxis *GetZaxis() {return &fZaxis;}
@@ -204,7 +204,7 @@ public:
virtual void Multiply(TH1 *h1);
virtual void Multiply(TH1 *h1, TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option=""); // *MENU*
virtual void Paint(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void PutStats(Stat_t *stats);
virtual TH1 *Rebin(Int_t ngroup=2, const char*newname="");
virtual void RebinAxis(Axis_t x, Option_t *axis="X");
@@ -275,7 +275,7 @@ public:
virtual void AddBinContent(Int_t bin, Stat_t w);
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Char_t (content);}
@@ -307,7 +307,7 @@ public:
virtual void AddBinContent(Int_t bin, Stat_t w);
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Short_t (content);}
@@ -341,7 +341,7 @@ public:
{fArray[bin] += Float_t (w);}
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Float_t (content);}
@@ -375,7 +375,7 @@ public:
{fArray[bin] += Double_t (w);}
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Double_t (content);}
diff --git a/hist/inc/TH2.h b/hist/inc/TH2.h
index 7fc056f013628e8a8949a619906d427c8d0a8672..b3d31bbf02e9092ca6f96e1bdc53d7fb2bf9c9d9 100644
--- a/hist/inc/TH2.h
+++ b/hist/inc/TH2.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TH2.h,v 1.6 2000/10/10 13:01:57 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TH2.h,v 1.7 2000/11/21 20:30:21 brun Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -60,10 +60,10 @@ public:
virtual void FillRandom(TH1 *h, Int_t ntimes=5000);
virtual void FitSlicesX(TF1 *f1=0,Int_t binmin=1, Int_t binmax=0, Int_t cut=0 ,Option_t *option="QNR"); // *MENU*
virtual void FitSlicesY(TF1 *f1=0,Int_t binmin=1, Int_t binmax=0, Int_t cut=0 ,Option_t *option="QNR"); // *MENU*
- virtual Stat_t GetCorrelationFactor(Int_t axis1=1,Int_t axis2=2);
- virtual Stat_t GetCovariance(Int_t axis1=1,Int_t axis2=2);
+ virtual Stat_t GetCorrelationFactor(Int_t axis1=1,Int_t axis2=2) const;
+ virtual Stat_t GetCovariance(Int_t axis1=1,Int_t axis2=2) const;
virtual void GetRandom2(Axis_t &x, Axis_t &y);
- virtual void GetStats(Stat_t *stats);
+ virtual void GetStats(Stat_t *stats) const;
virtual Stat_t Integral();
virtual Stat_t Integral(Int_t, Int_t) {return 0;}
virtual Stat_t Integral(Int_t binx1, Int_t binx2, Int_t biny1, Int_t biny2);
@@ -102,7 +102,7 @@ public:
virtual void AddBinContent(Int_t bin, Stat_t w);
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Char_t (content);}
@@ -141,7 +141,7 @@ public:
virtual void AddBinContent(Int_t bin, Stat_t w);
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Short_t (content);}
@@ -182,7 +182,7 @@ public:
{fArray[bin] += Float_t (w);}
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Float_t (content);}
@@ -223,7 +223,7 @@ public:
{fArray[bin] += Double_t (w);}
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Double_t (content);}
diff --git a/hist/inc/TH3.h b/hist/inc/TH3.h
index 190538a2614e4c8b15c509842ec78bb0d61427ca..8265286fd7a8781bad5606f65b82ac14b949720f 100644
--- a/hist/inc/TH3.h
+++ b/hist/inc/TH3.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TH3.h,v 1.5 2000/07/15 05:16:34 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TH3.h,v 1.6 2000/11/21 20:30:39 brun Exp $
// Author: Rene Brun 27/10/95
/*************************************************************************
@@ -54,7 +54,7 @@ public:
virtual void FitSlicesZ(TF1 *f1=0,Int_t binminx=1, Int_t binmaxx=0,Int_t binminy=1, Int_t binmaxy=0,
Int_t cut=0 ,Option_t *option="QNR"); // *MENU*
virtual void GetRandom3(Axis_t &x, Axis_t &y, Axis_t &z);
- virtual void GetStats(Stat_t *stats);
+ virtual void GetStats(Stat_t *stats) const;
virtual Stat_t Integral();
virtual Stat_t Integral(Int_t, Int_t) {return 0;}
virtual Stat_t Integral(Int_t, Int_t, Int_t, Int_t) {return 0;}
@@ -90,7 +90,7 @@ public:
virtual void AddBinContent(Int_t bin, Stat_t w);
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Char_t (content);}
@@ -126,7 +126,7 @@ public:
virtual void AddBinContent(Int_t bin, Stat_t w);
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Short_t (content);}
@@ -164,7 +164,7 @@ public:
{fArray[bin] += Float_t (w);}
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Float_t (content);}
@@ -201,7 +201,7 @@ public:
{fArray[bin] += Double_t (w);}
virtual void Copy(TObject &hnew);
virtual TH1 *DrawCopy(Option_t *option="");
- virtual Stat_t GetBinContent(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
virtual void Reset(Option_t *option="");
virtual void SetBinContent(Int_t bin, Stat_t content)
{fArray[bin] = Double_t (content);}
diff --git a/hist/inc/TMultiDimFit.h b/hist/inc/TMultiDimFit.h
index bc339efca1ac670e9204f8e9036593f31259b5fb..cfb416fe20fc30acd792567be5ccaf463bfdbd77 100644
--- a/hist/inc/TMultiDimFit.h
+++ b/hist/inc/TMultiDimFit.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TMultiDimFit.h,v 1.8 2000/11/07 07:19:26 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TMultiDimFit.h,v 1.1 2000/11/24 16:21:00 brun Exp $
// Author: Christian Holm Christensen 07/11/2000
#ifndef ROOT_TMultiDimFit
@@ -192,7 +192,7 @@ public:
virtual void MakeCode(const char *functionName="MDF", Option_t *option=""); // *MENU*
virtual void MakeHistograms(Option_t* option="A"); // *MENU*
virtual void MakeMethod(const Char_t* className="MDF", Option_t* option=""); // *MENU*
- virtual void Print(Option_t *option="ps"); // *MENU*
+ virtual void Print(Option_t *option="ps") const; // *MENU*
void SetMaxAngle(Double_t angle=0);
void SetMaxFunctions(Int_t n) { fMaxFunctions = n; }
diff --git a/hist/inc/TPolyMarker.h b/hist/inc/TPolyMarker.h
index 7be37ec19b7561d29642289306a0c443e101e811..0e5e4efe4e95377c03adf6abd280a3b8d8a719d6 100644
--- a/hist/inc/TPolyMarker.h
+++ b/hist/inc/TPolyMarker.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TPolyMarker.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/hist:$Name: $:$Id: TPolyMarker.h,v 1.2 2000/11/21 20:30:55 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -46,14 +46,14 @@ public:
virtual void Draw(Option_t *option="");
virtual void DrawPolyMarker(Int_t n, Float_t *x, Float_t *y, Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- virtual Int_t GetN() {return fN;}
- Option_t *GetOption() const {return fOption.Data();}
- Float_t *GetX() {return fX;}
- Float_t *GetY() {return fY;}
- virtual void ls(Option_t *option="");
+ virtual Int_t GetN() const {return fN;}
+ Option_t *GetOption() const {return fOption.Data();}
+ Float_t *GetX() const {return fX;}
+ Float_t *GetY() const {return fY;}
+ virtual void ls(Option_t *option="") const;
virtual void Paint(Option_t *option="");
virtual void PaintPolyMarker(Int_t n, Float_t *x, Float_t *y, Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void SavePrimitive(ofstream &out, Option_t *option);
virtual void SetPoint(Int_t point, Float_t x, Float_t y); // *MENU*
virtual void SetPolyMarker(Int_t n, Float_t *x=0, Float_t *y=0, Option_t *option="");
diff --git a/hist/inc/TPrincipal.h b/hist/inc/TPrincipal.h
index 2a370d9939d0eb86ba97688d54456946661d19b9..ab2cfa3404adec08d85f46df60234a87354f7e83 100644
--- a/hist/inc/TPrincipal.h
+++ b/hist/inc/TPrincipal.h
@@ -1,8 +1,8 @@
// -*- mode: c++ -*-
//
-// $Id: TPrincipal.h,v 1.3 2000/08/17 09:44:43 brun Exp $
+// $Id: TPrincipal.h,v 1.4 2000/09/05 09:21:23 brun Exp $
// $Author: brun $
-// $Date: 2000/08/17 09:44:43 $
+// $Date: 2000/09/05 09:21:23 $
//
#ifndef ROOT_TPrincipal
#define ROOT_TPrincipal
@@ -60,7 +60,7 @@ public:
const TMatrixD *GetCovarianceMatrix() const {return &fCovarianceMatrix;}
const TVectorD *GetEigenValues() const {return &fEigenValues;}
const TMatrixD *GetEigenVectors() const {return &fEigenVectors;}
- TList *GetHistograms() {return fHistograms;}
+ TList *GetHistograms() const {return fHistograms;}
const TVectorD *GetMeanValues() const {return &fMeanValues;}
const Double_t *GetRow(Int_t row);
const TVectorD *GetSigmas() const {return &fSigmas;}
@@ -71,7 +71,7 @@ public:
virtual void MakeMethods(const char *classname = "PCA", Option_t *option=""); // *MENU*
virtual void MakePrincipals(); // *MENU*
virtual void P2X(Double_t *p, Double_t *x, Int_t nTest);
- virtual void Print(Option_t *opt="MSE"); // *MENU*
+ virtual void Print(Option_t *opt="MSE") const; // *MENU*
virtual void SumOfSquareResiduals(Double_t *x, Double_t *s);
void Test(Option_t *option=""); // *MENU*
virtual void X2P(Double_t *x, Double_t *p);
diff --git a/hist/inc/TProfile.h b/hist/inc/TProfile.h
index 14bdd10694bd553476f0b08377d2940848268656..a2943276e0aecd86f203bcbd1be7af95eebbb74d 100644
--- a/hist/inc/TProfile.h
+++ b/hist/inc/TProfile.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TProfile.h,v 1.6 2000/08/15 08:24:10 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TProfile.h,v 1.7 2000/11/21 20:31:11 brun Exp $
// Author: Rene Brun 29/09/95
/*************************************************************************
@@ -68,12 +68,12 @@ public:
virtual Int_t Fill(Axis_t x, Axis_t y);
virtual Int_t Fill(Axis_t x, Axis_t y, Stat_t w);
virtual void FillN(Int_t ntimes, Axis_t *x, Axis_t *y, Double_t *w, Int_t stride=1);
- virtual Stat_t GetBinContent(Int_t bin);
- virtual Stat_t GetBinError(Int_t bin);
- virtual Stat_t GetBinEntries(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
+ virtual Stat_t GetBinError(Int_t bin) const;
+ virtual Stat_t GetBinEntries(Int_t bin) const;
Option_t *GetErrorOption() const;
- virtual Double_t GetYmin() {return fYmin;}
- virtual Double_t GetYmax() {return fYmax;}
+ virtual Double_t GetYmin() const {return fYmin;}
+ virtual Double_t GetYmax() const {return fYmax;}
virtual void Multiply(TF1 *h1, Double_t c1=1);
virtual void Multiply(TH1 *h1);
virtual void Multiply(TH1 *h1, TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option=""); // *MENU*
diff --git a/hist/inc/TProfile2D.h b/hist/inc/TProfile2D.h
index c3f9e26638108dff696de14ef07e61580b259f55..0f8a363432121784290e80562ba3dc2d600a4cb3 100644
--- a/hist/inc/TProfile2D.h
+++ b/hist/inc/TProfile2D.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TProfile2D.h,v 1.3 2000/08/15 08:51:37 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TProfile2D.h,v 1.4 2000/11/21 20:31:29 brun Exp $
// Author: Rene Brun 16/04/2000
/*************************************************************************
@@ -63,12 +63,12 @@ public:
Int_t Fill(Axis_t, Stat_t) {return -1; } //MayNotUse
Int_t Fill(Axis_t x, Axis_t y, Stat_t z);
virtual Int_t Fill(Axis_t x, Axis_t y, Axis_t z, Stat_t w);
- virtual Stat_t GetBinContent(Int_t bin);
- virtual Stat_t GetBinError(Int_t bin);
- virtual Stat_t GetBinEntries(Int_t bin);
+ virtual Stat_t GetBinContent(Int_t bin) const;
+ virtual Stat_t GetBinError(Int_t bin) const;
+ virtual Stat_t GetBinEntries(Int_t bin) const;
Option_t *GetErrorOption() const;
- virtual Double_t GetZmin() {return fZmin;}
- virtual Double_t GetZmax() {return fZmax;}
+ virtual Double_t GetZmin() const {return fZmin;}
+ virtual Double_t GetZmax() const {return fZmax;}
virtual void Multiply(TF1 *h1, Double_t c1=1);
virtual void Multiply(TH1 *h1);
virtual void Multiply(TH1 *h1, TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option=""); // *MENU*
diff --git a/hist/inc/TSpectrum.h b/hist/inc/TSpectrum.h
index 5be74fe9d300fcd081a318ec65ec96b21cbb829e..22379016f3aeede20a2d30b9e962c5c1f60b2745 100644
--- a/hist/inc/TSpectrum.h
+++ b/hist/inc/TSpectrum.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TSpectrum.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/hist:$Name: $:$Id: TSpectrum.h,v 1.2 2000/10/05 06:56:38 brun Exp $
// Author: Miroslav Morhac 27/05/99
/*************************************************************************
@@ -56,10 +56,10 @@ public:
virtual char *Background2(float **spectrum,int sizex,int sizey,int niter);
virtual char *Deconvolution1(float *source,float *resp,int size,int niter);
virtual char *Deconvolution2(float **source,float **resp,int sizex,int sizey,int niter);
- virtual TH1 *GetHistogram() {return fHistogram;}
- virtual Int_t GetNPeaks() {return fNPeaks;}
- virtual Float_t *GetPositionX() {return fPositionX;}
- virtual Float_t *GetPositionY() {return fPositionY;}
+ virtual TH1 *GetHistogram() const {return fHistogram;}
+ virtual Int_t GetNPeaks() const {return fNPeaks;}
+ virtual Float_t *GetPositionX() const {return fPositionX;}
+ virtual Float_t *GetPositionY() const {return fPositionY;}
virtual int PeakEvaluate(double *temp,int size,int xmax,double xmin);
virtual Int_t Search(TH1 *hist, Double_t sigma, Option_t *option="goff");
virtual Int_t Search1(float *spectrum,int size,double sigma);
diff --git a/hist/inc/TVirtualHistPainter.h b/hist/inc/TVirtualHistPainter.h
index a174ede2cfdee7a62415c23a91233a890d8e0a29..a848dd993a0e888c0bfcd332afc94bd35f41296a 100644
--- a/hist/inc/TVirtualHistPainter.h
+++ b/hist/inc/TVirtualHistPainter.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name$:$Id$
+// @(#)root/hist:$Name: $:$Id: TVirtualHistPainter.h,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
// Author: Rene Brun 30/08/99
/*************************************************************************
@@ -41,7 +41,7 @@ public:
virtual void DrawPanel() = 0;
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) = 0;
virtual void FitPanel() = 0;
- virtual char *GetObjectInfo(Int_t px, Int_t py) = 0;
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const = 0;
virtual void Paint(Option_t *option="") = 0;
virtual void PaintStat(Int_t dostat, TF1 *fit) = 0;
virtual void SetHistogram(TH1 *h) = 0;
diff --git a/hist/src/Haxis.cxx b/hist/src/Haxis.cxx
index b374f4e2d983bee7e03d862e4b3671ff08f1cf90..954eff0124e7902a52e55ba1e54509a3adcd43fc 100644
--- a/hist/src/Haxis.cxx
+++ b/hist/src/Haxis.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: Haxis.cxx,v 1.1.1.1 2000/05/16 17:00:41 rdm Exp $
+// @(#)root/hist:$Name: $:$Id: Haxis.cxx,v 1.2 2000/06/13 10:34:10 brun Exp $
// Author: Rene Brun 18/05/95
// ---------------------------------- haxis.C
@@ -10,7 +10,7 @@
//______________________________________________________________________________
-Int_t TH1::AxisChoice( Option_t *axis)
+Int_t TH1::AxisChoice( Option_t *axis) const
{
char achoice = toupper(axis[0]);
if (achoice == 'X') return 1;
@@ -20,7 +20,7 @@ Int_t TH1::AxisChoice( Option_t *axis)
}
//______________________________________________________________________________
-Int_t TH1::GetNdivisions( Option_t *axis)
+Int_t TH1::GetNdivisions( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetNdivisions();
@@ -30,7 +30,7 @@ Int_t TH1::GetNdivisions( Option_t *axis)
}
//______________________________________________________________________________
-Color_t TH1::GetAxisColor( Option_t *axis)
+Color_t TH1::GetAxisColor( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetAxisColor();
@@ -40,7 +40,7 @@ Color_t TH1::GetAxisColor( Option_t *axis)
}
//______________________________________________________________________________
-Color_t TH1::GetLabelColor( Option_t *axis)
+Color_t TH1::GetLabelColor( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelColor();
@@ -50,7 +50,7 @@ Color_t TH1::GetLabelColor( Option_t *axis)
}
//______________________________________________________________________________
-Style_t TH1::GetLabelFont( Option_t *axis)
+Style_t TH1::GetLabelFont( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelFont();
@@ -60,7 +60,7 @@ Style_t TH1::GetLabelFont( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TH1::GetLabelOffset( Option_t *axis)
+Float_t TH1::GetLabelOffset( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelOffset();
@@ -70,7 +70,7 @@ Float_t TH1::GetLabelOffset( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TH1::GetLabelSize( Option_t *axis)
+Float_t TH1::GetLabelSize( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetLabelSize();
@@ -80,7 +80,7 @@ Float_t TH1::GetLabelSize( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TH1::GetTickLength( Option_t *axis)
+Float_t TH1::GetTickLength( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetTickLength();
@@ -90,7 +90,7 @@ Float_t TH1::GetTickLength( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TH1::GetTitleOffset( Option_t *axis)
+Float_t TH1::GetTitleOffset( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetTitleOffset();
@@ -100,7 +100,7 @@ Float_t TH1::GetTitleOffset( Option_t *axis)
}
//______________________________________________________________________________
-Float_t TH1::GetTitleSize( Option_t *axis)
+Float_t TH1::GetTitleSize( Option_t *axis) const
{
Int_t ax = AxisChoice(axis);
if (ax == 1) return fXaxis.GetTitleSize();
diff --git a/hist/src/TAxis.cxx b/hist/src/TAxis.cxx
index 76644c76f3dcebd818c4dc8ffa3d432ca24a2ea8..e737ac43aaedbbed58d2ab1e5e8ca374ece7f3b1 100644
--- a/hist/src/TAxis.cxx
+++ b/hist/src/TAxis.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TAxis.cxx,v 1.11 2000/11/21 20:31:46 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TAxis.cxx,v 1.12 2000/12/02 16:29:54 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -365,7 +365,7 @@ Int_t TAxis::FindBin(Axis_t x)
}
//______________________________________________________________________________
-Int_t TAxis::FindFixBin(Axis_t x)
+Int_t TAxis::FindFixBin(Axis_t x) const
{
//*-*-*-*-*-*-*-*-*Find bin number corresponding to abscissa x-*-*-*-*-*-*
//*-* ===========================================
@@ -385,7 +385,7 @@ Int_t TAxis::FindFixBin(Axis_t x)
}
//______________________________________________________________________________
-Int_t TAxis::GetFirst()
+Int_t TAxis::GetFirst() const
{
// return first bin on the axis
// - 0 if no range defined
@@ -395,7 +395,7 @@ Int_t TAxis::GetFirst()
}
//______________________________________________________________________________
-Int_t TAxis::GetLast()
+Int_t TAxis::GetLast() const
{
// return last bin on the axis
// - fNbins if no range defined
@@ -405,7 +405,7 @@ Int_t TAxis::GetLast()
}
//______________________________________________________________________________
-Axis_t TAxis::GetBinCenter(Int_t bin)
+Axis_t TAxis::GetBinCenter(Int_t bin) const
{
//*-*-*-*-*-*-*-*-*-*-*Return center of bin*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ====================
@@ -420,7 +420,7 @@ Axis_t TAxis::GetBinCenter(Int_t bin)
}
//______________________________________________________________________________
-Axis_t TAxis::GetBinLowEdge(Int_t bin)
+Axis_t TAxis::GetBinLowEdge(Int_t bin) const
{
//*-*-*-*-*-*-*-*-*-*-*Return low edge of bin-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ======================
@@ -431,7 +431,7 @@ Axis_t TAxis::GetBinLowEdge(Int_t bin)
}
//______________________________________________________________________________
-Axis_t TAxis::GetBinUpEdge(Int_t bin)
+Axis_t TAxis::GetBinUpEdge(Int_t bin) const
{
//*-*-*-*-*-*-*-*-*-*-*Return up edge of bin-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ======================
@@ -447,7 +447,7 @@ Axis_t TAxis::GetBinUpEdge(Int_t bin)
}
//______________________________________________________________________________
-Axis_t TAxis::GetBinWidth(Int_t bin)
+Axis_t TAxis::GetBinWidth(Int_t bin) const
{
//*-*-*-*-*-*-*-*-*-*-*Return bin width-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ================
@@ -479,7 +479,7 @@ void TAxis::GetLowEdge(Axis_t *edge)
// LABELs methods
//--------------------------------------------------------------------
//______________________________________________________________________________
-char *TAxis::GetBinLabel(Int_t)
+char *TAxis::GetBinLabel(Int_t) const
{
//*-*-*-*-*-*-*-*-*-*Return label associated to bin-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==============================
diff --git a/hist/src/TF1.cxx b/hist/src/TF1.cxx
index 12aa23ea88e02f46a2f5a8553c4abbc0dc411a2f..89190b6cf6126bd995d0b5773616091f6e8e8636 100644
--- a/hist/src/TF1.cxx
+++ b/hist/src/TF1.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TF1.cxx,v 1.9 2000/11/24 10:24:59 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TF1.cxx,v 1.10 2000/11/28 07:34:32 brun Exp $
// Author: Rene Brun 18/08/95
/*************************************************************************
@@ -708,7 +708,7 @@ void TF1::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-TH1 *TF1::GetHistogram()
+TH1 *TF1::GetHistogram() const
{
// return a pointer to the histogram used to vusualize the function
@@ -721,7 +721,7 @@ TH1 *TF1::GetHistogram()
}
//______________________________________________________________________________
-char *TF1::GetObjectInfo(Int_t px, Int_t /* py */)
+char *TF1::GetObjectInfo(Int_t px, Int_t /* py */) const
{
// Redefines TObject::GetObjectInfo.
// Displays the function info (x, function value
@@ -729,7 +729,7 @@ char *TF1::GetObjectInfo(Int_t px, Int_t /* py */)
//
static char info[64];
Double_t x = gPad->PadtoX(gPad->AbsPixeltoX(px));
- sprintf(info,"(x=%g, f=%g)",x,Eval(x));
+ sprintf(info,"(x=%g, f=%g)",x,((TF1*)this)->Eval(x));
return info;
}
@@ -1424,7 +1424,7 @@ void TF1::Paint(Option_t *option)
}
//______________________________________________________________________________
-void TF1::Print(Option_t *option)
+void TF1::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this function with its attributes*-*-*-*-*-*-*-*-*-*
//*-* ==================================
diff --git a/hist/src/TF2.cxx b/hist/src/TF2.cxx
index f9aa1a3a74f7836e782b1c411b2486cd10e402fa..47143d3e486b6d355e159506aabaf05f20165f3c 100644
--- a/hist/src/TF2.cxx
+++ b/hist/src/TF2.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TF2.cxx,v 1.2 2000/06/13 10:37:48 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TF2.cxx,v 1.3 2000/11/21 20:32:34 brun Exp $
// Author: Rene Brun 23/08/95
/*************************************************************************
@@ -244,7 +244,7 @@ Int_t TF2::GetContour(Double_t *levels)
}
//______________________________________________________________________________
-Double_t TF2::GetContourLevel(Int_t level)
+Double_t TF2::GetContourLevel(Int_t level) const
{
//*-*-*-*-*-*-*-*Return the number of contour levels*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ===================================
@@ -255,7 +255,7 @@ Double_t TF2::GetContourLevel(Int_t level)
}
//______________________________________________________________________________
-char *TF2::GetObjectInfo(Int_t px, Int_t py)
+char *TF2::GetObjectInfo(Int_t px, Int_t py) const
{
// Redefines TObject::GetObjectInfo.
// Displays the function value
@@ -278,7 +278,7 @@ char *TF2::GetObjectInfo(Int_t px, Int_t py)
uymax=gPad->GetUymax();
y = fYmin +(fYmax-fYmin)*(y-uymin)/(uymax-uymin);
}
- sprintf(info,"(x=%g, y=%g, f=%.18g)",x,y,Eval(x,y));
+ sprintf(info,"(x=%g, y=%g, f=%.18g)",x,y,((TF2*)this)->Eval(x,y));
return info;
}
diff --git a/hist/src/TFormula.cxx b/hist/src/TFormula.cxx
index 23d87b18da0c43fc19d16edc9a1468ae3c453423..771cfb20591a70cc0b9cde62b90e4a13410727d1 100644
--- a/hist/src/TFormula.cxx
+++ b/hist/src/TFormula.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TFormula.cxx,v 1.8 2000/11/21 20:33:01 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TFormula.cxx,v 1.9 2000/11/24 10:23:51 brun Exp $
// Author: Nicolas Brun 19/08/95
/*************************************************************************
@@ -1739,7 +1739,7 @@ Double_t TFormula::EvalPar(Double_t *x, Double_t *params)
}
//______________________________________________________________________________
-Double_t TFormula::GetParameter(const char *parName)
+Double_t TFormula::GetParameter(const char *parName) const
{
//return value of parameter named parName
@@ -1764,7 +1764,7 @@ const char *TFormula::GetParName(Int_t ipar) const
}
//______________________________________________________________________________
-Int_t TFormula::GetParNumber(const char *parName)
+Int_t TFormula::GetParNumber(const char *parName) const
{
// return parameter number by name
@@ -1775,7 +1775,7 @@ Int_t TFormula::GetParNumber(const char *parName)
}
//______________________________________________________________________________
-void TFormula::Print(Option_t *)
+void TFormula::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*Dump this formula with its attributes*-*-*-*-*-*-*-*-*-*
//*-* =====================================
diff --git a/hist/src/TH1.cxx b/hist/src/TH1.cxx
index dd2527b2aa3036fb779eb6e50f9c6c47d5856552..33e5cd1cc684a76faa41e6e85ad14f9746fde0c4 100644
--- a/hist/src/TH1.cxx
+++ b/hist/src/TH1.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TH1.cxx,v 1.28 2000/11/21 20:33:51 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TH1.cxx,v 1.29 2000/12/02 11:11:05 brun Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -1736,7 +1736,7 @@ void TH1::FitPanel()
}
//______________________________________________________________________________
-char *TH1::GetObjectInfo(Int_t px, Int_t py)
+char *TH1::GetObjectInfo(Int_t px, Int_t py) const
{
// Redefines TObject::GetObjectInfo.
// Displays the histogram info (bin number, contents, integral up to bin
@@ -2174,7 +2174,7 @@ void H1LeastSquareSeqnd(Int_t n, Double_t *a, Int_t idim, Int_t &ifail, Int_t k,
//______________________________________________________________________________
-Int_t TH1::GetBin(Int_t binx, Int_t biny, Int_t binz)
+Int_t TH1::GetBin(Int_t binx, Int_t biny, Int_t binz) const
{
//*-*-*-*-*-*Return Global bin number corresponding to binx,y,z*-*-*-*-*-*-*
//*-* ==================================================
@@ -2247,7 +2247,7 @@ Axis_t TH1::GetRandom()
}
//______________________________________________________________________________
-Stat_t TH1::GetBinContent(Int_t)
+Stat_t TH1::GetBinContent(Int_t) const
{
//*-*-*-*-*-*-*Return content of global bin number bin*-*-*-*-*-*-*-*-*-*-*-*
//*-* =======================================
@@ -2977,7 +2977,7 @@ void TH1::Streamer(TBuffer &b)
}
//______________________________________________________________________________
-void TH1::Print(Option_t *option)
+void TH1::Print(Option_t *option) const
{
//*-*-*-*-*-*-*Print some global quantities for this histogram*-*-*-*-*-*-*-*
//*-* ===============================================
@@ -3111,7 +3111,7 @@ void TH1::UseCurrentStyle()
}
//______________________________________________________________________________
-Stat_t TH1::GetMean(Int_t axis)
+Stat_t TH1::GetMean(Int_t axis) const
{
//*-*-*-*-*-*-*-*Return mean value of this histogram along the X axis*-*-*-*-*
//*-* ====================================================
@@ -3125,7 +3125,7 @@ Stat_t TH1::GetMean(Int_t axis)
}
//______________________________________________________________________________
-Stat_t TH1::GetRMS(Int_t axis)
+Stat_t TH1::GetRMS(Int_t axis) const
{
//*-*-*-*-*-*-*-*Return the Root Mean Square value of this histogram*-*-*-*-*
//*-* ===================================================
@@ -3142,7 +3142,7 @@ Stat_t TH1::GetRMS(Int_t axis)
}
//______________________________________________________________________________
-void TH1::GetStats(Stat_t *stats)
+void TH1::GetStats(Stat_t *stats) const
{
// fill the array stats from the contents of this histogram
// The array stats must be correctly dimensionned in the calling program.
@@ -3190,7 +3190,7 @@ void TH1::PutStats(Stat_t *stats)
}
//______________________________________________________________________________
-Stat_t TH1::GetSumOfWeights()
+Stat_t TH1::GetSumOfWeights() const
{
//*-*-*-*-*-*-*-*Return the sum of weights excluding under/overflows*-*-*-*-*
//*-* ===================================================
@@ -3430,7 +3430,7 @@ Int_t TH1::GetContour(Double_t *levels)
}
//______________________________________________________________________________
-Double_t TH1::GetContourLevel(Int_t level)
+Double_t TH1::GetContourLevel(Int_t level) const
{
// Return value of contour number level
// see GetContour to return the array of all contour levels
@@ -3493,7 +3493,7 @@ void TH1::SetContourLevel(Int_t level, Double_t value)
}
//______________________________________________________________________________
-Double_t TH1::GetMaximum()
+Double_t TH1::GetMaximum() const
{
//*-*-*-*-*-*-*-*-*-*-*Return maximum value of bins in the range*-*-*-*-*-*
//*-* =========================================
@@ -3519,7 +3519,7 @@ Double_t TH1::GetMaximum()
}
//______________________________________________________________________________
-Int_t TH1::GetMaximumBin()
+Int_t TH1::GetMaximumBin() const
{
//*-*-*-*-*-*-*Return location of bin with maximum value in the range*-*
//*-* ======================================================
@@ -3528,7 +3528,7 @@ Int_t TH1::GetMaximumBin()
}
//______________________________________________________________________________
-Int_t TH1::GetMaximumBin(Int_t &locmax, Int_t &locmay, Int_t &locmaz)
+Int_t TH1::GetMaximumBin(Int_t &locmax, Int_t &locmay, Int_t &locmaz) const
{
//*-*-*-*-*-*-*Return location of bin with maximum value in the range*-*
//*-* ======================================================
@@ -3561,7 +3561,7 @@ Int_t TH1::GetMaximumBin(Int_t &locmax, Int_t &locmay, Int_t &locmaz)
}
//______________________________________________________________________________
-Double_t TH1::GetMinimum()
+Double_t TH1::GetMinimum() const
{
//*-*-*-*-*-*-*-*-*-*-*Return minimum value of bins in the range-*-*-*-*-*
//*-* =========================================
@@ -3587,7 +3587,7 @@ Double_t TH1::GetMinimum()
}
//______________________________________________________________________________
-Int_t TH1::GetMinimumBin()
+Int_t TH1::GetMinimumBin() const
{
//*-*-*-*-*-*-*Return location of bin with minimum value in the range*-*
//*-* ======================================================
@@ -3596,7 +3596,7 @@ Int_t TH1::GetMinimumBin()
}
//______________________________________________________________________________
-Int_t TH1::GetMinimumBin(Int_t &locmix, Int_t &locmiy, Int_t &locmiz)
+Int_t TH1::GetMinimumBin(Int_t &locmix, Int_t &locmiy, Int_t &locmiz) const
{
//*-*-*-*-*-*-*Return location of bin with minimum value in the range*-*
//*-* ======================================================
@@ -3824,7 +3824,7 @@ void TH1::Sumw2()
}
//______________________________________________________________________________
-TF1 *TH1::GetFunction(const char *name)
+TF1 *TH1::GetFunction(const char *name) const
{
//*-*-*-*-*Return pointer to function with name*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ===================================
@@ -3836,7 +3836,7 @@ TF1 *TH1::GetFunction(const char *name)
}
//______________________________________________________________________________
-Stat_t TH1::GetBinError(Int_t bin)
+Stat_t TH1::GetBinError(Int_t bin) const
{
//*-*-*-*-*-*-*Return value of error associated to bin number bin*-*-*-*-*
//*-* ==================================================
@@ -3855,7 +3855,7 @@ Stat_t TH1::GetBinError(Int_t bin)
}
//______________________________________________________________________________
-Stat_t TH1::GetCellContent(Int_t binx, Int_t biny)
+Stat_t TH1::GetCellContent(Int_t binx, Int_t biny) const
{
Stat_t binval;
if (GetDimension() > 1) {
@@ -3866,7 +3866,7 @@ Stat_t TH1::GetCellContent(Int_t binx, Int_t biny)
}
//______________________________________________________________________________
-Stat_t TH1::GetCellError(Int_t binx, Int_t biny)
+Stat_t TH1::GetCellError(Int_t binx, Int_t biny) const
{
if (GetDimension() > 1) return GetBinError(biny*(fXaxis.GetNbins()+2) + binx);
return GetBinError(binx);
@@ -4005,7 +4005,7 @@ TH1 *TH1C::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH1C::GetBinContent(Int_t bin)
+Stat_t TH1C::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -4172,7 +4172,7 @@ TH1 *TH1S::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH1S::GetBinContent(Int_t bin)
+Stat_t TH1S::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -4330,7 +4330,7 @@ TH1 *TH1F::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH1F::GetBinContent(Int_t bin)
+Stat_t TH1F::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -4489,7 +4489,7 @@ TH1 *TH1D::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH1D::GetBinContent(Int_t bin)
+Stat_t TH1D::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
diff --git a/hist/src/TH2.cxx b/hist/src/TH2.cxx
index 5016c260b0198376db386576cbff89ee05bf1533..e143102af90778dad9971abb4d5d2810d87d7d03 100644
--- a/hist/src/TH2.cxx
+++ b/hist/src/TH2.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TH2.cxx,v 1.10 2000/10/10 13:01:57 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TH2.cxx,v 1.11 2000/11/21 20:34:34 brun Exp $
// Author: Rene Brun 26/12/94
/*************************************************************************
@@ -526,7 +526,7 @@ void TH2::FitSlicesY(TF1 *f1, Int_t binmin, Int_t binmax, Int_t cut, Option_t *o
}
//______________________________________________________________________________
-Stat_t TH2::GetCorrelationFactor(Int_t axis1, Int_t axis2)
+Stat_t TH2::GetCorrelationFactor(Int_t axis1, Int_t axis2) const
{
//*-*-*-*-*-*-*-*Return correlation factor between axis1 and axis2*-*-*-*-*
//*-* ====================================================
@@ -543,7 +543,7 @@ Stat_t TH2::GetCorrelationFactor(Int_t axis1, Int_t axis2)
}
//______________________________________________________________________________
-Stat_t TH2::GetCovariance(Int_t axis1, Int_t axis2)
+Stat_t TH2::GetCovariance(Int_t axis1, Int_t axis2) const
{
//*-*-*-*-*-*-*-*Return covariance between axis1 and axis2*-*-*-*-*
//*-* ====================================================
@@ -598,7 +598,7 @@ void TH2::GetRandom2(Axis_t &x, Axis_t &y)
}
//______________________________________________________________________________
-void TH2::GetStats(Stat_t *stats)
+void TH2::GetStats(Stat_t *stats) const
{
// fill the array stats from the contents of this histogram
// The array stats must be correctly dimensionned in the calling program.
@@ -1205,7 +1205,7 @@ TH1 *TH2C::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH2C::GetBinContent(Int_t bin)
+Stat_t TH2C::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -1412,7 +1412,7 @@ TH1 *TH2S::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH2S::GetBinContent(Int_t bin)
+Stat_t TH2S::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -1611,7 +1611,7 @@ TH1 *TH2F::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH2F::GetBinContent(Int_t bin)
+Stat_t TH2F::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -1818,7 +1818,7 @@ TH1 *TH2D::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH2D::GetBinContent(Int_t bin)
+Stat_t TH2D::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
diff --git a/hist/src/TH3.cxx b/hist/src/TH3.cxx
index 9ab3adbabc8cdfcb98bed8149720944cb06e7876..77cfd979bdc3611fb060e5149fb30bfaa85b1a22 100644
--- a/hist/src/TH3.cxx
+++ b/hist/src/TH3.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TH3.cxx,v 1.6 2000/07/12 07:06:18 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TH3.cxx,v 1.7 2000/11/21 20:35:04 brun Exp $
// Author: Rene Brun 27/10/95
/*************************************************************************
@@ -394,7 +394,7 @@ void TH3::GetRandom3(Axis_t &x, Axis_t &y, Axis_t &z)
}
//______________________________________________________________________________
-void TH3::GetStats(Stat_t *stats)
+void TH3::GetStats(Stat_t *stats) const
{
// fill the array stats from the contents of this histogram
// The array stats must be correctly dimensionned in the calling program.
@@ -1142,7 +1142,7 @@ TH1 *TH3C::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH3C::GetBinContent(Int_t bin)
+Stat_t TH3C::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -1342,7 +1342,7 @@ TH1 *TH3S::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH3S::GetBinContent(Int_t bin)
+Stat_t TH3S::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -1521,7 +1521,7 @@ TH1 *TH3F::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH3F::GetBinContent(Int_t bin)
+Stat_t TH3F::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
@@ -1700,7 +1700,7 @@ TH1 *TH3D::DrawCopy(Option_t *option)
}
//______________________________________________________________________________
-Stat_t TH3D::GetBinContent(Int_t bin)
+Stat_t TH3D::GetBinContent(Int_t bin) const
{
if (bin < 0) bin = 0;
if (bin >= fNcells) bin = fNcells-1;
diff --git a/hist/src/TMultiDimFit.cxx b/hist/src/TMultiDimFit.cxx
index 85e7e855cacca1781a0a103e1026ea270db60036..302cc8c53ab945fee8d4793050fa4d9fa9db31b4 100644
--- a/hist/src/TMultiDimFit.cxx
+++ b/hist/src/TMultiDimFit.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TMultiDimFit.cxx,v 1.1 2000/11/24 16:21:00 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TMultiDimFit.cxx,v 1.2 2000/11/24 16:36:01 brun Exp $
// Author: Christian Holm Christensen 07/11/2000
//____________________________________________________________________
@@ -3373,7 +3373,7 @@ void TMultiDimFit::MakeRealCode(const char *filename,
//____________________________________________________________________
-void TMultiDimFit::Print(Option_t *option)
+void TMultiDimFit::Print(Option_t *option) const
{
// Print statistics etc.
// Options are
diff --git a/hist/src/TPolyMarker.cxx b/hist/src/TPolyMarker.cxx
index 38c5fefbcab312247e863fc26331a617e623bc6c..6aae049e06e727f58af4ca6dab9cee77e184b4a2 100644
--- a/hist/src/TPolyMarker.cxx
+++ b/hist/src/TPolyMarker.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TPolyMarker.cxx,v 1.2 2000/09/05 09:21:23 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TPolyMarker.cxx,v 1.3 2000/11/21 20:35:27 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -119,7 +119,7 @@ void TPolyMarker::ExecuteEvent(Int_t, Int_t, Int_t)
}
//______________________________________________________________________________
-void TPolyMarker::ls(Option_t *)
+void TPolyMarker::ls(Option_t *) const
{
TROOT::IndentLevel();
printf("TPolyMarker N=%d\n",fN);
@@ -141,7 +141,7 @@ void TPolyMarker::PaintPolyMarker(Int_t n, Float_t *x, Float_t *y, Option_t *opt
}
//______________________________________________________________________________
-void TPolyMarker::Print(Option_t *)
+void TPolyMarker::Print(Option_t *) const
{
printf("TPolyMarker N=%d\n",fN);
diff --git a/hist/src/TPrincipal.cxx b/hist/src/TPrincipal.cxx
index 50e5bd0832c852a227c132b68c3d8bcd387991b5..fd8cf24d5c6123683cdf0bf25cda792ec4ee64ff 100644
--- a/hist/src/TPrincipal.cxx
+++ b/hist/src/TPrincipal.cxx
@@ -657,8 +657,8 @@ in the transformed space.
*/
//End_Html
-// $Id: TPrincipal.cxx,v 1.10 2000/08/17 09:44:42 brun Exp $
-// $Date: 2000/08/17 09:44:42 $
+// $Id: TPrincipal.cxx,v 1.11 2000/10/01 20:50:08 brun Exp $
+// $Date: 2000/10/01 20:50:08 $
// $Author: brun $
#include "TPrincipal.h"
@@ -1922,7 +1922,7 @@ void TPrincipal::P2X(Double_t *p, Double_t *x, Int_t nTest)
}
//____________________________________________________________________
-void TPrincipal::Print(Option_t *opt)
+void TPrincipal::Print(Option_t *opt) const
{
// Print the statistics
// Options are
diff --git a/hist/src/TProfile.cxx b/hist/src/TProfile.cxx
index 5b85636f130309cfbb26467f0cfe8a768372626a..97e1569e6e03558db85651467ae301c8990b8f85 100644
--- a/hist/src/TProfile.cxx
+++ b/hist/src/TProfile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TProfile.cxx,v 1.6 2000/08/15 08:24:10 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TProfile.cxx,v 1.7 2000/11/21 20:35:46 brun Exp $
// Author: Rene Brun 29/09/95
/*************************************************************************
@@ -569,7 +569,7 @@ void TProfile::FillN(Int_t ntimes, Axis_t *x, Axis_t *y, Stat_t *w, Int_t stride
}
//______________________________________________________________________________
-Stat_t TProfile::GetBinContent(Int_t bin)
+Stat_t TProfile::GetBinContent(Int_t bin) const
{
//*-*-*-*-*-*-*Return bin content of a Profile histogram*-*-*-*-*-*-*-*-*-*
//*-* =========================================
@@ -580,7 +580,7 @@ Stat_t TProfile::GetBinContent(Int_t bin)
}
//______________________________________________________________________________
-Stat_t TProfile::GetBinEntries(Int_t bin)
+Stat_t TProfile::GetBinEntries(Int_t bin) const
{
//*-*-*-*-*-*-*Return bin entries of a Profile histogram*-*-*-*-*-*-*-*-*-*
//*-* =========================================
@@ -590,7 +590,7 @@ Stat_t TProfile::GetBinEntries(Int_t bin)
}
//______________________________________________________________________________
-Stat_t TProfile::GetBinError(Int_t bin)
+Stat_t TProfile::GetBinError(Int_t bin) const
{
//*-*-*-*-*-*-*Return bin error of a Profile histogram*-*-*-*-*-*-*-*-*-*
//*-* =======================================
diff --git a/hist/src/TProfile2D.cxx b/hist/src/TProfile2D.cxx
index 4110fddd55adcfd5ca65c2f83cd540974e5dd18f..4d8f6da29bba6a42e1bfe110c8d1b6b8169536ea 100644
--- a/hist/src/TProfile2D.cxx
+++ b/hist/src/TProfile2D.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TProfile2D.cxx,v 1.3 2000/08/15 08:51:37 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TProfile2D.cxx,v 1.4 2000/11/21 20:36:08 brun Exp $
// Author: Rene Brun 16/04/2000
/*************************************************************************
@@ -557,7 +557,7 @@ Int_t TProfile2D::Fill(Axis_t x, Axis_t y, Axis_t z, Stat_t w)
}
//______________________________________________________________________________
-Stat_t TProfile2D::GetBinContent(Int_t bin)
+Stat_t TProfile2D::GetBinContent(Int_t bin) const
{
//*-*-*-*-*-*-*Return bin content of a Profile2D histogram*-*-*-*-*-*-*-*-*
//*-* ===========================================
@@ -568,7 +568,7 @@ Stat_t TProfile2D::GetBinContent(Int_t bin)
}
//______________________________________________________________________________
-Stat_t TProfile2D::GetBinEntries(Int_t bin)
+Stat_t TProfile2D::GetBinEntries(Int_t bin) const
{
//*-*-*-*-*-*-*Return bin entries of a Profile2D histogram*-*-*-*-*-*-*-*-*
//*-* ===========================================
@@ -578,7 +578,7 @@ Stat_t TProfile2D::GetBinEntries(Int_t bin)
}
//______________________________________________________________________________
-Stat_t TProfile2D::GetBinError(Int_t bin)
+Stat_t TProfile2D::GetBinError(Int_t bin) const
{
//*-*-*-*-*-*-*Return bin error of a Profile2D histogram*-*-*-*-*-*-*-*-*
//*-* =========================================
diff --git a/histpainter/inc/THistPainter.h b/histpainter/inc/THistPainter.h
index 8cba202d2ad3da3502e7348bf7bbd01010c57bc7..5994e2e39102b76e69775656b06434dccf0152d1 100644
--- a/histpainter/inc/THistPainter.h
+++ b/histpainter/inc/THistPainter.h
@@ -1,4 +1,4 @@
-// @(#)root/histpainter:$Name: $:$Id: THistPainter.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
+// @(#)root/histpainter:$Name: $:$Id: THistPainter.h,v 1.2 2000/06/13 09:52:03 brun Exp $
// Author: Rene Brun 26/08/99
/*************************************************************************
@@ -52,7 +52,7 @@ public:
virtual void DrawPanel();
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual void FitPanel();
- virtual char *GetObjectInfo(Int_t px, Int_t py);
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
virtual Int_t MakeChopt(Option_t *option);
virtual void Paint(Option_t *option="");
virtual void PaintArrows();
diff --git a/histpainter/src/THistPainter.cxx b/histpainter/src/THistPainter.cxx
index e76e123919f3399fbefebeeb4e96e19a3b2e2773..eb5001a8bd5fc51b6d3e808d4dc4c2ab03994dbc 100644
--- a/histpainter/src/THistPainter.cxx
+++ b/histpainter/src/THistPainter.cxx
@@ -1,4 +1,4 @@
-// @(#)root/histpainter:$Name: $:$Id: THistPainter.cxx,v 1.17 2000/09/13 12:04:15 brun Exp $
+// @(#)root/histpainter:$Name: $:$Id: THistPainter.cxx,v 1.21 2000/11/21 20:36:46 brun Exp $
// Author: Rene Brun 26/08/99
/*************************************************************************
@@ -357,7 +357,7 @@ void THistPainter::FitPanel()
}
//______________________________________________________________________________
-char *THistPainter::GetObjectInfo(Int_t px, Int_t py)
+char *THistPainter::GetObjectInfo(Int_t px, Int_t py) const
{
// Redefines TObject::GetObjectInfo.
// Displays the histogram info (bin number, contents, integral up to bin
diff --git a/io/inc/TFile.h b/io/inc/TFile.h
index 191e4fbfbab607186877ae004e4c8a404df40410..284387b6bb09dfe4bb0fd6eac340dfc0a4fe6d3b 100644
--- a/io/inc/TFile.h
+++ b/io/inc/TFile.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFile.h,v 1.3 2000/11/21 16:11:53 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFile.h,v 1.4 2000/12/04 16:48:08 brun Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -82,26 +82,26 @@ public:
virtual void Draw(Option_t *option="");
virtual void FillBuffer(char *&buffer);
virtual void Flush();
- Int_t GetBestBuffer();
- TArrayC *GetClassIndex() {return fClassIndex;}
- Int_t GetCompressionLevel() {return fCompress;}
+ Int_t GetBestBuffer() const;
+ TArrayC *GetClassIndex() const {return fClassIndex;}
+ Int_t GetCompressionLevel() const {return fCompress;}
Float_t GetCompressionFactor();
- virtual Seek_t GetEND() {return fEND;}
+ virtual Seek_t GetEND() const {return fEND;}
Int_t GetFd() const { return fD; }
- TList *GetListOfFree() {return fFree;}
- virtual Int_t GetNfree() {return fFree->GetSize();}
+ TList *GetListOfFree() const {return fFree;}
+ virtual Int_t GetNfree() const {return fFree->GetSize();}
Option_t *GetOption() const { return fOption.Data();}
Double_t GetBytesRead() const { return fBytesRead; }
Double_t GetBytesWritten() const { return fBytesWrite; }
Int_t GetVersion() const { return fVersion; }
Int_t GetRecordHeader(char *buf, Seek_t first, Int_t maxbytes, Int_t &nbytes, Int_t &objlen, Int_t &keylen);
virtual Bool_t IsOpen() const;
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void MakeFree(Seek_t first, Seek_t last);
virtual void MakeProject(const char *dirname, const char *classes="*", Option_t *option="new"); // *MENU*
virtual void Map(); // *MENU*
virtual void Paint(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual Bool_t ReadBuffer(char *buf, int len);
virtual void ReadFree();
virtual void ReadStreamerInfo();
diff --git a/io/inc/TFree.h b/io/inc/TFree.h
index f80c08632842a3b50ac91950852c82a9faf48bf9..c0417f1d98bee378d2afd9606513544d4fa8e04f 100644
--- a/io/inc/TFree.h
+++ b/io/inc/TFree.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFree.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TFree.h,v 1.2 2000/11/21 16:15:29 brun Exp $
// Author: Rene Brun 28/12/94
/*************************************************************************
@@ -39,8 +39,8 @@ public:
TFree *AddFree(TList *lfree, Seek_t first, Seek_t last);
virtual void FillBuffer(char *&buffer);
TFree *GetBestFree(TList *lfree, Int_t nbytes);
- Seek_t GetFirst() {return fFirst;}
- Seek_t GetLast() {return fLast;}
+ Seek_t GetFirst() const {return fFirst;}
+ Seek_t GetLast() const {return fLast;}
virtual void ReadBuffer(char *&buffer);
void SetFirst(Seek_t first) {fFirst=first;}
void SetLast(Seek_t last) {fLast=last;}
diff --git a/io/inc/TKey.h b/io/inc/TKey.h
index 79e567923cfb599f11476811797b1393514fb8fd..12be9377f1dc4c787611cccc08569409994ddbb6 100644
--- a/io/inc/TKey.h
+++ b/io/inc/TKey.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TKey.h,v 1.2 2000/05/24 10:31:47 brun Exp $
+// @(#)root/base:$Name: $:$Id: TKey.h,v 1.3 2000/09/05 09:21:22 brun Exp $
// Author: Rene Brun 28/12/94
/*************************************************************************
@@ -65,20 +65,20 @@ public:
virtual void DeleteBuffer();
virtual void FillBuffer(char *&buffer);
virtual const char *GetClassName() const {return fClassName.Data();}
- virtual char *GetBuffer() {return fBuffer+fKeylen;}
- TBuffer *GetBufferRef() {return fBufferRef;}
- Short_t GetCycle();
- Short_t GetKeep();
- Int_t GetKeylen() {return fKeylen;}
- Int_t GetNbytes() {return fNbytes;}
- Int_t GetObjlen() {return fObjlen;}
- Int_t GetVersion() {return fVersion;}
- virtual Seek_t GetSeekKey() {return fSeekKey;}
- virtual Seek_t GetSeekPdir() {return fSeekPdir;}
+ virtual char *GetBuffer() const {return fBuffer+fKeylen;}
+ TBuffer *GetBufferRef() const {return fBufferRef;}
+ Short_t GetCycle() const ;
+ Short_t GetKeep() const;
+ Int_t GetKeylen() const {return fKeylen;}
+ Int_t GetNbytes() const {return fNbytes;}
+ Int_t GetObjlen() const {return fObjlen;}
+ Int_t GetVersion() const {return fVersion;}
+ virtual Seek_t GetSeekKey() const {return fSeekKey;}
+ virtual Seek_t GetSeekPdir() const {return fSeekPdir;}
Bool_t IsFolder() const;
virtual void Keep();
- virtual void ls(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
+ virtual void Print(Option_t *option="") const;
virtual Int_t Read(TObject *obj);
virtual TObject *ReadObj();
virtual void ReadBuffer(char *&buffer);
diff --git a/io/inc/TMapFile.h b/io/inc/TMapFile.h
index 880176f9cab298ae199507d0f74b50035bff148e..96c6a2076fde58e267b5e060605e836c7324e5bc 100644
--- a/io/inc/TMapFile.h
+++ b/io/inc/TMapFile.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TMapFile.h,v 1.1.1.1 2000/05/16 17:00:39 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TMapFile.h,v 1.2 2000/09/05 09:21:22 brun Exp $
// Author: Fons Rademakers 08/07/97
/*************************************************************************
@@ -110,7 +110,7 @@ public:
void Close(Option_t *option = "");
void *GetBaseAddr() const { return (void *)fBaseAddr; }
void *GetBreakval() const;
- TDirectory *GetDirectory() {return fDirectory;}
+ TDirectory *GetDirectory() const {return fDirectory;}
Int_t GetFd() const { return fFd; }
void *GetMmallocDesc() const { return fMmallocDesc; }
const char *GetName() const { return fName; }
@@ -122,11 +122,11 @@ public:
Bool_t IsFolder() const;
Bool_t IsWritable() const { return fWritable; }
void *OrgAddress(void *addr) const { return (void *)((Long_t)addr - fOffset); }
- void Print(Option_t *option="");
- void ls(Option_t *option="");
+ void Print(Option_t *option="") const;
+ void ls(Option_t *option="") const;
Bool_t cd(const char *path = 0);
- void Add(TObject *obj, const char *name = "");
+ void Add(const TObject *obj, const char *name = "");
void Update(TObject *obj = 0);
TObject *Remove(TObject *obj) { return Remove(obj, kTRUE); }
TObject *Remove(const char *name) { return Remove(name, kTRUE); }
@@ -164,7 +164,7 @@ private:
TMapRec *fNext; // next MapRec in list
public:
- TMapRec(const char *name, TObject *obj, Int_t size, void *buf);
+ TMapRec(const char *name, const TObject *obj, Int_t size, void *buf);
~TMapRec();
const char *GetName(Long_t offset = 0) const { return (char *)((Long_t) fName + offset); }
const char *GetClassName(Long_t offset = 0) const { return (char *)((Long_t) fClassName + offset); }
diff --git a/io/inc/TStreamerInfo.h b/io/inc/TStreamerInfo.h
index 6e2a010158a16a032ae4d33b431c1e0934e15d48..7699c1c1f68117380382bd3863ca7a94d88a596b 100644
--- a/io/inc/TStreamerInfo.h
+++ b/io/inc/TStreamerInfo.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TStreamerInfo.h,v 1.5 2000/12/02 16:26:49 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TStreamerInfo.h,v 1.6 2000/12/11 18:06:31 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -75,13 +75,13 @@ public:
void BuildCheck();
void BuildOld();
Int_t GenerateHeaderFile(const char *dirname);
- TClass *GetClass() {return fClass;}
- UInt_t GetCheckSum() {return fCheckSum;}
- Int_t GetClassVersion() {return fClassVersion;}
- Int_t GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer);
- TObjArray *GetElements() {return fElements;}
- Int_t GetNumber() {return fNumber;}
- void ls(Option_t *option="");
+ TClass *GetClass() const {return fClass;}
+ UInt_t GetCheckSum() const {return fCheckSum;}
+ Int_t GetClassVersion() const {return fClassVersion;}
+ Int_t GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer) const;
+ TObjArray *GetElements() const {return fElements;}
+ Int_t GetNumber() const {return fNumber;}
+ void ls(Option_t *option="") const;
Int_t ReadBuffer(TBuffer &b, char *pointer);
Int_t ReadBufferClones(TBuffer &b, TClonesArray *clones, Int_t nc);
Int_t WriteBuffer(TBuffer &b, char *pointer);
diff --git a/io/src/TFile.cxx b/io/src/TFile.cxx
index fa7cef2430f3ed9cde0fabec2e54d1fe0ddd8c3f..95808db90250bf32123499359106c46c059caf46 100644
--- a/io/src/TFile.cxx
+++ b/io/src/TFile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.15 2000/12/04 16:48:08 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.16 2000/12/04 17:16:35 brun Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -557,7 +557,7 @@ void TFile::FillBuffer(char *&buffer)
}
//______________________________________________________________________________
-Int_t TFile::GetBestBuffer()
+Int_t TFile::GetBestBuffer() const
{
//*-*-*-*-*-*-*-*Return the best buffer size of objects on this file*-*-*-*-*-*
//*-* ===================================================
@@ -665,7 +665,7 @@ Int_t TFile::GetRecordHeader(char *buf, Seek_t first, Int_t maxbytes, Int_t &nby
}
//______________________________________________________________________________
-void TFile::ls(Option_t *option)
+void TFile::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*List File contents*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==================
@@ -805,7 +805,7 @@ void TFile::Paint(Option_t *option)
}
//______________________________________________________________________________
-void TFile::Print(Option_t *option)
+void TFile::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*Print all objects in the file*-*-*-*-*-*-*-*-*-*-*
//*-* =============================
diff --git a/io/src/TKey.cxx b/io/src/TKey.cxx
index 34edc2dd565942095a19b42d345d77541704cd11..c977ffe5ce848a8cdc78a47543c9e9ad2ee7d8d4 100644
--- a/io/src/TKey.cxx
+++ b/io/src/TKey.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TKey.cxx,v 1.6 2000/09/12 06:43:53 brun Exp $
+// @(#)root/base:$Name: $:$Id: TKey.cxx,v 1.7 2000/11/21 16:33:56 brun Exp $
// Author: Rene Brun 28/12/94
/*************************************************************************
@@ -309,7 +309,7 @@ void TKey::DeleteBuffer()
}
//______________________________________________________________________________
-Short_t TKey::GetCycle()
+Short_t TKey::GetCycle() const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*Return cycle number associated to this key*-*-*-*
//*-* ==========================================
@@ -317,7 +317,7 @@ Short_t TKey::GetCycle()
}
//______________________________________________________________________________
-Short_t TKey::GetKeep()
+Short_t TKey::GetKeep() const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*Returns the "KEEP" status*-*-*-*-*-*-*-*-*-*-*-*
//*-* =========================
@@ -372,7 +372,7 @@ void TKey::Keep()
}
//______________________________________________________________________________
-void TKey::ls(Option_t *)
+void TKey::ls(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*List Key contents-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =================
@@ -381,7 +381,7 @@ void TKey::ls(Option_t *)
}
//______________________________________________________________________________
-void TKey::Print(Option_t *)
+void TKey::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*-*Print key contents*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ==================
diff --git a/io/src/TMapFile.cxx b/io/src/TMapFile.cxx
index 9aee71ab5ed81951a091231bdf873f6d958ca07f..b0472a5987d8eb194fccca979c4412a9edbdc953 100644
--- a/io/src/TMapFile.cxx
+++ b/io/src/TMapFile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TMapFile.cxx,v 1.4 2000/09/05 09:21:22 brun Exp $
+// @(#)root/base:$Name: $:$Id: TMapFile.cxx,v 1.5 2000/09/13 07:03:00 brun Exp $
// Author: Fons Rademakers 08/07/97
/*************************************************************************
@@ -125,11 +125,11 @@ void *gMmallocDesc = 0;
//______________________________________________________________________________
-TMapRec::TMapRec(const char *name, TObject *obj, Int_t size, void *buf)
+TMapRec::TMapRec(const char *name, const TObject *obj, Int_t size, void *buf)
{
fName = StrDup(name);
fClassName = 0;
- fObject = obj;
+ fObject = (TObject*)obj;
fBuffer = buf;
fBufSize = size;
fNext = 0;
@@ -514,7 +514,7 @@ void TMapFile::InitDirectory()
}
//______________________________________________________________________________
-void TMapFile::Add(TObject *obj, const char *name)
+void TMapFile::Add(const TObject *obj, const char *name)
{
// Add an object to the list of objects to be stored in shared memory.
// To place the object actually into shared memory call Update().
@@ -924,7 +924,7 @@ TMapFile *TMapFile::FindShadowMapFile()
}
//______________________________________________________________________________
-void TMapFile::Print(Option_t *)
+void TMapFile::Print(Option_t *) const
{
// Print some info about the mapped file.
@@ -987,13 +987,13 @@ Bool_t TMapFile::cd(const char *path)
}
//______________________________________________________________________________
-void TMapFile::ls(Option_t *)
+void TMapFile::ls(Option_t *) const
{
// List contents of TMapFile.
if (fMmallocDesc) {
- AcquireSemaphore();
+ ((TMapFile*)this)->AcquireSemaphore();
Printf("%-20s %-20s %-10s", "Object", "Class", "Size");
if (!fFirst)
@@ -1006,7 +1006,7 @@ void TMapFile::ls(Option_t *)
mr = mr->GetNext(fOffset);
}
- ReleaseSemaphore();
+ ((TMapFile*)this)->ReleaseSemaphore();
}
}
diff --git a/io/src/TStreamerInfo.cxx b/io/src/TStreamerInfo.cxx
index d8618c643125409711492a3b7e0f4549df295477..e99e4c8bd40cd4f030ac9ee2db24a564ffc8e0af 100644
--- a/io/src/TStreamerInfo.cxx
+++ b/io/src/TStreamerInfo.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TStreamerInfo.cxx,v 1.15 2000/12/06 07:29:18 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TStreamerInfo.cxx,v 1.16 2000/12/11 18:06:31 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -663,7 +663,7 @@ Int_t TStreamerInfo::GenerateHeaderFile(const char *dirname)
}
//______________________________________________________________________________
-Int_t TStreamerInfo::GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer)
+Int_t TStreamerInfo::GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer) const
{
// Compute data member offset
// return pointer to the Streamer function if one exists
@@ -713,7 +713,7 @@ TStreamerBasicType *TStreamerInfo::GetElementCounter(const char *countName, TCla
}
//______________________________________________________________________________
-void TStreamerInfo::ls(Option_t *option)
+void TStreamerInfo::ls(Option_t *option) const
{
// List the TStreamerElement list and also the precomputed tables
diff --git a/matrix/inc/TMatrix.h b/matrix/inc/TMatrix.h
index 93a52a2f51c13f92bb50f61c589b747e0b826981..2a3014fa55640b2029ce9416adb30fcf4b36940f 100644
--- a/matrix/inc/TMatrix.h
+++ b/matrix/inc/TMatrix.h
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TMatrix.h,v 1.2 2000/10/10 13:03:27 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TMatrix.h,v 1.3 2000/11/21 20:38:12 brun Exp $
// Author: Fons Rademakers 03/11/97
/*************************************************************************
@@ -152,7 +152,7 @@ public:
Double_t Determinant() const;
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
friend TMatrix &operator+=(TMatrix &target, const TMatrix &source);
friend TMatrix &operator-=(TMatrix &target, const TMatrix &source);
diff --git a/matrix/inc/TMatrixD.h b/matrix/inc/TMatrixD.h
index 9d75d4c9d40b69b75bbc0452be9a4ad28be8388a..d02ed5650ef36cec50ef8e19690d7b2efb73b6e7 100644
--- a/matrix/inc/TMatrixD.h
+++ b/matrix/inc/TMatrixD.h
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TMatrixD.h,v 1.2 2000/10/10 13:03:27 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TMatrixD.h,v 1.3 2000/11/21 20:38:27 brun Exp $
// Author: Fons Rademakers 03/11/97
/*************************************************************************
@@ -103,10 +103,10 @@ public:
Int_t GetRowLwb() const { return fRowLwb; }
Int_t GetRowUpb() const { return fNrows+fRowLwb-1; }
- Int_t GetNrows() const { return fNrows; }
+ Int_t GetNrows() const { return fNrows; }
Int_t GetColLwb() const { return fColLwb; }
Int_t GetColUpb() const { return fNcols+fColLwb-1; }
- Int_t GetNcols() const { return fNcols; }
+ Int_t GetNcols() const { return fNcols; }
Int_t GetNoElements() const { return fNelems; }
const Double_t &operator()(Int_t rown, Int_t coln) const;
@@ -152,7 +152,7 @@ public:
Double_t Determinant() const;
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
friend TMatrixD &operator+=(TMatrixD &target, const TMatrixD &source);
friend TMatrixD &operator-=(TMatrixD &target, const TMatrixD &source);
diff --git a/matrix/inc/TVector.h b/matrix/inc/TVector.h
index 76d77fa4899a39e6453471cc68edc5c6ee17a0a5..46db9a3cf6f2b8e2d67aae3ccb5ab18194b024d7 100644
--- a/matrix/inc/TVector.h
+++ b/matrix/inc/TVector.h
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TVector.h,v 1.2 2000/10/10 11:13:58 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TVector.h,v 1.3 2000/11/21 20:39:31 brun Exp $
// Author: Fons Rademakers 05/11/97
/*************************************************************************
@@ -130,7 +130,7 @@ public:
Double_t Norm2Sqr() const;
Double_t NormInf() const;
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
friend TVector &operator+=(TVector &target, const TVector &source);
friend TVector &operator-=(TVector &target, const TVector &source);
diff --git a/matrix/inc/TVectorD.h b/matrix/inc/TVectorD.h
index ffc7465de62fb7a851ae1f26e65a0fcef3f68426..ae6769a6af97aa2453f0b3051cab3553b1f63916 100644
--- a/matrix/inc/TVectorD.h
+++ b/matrix/inc/TVectorD.h
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TVectorD.h,v 1.2 2000/10/10 11:13:58 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TVectorD.h,v 1.3 2000/11/21 20:39:57 brun Exp $
// Author: Fons Rademakers 03/11/97
/*************************************************************************
@@ -130,7 +130,7 @@ public:
Double_t Norm2Sqr() const;
Double_t NormInf() const;
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
friend TVectorD &operator+=(TVectorD &target, const TVectorD &source);
friend TVectorD &operator-=(TVectorD &target, const TVectorD &source);
diff --git a/matrix/src/TMatrix.cxx b/matrix/src/TMatrix.cxx
index d994903a4f7a19cb991ab508397dd74013b9e06d..07dc7f5b911f908b7f364ce66b8fbb2fad0c9144 100644
--- a/matrix/src/TMatrix.cxx
+++ b/matrix/src/TMatrix.cxx
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TMatrix.cxx,v 1.2 2000/10/10 13:03:27 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TMatrix.cxx,v 1.3 2000/11/21 20:40:18 brun Exp $
// Author: Fons Rademakers 03/11/97
/*************************************************************************
@@ -834,7 +834,7 @@ Double_t E2Norm(const TMatrix &m1, const TMatrix &m2)
}
//______________________________________________________________________________
-void TMatrix::Print(Option_t *)
+void TMatrix::Print(Option_t *) const
{
// Print the matrix as a table of elements (zeros are printed as dots).
diff --git a/matrix/src/TMatrixD.cxx b/matrix/src/TMatrixD.cxx
index 69af45262c3fab35c168cdc244085b10207279ce..c5b790913c92e7f681a68ae5bba8d597b904f9a7 100644
--- a/matrix/src/TMatrixD.cxx
+++ b/matrix/src/TMatrixD.cxx
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TMatrixD.cxx,v 1.2 2000/10/10 13:03:27 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TMatrixD.cxx,v 1.3 2000/11/21 20:40:52 brun Exp $
// Author: Fons Rademakers 03/11/97
/*************************************************************************
@@ -836,7 +836,7 @@ Double_t E2Norm(const TMatrixD &m1, const TMatrixD &m2)
}
//______________________________________________________________________________
-void TMatrixD::Print(Option_t *)
+void TMatrixD::Print(Option_t *) const
{
// Print the matrix as a table of elements (zeros are printed as dots).
diff --git a/matrix/src/TVector.cxx b/matrix/src/TVector.cxx
index f260291ba9db64fe728012351839c0845e9ee22e..7d483b2f88926a522a8ff4fa3d77535249a55a19 100644
--- a/matrix/src/TVector.cxx
+++ b/matrix/src/TVector.cxx
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TVector.cxx,v 1.4 2000/12/13 07:28:11 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TVector.cxx,v 1.5 2000/12/13 12:03:52 rdm Exp $
// Author: Fons Rademakers 05/11/97
/*************************************************************************
@@ -727,7 +727,7 @@ TVector &ElementDiv(TVector &target, const TVector &source)
}
//______________________________________________________________________________
-void TVector::Print(Option_t *)
+void TVector::Print(Option_t *) const
{
// Print the vector as a list of elements.
diff --git a/matrix/src/TVectorD.cxx b/matrix/src/TVectorD.cxx
index c267b73e05a192f3b8c459f6b5712283c6f3cae3..7903f0300dda2df8c650bc8a3cd56f5a6da839bc 100644
--- a/matrix/src/TVectorD.cxx
+++ b/matrix/src/TVectorD.cxx
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TVectorD.cxx,v 1.4 2000/12/13 07:28:11 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TVectorD.cxx,v 1.5 2000/12/13 12:03:52 rdm Exp $
// Author: Fons Rademakers 03/11/97
/*************************************************************************
@@ -726,7 +726,7 @@ TVectorD &ElementDiv(TVectorD &target, const TVectorD &source)
}
//______________________________________________________________________________
-void TVectorD::Print(Option_t *)
+void TVectorD::Print(Option_t *) const
{
// Print the vector as a list of elements.
diff --git a/meta/inc/TBaseClass.h b/meta/inc/TBaseClass.h
index 1638123b4873446fa2f4e88c59b330e29dad443c..d2cc39c60471aa1552e71b48f537d026be41baef 100644
--- a/meta/inc/TBaseClass.h
+++ b/meta/inc/TBaseClass.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TBaseClass.h,v 1.2 2000/09/05 09:21:23 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TBaseClass.h,v 1.3 2000/11/30 07:46:59 brun Exp $
// Author: Fons Rademakers 08/02/95
/*************************************************************************
@@ -40,18 +40,18 @@ private:
G__BaseClassInfo *fInfo; //pointer to CINT base class info
TClass *fClassPtr; //pointer to the base class TClass
TClass *fClass; //pointer to class
- TString fName; //name of class
+ TString fName; //name of class
public:
TBaseClass(G__BaseClassInfo *info = 0, TClass *cl = 0);
virtual ~TBaseClass();
virtual void Browse(TBrowser *b);
+ Int_t Compare(const TObject *obj) const;
const char *GetName() const;
const char *GetTitle() const;
TClass *GetClassPointer();
Int_t GetDelta() const;
- Int_t Compare(TObject *obj);
- ULong_t Hash();
+ ULong_t Hash() const;
Bool_t IsFolder() const {return kTRUE;}
Long_t Property() const;
diff --git a/meta/inc/TClass.h b/meta/inc/TClass.h
index c66e0e9eabbf69d9da6cdda294859dde635b3d88..26b17580ff3bef4f5ece02d9735ab754a731cc41 100644
--- a/meta/inc/TClass.h
+++ b/meta/inc/TClass.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TClass.h,v 1.9 2000/12/02 16:26:49 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TClass.h,v 1.10 2000/12/04 16:43:53 brun Exp $
// Author: Rene Brun 07/01/95
/*************************************************************************
@@ -83,9 +83,10 @@ public:
void BypassStreamer(Bool_t bypass=kTRUE);
Bool_t CanBypassStreamer() { return TestBit(kBypassStreamer);}
Bool_t CanIgnoreTObjectStreamer() { return TestBit(kIgnoreTObjectStreamer);}
+ Int_t Compare(const TObject *obj) const;
void Draw(Option_t *option="");
void *DynamicCast(const TClass *base, void *obj, Bool_t up = kTRUE);
- char *EscapeChars(char * text);
+ char *EscapeChars(char * text) const;
UInt_t GetCheckSum() const;
Version_t GetClassVersion() const { return fClassVersion; }
TDataMember *GetDataMember(const char *datamember);
@@ -95,7 +96,7 @@ public:
TList *GetListOfDataMembers();
TList *GetListOfBases();
TList *GetListOfMethods();
- TList *GetListOfRealData() { return fRealData; }
+ TList *GetListOfRealData() const { return fRealData; }
TList *GetListOfAllPublicMethods();
TList *GetListOfAllPublicDataMembers();
const char *GetName() const { return fName.Data(); }
@@ -106,18 +107,17 @@ public:
TClass *GetBaseClass(const TClass *base);
Int_t GetBaseClassOffset(const TClass *base);
TClass *GetBaseDataMember(const char *datamember);
- UInt_t GetInstanceCount() { return fInstanceCount; }
- UInt_t GetHeapInstanceCount() { return fOnHeap; }
+ UInt_t GetInstanceCount() const { return fInstanceCount; }
+ UInt_t GetHeapInstanceCount() const { return fOnHeap; }
void GetMenuItems(TList *listitems);
TMethod *GetMethod(const char *method, const char *params);
TMethod *GetMethodWithPrototype(const char *method, const char *proto);
TMethod *GetMethodAny(const char *method);
Int_t GetNdata();
Int_t GetNmethods();
- TObjArray *GetStreamerInfos() {return fStreamerInfo;}
+ TObjArray *GetStreamerInfos() const {return fStreamerInfo;}
TStreamerInfo *GetStreamerInfo(Int_t version=0);
- Int_t Compare(TObject *obj);
- ULong_t Hash() { return fName.Hash(); }
+ ULong_t Hash() const { return fName.Hash(); }
void IgnoreTObjectStreamer(Bool_t ignore=kTRUE);
Bool_t InheritsFrom(const char *cl) const;
Bool_t InheritsFrom(const TClass *cl) const;
diff --git a/meta/inc/TDataMember.h b/meta/inc/TDataMember.h
index 3c262ae895ec30bc3428196cd6200f01aaca5d0f..140c7742516b1754255a7ab3226e3e58cf2c56aa 100644
--- a/meta/inc/TDataMember.h
+++ b/meta/inc/TDataMember.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TDataMember.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/meta:$Name: $:$Id: TDataMember.h,v 1.2 2000/09/08 16:07:33 rdm Exp $
// Author: Fons Rademakers 04/02/95
/*************************************************************************
@@ -61,12 +61,12 @@ public:
const char *GetFullTypeName() const;
const char *GetArrayIndex() const;
- TList *GetOptions();
+ TList *GetOptions() const;
TMethodCall *SetterMethod();
TMethodCall *GetterMethod();
- Int_t Compare(TObject *obj);
- ULong_t Hash();
+ Int_t Compare(const TObject *obj) const;
+ ULong_t Hash() const;
Bool_t IsBasic() const;
Bool_t IsEnum() const;
Bool_t IsaPointer() const;
diff --git a/meta/inc/TDataType.h b/meta/inc/TDataType.h
index 2d4baedef7c26ef769277d349dd6ed8fb1b0c3e7..94bd2d9850f9c539b2919a4e5b419a60eb8cb47d 100644
--- a/meta/inc/TDataType.h
+++ b/meta/inc/TDataType.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TDataType.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 04/02/95
/*************************************************************************
@@ -59,8 +59,8 @@ public:
const char *GetFullTypeName() const;
const char *GetName() const;
const char *GetTitle() const;
- Int_t Compare(TObject *obj);
- ULong_t Hash();
+ Int_t Compare(const TObject *obj) const;
+ ULong_t Hash() const;
const char *AsString(void *buf) const;
Long_t Property() const;
diff --git a/meta/inc/TDictionary.h b/meta/inc/TDictionary.h
index 4f2409f5256f7e38864218cbbbae616d1e05e400..75819be94b0ef8dca3ce64ac068507d129deedf0 100644
--- a/meta/inc/TDictionary.h
+++ b/meta/inc/TDictionary.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TDictionary.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
+// @(#)root/meta:$Name: $:$Id: TDictionary.h,v 1.2 2000/08/25 21:45:22 rdm Exp $
// Author: Fons Rademakers 20/06/96
/*************************************************************************
@@ -79,9 +79,9 @@ public:
virtual const char *GetTitle() const = 0;
virtual Long_t Property() const = 0;
- virtual ULong_t Hash() = 0;
+ virtual Int_t Compare(const TObject *obj) const = 0;
+ virtual ULong_t Hash() const = 0;
virtual Bool_t IsSortable() const { return kTRUE; }
- virtual Int_t Compare(TObject *obj) = 0;
ClassDef(TDictionary,0) //ABC defining interface to dictionary
};
diff --git a/meta/inc/TFunction.h b/meta/inc/TFunction.h
index 046d81c76739a6371df7026408a8b25cc0e8f44c..69b3f83c4a1fba447a1f7775a02f131aa86a3469 100644
--- a/meta/inc/TFunction.h
+++ b/meta/inc/TFunction.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TFunction.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Fons Rademakers 07/02/97
/*************************************************************************
@@ -46,6 +46,7 @@ protected:
public:
TFunction(G__MethodInfo *info = 0);
virtual ~TFunction();
+ Int_t Compare(const TObject *obj) const;
const char *GetName() const;
const char *GetSignature();
const char *GetTitle() const;
@@ -53,8 +54,7 @@ public:
TList *GetListOfMethodArgs();
Int_t GetNargs() const;
Int_t GetNargsOpt() const;
- Int_t Compare(TObject *obj);
- ULong_t Hash();
+ ULong_t Hash() const;
void *InterfaceMethod() const;
Long_t Property() const;
diff --git a/meta/inc/TGlobal.h b/meta/inc/TGlobal.h
index 2fd0261d840ab14b77afbfb8242ba0f88eb6e8e8..d41db050ab92ec70c06e955444cd551367cff926 100644
--- a/meta/inc/TGlobal.h
+++ b/meta/inc/TGlobal.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TGlobal.h,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 13/11/95
/*************************************************************************
@@ -36,6 +36,7 @@ private:
public:
TGlobal(G__DataMemberInfo *info = 0);
virtual ~TGlobal();
+ Int_t Compare(const TObject *obj) const;
Int_t GetArrayDim() const;
Int_t GetMaxIndex(Int_t dim) const;
void *GetAddress() const;
@@ -43,8 +44,7 @@ public:
const char *GetFullTypeName() const;
const char *GetName() const;
const char *GetTitle() const;
- Int_t Compare(TObject *obj);
- ULong_t Hash();
+ ULong_t Hash() const;
Long_t Property() const;
ClassDef(TGlobal,0) //Global variable class
diff --git a/meta/inc/TMethodArg.h b/meta/inc/TMethodArg.h
index 9e36edeb0c6e9b38d76d17689e136e802bf2cd79..23f4f9cc8ea2287a2f1f3018eccb27c4f24f6ca5 100644
--- a/meta/inc/TMethodArg.h
+++ b/meta/inc/TMethodArg.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TMethodArg.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Rene Brun 04/02/95
/*************************************************************************
@@ -44,18 +44,18 @@ private:
public:
TMethodArg(G__MethodArgInfo *info = 0, TFunction *method = 0);
virtual ~TMethodArg();
+ Int_t Compare(const TObject *obj) const;
const char *GetDefault() const;
TFunction *GetMethod() const { return fMethod; }
const char *GetName() const;
const char *GetTitle() const;
const char *GetTypeName() const;
const char *GetFullTypeName() const;
- Int_t Compare(TObject *obj);
- ULong_t Hash();
+ ULong_t Hash() const;
Long_t Property() const;
- TDataMember *GetDataMember();
- TList *GetOptions();
+ TDataMember *GetDataMember() const;
+ TList *GetOptions() const;
ClassDef(TMethodArg,0) //Dictionary for a method argument
};
diff --git a/meta/inc/TStreamerElement.h b/meta/inc/TStreamerElement.h
index 25462e0977104ea2b79b6c78aed1f4ee9b4dd809..47a2e70b6002feafe37ec375771e48e5fb685155 100644
--- a/meta/inc/TStreamerElement.h
+++ b/meta/inc/TStreamerElement.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TStreamerElement.h,v 1.6 2000/11/28 09:07:21 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TStreamerElement.h,v 1.7 2000/12/02 16:26:49 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -51,20 +51,20 @@ public:
TStreamerElement();
TStreamerElement(const char *name, const char *title, Int_t offset, Int_t dtype, const char *typeName);
virtual ~TStreamerElement();
- Int_t GetArrayDim() {return fArrayDim;}
- Int_t GetArrayLength() {return fArrayLength;}
+ Int_t GetArrayDim() const {return fArrayDim;}
+ Int_t GetArrayLength() const {return fArrayLength;}
virtual const char *GetInclude() const {return "";}
- Int_t GetMaxIndex(Int_t i) {return fMaxIndex[i];}
- virtual ULong_t GetMethod() {return ULong_t(fStreamer);}
- Streamer_t GetStreamer() {return fStreamer;}
- Int_t GetSize() {return fSize;}
- Int_t GetNewType() {return fNewType;}
- Int_t GetType() {return fType;}
- Int_t GetOffset() {return fOffset;}
+ Int_t GetMaxIndex(Int_t i) const {return fMaxIndex[i];}
+ virtual ULong_t GetMethod() const {return ULong_t(fStreamer);}
+ Streamer_t GetStreamer() const {return fStreamer;}
+ Int_t GetSize() const {return fSize;}
+ Int_t GetNewType() const {return fNewType;}
+ Int_t GetType() const {return fType;}
+ Int_t GetOffset() const {return fOffset;}
const char *GetTypeName() const {return fTypeName.Data();}
virtual void Init(TObject *obj=0);
- virtual Bool_t IsaPointer() {return kFALSE;}
- virtual void ls(Option_t *option="");
+ virtual Bool_t IsaPointer() const {return kFALSE;}
+ virtual void ls(Option_t *option="") const;
virtual void SetArrayDim(Int_t dim);
virtual void SetMaxIndex(Int_t dim, Int_t max);
virtual void SetOffset(Int_t offset) {fOffset=offset;}
@@ -85,7 +85,7 @@ public:
TStreamerBase(const char *name, const char *title, Int_t offset);
virtual ~TStreamerBase();
const char *GetInclude() const;
- ULong_t GetMethod() {return ULong_t(fMethod);}
+ ULong_t GetMethod() const {return ULong_t(fMethod);}
virtual void Init(TObject *obj=0);
ClassDef(TStreamerBase,1) //Streamer element of type base class
@@ -105,9 +105,9 @@ public:
TStreamerBasicPointer();
TStreamerBasicPointer(const char *name, const char *title, Int_t offset, Int_t dtype, const char *countName, const char *countClass, Int_t version, const char *typeName);
virtual ~TStreamerBasicPointer();
- ULong_t GetMethod();
+ ULong_t GetMethod() const;
virtual void Init(TObject *obj=0);
- virtual Bool_t IsaPointer() {return kTRUE;}
+ virtual Bool_t IsaPointer() const {return kTRUE;}
ClassDef(TStreamerBasicPointer,1) //Streamer element for a pointer to a basic type
};
@@ -127,9 +127,9 @@ public:
TStreamerTStringPointer(const char *name, const char *title, Int_t offset, const char *countName, const char *countClass, Int_t version, const char *typeName);
virtual ~TStreamerTStringPointer();
const char *GetInclude() const;
- ULong_t GetMethod();
+ ULong_t GetMethod() const;
virtual void Init(TObject *obj=0);
- virtual Bool_t IsaPointer() {return kTRUE;}
+ virtual Bool_t IsaPointer() const {return kTRUE;}
ClassDef(TStreamerTStringPointer,1) //Streamer element for a pointer to an array of TString
};
@@ -145,8 +145,8 @@ public:
TStreamerBasicType();
TStreamerBasicType(const char *name, const char *title, Int_t offset, Int_t dtype, const char *typeName);
virtual ~TStreamerBasicType();
- Int_t GetCounter() {return fCounter;}
- ULong_t GetMethod();
+ Int_t GetCounter() const {return fCounter;}
+ ULong_t GetMethod() const;
ClassDef(TStreamerBasicType,1) //Streamer element for a basic type
};
@@ -162,7 +162,7 @@ public:
TStreamerObject();
TStreamerObject(const char *name, const char *title, Int_t offset, const char *typeName);
virtual ~TStreamerObject();
- TClass *GetClass() {return fClassObject;}
+ TClass *GetClass() const {return fClassObject;}
const char *GetInclude() const;
virtual void Init(TObject *obj=0);
@@ -197,10 +197,10 @@ public:
TStreamerObjectPointer();
TStreamerObjectPointer(const char *name, const char *title, Int_t offset, const char *typeName);
virtual ~TStreamerObjectPointer();
- TClass *GetClass() {return fClassObject;}
+ TClass *GetClass() const {return fClassObject;}
const char *GetInclude() const;
virtual void Init(TObject *obj=0);
- virtual Bool_t IsaPointer() {return kTRUE;}
+ virtual Bool_t IsaPointer() const {return kTRUE;}
ClassDef(TStreamerObjectPointer,1) //Streamer element of type pointer to a TObject
};
@@ -229,10 +229,10 @@ public:
TStreamerSTL();
TStreamerSTL(const char *name, const char *title, Int_t offset, const char *typeName, Bool_t dmPointer);
virtual ~TStreamerSTL();
- Int_t GetSTLtype() {return fSTLtype;}
- Int_t GetCtype() {return fCtype;}
+ Int_t GetSTLtype() const {return fSTLtype;}
+ Int_t GetCtype() const {return fCtype;}
const char *GetInclude() const;
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
ClassDef(TStreamerSTL,1) //Streamer element of type STL container
};
diff --git a/meta/inc/TStreamerInfo.h b/meta/inc/TStreamerInfo.h
index 6e2a010158a16a032ae4d33b431c1e0934e15d48..7699c1c1f68117380382bd3863ca7a94d88a596b 100644
--- a/meta/inc/TStreamerInfo.h
+++ b/meta/inc/TStreamerInfo.h
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TStreamerInfo.h,v 1.5 2000/12/02 16:26:49 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TStreamerInfo.h,v 1.6 2000/12/11 18:06:31 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -75,13 +75,13 @@ public:
void BuildCheck();
void BuildOld();
Int_t GenerateHeaderFile(const char *dirname);
- TClass *GetClass() {return fClass;}
- UInt_t GetCheckSum() {return fCheckSum;}
- Int_t GetClassVersion() {return fClassVersion;}
- Int_t GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer);
- TObjArray *GetElements() {return fElements;}
- Int_t GetNumber() {return fNumber;}
- void ls(Option_t *option="");
+ TClass *GetClass() const {return fClass;}
+ UInt_t GetCheckSum() const {return fCheckSum;}
+ Int_t GetClassVersion() const {return fClassVersion;}
+ Int_t GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer) const;
+ TObjArray *GetElements() const {return fElements;}
+ Int_t GetNumber() const {return fNumber;}
+ void ls(Option_t *option="") const;
Int_t ReadBuffer(TBuffer &b, char *pointer);
Int_t ReadBufferClones(TBuffer &b, TClonesArray *clones, Int_t nc);
Int_t WriteBuffer(TBuffer &b, char *pointer);
diff --git a/meta/src/TBaseClass.cxx b/meta/src/TBaseClass.cxx
index c09259fd0d76d7df79c1ee609bf6639c28e75081..0afafc36a62429d4869dcbea0f1f5fbba9f41093 100644
--- a/meta/src/TBaseClass.cxx
+++ b/meta/src/TBaseClass.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TBaseClass.cxx,v 1.2 2000/11/23 08:15:39 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TBaseClass.cxx,v 1.3 2000/11/30 07:46:59 brun Exp $
// Author: Fons Rademakers 08/02/95
/*************************************************************************
@@ -93,7 +93,7 @@ const char *TBaseClass::GetTitle() const
}
//______________________________________________________________________________
-Int_t TBaseClass::Compare(TObject *obj)
+Int_t TBaseClass::Compare(const TObject *obj) const
{
// Compare to other object. Returns 0<, 0 or >0 depending on
// whether "this" is lexicographically less than, equal to, or
@@ -103,7 +103,7 @@ Int_t TBaseClass::Compare(TObject *obj)
}
//______________________________________________________________________________
-ULong_t TBaseClass::Hash()
+ULong_t TBaseClass::Hash() const
{
// Return hash value for TBaseClass based on its name.
diff --git a/meta/src/TClass.cxx b/meta/src/TClass.cxx
index 0f4029923096c34c8e13e6f3b98f08f7cb4e4ab7..5671db515e9b2872b6493c0a6be1451c02768659 100644
--- a/meta/src/TClass.cxx
+++ b/meta/src/TClass.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TClass.cxx,v 1.17 2000/12/04 16:43:53 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TClass.cxx,v 1.18 2000/12/11 10:33:12 brun Exp $
// Author: Rene Brun 07/01/95
/*************************************************************************
@@ -282,7 +282,7 @@ void TClass::BypassStreamer(Bool_t bypass)
//______________________________________________________________________________
-Int_t TClass::Compare(TObject *obj)
+Int_t TClass::Compare(const TObject *obj) const
{
// Compare to other object. Returns 0<, 0 or >0 depending on
// whether "this" is lexicographically less than, equal to, or
@@ -320,7 +320,7 @@ void TClass::Draw(Option_t *option)
}
//______________________________________________________________________________
-char *TClass::EscapeChars(char *text)
+char *TClass::EscapeChars(char *text) const
{
// Introduce an escape character (@) in front of a special chars.
// You need to use the result immediately before it is being overwritten.
@@ -349,7 +349,7 @@ TClass *TClass::GetBaseClass(const char *classname)
// "classname" is not a base class. Takes care of multiple inheritance.
// check if class name itself is equal to classname
- if (strcmp(GetName(), classname) == 0) return this;
+ if (strcmp(GetName(), classname) == 0) return (TClass*)this;
if (!fClassInfo) return 0;
@@ -377,7 +377,7 @@ TClass *TClass::GetBaseClass(const TClass *cl)
// is not a base class. Takes care of multiple inheritance.
// check if class name itself is equal to classname
- if (cl == this) return this;
+ if (cl == this) return (TClass*)this;
if (!fClassInfo) return 0;
@@ -436,7 +436,7 @@ TClass *TClass::GetBaseDataMember(const char *datamember)
// Check if data member exists in class itself
TDataMember *dm = GetDataMember(datamember);
- if (dm) return this;
+ if (dm) return (TClass*)this;
// if datamember not found in class, search in next base classes
TBaseClass *inh;
diff --git a/meta/src/TDataMember.cxx b/meta/src/TDataMember.cxx
index ec7e388e3b1286a6e3881e3fa6a955b0e5446fcb..9ac111e1325c10bfa4f8cd0462362862cd0a8448 100644
--- a/meta/src/TDataMember.cxx
+++ b/meta/src/TDataMember.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TDataMember.cxx,v 1.2 2000/09/06 14:18:58 rdm Exp $
+// @(#)root/meta:$Name: $:$Id: TDataMember.cxx,v 1.3 2000/11/21 20:43:33 brun Exp $
// Author: Fons Rademakers 04/02/95
/*************************************************************************
@@ -489,7 +489,7 @@ const char *TDataMember::GetTitle() const
}
//______________________________________________________________________________
-Int_t TDataMember::Compare(TObject *obj)
+Int_t TDataMember::Compare(const TObject *obj) const
{
// Compare to other object. Returns 0<, 0 or >0 depending on
// whether "this" is lexicographically less than, equal to, or
@@ -499,7 +499,7 @@ Int_t TDataMember::Compare(TObject *obj)
}
//______________________________________________________________________________
-ULong_t TDataMember::Hash()
+ULong_t TDataMember::Hash() const
{
// Return hash value for TDataMember based on its name.
@@ -540,7 +540,7 @@ Long_t TDataMember::Property() const
}
//______________________________________________________________________________
-TList *TDataMember::GetOptions()
+TList *TDataMember::GetOptions() const
{
// Returns list of options - list of TOptionListItems
diff --git a/meta/src/TDataType.cxx b/meta/src/TDataType.cxx
index 932cce5be3d19e3d2850dac18b7e249ff985a673..7d6a36ad66fc97948a6e9f4f4c3271f6f55c8c42 100644
--- a/meta/src/TDataType.cxx
+++ b/meta/src/TDataType.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TDataType.cxx,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 04/02/95
/*************************************************************************
@@ -100,7 +100,7 @@ const char *TDataType::GetTitle() const
}
//______________________________________________________________________________
-Int_t TDataType::Compare(TObject *obj)
+Int_t TDataType::Compare(const TObject *obj) const
{
// Compare to other object. Returns 0<, 0 or >0 depending on
// whether "this" is lexicographically less than, equal to, or
@@ -110,7 +110,7 @@ Int_t TDataType::Compare(TObject *obj)
}
//______________________________________________________________________________
-ULong_t TDataType::Hash()
+ULong_t TDataType::Hash() const
{
// Return hash value for TDataType based on its name.
diff --git a/meta/src/TFunction.cxx b/meta/src/TFunction.cxx
index ec1ad87f10f06b24bbf0f41e5d96f2bbe11edf60..618fa5491d668b6290451a8db5a12ea57a5801e3 100644
--- a/meta/src/TFunction.cxx
+++ b/meta/src/TFunction.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TFunction.cxx,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Fons Rademakers 07/02/97
/*************************************************************************
@@ -144,7 +144,7 @@ Int_t TFunction::GetNargsOpt() const
}
//______________________________________________________________________________
-Int_t TFunction::Compare(TObject *obj)
+Int_t TFunction::Compare(const TObject *obj) const
{
// Compare to other object. Returns 0<, 0 or >0 depending on
// whether "this" is lexicographically less than, equal to, or
@@ -154,7 +154,7 @@ Int_t TFunction::Compare(TObject *obj)
}
//______________________________________________________________________________
-ULong_t TFunction::Hash()
+ULong_t TFunction::Hash() const
{
// Return hash value for TFunction based on its name.
diff --git a/meta/src/TGlobal.cxx b/meta/src/TGlobal.cxx
index 669db35a41524cd1274e9af143765b5bfec51aaa..3e235ea706d8cec24dbab72b63c4206ef6bfe54b 100644
--- a/meta/src/TGlobal.cxx
+++ b/meta/src/TGlobal.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TGlobal.cxx,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 13/11/95
/*************************************************************************
@@ -101,7 +101,7 @@ const char *TGlobal::GetTitle() const
}
//______________________________________________________________________________
-Int_t TGlobal::Compare(TObject *obj)
+Int_t TGlobal::Compare(const TObject *obj) const
{
// Compare to other object. Returns 0<, 0 or >0 depending on
// whether "this" is lexicographically less than, equal to, or
@@ -111,7 +111,7 @@ Int_t TGlobal::Compare(TObject *obj)
}
//______________________________________________________________________________
-ULong_t TGlobal::Hash()
+ULong_t TGlobal::Hash() const
{
// Return hash value for TGlobal based on its name.
diff --git a/meta/src/TMethodArg.cxx b/meta/src/TMethodArg.cxx
index 19ca2e35c3f829c082f8fe9a60f281feed1ab3bd..b0e2592dd46f42e70cbb9f2c9e67bf1a11ca6722 100644
--- a/meta/src/TMethodArg.cxx
+++ b/meta/src/TMethodArg.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name$:$Id$
+// @(#)root/meta:$Name: $:$Id: TMethodArg.cxx,v 1.1.1.1 2000/05/16 17:00:43 rdm Exp $
// Author: Rene Brun 04/02/95
/*************************************************************************
@@ -95,7 +95,7 @@ const char *TMethodArg::GetTitle() const
}
//______________________________________________________________________________
-Int_t TMethodArg::Compare(TObject *obj)
+Int_t TMethodArg::Compare(const TObject *obj) const
{
// Compare to other object. Returns 0<, 0 or >0 depending on
// whether "this" is lexicographically less than, equal to, or
@@ -107,7 +107,7 @@ Int_t TMethodArg::Compare(TObject *obj)
}
//______________________________________________________________________________
-ULong_t TMethodArg::Hash()
+ULong_t TMethodArg::Hash() const
{
// Return hash value for TDataType based on its name.
@@ -126,7 +126,7 @@ Long_t TMethodArg::Property() const
}
//______________________________________________________________________________
-TList *TMethodArg::GetOptions()
+TList *TMethodArg::GetOptions() const
{
// Returns list of possible options - according to pointed datamember.
// If there is no datamember field assigned to this methodarg - returns 0.
@@ -135,7 +135,7 @@ TList *TMethodArg::GetOptions()
}
//______________________________________________________________________________
-TDataMember *TMethodArg::GetDataMember()
+TDataMember *TMethodArg::GetDataMember() const
{
// Returns TDataMember pointed by this methodarg.
// If you want to specify list of options or current value for your
diff --git a/meta/src/TStreamerElement.cxx b/meta/src/TStreamerElement.cxx
index 049c73f66814692ba3bb6699c9ea1bb38ae1326f..040ed8e77091d36d4860be8b0f12174373fec074 100644
--- a/meta/src/TStreamerElement.cxx
+++ b/meta/src/TStreamerElement.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TStreamerElement.cxx,v 1.5 2000/11/28 09:07:21 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TStreamerElement.cxx,v 1.6 2000/12/02 16:26:49 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -75,7 +75,7 @@ void TStreamerElement::Init(TObject *)
}
//______________________________________________________________________________
-void TStreamerElement::ls(Option_t *)
+void TStreamerElement::ls(Option_t *) const
{
char name[128];
char cdim[8];
@@ -212,7 +212,7 @@ TStreamerBasicPointer::~TStreamerBasicPointer()
}
//______________________________________________________________________________
-ULong_t TStreamerBasicPointer::GetMethod()
+ULong_t TStreamerBasicPointer::GetMethod() const
{
// return address of counter
@@ -271,7 +271,7 @@ TStreamerTStringPointer::~TStreamerTStringPointer()
}
//______________________________________________________________________________
-ULong_t TStreamerTStringPointer::GetMethod()
+ULong_t TStreamerTStringPointer::GetMethod() const
{
// return address of counter
@@ -328,7 +328,7 @@ TStreamerBasicType::~TStreamerBasicType()
}
//______________________________________________________________________________
-ULong_t TStreamerBasicType::GetMethod()
+ULong_t TStreamerBasicType::GetMethod() const
{
// return address of counter
@@ -597,7 +597,7 @@ TStreamerSTL::~TStreamerSTL()
}
//______________________________________________________________________________
-void TStreamerSTL::ls(Option_t *)
+void TStreamerSTL::ls(Option_t *) const
{
char name[128];
char cdim[8];
diff --git a/meta/src/TStreamerInfo.cxx b/meta/src/TStreamerInfo.cxx
index d8618c643125409711492a3b7e0f4549df295477..e99e4c8bd40cd4f030ac9ee2db24a564ffc8e0af 100644
--- a/meta/src/TStreamerInfo.cxx
+++ b/meta/src/TStreamerInfo.cxx
@@ -1,4 +1,4 @@
-// @(#)root/meta:$Name: $:$Id: TStreamerInfo.cxx,v 1.15 2000/12/06 07:29:18 brun Exp $
+// @(#)root/meta:$Name: $:$Id: TStreamerInfo.cxx,v 1.16 2000/12/11 18:06:31 brun Exp $
// Author: Rene Brun 12/10/2000
/*************************************************************************
@@ -663,7 +663,7 @@ Int_t TStreamerInfo::GenerateHeaderFile(const char *dirname)
}
//______________________________________________________________________________
-Int_t TStreamerInfo::GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer)
+Int_t TStreamerInfo::GetDataMemberOffset(TDataMember *dm, Streamer_t &streamer) const
{
// Compute data member offset
// return pointer to the Streamer function if one exists
@@ -713,7 +713,7 @@ TStreamerBasicType *TStreamerInfo::GetElementCounter(const char *countName, TCla
}
//______________________________________________________________________________
-void TStreamerInfo::ls(Option_t *option)
+void TStreamerInfo::ls(Option_t *option) const
{
// List the TStreamerElement list and also the precomputed tables
diff --git a/minuit/inc/TFitter.h b/minuit/inc/TFitter.h
index f1af46546afaf8cc09e9f3daa090ffaf62bb9047..a5c2d45fd0f066b5bfe265276d774d4b0627211b 100644
--- a/minuit/inc/TFitter.h
+++ b/minuit/inc/TFitter.h
@@ -1,4 +1,4 @@
-// @(#)root/minuit:$Name$:$Id$
+// @(#)root/minuit:$Name: $:$Id: TFitter.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Rene Brun 31/08/99
/*************************************************************************
@@ -39,11 +39,11 @@ private:
virtual Int_t ExecuteCommand(const char *command, Double_t *args, Int_t nargs);
virtual void FixParameter(Int_t ipar);
virtual Int_t GetErrors(Int_t ipar,Double_t &eplus, Double_t &eminus, Double_t &eparab, Double_t &globcc);
- virtual TObject *GetObjectFit();
+ virtual TObject *GetObjectFit() const;
virtual Int_t GetParameter(Int_t ipar,char *name,Double_t &value,Double_t &verr,Double_t &vlow, Double_t &vhigh);
virtual Int_t GetStats(Double_t &amin, Double_t &edm, Double_t &errdef, Int_t &nvpar, Int_t &nparx);
virtual Double_t GetSumLog(Int_t i);
- virtual void PrintResults(Int_t level, Double_t amin);
+ virtual void PrintResults(Int_t level, Double_t amin) const;
virtual void ReleaseParameter(Int_t ipar);
virtual void SetFCN(void *fcn);
virtual void SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Double_t *, Int_t));
diff --git a/minuit/src/TFitter.cxx b/minuit/src/TFitter.cxx
index d6d3d708223e7fc1a2da0a5dfbbb46bae8cdce60..b9175976394bddb67f2eca8b77835934ba11053c 100644
--- a/minuit/src/TFitter.cxx
+++ b/minuit/src/TFitter.cxx
@@ -1,4 +1,4 @@
-// @(#)root/minuit:$Name$:$Id$
+// @(#)root/minuit:$Name: $:$Id: TFitter.cxx,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Rene Brun 31/08/99
/*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
@@ -80,7 +80,7 @@ Int_t TFitter::GetErrors(Int_t ipar,Double_t &eplus, Double_t &eminus, Double_t
}
//______________________________________________________________________________
-TObject *TFitter::GetObjectFit()
+TObject *TFitter::GetObjectFit() const
{
// return a pointer to the current object being fitted
@@ -142,7 +142,7 @@ Double_t TFitter::GetSumLog(Int_t n)
}
//______________________________________________________________________________
-void TFitter::PrintResults(Int_t level, Double_t amin)
+void TFitter::PrintResults(Int_t level, Double_t amin) const
{
// Print fit results
diff --git a/net/inc/TInetAddress.h b/net/inc/TInetAddress.h
index 076d1e9fabb73fe8f09616b1a37b211d986ff974..eccad40268dd87c87ce7da64e4c2dcee1f8d5ccf 100644
--- a/net/inc/TInetAddress.h
+++ b/net/inc/TInetAddress.h
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name$:$Id$
+// @(#)root/net:$Name: $:$Id: TInetAddress.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 16/12/96
/*************************************************************************
@@ -63,7 +63,7 @@ public:
Int_t GetFamily() const { return fFamily; }
Int_t GetPort() const { return fPort; }
Bool_t IsValid() const { return fFamily == -1 ? kFALSE : kTRUE; }
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
ClassDef(TInetAddress,1) //Represents an Internet Protocol (IP) address
};
diff --git a/net/inc/TNetFile.h b/net/inc/TNetFile.h
index 26512ace7f7410821d1cb96d240e5b6b353dc192..abab5f0b76f2115b8c9fc3d233b8d0bec3ad8156 100644
--- a/net/inc/TNetFile.h
+++ b/net/inc/TNetFile.h
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name: $:$Id: TNetFile.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
+// @(#)root/net:$Name: $:$Id: TNetFile.h,v 1.2 2000/11/27 10:47:26 rdm Exp $
// Author: Fons Rademakers 14/08/97
/*************************************************************************
@@ -45,8 +45,8 @@ private:
TNetFile() : fUrl("dummy") { fSocket = 0; }
void Init(Bool_t create);
- void Print(Option_t *option);
- void PrintError(const char *where, Int_t err);
+ void Print(Option_t *option) const;
+ void PrintError(const char *where, Int_t err) const;
Int_t Recv(Int_t &status, EMessageTypes &kind);
public:
diff --git a/net/inc/TUrl.h b/net/inc/TUrl.h
index c2d2bd322590d3a8e97a83d55592f7c443170c87..05e1264e9f5d2a87920ddb4b0f39bd2c46766621 100644
--- a/net/inc/TUrl.h
+++ b/net/inc/TUrl.h
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name$:$Id$
+// @(#)root/net:$Name: $:$Id: TUrl.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 17/01/97
/*************************************************************************
@@ -58,7 +58,7 @@ public:
const char *GetOptions() const { return fOptions.Data(); }
Int_t GetPort() const { return fPort; }
Bool_t IsValid() const { return fPort == -1 ? kFALSE : kTRUE; }
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
ClassDef(TUrl,1) //Represents an URL
};
diff --git a/net/src/TInetAddress.cxx b/net/src/TInetAddress.cxx
index 783619f943b295ecef9726699a7526d8c7404130..f10dbe0453a2adf411173c56ffaf3396a277bc31 100644
--- a/net/src/TInetAddress.cxx
+++ b/net/src/TInetAddress.cxx
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name$:$Id$
+// @(#)root/net:$Name: $:$Id: TInetAddress.cxx,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 16/12/96
/*************************************************************************
@@ -104,7 +104,7 @@ const char *TInetAddress::GetHostAddress() const
}
//______________________________________________________________________________
-void TInetAddress::Print(Option_t *)
+void TInetAddress::Print(Option_t *) const
{
// Print internet address as string.
diff --git a/net/src/TNetFile.cxx b/net/src/TNetFile.cxx
index 1e72c737aa72cab164626f4fb3c9e8bc0095dd8b..666a9cecf29518b8e7b16bbf90b3380c69e137d0 100644
--- a/net/src/TNetFile.cxx
+++ b/net/src/TNetFile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name: $:$Id: TNetFile.cxx,v 1.7 2000/11/27 10:47:26 rdm Exp $
+// @(#)root/net:$Name: $:$Id: TNetFile.cxx,v 1.8 2000/12/02 15:50:28 rdm Exp $
// Author: Fons Rademakers 14/08/97
/*************************************************************************
@@ -249,12 +249,12 @@ Bool_t TNetFile::IsOpen() const
}
//______________________________________________________________________________
-void TNetFile::Print(Option_t *)
+void TNetFile::Print(Option_t *) const
{
// Print some info about the net file.
const char *fname = fUrl.GetFile();
- Printf("URL: %s", fUrl.GetUrl());
+ Printf("URL: %s", ((TUrl*)&fUrl)->GetUrl());
Printf("Remote file: %s", &fname[1]);
Printf("Remote user: %s", fUser.Data());
Printf("Title: %s", fTitle.Data());
@@ -264,7 +264,7 @@ void TNetFile::Print(Option_t *)
}
//______________________________________________________________________________
-void TNetFile::PrintError(const char *where, Int_t err)
+void TNetFile::PrintError(const char *where, Int_t err) const
{
// Print error string depending on error code.
diff --git a/net/src/TUrl.cxx b/net/src/TUrl.cxx
index d1629f1f84a583f52b28e22528f42de6ed9e3132..2850787c74539112875e37e7a4df4b1384078fb8 100644
--- a/net/src/TUrl.cxx
+++ b/net/src/TUrl.cxx
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name: $:$Id: TUrl.cxx,v 1.3 2000/07/29 11:04:37 rdm Exp $
+// @(#)root/net:$Name: $:$Id: TUrl.cxx,v 1.4 2000/12/02 15:51:07 rdm Exp $
// Author: Fons Rademakers 17/01/97
/*************************************************************************
@@ -262,12 +262,12 @@ const char *TUrl::GetUrl()
}
//______________________________________________________________________________
-void TUrl::Print(Option_t *)
+void TUrl::Print(Option_t *) const
{
// Print URL on stdout.
if (fPort == -1)
Printf("Illegal URL");
- Printf("%s", GetUrl());
+ Printf("%s", ((TUrl*)this)->GetUrl());
}
diff --git a/proof/inc/TProof.h b/proof/inc/TProof.h
index 9fa4f4a315e0a44330a2be6f843ebfe6e35a6984..8258bf3cf5879380482a98880cc8650edb916866 100644
--- a/proof/inc/TProof.h
+++ b/proof/inc/TProof.h
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProof.h,v 1.5 2000/11/27 10:51:46 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProof.h,v 1.6 2000/12/13 12:07:59 rdm Exp $
// Author: Fons Rademakers 13/02/97
/*************************************************************************
@@ -171,7 +171,7 @@ public:
Int_t SetParallel(Int_t nodes = 9999);
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
static void SetUser(const char *user);
static void SetPasswd(const char *passwd);
diff --git a/proof/inc/TProofServ.h b/proof/inc/TProofServ.h
index 74fa4b924b606c1610a83404de1fd19eadd35f03..4f1ac390f8dad740bc7e2f8011f46b98a0fe38e4 100644
--- a/proof/inc/TProofServ.h
+++ b/proof/inc/TProofServ.h
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProofServ.h,v 1.4 2000/11/24 18:11:32 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProofServ.h,v 1.5 2000/11/27 10:51:46 rdm Exp $
// Author: Fons Rademakers 16/02/97
/*************************************************************************
@@ -93,7 +93,7 @@ public:
void Run(Bool_t retrn = kFALSE);
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
TObject *Get(const char *namecycle);
Stat_t GetEntriesProcessed() const { return fEntriesProcessed; }
diff --git a/proof/inc/TSlave.h b/proof/inc/TSlave.h
index 117e853f14d176e47aa3f92881a334047763fdaf..e6c47e2f5476de3066fd781cfe5c0242f94d02ec 100644
--- a/proof/inc/TSlave.h
+++ b/proof/inc/TSlave.h
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TSlave.h,v 1.2 2000/11/21 12:27:59 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TSlave.h,v 1.3 2000/12/13 12:07:59 rdm Exp $
// Author: Fons Rademakers 14/02/97
/*************************************************************************
@@ -67,7 +67,7 @@ public:
void Close(Option_t *opt = "");
- Int_t Compare(TObject *obj);
+ Int_t Compare(const TObject *obj) const;
Bool_t IsSortable() const { return kTRUE; }
const char *GetName() const { return fName.Data(); }
@@ -87,7 +87,7 @@ public:
Bool_t IsValid() const { return fSocket ? kTRUE : kFALSE; }
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
ClassDef(TSlave,0) //PROOF slave server
};
diff --git a/proof/src/TProof.cxx b/proof/src/TProof.cxx
index fb8b3a54b8ca421beb31d8353df1d240e6eb18ad..f16afe2468fa067d83d16654343d4c26d3042804 100644
--- a/proof/src/TProof.cxx
+++ b/proof/src/TProof.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProof.cxx,v 1.6 2000/11/27 18:37:12 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProof.cxx,v 1.7 2000/12/13 12:08:00 rdm Exp $
// Author: Fons Rademakers 13/02/97
/*************************************************************************
@@ -1030,7 +1030,7 @@ Int_t TProof::Ping(ESlaves list)
}
//______________________________________________________________________________
-void TProof::Print(Option_t *option)
+void TProof::Print(Option_t *option) const
{
// Print status of PROOF cluster.
@@ -1042,10 +1042,10 @@ void TProof::Print(Option_t *option)
Printf("Protocol version: %d", GetProtocol());
Printf("Log level: %d", GetLogLevel());
if (IsValid())
- SendPrint();
+ ((TProof*)this)->SendPrint();
} else {
- AskStatus();
+ ((TProof*)this)->AskStatus();
if (IsParallel())
Printf("*** Master server (parallel mode, %d slaves):",
GetNumberOfActiveSlaves());
diff --git a/proof/src/TProofServ.cxx b/proof/src/TProofServ.cxx
index 7234df1210dca1bb9cb48186e3b7ead2c306388a..968bbad900e41d68fb7a6b26e6df050a211b8b77 100644
--- a/proof/src/TProofServ.cxx
+++ b/proof/src/TProofServ.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProofServ.cxx,v 1.7 2000/11/27 18:37:12 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProofServ.cxx,v 1.8 2000/12/13 12:08:00 rdm Exp $
// Author: Fons Rademakers 16/02/97
/*************************************************************************
@@ -714,7 +714,7 @@ Bool_t TProofServ::IsParallel() const
}
//______________________________________________________________________________
-void TProofServ::Print(Option_t *)
+void TProofServ::Print(Option_t *) const
{
// Print status of slave server.
diff --git a/proof/src/TSlave.cxx b/proof/src/TSlave.cxx
index 654feb8fc02b275609b9dfec165f413862ccc460..791ba9b67684886147e8ae48096e30a2b39f64fa 100644
--- a/proof/src/TSlave.cxx
+++ b/proof/src/TSlave.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TSlave.cxx,v 1.4 2000/11/24 18:11:32 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TSlave.cxx,v 1.5 2000/12/13 12:08:00 rdm Exp $
// Author: Fons Rademakers 14/02/97
/*************************************************************************
@@ -124,7 +124,7 @@ void TSlave::Close(Option_t *)
}
//______________________________________________________________________________
-Int_t TSlave::Compare(TObject *obj)
+Int_t TSlave::Compare(const TObject *obj) const
{
// Used to sort slaves by performance index.
@@ -136,7 +136,7 @@ Int_t TSlave::Compare(TObject *obj)
}
//______________________________________________________________________________
-void TSlave::Print(Option_t *)
+void TSlave::Print(Option_t *) const
{
// Printf info about slave.
diff --git a/pythia/inc/TMCParticle.h b/pythia/inc/TMCParticle.h
index a24058a715198c5267a92343a758b3ca590a886e..1382549751635c74220ff61da38b33699e8f6810 100644
--- a/pythia/inc/TMCParticle.h
+++ b/pythia/inc/TMCParticle.h
@@ -1,4 +1,4 @@
-// @(#)root/pythia:$Name$:$Id$
+// @(#)root/pythia:$Name: $:$Id: TMCParticle.h,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
// Author: Piotr Golonka 17/09/97
/*************************************************************************
@@ -113,7 +113,7 @@ public:
virtual void SetLifetime(Float_t lifetime) {fLifetime=lifetime;}
- virtual void ls(Option_t* option);
+ virtual void ls(Option_t* option) const;
ClassDef(TMCParticle,1) // LUJETS particles data record.
};
diff --git a/pythia/inc/TPythia.h b/pythia/inc/TPythia.h
index 237bc4060603fa8b35a666d1bda348538370720f..babbb1a4e68962421072263bc2b5e01859bff7b8 100644
--- a/pythia/inc/TPythia.h
+++ b/pythia/inc/TPythia.h
@@ -1,4 +1,4 @@
-// @(#)root/pythia:$Name$:$Id$
+// @(#)root/pythia:$Name: $:$Id: TPythia.h,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
// Author: Piotr Golonka 10/09/97
/*************************************************************************
@@ -30,10 +30,10 @@ class TPrimary;
class TPythia : public TGenerator {
private:
- void Unsupported(const char *name)
+ void Unsupported(const char *name) const
{printf("TPythia::%s unsupported !\n",name);}
- virtual TPrimary *GetPrimary(Int_t) {Unsupported("GetPrimary");return 0;};
+ virtual TPrimary *GetPrimary(Int_t) const {Unsupported("GetPrimary");return 0;};
virtual void ShowNeutrons(Bool_t) {Unsupported("ShowNeutrons");};
public:
diff --git a/pythia/src/TMCParticle.cxx b/pythia/src/TMCParticle.cxx
index 481894a7135734e8420fb2b947cf222efc049a93..a30d9881452f0270257e7514352e9034cd228b78 100644
--- a/pythia/src/TMCParticle.cxx
+++ b/pythia/src/TMCParticle.cxx
@@ -1,4 +1,4 @@
-// @(#)root/pythia:$Name$:$Id$
+// @(#)root/pythia:$Name: $:$Id: TMCParticle.cxx,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
// Author: Piotr Golonka 17/09/97
////////////////////////////////////////////////////////////////////////////////
// //
@@ -23,7 +23,7 @@ extern "C" void luname(const Int_t &kf, const char *name, const Int_t len);
ClassImp(TMCParticle)
//______________________________________________________________________________
-void TMCParticle::ls(Option_t *)
+void TMCParticle::ls(Option_t *) const
{
printf("(%2i,%4i) <-%3i, =>[%3i,%3i]",fKS,fKF,fParent,
fFirstChild,fLastChild);
diff --git a/pythia6/inc/TMCParticle6.h b/pythia6/inc/TMCParticle6.h
index aac8ab309d0a9ccf92ea062ce731d014c2167838..a84feb24231271deb0d44f18cc2b153f1f54701c 100644
--- a/pythia6/inc/TMCParticle6.h
+++ b/pythia6/inc/TMCParticle6.h
@@ -1,4 +1,4 @@
-// @(#)root/pythia6:$Name$:$Id$
+// @(#)root/pythia6:$Name: $:$Id: TMCParticle6.h,v 1.1 2000/07/01 08:35:28 rdm Exp $
// Author: Piotr Golonka 17/09/97
/*************************************************************************
@@ -113,7 +113,7 @@ public:
virtual void SetLifetime(Float_t lifetime) {fLifetime=lifetime;}
- virtual void ls(Option_t* option);
+ virtual void ls(Option_t* option) const;
ClassDef(TMCParticle,1) // LUJETS particles data record.
};
diff --git a/pythia6/src/TMCParticle6.cxx b/pythia6/src/TMCParticle6.cxx
index aab1709c7e6c43e0ba410b3142e654251ad2f5c1..e19f808c84610eb87e86471810311861266b4ce6 100644
--- a/pythia6/src/TMCParticle6.cxx
+++ b/pythia6/src/TMCParticle6.cxx
@@ -1,4 +1,4 @@
-// @(#)root/pythia6:$Name$:$Id$
+// @(#)root/pythia6:$Name: $:$Id: TMCParticle6.cxx,v 1.1 2000/07/01 08:37:43 rdm Exp $
// Author: Piotr Golonka 17/09/97
////////////////////////////////////////////////////////////////////////////////
// //
@@ -23,7 +23,7 @@ extern "C" void pyname(const Int_t &kf, const char *name, const Int_t len);
ClassImp(TMCParticle)
//______________________________________________________________________________
-void TMCParticle::ls(Option_t *)
+void TMCParticle::ls(Option_t *) const
{
printf("(%2i,%4i) <-%3i, =>[%3i,%3i]",fKS,fKF,fParent,
fFirstChild,fLastChild);
diff --git a/star/inc/TChair.h b/star/inc/TChair.h
index d4fccb8b1154bee3f9dac7a27c98dd205d2eb1b5..a254cfb7da0c184b3021adaec40d5ed510c5d0c9 100644
--- a/star/inc/TChair.h
+++ b/star/inc/TChair.h
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TChair.h,v 1.5 2000/09/29 07:15:30 brun Exp $
+// @(#)root/star:$Name: $:$Id: TChair.h,v 1.6 2000/12/11 09:52:24 brun Exp $
// Author: Valery Fine(fine@bnl.gov) 13/03/2000
/*************************************************************************
@@ -9,7 +9,7 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/
-// $Id: TChair.h,v 1.5 2000/09/29 07:15:30 brun Exp $
+// $Id: TChair.h,v 1.6 2000/12/11 09:52:24 brun Exp $
#ifndef ROOT_TChair
#define ROOT_TChair
@@ -76,7 +76,7 @@ public:
virtual Char_t *MakeExpression(const Char_t *expressions[],Int_t nExpressions)
{return GetThisTable()->MakeExpression(expressions,nExpressions);}
virtual Char_t *Print(Char_t *buf,Int_t n) const { return GetThisTable()->Print(buf, n);}
- virtual void Print(Option_t *opt="") {GetThisTable()->Print(opt);}
+ virtual void Print(Option_t *opt="") const {GetThisTable()->Print(opt);}
virtual const Char_t *Print(Int_t row, Int_t rownumber=10,
const Char_t *colfirst="",const Char_t *collast="") const {
return GetThisTable()->Print(row,rownumber,colfirst,collast); }
@@ -115,6 +115,9 @@ inline const void *TChair::operator[](Int_t i) const
}
// $Log: TChair.h,v $
+// Revision 1.6 2000/12/11 09:52:24 brun
+// Functions ls declared const like in the base class
+//
// Revision 1.5 2000/09/29 07:15:30 brun
// Remove unused function ReadGenericArray
//
diff --git a/star/inc/TDataSetIter.h b/star/inc/TDataSetIter.h
index d70f4d90a6fc39d432d37abc0f6ffa198a7f8fba..21fb178107382a2b329dd1787624984cb15ecdb6 100644
--- a/star/inc/TDataSetIter.h
+++ b/star/inc/TDataSetIter.h
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TDataSetIter.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TDataSetIter.h,v 1.2 2000/09/05 09:18:42 brun Exp $
// Author: Valery Fine(fine@mail.cern.ch) 03/07/98
/*************************************************************************
@@ -15,7 +15,7 @@
//////////////////////////////////////////////////////////////////////////
// //
-// $Id: TDataSetIter.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
+// $Id: TDataSetIter.h,v 1.2 2000/09/05 09:18:42 brun Exp $
//
// TDataSetIter //
// //
@@ -77,10 +77,10 @@ public:
virtual Int_t Flag(const Char_t *path,UInt_t flag=kMark,EBitOpt reset=kSet);
virtual Int_t Flag(TDataSet *dataset,UInt_t flag=kMark,EBitOpt reset=kSet);
- virtual TDataSet *Ls(const Char_t *dirname="",Option_t *opt="");
- virtual TDataSet *Ls(const Char_t *dirname,Int_t depth);
- virtual TDataSet *ls(const Char_t *dirname="",Option_t *opt="") {return Ls(dirname,opt);}
- virtual TDataSet *ls(const Char_t *dirname,Int_t depth){return Ls(dirname,depth);}
+ virtual TDataSet *Ls(const Char_t *dirname="",Option_t *opt="") const;
+ virtual TDataSet *Ls(const Char_t *dirname,Int_t depth) const;
+ virtual TDataSet *ls(const Char_t *dirname="",Option_t *opt="") const {return Ls(dirname,opt);}
+ virtual TDataSet *ls(const Char_t *dirname,Int_t depth) const {return Ls(dirname,depth);}
virtual TDataSet *Mkdir(const Char_t *dirname);
virtual TDataSet *Md(const Char_t *dirname) {return Mkdir(dirname);}
virtual TString Path(const Char_t *path) {TDataSet *set = Find(path); return set ? TString (""):set->Path();}
diff --git a/star/inc/TPoints3D.h b/star/inc/TPoints3D.h
index 37553961742908ef6c69e89ef335b10b58ad973b..201437c3dc409bdbf70156c9661b58d4c24e9705 100644
--- a/star/inc/TPoints3D.h
+++ b/star/inc/TPoints3D.h
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name$:$Id$
+// @(#)root/star:$Name: $:$Id: TPoints3D.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
// Author: Valery Fine(fine@mail.cern.ch) 24/04/99
/*************************************************************************
@@ -10,7 +10,7 @@
*************************************************************************/
#ifndef ROOT_TPoints3D
#define ROOT_TPoints3D
-// $Id: TPoints3D.h,v 1.6 1999/12/21 18:57:14 fine Exp $
+// $Id: TPoints3D.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
// ***********************************************************************
// * C++ class to define the abstract array of 3D points
// * Copyright(c) 1997~1999 [BNL] Brookhaven National Laboratory, STAR, All rights reserved
@@ -76,9 +76,9 @@ public:
virtual Float_t *GetXYZ(Float_t *xyz,Int_t idx,Int_t num=1) const;
virtual const Float_t *GetXYZ(Int_t idx);
virtual Option_t *GetOption() const ;
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void PaintPoints(Int_t, Float_t *,Option_t *){;}
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual Int_t SetLastPosition(Int_t idx);
virtual void SetOption(Option_t *option="");
virtual Int_t SetPoint(Int_t point, Float_t x, Float_t y, Float_t z); // *MENU*
diff --git a/star/inc/TPointsArray3D.h b/star/inc/TPointsArray3D.h
index 29371388b9e29e99903b74ef072ace27b085c844..f573ca605c0c31ea64009674815cb1589bfea597 100644
--- a/star/inc/TPointsArray3D.h
+++ b/star/inc/TPointsArray3D.h
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name$:$Id$
+// @(#)root/star:$Name: $:$Id: TPointsArray3D.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
// Author: Valery Fine(fine@mail.cern.ch) 24/04/99
/*************************************************************************
@@ -46,7 +46,7 @@ public:
virtual void Copy(TObject &points);
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
- virtual Int_t GetLastPosition() const;
+ virtual Int_t GetLastPosition() const;
virtual Int_t GetN() const;
virtual Float_t *GetP() const;
virtual Float_t GetX(Int_t idx) const;
@@ -55,10 +55,10 @@ public:
virtual Float_t *GetXYZ(Float_t *xyz,Int_t idx,Int_t num=1) const;
virtual const Float_t *GetXYZ(Int_t idx);
virtual Option_t *GetOption() const ;
- virtual Bool_t Is3D();
- virtual void ls(Option_t *option="");
+ virtual Bool_t Is3D() const;
+ virtual void ls(Option_t *option="") const;
virtual void PaintPoints(Int_t , Float_t *,Option_t *){;}
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual Int_t SetLastPosition(Int_t idx);
virtual void SetOption(Option_t *option="");
virtual Int_t SetPoint(Int_t point, Float_t x, Float_t y, Float_t z); // *MENU*
@@ -79,7 +79,7 @@ inline const Float_t *TPointsArray3D::GetXYZ(Int_t idx) {ret
inline Float_t *TPointsArray3D::GetXYZ(Float_t *xyz,Int_t idx,Int_t num) const
{return (Float_t *)memcpy(xyz,&fP[3*idx],3*num*sizeof(Float_t));}
inline Option_t *TPointsArray3D::GetOption() const {return fOption.Data();}
-inline Bool_t TPointsArray3D::Is3D() {return kTRUE;}
+inline Bool_t TPointsArray3D::Is3D() const {return kTRUE;}
inline void TPointsArray3D::SetOption(Option_t *option) {fOption = option;}
inline Int_t TPointsArray3D::Size() const {return fLastPoint+1;}
diff --git a/star/inc/TVolume.h b/star/inc/TVolume.h
index 9f95ec88d3d5c757f6fc1da62b3468c0c65b0c06..8d460ff02860a4dee43ac79e211c6212dbdf118e 100644
--- a/star/inc/TVolume.h
+++ b/star/inc/TVolume.h
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TVolume.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TVolume.h,v 1.2 2000/12/11 09:35:06 brun Exp $
// Author: Valery Fine 10/12/98
/*************************************************************************
@@ -81,17 +81,17 @@ class TVolume : public TObjectSet, public TAttLine, public TAttFill, public TAt
virtual void DrawOnly(Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
static TRotMatrix *GetIdentity();
- virtual Text_t *GetObjectInfo(Int_t px, Int_t py);
+ virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;
const Option_t *GetOption() const { return fOption.Data();}
TShape *GetShape() const {return fShape;}
TList *GetListOfShapes() const {return fListOfShapes;}
virtual void GetLocalRange(Float_t *min, Float_t *max);
virtual ENodeSEEN GetVisibility() const {return fVisibility;}
virtual TList *GetListOfPositions() { return (TList *)(GetObject());}
- virtual ULong_t Hash() { return TObject::Hash();}
+ virtual ULong_t Hash() const { return TObject::Hash();}
virtual void ImportShapeAttributes();
virtual Bool_t IsMarked() const;
- virtual Bool_t Is3D() {return kTRUE;}
+ virtual Bool_t Is3D() const {return kTRUE;}
virtual TList *Nodes() const { return GetList(); }
virtual void Paint(Option_t *option="");
virtual void PaintShape(Option_t *option="");
diff --git a/star/inc/TVolumePosition.h b/star/inc/TVolumePosition.h
index 44590235b839c7b9dfbfdb8442698a46f8e75651..6d9d301a6a1c9769fec6f02175dfb2ca988248e9 100644
--- a/star/inc/TVolumePosition.h
+++ b/star/inc/TVolumePosition.h
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TVolumePosition.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TVolumePosition.h,v 1.2 2000/09/05 09:21:24 brun Exp $
// Author: Valery Fine(fine@bnl.gov) 25/12/98
/*************************************************************************
@@ -50,7 +50,7 @@ class TVolumePosition : public TObject {
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual TRotMatrix *GetMatrix() const {return fMatrix;}
virtual TVolume *GetNode() const {return fNode;}
- virtual Text_t *GetObjectInfo(Int_t px, Int_t py);
+ virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;
const Option_t *GetOption() const { return GetNode()?GetNode()->GetOption():0;}
virtual const Char_t *GetName() const { return GetNode() ? GetNode()->GetName():IsA()->GetName();}
Int_t GetVisibility() const {return GetNode()?GetNode()->GetVisibility():0;}
@@ -59,11 +59,11 @@ class TVolumePosition : public TObject {
virtual Double_t GetZ() const {return fX[2];}
virtual UInt_t GetId() const {return fId;}
Bool_t IsFolder() const {return GetNode()?kTRUE:kFALSE;}
- virtual Bool_t Is3D() {return kTRUE;}
+ virtual Bool_t Is3D() const {return kTRUE;}
virtual Double_t *Local2Master(const Double_t *local, Double_t *master,Int_t nPoints=1);
virtual Float_t *Local2Master(const Float_t *local, Float_t *master,Int_t nPoints=1);
virtual void Paint(Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void UpdatePosition(Option_t *option="");
virtual TVolumePosition *Reset(TVolume *node=0,Double_t x=0, Double_t y=0, Double_t z=0, TRotMatrix *matrix=0);
virtual void SavePrimitive(ofstream &out, Option_t *option);
diff --git a/star/inc/TVolumeView.h b/star/inc/TVolumeView.h
index 5e0c846208fa4f589d299518b38b80c0e4727122..1e0078f09660024529b7f2ab61b84f7225dc17c2 100644
--- a/star/inc/TVolumeView.h
+++ b/star/inc/TVolumeView.h
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TVolumeView.h,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TVolumeView.h,v 1.2 2000/12/11 09:52:24 brun Exp $
// Author: Valery Fine(fine@bnl.gov) 25/12/98
/*************************************************************************
@@ -49,13 +49,13 @@ public:
virtual TVolumePosition *GetPosition() const { return (TVolumePosition *)GetObject();}
virtual TVolume *GetNode() const ;
virtual Int_t GetGlobalRange(const TVolumeView *rootNode,Float_t *min, Float_t *max);
- virtual TList *GetListOfShapes() const;
+ virtual TList *GetListOfShapes() const;
virtual void GetLocalRange(Float_t *min, Float_t *max);
- virtual Text_t *GetObjectInfo(Int_t px, Int_t py);
+ virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;
virtual TShape *GetShape() const;
virtual Int_t GetVisibility() const;
virtual Bool_t IsMarked() const;
- virtual Bool_t Is3D() {return kTRUE;}
+ virtual Bool_t Is3D() const {return kTRUE;}
virtual TVolumePosition *Local2Master(const TVolumeView *localNode,const TVolumeView *masterNode=0);
virtual TVolumePosition *Local2Master(const Char_t *localName, const Char_t *masterName=0);
virtual Float_t *Local2Master(const Float_t *local, Float_t *master,
diff --git a/star/src/TDataSetIter.cxx b/star/src/TDataSetIter.cxx
index 334050244102aa578019c2fd3e6711d2a22a38dd..7338ea5259696bdf45a65a4c3b5373953a69224e 100644
--- a/star/src/TDataSetIter.cxx
+++ b/star/src/TDataSetIter.cxx
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TDataSetIter.cxx,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TDataSetIter.cxx,v 1.2 2000/09/05 09:18:42 brun Exp $
// Author: Valery Fine(fine@mail.cern.ch) 03/07/98
// Copyright (C) Valery Fine (Valeri Faine) 1998. All right reserved
@@ -313,7 +313,7 @@ Int_t TDataSetIter::Flag(TDataSet *dataset,UInt_t flag,EBitOpt reset)
}
//______________________________________________________________________________
-TDataSet *TDataSetIter::Ls(const Char_t *dirname,Option_t *opt) {
+TDataSet *TDataSetIter::Ls(const Char_t *dirname,Option_t *opt) const {
//
// Ls(const Char_t *dirname,Option_t)
//
@@ -325,14 +325,14 @@ TDataSet *TDataSetIter::Ls(const Char_t *dirname,Option_t *opt) {
//
TDataSet *set= 0;
- if (dirname && strlen(dirname)) set = Find(dirname);
+ if (dirname && strlen(dirname)) set = ((TDataSetIter*)this)->Find(dirname);
if (!set && dirname==0) set=Cwd();
if (set) set->ls(opt);
return set;
}
//______________________________________________________________________________
-TDataSet *TDataSetIter::Ls(const Char_t *dirname,Int_t depth) {
+TDataSet *TDataSetIter::Ls(const Char_t *dirname,Int_t depth) const {
//
// Ls(const Char_t *dirname,Int_t depth)
//
@@ -347,7 +347,7 @@ TDataSet *TDataSetIter::Ls(const Char_t *dirname,Int_t depth) {
// > 0 - print depth levels at most of the dirname TDataSet
//
TDataSet *set= fWorkingDataSet;
- if (dirname && strlen(dirname)) set= Find(dirname);
+ if (dirname && strlen(dirname)) set= ((TDataSetIter*)this)->Find(dirname);
if (set) set->ls(depth);
return set;
}
diff --git a/star/src/TPoints3D.cxx b/star/src/TPoints3D.cxx
index 3ff97456c9fdd893e9fdf4bfb2707264db6cea2f..24c12323dcad35141d14f0e7913bf835a148a593 100644
--- a/star/src/TPoints3D.cxx
+++ b/star/src/TPoints3D.cxx
@@ -1,7 +1,7 @@
-// @(#)root/star:$Name: $:$Id: TPoints3D.cxx,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TPoints3D.cxx,v 1.2 2000/09/05 09:21:24 brun Exp $
// Author: Valery Fine(fine@mail.cern.ch) 24/04/99
-// $Id: TPoints3D.cxx,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
+// $Id: TPoints3D.cxx,v 1.2 2000/09/05 09:21:24 brun Exp $
// ***********************************************************************
// * C++ class to define the abstract array of 3D points
// * Copyright(c) 1997~1999 [BNL] Brookhaven National Laboratory, STAR, All rights reserved
@@ -168,7 +168,7 @@ void TPoints3D::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TPoints3D::ls(Option_t *option)
+void TPoints3D::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*List this 3-D polyline with its attributes*-*-*-*-*-*-*
//*-* ==========================================
@@ -179,7 +179,7 @@ void TPoints3D::ls(Option_t *option)
}
//______________________________________________________________________________
-void TPoints3D::Print(Option_t *option)
+void TPoints3D::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*Dump this 3-D polyline with its attributes*-*-*-*-*-*-*-*-*
//*-* ==========================================
diff --git a/star/src/TPointsArray3D.cxx b/star/src/TPointsArray3D.cxx
index f060c5eb2f8ccd6318823b15cde2794895475c18..3bfd0c9be39b61436674d20a9d20d477fdc5f7c6 100644
--- a/star/src/TPointsArray3D.cxx
+++ b/star/src/TPointsArray3D.cxx
@@ -1,6 +1,6 @@
-// @(#)root/star:$Name: $:$Id: TPointsArray3D.cxx,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TPointsArray3D.cxx,v 1.2 2000/09/05 09:21:24 brun Exp $
// Author: Valery Fine(fine@mail.cern.ch) 24/04/99
-// $Id: TPointsArray3D.cxx,v 1.1.1.1 2000/05/16 17:00:48 rdm Exp $
+// $Id: TPointsArray3D.cxx,v 1.2 2000/09/05 09:21:24 brun Exp $
#include <fstream.h>
#include <iostream.h>
@@ -219,7 +219,7 @@ void TPointsArray3D::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
//______________________________________________________________________________
-void TPointsArray3D::ls(Option_t *option)
+void TPointsArray3D::ls(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*List this 3-D polyline with its attributes*-*-*-*-*-*-*
//*-* ==========================================
@@ -229,7 +229,7 @@ void TPointsArray3D::ls(Option_t *option)
}
//______________________________________________________________________________
-void TPointsArray3D::Print(Option_t *option)
+void TPointsArray3D::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*Dump this 3-D polyline with its attributes*-*-*-*-*-*-*-*-*
//*-* ==========================================
diff --git a/star/src/TVolume.cxx b/star/src/TVolume.cxx
index ef7f3804b9631b9a98364a35f561c54670196e54..e0372d3c627e58e349c2f4ba61f05dc3d42030b4 100644
--- a/star/src/TVolume.cxx
+++ b/star/src/TVolume.cxx
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TVolume.cxx,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
+// @(#)root/star:$Name: $:$Id: TVolume.cxx,v 1.2 2000/06/13 09:31:59 brun Exp $
// Author: Valery Fine 10/12/98
//
/*************************************************************************
@@ -516,7 +516,7 @@ TRotMatrix *TVolume::GetIdentity()
}
//______________________________________________________________________________
-Text_t *TVolume::GetObjectInfo(Int_t px, Int_t py)
+Text_t *TVolume::GetObjectInfo(Int_t px, Int_t py) const
{
if (!gPad) return "";
static char info[512];
diff --git a/star/src/TVolumePosition.cxx b/star/src/TVolumePosition.cxx
index 74a19f5c10fc89fb4fe6935e0ac691616f78bdf2..06f66e1c2b8baca84e05776329ff5dd0e7935e70 100644
--- a/star/src/TVolumePosition.cxx
+++ b/star/src/TVolumePosition.cxx
@@ -1,6 +1,6 @@
-// @(#)root/star:$Name$:$Id$
+// @(#)root/star:$Name: $:$Id: TVolumePosition.cxx,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
// Author: Valery Fine(fine@bnl.gov) 25/12/98
-// $Id: TNodePosition.cxx,v 1.23 1999/12/21 18:57:14 fine Exp $
+// $Id: TVolumePosition.cxx,v 1.1.1.1 2000/05/16 17:00:49 rdm Exp $
#include <iostream.h>
#include <iomanip.h>
@@ -143,7 +143,7 @@ void TVolumePosition::ExecuteEvent(Int_t, Int_t, Int_t)
}
//______________________________________________________________________________
-Text_t *TVolumePosition::GetObjectInfo(Int_t, Int_t)
+Text_t *TVolumePosition::GetObjectInfo(Int_t, Int_t) const
{
if (!gPad) return "";
if (!GetNode()) return "";
@@ -271,7 +271,7 @@ void TVolumePosition::Paint(Option_t *)
}
//_______________________________________________________________________
-void TVolumePosition::Print(Option_t *)
+void TVolumePosition::Print(Option_t *) const
{
cout << " Node: " << GetNode()->GetName() << endl;
cout << " Position: x=" <<
diff --git a/star/src/TVolumeView.cxx b/star/src/TVolumeView.cxx
index fef85797b9c2957912f29a436d8f33fc7896b78e..18ba12d831dc1a2d0f57ad0f3a40c272451e7fdf 100644
--- a/star/src/TVolumeView.cxx
+++ b/star/src/TVolumeView.cxx
@@ -1,4 +1,4 @@
-// @(#)root/star:$Name: $:$Id: TVolumeView.cxx,v 1.2 2000/07/13 16:00:10 fine Exp $
+// @(#)root/star:$Name: $:$Id: TVolumeView.cxx,v 1.3 2000/08/09 08:41:22 brun Exp $
// Author: Valery Fine(fine@bnl.gov) 25/12/98
// $Id:
// $Log:
@@ -589,7 +589,7 @@ void TVolumeView::GetLocalRange(Float_t *min, Float_t *max)
}
//______________________________________________________________________________
-Text_t *TVolumeView::GetObjectInfo(Int_t px, Int_t py)
+Text_t *TVolumeView::GetObjectInfo(Int_t px, Int_t py) const
{
if (!gPad) return "";
static char info[512];
diff --git a/tree/inc/TBasket.h b/tree/inc/TBasket.h
index 6a1994ec08e8186ec333368f15a96ae0e7b7fada..7d227303ad063fbaca41e7aa6f3b7b388eb72d07 100644
--- a/tree/inc/TBasket.h
+++ b/tree/inc/TBasket.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TBasket.h,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TBasket.h,v 1.2 2000/07/12 16:32:53 brun Exp $
// Author: Rene Brun 19/01/96
/*************************************************************************
@@ -55,15 +55,15 @@ public:
virtual void AdjustSize(Int_t newsize);
virtual Int_t DropBuffers();
- TBranch *GetBranch() {return fBranch;}
- Int_t GetBufferSize() {return fBufferSize;}
- Int_t *GetDisplacement() {return fDisplacement;}
- Int_t *GetEntryOffset() {return fEntryOffset;}
+ TBranch *GetBranch() const {return fBranch;}
+ Int_t GetBufferSize() const {return fBufferSize;}
+ Int_t *GetDisplacement() const {return fDisplacement;}
+ Int_t *GetEntryOffset() const {return fEntryOffset;}
virtual Int_t GetEntryPointer(Int_t Entry);
- char *GetZipBuffer() {return fZipBuffer;}
- Int_t GetNevBuf() {return fNevBuf;}
- Int_t GetNevBufSize() {return fNevBufSize;}
- Int_t GetLast() {return fLast;}
+ char *GetZipBuffer() const {return fZipBuffer;}
+ Int_t GetNevBuf() const {return fNevBuf;}
+ Int_t GetNevBufSize() const {return fNevBufSize;}
+ Int_t GetLast() const {return fLast;}
virtual void ReadBasketBuffers(Seek_t pos, Int_t len, TFile *file);
virtual Int_t ReadBasketBytes(Seek_t pos, TFile *file);
diff --git a/tree/inc/TBranch.h b/tree/inc/TBranch.h
index 2670c5f4f6b614b986e49ad5d33537ab932908d6..6e69b08207b89e5585a254b9d4dff2a236e10833 100644
--- a/tree/inc/TBranch.h
+++ b/tree/inc/TBranch.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TBranch.h,v 1.3 2000/11/21 20:46:38 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TBranch.h,v 1.4 2000/11/24 10:29:03 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -89,55 +89,55 @@ public:
TBranch(const char *name, void *address, const char *leaflist, Int_t basketsize=32000, Int_t compress=-1);
virtual ~TBranch();
- virtual void Browse(TBrowser *b);
- virtual void DropBaskets();
- virtual Int_t Fill();
- virtual char *GetAddress() {return fAddress;}
- virtual Int_t GetBasketSize() {return fBasketSize;}
- virtual Int_t GetCompressionLevel() {return fCompress;}
- virtual Int_t GetEntry(Int_t entry=0, Int_t getall = 0);
- virtual Int_t GetEntryExport(Int_t entry, Int_t getall, TClonesArray *list, Int_t n);
- Int_t GetEvent(Int_t entry=0) {return GetEntry(entry);}
- Int_t GetEntryOffsetLen() {return fEntryOffsetLen;}
- virtual TLeaf *GetLeaf(const char *name);
+ virtual void Browse(TBrowser *b);
+ virtual void DropBaskets();
+ virtual Int_t Fill();
+ virtual char *GetAddress() const {return fAddress;}
+ virtual Int_t GetBasketSize() const {return fBasketSize;}
+ virtual Int_t GetCompressionLevel() const {return fCompress;}
+ virtual Int_t GetEntry(Int_t entry=0, Int_t getall = 0);
+ virtual Int_t GetEntryExport(Int_t entry, Int_t getall, TClonesArray *list, Int_t n);
+ Int_t GetEvent(Int_t entry=0) {return GetEntry(entry);}
+ Int_t GetEntryOffsetLen() const {return fEntryOffsetLen;}
+ virtual TLeaf *GetLeaf(const char *name) const;
TBasket *GetBasket(Int_t basket);
- Int_t *GetBasketBytes() {return fBasketBytes;}
- virtual Seek_t GetBasketSeek(Int_t basket);
- TDirectory *GetDirectory() {return fDirectory;}
+ Int_t *GetBasketBytes() const {return fBasketBytes;}
+ virtual Seek_t GetBasketSeek(Int_t basket) const;
+ TDirectory *GetDirectory() const {return fDirectory;}
virtual TFile *GetFile(Int_t mode=0);
const char *GetFileName() const {return fFileName.Data();}
- Int_t GetOffset() {return fOffset;}
- Int_t GetReadBasket() {return fReadBasket;}
- Int_t GetReadEntry() {return fReadEntry;}
- Int_t GetWriteBasket() {return fWriteBasket;}
- Stat_t GetTotBytes() {return fTotBytes;}
- Stat_t GetZipBytes() {return fZipBytes;}
- Int_t GetEntryNumber() {return fEntryNumber;}
- TObjArray *GetListOfBaskets() {return &fBaskets;}
- TObjArray *GetListOfBranches() {return &fBranches;}
- TObjArray *GetListOfLeaves() {return &fLeaves;}
- Int_t GetMaxBaskets() {return fMaxBaskets;}
- Int_t GetNleaves() {return fNleaves;}
- Stat_t GetEntries() {return fEntries;}
- TTree *GetTree() {return fTree;}
- virtual Int_t GetRow(Int_t row);
- Bool_t IsAutoDelete();
- Bool_t IsFolder() const;
- virtual void Print(Option_t *option="");
- virtual void ReadBasket(TBuffer &b);
- virtual void Reset(Option_t *option="");
- virtual void ResetReadEntry() {fReadEntry = -1;}
- virtual void SetAddress(void *add);
- virtual void SetAutoDelete(Bool_t autodel=kTRUE);
- virtual void SetBasketSize(Int_t buffsize) {fBasketSize=buffsize;}
- virtual void SetBufferAddress(TBuffer *entryBuffer);
- virtual void SetCompressionLevel(Int_t level=1);
- virtual void SetEntryOffsetLen(Int_t len) {fEntryOffsetLen = len;}
- virtual void SetFile(TFile *file=0);
- virtual void SetFile(const char *filename);
- virtual void SetOffset(Int_t offset=0) {fOffset=offset;}
- virtual void SetTree(TTree *tree) { fTree = tree;}
- virtual void UpdateAddress() {;}
+ Int_t GetOffset() const {return fOffset;}
+ Int_t GetReadBasket() const {return fReadBasket;}
+ Int_t GetReadEntry() const {return fReadEntry;}
+ Int_t GetWriteBasket() const {return fWriteBasket;}
+ Stat_t GetTotBytes() const {return fTotBytes;}
+ Stat_t GetZipBytes() const {return fZipBytes;}
+ Int_t GetEntryNumber() const {return fEntryNumber;}
+ TObjArray *GetListOfBaskets() {return &fBaskets;}
+ TObjArray *GetListOfBranches() {return &fBranches;}
+ TObjArray *GetListOfLeaves() {return &fLeaves;}
+ Int_t GetMaxBaskets() const {return fMaxBaskets;}
+ Int_t GetNleaves() const {return fNleaves;}
+ Stat_t GetEntries() const {return fEntries;}
+ TTree *GetTree() const {return fTree;}
+ virtual Int_t GetRow(Int_t row);
+ Bool_t IsAutoDelete() const;
+ Bool_t IsFolder() const;
+ virtual void Print(Option_t *option="") const;
+ virtual void ReadBasket(TBuffer &b);
+ virtual void Reset(Option_t *option="");
+ virtual void ResetReadEntry() {fReadEntry = -1;}
+ virtual void SetAddress(void *add);
+ virtual void SetAutoDelete(Bool_t autodel=kTRUE);
+ virtual void SetBasketSize(Int_t buffsize) {fBasketSize=buffsize;}
+ virtual void SetBufferAddress(TBuffer *entryBuffer);
+ virtual void SetCompressionLevel(Int_t level=1);
+ virtual void SetEntryOffsetLen(Int_t len) {fEntryOffsetLen = len;}
+ virtual void SetFile(TFile *file=0);
+ virtual void SetFile(const char *filename);
+ virtual void SetOffset(Int_t offset=0) {fOffset=offset;}
+ virtual void SetTree(TTree *tree) { fTree = tree;}
+ virtual void UpdateAddress() {;}
ClassDef(TBranch,6) //Branch descriptor
};
diff --git a/tree/inc/TBranchClones.h b/tree/inc/TBranchClones.h
index 4fb518d2e4e45924ad0d282910645887d2e6f68a..22b168514270d7e8e116198ea98ac748c4af93a7 100644
--- a/tree/inc/TBranchClones.h
+++ b/tree/inc/TBranchClones.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TBranchClones.h,v 1.2 2000/09/05 09:21:24 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TBranchClones.h,v 1.3 2000/11/21 20:46:58 brun Exp $
// Author: Rene Brun 11/02/96
/*************************************************************************
@@ -47,10 +47,10 @@ public:
virtual void Browse(TBrowser *b);
virtual Int_t Fill();
virtual Int_t GetEntry(Int_t entry=0, Int_t getall = 0);
- virtual Int_t GetN() {return fN;}
- TClonesArray *GetList() {return fList;}
+ virtual Int_t GetN() const {return fN;}
+ TClonesArray *GetList() const {return fList;}
Bool_t IsFolder() const {return kTRUE;}
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void Reset(Option_t *option="");
virtual void SetAddress(void *add);
virtual void SetBasketSize(Int_t buffsize);
diff --git a/tree/inc/TBranchObject.h b/tree/inc/TBranchObject.h
index 0d5573d819daebe50d8ec2dc20a3b0b94037e676..947d554d3b22cf28ef3cd003612ca5be4542515a 100644
--- a/tree/inc/TBranchObject.h
+++ b/tree/inc/TBranchObject.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TBranchObject.h,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TBranchObject.h,v 1.2 2000/09/05 09:21:24 brun Exp $
// Author: Rene Brun 11/02/96
/*************************************************************************
@@ -42,7 +42,7 @@ public:
virtual Int_t Fill();
virtual Int_t GetEntry(Int_t entry=0, Int_t getall = 0);
Bool_t IsFolder() const;
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void Reset(Option_t *option="");
virtual void SetAddress(void *addobj);
virtual void SetAutoDelete(Bool_t autodel=kTRUE);
diff --git a/tree/inc/TChain.h b/tree/inc/TChain.h
index 31b03d526507257d0284486dfc9f7a409d8d3d81..e9e5a5a5e4c44d588eef4c72c143e7fd72472deb 100644
--- a/tree/inc/TChain.h
+++ b/tree/inc/TChain.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TChain.h,v 1.8 2000/08/15 08:56:00 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TChain.h,v 1.9 2000/11/21 20:47:14 brun Exp $
// Author: Rene Brun 03/02/97
/*************************************************************************
@@ -55,29 +55,29 @@ public:
virtual Int_t Draw(const char *varexp, const char *selection, Option_t *option=""
,Int_t nentries=1000000000, Int_t firstentry=0); // *MENU*
virtual TBranch *GetBranch(const char *name);
- virtual Int_t GetChainEntryNumber(Int_t entry);
- Int_t GetNtrees() {return fNtrees;}
+ virtual Int_t GetChainEntryNumber(Int_t entry) const;
+ Int_t GetNtrees() const {return fNtrees;}
virtual Int_t GetEntry(Int_t entry=0, Int_t getall=0);
- TFile *GetFile() {return fFile;}
+ TFile *GetFile() const {return fFile;}
TLeaf *GetLeaf(const char *name);
TObjArray *GetListOfBranches();
- TObjArray *GetListOfFiles() {return fFiles;}
+ TObjArray *GetListOfFiles() const {return fFiles;}
TObjArray *GetListOfLeaves();
virtual Double_t GetMaximum(const char *columname);
virtual Double_t GetMinimum(const char *columname);
virtual Int_t GetNbranches();
- TObject *GetNotify() {return fNotify;}
- TList *GetStatus() {return fStatus;}
- TTree *GetTree() {return fTree;}
- Int_t GetTreeNumber() {return fTreeNumber;}
- Int_t *GetTreeOffset() {return fTreeOffset;}
- Int_t GetTreeOffsetLen() {return fTreeOffsetLen;}
+ TObject *GetNotify() const {return fNotify;}
+ TList *GetStatus() const {return fStatus;}
+ TTree *GetTree() const {return fTree;}
+ Int_t GetTreeNumber() const {return fTreeNumber;}
+ Int_t *GetTreeOffset() const {return fTreeOffset;}
+ Int_t GetTreeOffsetLen() const {return fTreeOffsetLen;}
Int_t LoadTree(Int_t entry);
virtual void Loop(Option_t *option="",Int_t nentries=1000000000, Int_t firstentry=0); // *MENU*
- virtual void ls(Option_t *option="");
+ virtual void ls(Option_t *option="") const;
virtual void Merge(const char *name);
virtual void Merge(TFile *file, Int_t basketsize, Option_t *option="");
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual Int_t Process(const char *filename,Option_t *option="", Int_t nentries=1000000000, Int_t firstentry=0); // *MENU*
virtual Int_t Process(TSelector *selector,Option_t *option="", Int_t nentries=1000000000, Int_t firstentry=0);
virtual void SetBranchAddress(const char *bname,void *add);
diff --git a/tree/inc/TChainElement.h b/tree/inc/TChainElement.h
index a0080583fb9d851d5fb014b5c3ac092bf1f59d38..107f6de62c0922118834bf27c215d2032c481a5b 100644
--- a/tree/inc/TChainElement.h
+++ b/tree/inc/TChainElement.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TChainElement.h,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TChainElement.h,v 1.2 2000/11/21 20:47:29 brun Exp $
// Author: Rene Brun 11/02/97
/*************************************************************************
@@ -40,10 +40,10 @@ public:
TChainElement(const char *filename, const char *title);
virtual ~TChainElement();
virtual void CreatePackets();
- virtual void *GetBaddress() {return fBaddress;}
- virtual char *GetPackets() {return fPackets;}
- virtual Int_t GetPacketSize() {return fPacketSize;}
- virtual Int_t GetStatus() {return fStatus;}
+ virtual void *GetBaddress() const {return fBaddress;}
+ virtual char *GetPackets() const {return fPackets;}
+ virtual Int_t GetPacketSize() const {return fPacketSize;}
+ virtual Int_t GetStatus() const {return fStatus;}
virtual void SetBaddress(void *add) {fBaddress = add;}
virtual void SetNumberEntries(Int_t n) {fEntries=n;}
virtual void SetPacketSize(Int_t size = 100);
diff --git a/tree/inc/TEventList.h b/tree/inc/TEventList.h
index 1ee9f6646486e45939de62de196651bad094b937..b3b6386dd744b083f3aa56534f98c2e08bfaba9d 100644
--- a/tree/inc/TEventList.h
+++ b/tree/inc/TEventList.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TEventList.h,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TEventList.h,v 1.2 2000/11/21 20:47:45 brun Exp $
// Author: Rene Brun 11/02/97
/*************************************************************************
@@ -45,13 +45,13 @@ public:
virtual void Add(const TEventList *list);
virtual Bool_t Contains(Int_t entry);
virtual void Enter(Int_t entry);
- TDirectory *GetDirectory() {return fDirectory;}
+ TDirectory *GetDirectory() const {return fDirectory;}
virtual Int_t GetEntry(Int_t index) const;
virtual Int_t GetIndex(Int_t entry) const;
virtual Int_t *GetList() const { return fList; }
virtual Int_t GetN() const { return fN; }
virtual Int_t GetSize() const { return fSize; }
- virtual void Print(Option_t *option="");
+ virtual void Print(Option_t *option="") const;
virtual void Reset(Option_t *option="");
virtual void Resize(Int_t delta=0);
virtual void SetDelta(Int_t delta=100) {fDelta = delta;}
diff --git a/tree/inc/TLeaf.h b/tree/inc/TLeaf.h
index 82a1c852d003c88ceef9bf19921c5292297fc4d6..da80d7bed3e0853c2cbd29d00b5ad7d498e270f2 100644
--- a/tree/inc/TLeaf.h
+++ b/tree/inc/TLeaf.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeaf.h,v 1.3 2000/09/29 07:51:12 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeaf.h,v 1.4 2000/11/21 20:48:08 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -57,22 +57,22 @@ public:
virtual void Browse(TBrowser *b);
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
- TBranch *GetBranch() { return fBranch; }
- virtual TLeaf *GetLeafCount() { return fLeafCount; }
- virtual TLeaf *GetLeafCounter(Int_t &countval);
+ TBranch *GetBranch() const { return fBranch; }
+ virtual TLeaf *GetLeafCount() const { return fLeafCount; }
+ virtual TLeaf *GetLeafCounter(Int_t &countval) const;
virtual Int_t GetLen() const;
- virtual Int_t GetLenStatic() { return fLen; }
- virtual Int_t GetLenType() { return fLenType; }
- virtual Int_t GetMaximum() { return 0; }
- virtual Int_t GetMinimum() { return 0; }
- virtual Int_t GetNdata() { return fNdata; }
- virtual Int_t GetOffset() { return fOffset; }
- virtual void *GetValuePointer() { return 0; }
+ virtual Int_t GetLenStatic() const { return fLen; }
+ virtual Int_t GetLenType() const { return fLenType; }
+ virtual Int_t GetMaximum() const { return 0; }
+ virtual Int_t GetMinimum() const { return 0; }
+ virtual Int_t GetNdata() const { return fNdata; }
+ virtual Int_t GetOffset() const { return fOffset; }
+ virtual void *GetValuePointer() const { return 0; }
virtual const char *GetTypeName() const { return ""; }
- virtual Double_t GetValue(Int_t i=0);
+ virtual Double_t GetValue(Int_t i=0) const;
virtual void Import(TClonesArray *list, Int_t n);
- virtual Bool_t IsRange() { return fIsRange; }
- virtual Bool_t IsUnsigned() { return fIsUnsigned; }
+ virtual Bool_t IsRange() const { return fIsRange; }
+ virtual Bool_t IsUnsigned() const { return fIsUnsigned; }
virtual void ReadBasket(TBuffer &) {;}
virtual void ReadBasketExport(TBuffer &, TClonesArray *, Int_t) {;}
Int_t ResetAddress(void *add, Bool_t destructor = kFALSE);
@@ -88,7 +88,7 @@ public:
};
inline void TLeaf::Export(TClonesArray *, Int_t) { }
-inline Double_t TLeaf::GetValue(Int_t) { return 0; }
+inline Double_t TLeaf::GetValue(Int_t) const { return 0; }
inline void TLeaf::Import(TClonesArray *, Int_t) { }
inline void TLeaf::SetAddress(void *) { }
diff --git a/tree/inc/TLeafB.h b/tree/inc/TLeafB.h
index 61e5d50c422801c36eea250a0c4bb0dcf826ceb2..4267f233f231dedec5e5d169cd4f12c87c4fb1ed 100644
--- a/tree/inc/TLeafB.h
+++ b/tree/inc/TLeafB.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafB.h,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafB.h,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -41,10 +41,9 @@ public:
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
const char *GetTypeName() const;
- Double_t GetValue(Int_t i=0);
- virtual void *GetValuePointer() {return fValue;}
+ Double_t GetValue(Int_t i=0) const;
+ virtual void *GetValuePointer() const {return fValue;}
virtual void Import(TClonesArray *list, Int_t n);
- virtual void Print(Option_t *option="");
virtual void ReadBasket(TBuffer &b);
virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n);
virtual void SetAddress(void *add=0);
@@ -52,7 +51,7 @@ public:
ClassDef(TLeafB,1) //A TLeaf for an 8 bit Integer data type.
};
-inline Double_t TLeafB::GetValue(Int_t i)
+inline Double_t TLeafB::GetValue(Int_t i) const
{ return (IsUnsigned())? (UChar_t)(fValue[i]):fValue[i]; }
#endif
diff --git a/tree/inc/TLeafC.h b/tree/inc/TLeafC.h
index e0120b5b361e5075b667abff8057ecf9f244850a..9c6059629c49bc31718a9ba436a0fdcd71bd6a09 100644
--- a/tree/inc/TLeafC.h
+++ b/tree/inc/TLeafC.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafC.h,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafC.h,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 17/03/97
/*************************************************************************
@@ -40,14 +40,13 @@ public:
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
- virtual Int_t GetMaximum() {return fMaximum;}
- virtual Int_t GetMinimum() {return fMinimum;}
+ virtual Int_t GetMaximum() const {return fMaximum;}
+ virtual Int_t GetMinimum() const {return fMinimum;}
const char *GetTypeName() const;
- Double_t GetValue(Int_t i=0);
- virtual void *GetValuePointer() {return fValue;}
- char *GetValueString() {return fValue;}
+ Double_t GetValue(Int_t i=0) const;
+ virtual void *GetValuePointer() const {return fValue;}
+ char *GetValueString() const {return fValue;}
virtual void Import(TClonesArray *list, Int_t n);
- virtual void Print(Option_t *option="");
virtual void ReadBasket(TBuffer &b);
virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n);
virtual void SetAddress(void *add=0);
@@ -55,6 +54,6 @@ public:
ClassDef(TLeafC,1) //A TLeaf for a variable length string.
};
-inline Double_t TLeafC::GetValue(Int_t i) { return fValue[i]; }
+inline Double_t TLeafC::GetValue(Int_t i) const { return fValue[i]; }
#endif
diff --git a/tree/inc/TLeafD.h b/tree/inc/TLeafD.h
index 774a16d0d6a3176216a4463d5d0415edf1fd6ceb..2cdbc5bc32d6554ab2f574e4a577756ab08632e7 100644
--- a/tree/inc/TLeafD.h
+++ b/tree/inc/TLeafD.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafD.h,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafD.h,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -41,10 +41,9 @@ public:
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
const char *GetTypeName() const {return "Double_t";}
- Double_t GetValue(Int_t i=0);
- virtual void *GetValuePointer() {return fValue;}
+ Double_t GetValue(Int_t i=0) const;
+ virtual void *GetValuePointer() const {return fValue;}
virtual void Import(TClonesArray *list, Int_t n);
- virtual void Print(Option_t *option="");
virtual void ReadBasket(TBuffer &b);
virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n);
virtual void SetAddress(void *add=0);
@@ -52,6 +51,6 @@ public:
ClassDef(TLeafD,1) //A TLeaf for a 64 bit floating point data type.
};
-inline Double_t TLeafD::GetValue(Int_t i) { return fValue[i]; }
+inline Double_t TLeafD::GetValue(Int_t i) const { return fValue[i]; }
#endif
diff --git a/tree/inc/TLeafF.h b/tree/inc/TLeafF.h
index 65f8265808be044ac6adda243a0922afd0818399..7832f32eea9d9e21d331a85eef6b02f9ab865c6e 100644
--- a/tree/inc/TLeafF.h
+++ b/tree/inc/TLeafF.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafF.h,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafF.h,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -41,10 +41,9 @@ public:
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
const char *GetTypeName() const {return "Float_t";}
- Double_t GetValue(Int_t i=0);
- virtual void *GetValuePointer() {return fValue;}
+ Double_t GetValue(Int_t i=0) const;
+ virtual void *GetValuePointer() const {return fValue;}
virtual void Import(TClonesArray *list, Int_t n);
- virtual void Print(Option_t *option="");
virtual void ReadBasket(TBuffer &b);
virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n);
virtual void SetAddress(void *add=0);
@@ -52,6 +51,6 @@ public:
ClassDef(TLeafF,1) //A TLeaf for a 32 bit floating point data type.
};
-inline Double_t TLeafF::GetValue(Int_t i) { return fValue[i]; }
+inline Double_t TLeafF::GetValue(Int_t i) const { return fValue[i]; }
#endif
diff --git a/tree/inc/TLeafI.h b/tree/inc/TLeafI.h
index 6b4c062fa2f8605529a085d18e1cd2ecea4b750a..63e19907b1bfeb2eca0a4008e626fec0490bf6b4 100644
--- a/tree/inc/TLeafI.h
+++ b/tree/inc/TLeafI.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafI.h,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafI.h,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -42,12 +42,11 @@ public:
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
const char *GetTypeName() const;
- virtual Int_t GetMaximum() {return fMaximum;}
- virtual Int_t GetMinimum() {return fMinimum;}
- Double_t GetValue(Int_t i=0);
- virtual void *GetValuePointer() {return fValue;}
+ virtual Int_t GetMaximum() const {return fMaximum;}
+ virtual Int_t GetMinimum() const {return fMinimum;}
+ Double_t GetValue(Int_t i=0) const;
+ virtual void *GetValuePointer() const {return fValue;}
virtual void Import(TClonesArray *list, Int_t n);
- virtual void Print(Option_t *option="");
virtual void ReadBasket(TBuffer &b);
virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n);
virtual void SetAddress(void *add=0);
diff --git a/tree/inc/TLeafObject.h b/tree/inc/TLeafObject.h
index 2f060194b5a466ae28b2d6f4455ef95ae26c3c23..a334053df3c296a07a294217000b120399283981 100644
--- a/tree/inc/TLeafObject.h
+++ b/tree/inc/TLeafObject.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafObject.h,v 1.2 2000/05/29 06:19:21 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafObject.h,v 1.3 2000/11/21 20:48:23 brun Exp $
// Author: Rene Brun 27/01/96
/*************************************************************************
@@ -33,7 +33,7 @@ class TLeafObject : public TLeaf {
protected:
TClass *fClass; //! pointer to class
- void **fObjAddress; //! Address of Pointer to object
+ void **fObjAddress; //! Address of Pointer to object
Bool_t fVirtual; //! Support for Virtuality
public:
@@ -42,11 +42,11 @@ public:
virtual ~TLeafObject();
virtual void FillBasket(TBuffer &b);
- TClass *GetClass() {return fClass;}
- TMethodCall *GetMethodCall(const char *name);
- TObject *GetObject() {return (TObject*)(*fObjAddress);}
- const char *GetTypeName() const ;
- Bool_t IsVirtual() {return fVirtual;}
+ TClass *GetClass() const {return fClass;}
+ TMethodCall *GetMethodCall(const char *name);
+ TObject *GetObject() const {return (TObject*)(*fObjAddress);}
+ const char *GetTypeName() const ;
+ Bool_t IsVirtual() const {return fVirtual;}
virtual void ReadBasket(TBuffer &b);
virtual void SetAddress(void *add=0);
virtual void SetVirtual(Bool_t virt=kTRUE) {fVirtual=virt;}
diff --git a/tree/inc/TLeafS.h b/tree/inc/TLeafS.h
index 3607bae1c6e689ee3941d89637921c2bc6beb3d3..628f738778769c663fef1e5bebba252f56184149 100644
--- a/tree/inc/TLeafS.h
+++ b/tree/inc/TLeafS.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafS.h,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafS.h,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -41,10 +41,9 @@ public:
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
const char *GetTypeName() const;
- Double_t GetValue(Int_t i=0);
- virtual void *GetValuePointer() {return fValue;}
+ Double_t GetValue(Int_t i=0) const;
+ virtual void *GetValuePointer() const {return fValue;}
virtual void Import(TClonesArray *list, Int_t n);
- virtual void Print(Option_t *option="");
virtual void ReadBasket(TBuffer &b);
virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n);
virtual void SetAddress(void *add=0);
diff --git a/tree/inc/TTree.h b/tree/inc/TTree.h
index a482365295593a3a193279ca811f9b24335c4d3a..8a8745485c7ffafa5d0e0369f74ee1abd2f67e16 100644
--- a/tree/inc/TTree.h
+++ b/tree/inc/TTree.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TTree.h,v 1.17 2000/12/04 16:45:09 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TTree.h,v 1.18 2000/12/10 17:14:36 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -111,7 +111,7 @@ protected:
TVirtualTreePlayer *fPlayer; //! Pointer to current Tree player
protected:
- const char *GetNameByIndex(TString &varexp, Int_t *index,Int_t colindex);
+ const char *GetNameByIndex(TString &varexp, Int_t *index,Int_t colindex) const;
virtual void MakeIndex(TString &varexp, Int_t *index);
public:
@@ -150,40 +150,40 @@ public:
,Int_t nentries=1000000000, Int_t firstentry=0); // *MENU*
virtual TBranch *GetBranch(const char *name);
- virtual Int_t GetChainEntryNumber(Int_t entry) {return entry;}
+ virtual Int_t GetChainEntryNumber(Int_t entry) const {return entry;}
virtual Int_t GetChainOffset() const { return fChainOffset; }
- TFile *GetCurrentFile();
- TDirectory *GetDirectory() {return fDirectory;}
- virtual Stat_t GetEntries() {return fEntries;}
+ TFile *GetCurrentFile() const;
+ TDirectory *GetDirectory() const {return fDirectory;}
+ virtual Stat_t GetEntries() const {return fEntries;}
virtual Int_t GetEstimate() const { return fEstimate; }
virtual Int_t GetEntry(Int_t entry=0, Int_t getall=0);
Int_t GetEvent(Int_t entry=0, Int_t getall=0) {return GetEntry(entry,getall);}
virtual Int_t GetEntryWithIndex(Int_t major, Int_t minor);
- virtual Int_t GetEntryNumberWithIndex(Int_t major, Int_t minor);
- TEventList *GetEventList() {return fEventList;}
- virtual Int_t GetEntryNumber(Int_t entry);
+ virtual Int_t GetEntryNumberWithIndex(Int_t major, Int_t minor) const;
+ TEventList *GetEventList() const {return fEventList;}
+ virtual Int_t GetEntryNumber(Int_t entry) const;
TH1 *GetHistogram() {return GetPlayer()->GetHistogram();}
virtual Int_t *GetIndex() {return &fIndex.fArray[0];}
virtual Double_t *GetIndexValues() {return &fIndexValues.fArray[0];}
virtual TLeaf *GetLeaf(const char *name);
- virtual TObjArray *GetListOfBranches() {return &fBranches;}
- virtual TObjArray *GetListOfLeaves() {return &fLeaves;}
- virtual Int_t GetMaxEntryLoop() {return fMaxEntryLoop;}
- virtual Double_t GetMaximum(const char *columname);
- virtual Double_t GetMinimum(const char *columname);
- virtual Int_t GetMaxVirtualSize() {return fMaxVirtualSize;}
- virtual Int_t GetNbranches() {return fBranches.GetEntriesFast();}
+ virtual TObjArray *GetListOfBranches() {return &fBranches;}
+ virtual TObjArray *GetListOfLeaves() {return &fLeaves;}
+ virtual Int_t GetMaxEntryLoop() const {return fMaxEntryLoop;}
+ virtual Double_t GetMaximum(const char *columname) const;
+ virtual Double_t GetMinimum(const char *columname) const;
+ virtual Int_t GetMaxVirtualSize() const {return fMaxVirtualSize;}
+ virtual Int_t GetNbranches() const {return fBranches.GetEntriesFast();}
TVirtualTreePlayer *GetPlayer();
virtual Int_t GetPacketSize() const {return fPacketSize;}
- virtual Int_t GetReadEntry() {return fReadEntry;}
- virtual Int_t GetReadEvent() {return fReadEntry;}
- virtual Int_t GetScanField() {return fScanField;}
+ virtual Int_t GetReadEntry() const {return fReadEntry;}
+ virtual Int_t GetReadEvent() const {return fReadEntry;}
+ virtual Int_t GetScanField() const {return fScanField;}
TTreeFormula *GetSelect() {return GetPlayer()->GetSelect();}
- virtual Int_t GetSelectedRows() {return GetPlayer()->GetSelectedRows();}
- virtual Int_t GetTimerInterval() {return fTimerInterval;}
- virtual TTree *GetTree() {return this;}
- virtual Int_t GetUpdate() {return fUpdate;}
- virtual Int_t GetTreeNumber() {return 0;}
+ virtual Int_t GetSelectedRows() {return GetPlayer()->GetSelectedRows();}
+ virtual Int_t GetTimerInterval() const {return fTimerInterval;}
+ virtual TTree *GetTree() const {return (TTree*)this;}
+ virtual Int_t GetUpdate() const {return fUpdate;}
+ virtual Int_t GetTreeNumber() const {return 0;}
TTreeFormula *GetVar1() {return GetPlayer()->GetVar1();}
TTreeFormula *GetVar2() {return GetPlayer()->GetVar2();}
TTreeFormula *GetVar3() {return GetPlayer()->GetVar3();}
@@ -192,8 +192,8 @@ public:
virtual Double_t *GetV2() {return GetPlayer()->GetV2();}
virtual Double_t *GetV3() {return GetPlayer()->GetV3();}
virtual Double_t *GetW() {return GetPlayer()->GetW();}
- virtual Stat_t GetTotBytes() {return fTotBytes;}
- virtual Stat_t GetZipBytes() {return fZipBytes;}
+ virtual Stat_t GetTotBytes() const {return fTotBytes;}
+ virtual Stat_t GetZipBytes() const {return fZipBytes;}
virtual void IncrementTotalBuffers(Int_t nbytes) {fTotalBuffers += nbytes;}
Bool_t IsFolder() const {return kTRUE;}
virtual Int_t LoadTree(Int_t entry);
@@ -204,7 +204,7 @@ public:
Bool_t MemoryFull(Int_t nbytes);
TPrincipal *Principal(const char *varexp="", const char *selection="", Option_t *option="np"
,Int_t nentries=1000000000, Int_t firstentry=0);
- virtual void Print(Option_t *option=""); // *MENU*
+ virtual void Print(Option_t *option="") const; // *MENU*
virtual Int_t Process(const char *filename,Option_t *option="", Int_t nentries=1000000000, Int_t firstentry=0); // *MENU*
virtual Int_t Process(TSelector *selector, Option_t *option="", Int_t nentries=1000000000, Int_t firstentry=0);
virtual Int_t Project(const char *hname, const char *varexp, const char *selection="", Option_t *option=""
diff --git a/tree/inc/TVirtualTreePlayer.h b/tree/inc/TVirtualTreePlayer.h
index 4fea1c8ed3e759302c460f70b22afeafe7954ea1..eb3687a02513f9dd4274d08936bc9dfcf04d5eaf 100644
--- a/tree/inc/TVirtualTreePlayer.h
+++ b/tree/inc/TVirtualTreePlayer.h
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TVirtualTreePlayer.h,v 1.7 2000/07/18 16:35:00 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TVirtualTreePlayer.h,v 1.8 2000/08/17 09:46:59 brun Exp $
// Author: Rene Brun 30/08/99
/*************************************************************************
@@ -48,19 +48,19 @@ public:
,Int_t nentries, Int_t firstentry) = 0;
virtual Int_t Fit(const char *formula ,const char *varexp, const char *selection,Option_t *option ,Option_t *goption
,Int_t nentries, Int_t firstentry) = 0;
- virtual Int_t GetDimension() = 0;
- virtual TH1 *GetHistogram() = 0;
+ virtual Int_t GetDimension() const = 0;
+ virtual TH1 *GetHistogram() const = 0;
virtual void GetNextPacket(TSlave *sl, Int_t &nentries, Stat_t &firstentry, Stat_t &processed) = 0;
- virtual Int_t GetSelectedRows() = 0;
- virtual TTreeFormula *GetSelect() = 0;
- virtual TTreeFormula *GetVar1() = 0;
- virtual TTreeFormula *GetVar2() = 0;
- virtual TTreeFormula *GetVar3() = 0;
- virtual TTreeFormula *GetVar4() = 0;
- virtual Double_t *GetV1() = 0;
- virtual Double_t *GetV2() = 0;
- virtual Double_t *GetV3() = 0;
- virtual Double_t *GetW() = 0;
+ virtual Int_t GetSelectedRows() const = 0;
+ virtual TTreeFormula *GetSelect() const = 0;
+ virtual TTreeFormula *GetVar1() const = 0;
+ virtual TTreeFormula *GetVar2() const = 0;
+ virtual TTreeFormula *GetVar3() const = 0;
+ virtual TTreeFormula *GetVar4() const = 0;
+ virtual Double_t *GetV1() const = 0;
+ virtual Double_t *GetV2() const = 0;
+ virtual Double_t *GetV3() const = 0;
+ virtual Double_t *GetW() const = 0;
virtual void Loop(Option_t *option,Int_t nentries, Int_t firstentry) = 0;
virtual Int_t MakeClass(const char *classname, const char *option) = 0;
virtual Int_t MakeCode(const char *filename) = 0;
diff --git a/tree/src/TBranch.cxx b/tree/src/TBranch.cxx
index c37d4c4e12725f1d86be1a9a1590800549ef75f2..a86488dd544437036ee98712360c88e53aa928c9 100644
--- a/tree/src/TBranch.cxx
+++ b/tree/src/TBranch.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TBranch.cxx,v 1.8 2000/10/09 13:55:26 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TBranch.cxx,v 1.9 2000/11/21 20:49:18 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -492,7 +492,7 @@ TBasket *TBranch::GetBasket(Int_t basketnumber)
}
//______________________________________________________________________________
-Seek_t TBranch::GetBasketSeek(Int_t basketnumber)
+Seek_t TBranch::GetBasketSeek(Int_t basketnumber) const
{
//*-*-*-*-*Return address of basket in the file*-*-*-*-*-*
//*-* ====================================
@@ -635,7 +635,7 @@ TFile *TBranch::GetFile(Int_t mode)
}
//______________________________________________________________________________
-TLeaf *TBranch::GetLeaf(const char *name)
+TLeaf *TBranch::GetLeaf(const char *name) const
{
//*-*-*-*-*-*Return pointer to the 1st Leaf named name in thisBranch-*-*-*-*-*
//*-* =======================================================
@@ -660,7 +660,7 @@ Int_t TBranch::GetRow(Int_t)
//______________________________________________________________________________
-Bool_t TBranch::IsAutoDelete()
+Bool_t TBranch::IsAutoDelete() const
{
//*-*-*-*-*Return TRUE if an existing object in a TBranchObject must be deleted
//*-* ==================================================
@@ -680,7 +680,7 @@ Bool_t TBranch::IsFolder() const
}
//______________________________________________________________________________
-void TBranch::Print(Option_t *)
+void TBranch::Print(Option_t *) const
{
//*-*-*-*-*-*-*-*-*-*-*-*Print TBranch parameters*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ========================
diff --git a/tree/src/TBranchClones.cxx b/tree/src/TBranchClones.cxx
index 5bb4bb6c3f8968f6abd3737469e4e3f873e6439f..1dbf7e2e66c720af9d79936dfa3b2284987506c4 100644
--- a/tree/src/TBranchClones.cxx
+++ b/tree/src/TBranchClones.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TBranchClones.cxx,v 1.6 2000/12/09 16:00:28 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TBranchClones.cxx,v 1.7 2000/12/10 17:14:36 brun Exp $
// Author: Rene Brun 11/02/96
/*************************************************************************
@@ -237,7 +237,7 @@ Int_t TBranchClones::GetEntry(Int_t entry, Int_t getall)
}
//______________________________________________________________________________
-void TBranchClones::Print(Option_t *option)
+void TBranchClones::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*Print TBranch parameters*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ========================
@@ -246,7 +246,7 @@ void TBranchClones::Print(Option_t *option)
Int_t i;
Int_t nbranches = fBranches.GetEntriesFast();
for (i=0;i<nbranches;i++) {
- TBranch *branch = (TBranch*)fBranches[i];
+ TBranch *branch = (TBranch*)fBranches.At(i);
branch->Print(option);
}
}
@@ -267,7 +267,7 @@ void TBranchClones::Reset(Option_t *option)
Int_t i;
Int_t nbranches = fBranches.GetEntriesFast();
for (i=0;i<nbranches;i++) {
- TBranch *branch = (TBranch*)fBranches[i];
+ TBranch *branch = (TBranch*)fBranches.At(i);
branch->Reset(option);
}
fBranchCount->Reset();
diff --git a/tree/src/TBranchObject.cxx b/tree/src/TBranchObject.cxx
index befd4eecf3c440669d47bb6c176027c379e70093..126797734661ad1198409994d2ba4c80351b74a9 100644
--- a/tree/src/TBranchObject.cxx
+++ b/tree/src/TBranchObject.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TBranchObject.cxx,v 1.5 2000/12/07 07:26:54 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TBranchObject.cxx,v 1.6 2000/12/10 17:14:36 brun Exp $
// Author: Rene Brun 11/02/96
/*************************************************************************
@@ -195,7 +195,7 @@ Bool_t TBranchObject::IsFolder() const
}
//______________________________________________________________________________
-void TBranchObject::Print(Option_t *option)
+void TBranchObject::Print(Option_t *option) const
{
//*-*-*-*-*-*-*-*-*-*-*-*Print TBranch parameters*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* ========================
@@ -207,7 +207,7 @@ void TBranchObject::Print(Option_t *option)
Printf("*Entries : %8d : BranchObject (see below) *",Int_t(fEntries));
Printf("*............................................................................*");
for (i=0;i<nbranches;i++) {
- TBranch *branch = (TBranch*)fBranches[i];
+ TBranch *branch = (TBranch*)fBranches.At(i);
branch->Print(option);
}
} else {
diff --git a/tree/src/TChain.cxx b/tree/src/TChain.cxx
index 9b92c46f5578aff264fe9b200985f4cf8e2ae85e..1516244c099f163928b5d06725a52ba31046c98f 100644
--- a/tree/src/TChain.cxx
+++ b/tree/src/TChain.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TChain.cxx,v 1.10 2000/10/09 13:56:40 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TChain.cxx,v 1.11 2000/11/21 20:49:45 brun Exp $
// Author: Rene Brun 03/02/97
/*************************************************************************
@@ -266,7 +266,7 @@ TBranch *TChain::GetBranch(const char *name)
}
//______________________________________________________________________________
-Int_t TChain::GetChainEntryNumber(Int_t entry)
+Int_t TChain::GetChainEntryNumber(Int_t entry) const
{
// return absolute entry number in the chain
// the input parameter entry is the entry number in the current Tree of this chain
@@ -476,7 +476,7 @@ void TChain::Loop(Option_t *option, Int_t nentries, Int_t firstentry)
//______________________________________________________________________________
-void TChain::ls(Option_t *option)
+void TChain::ls(Option_t *option) const
{
fFiles->ls(option);
}
@@ -591,7 +591,7 @@ void TChain::Merge(TFile *file, Int_t basketsize, Option_t *option)
//______________________________________________________________________________
-void TChain::Print(Option_t *option)
+void TChain::Print(Option_t *option) const
{
fFiles->ls(option);
}
diff --git a/tree/src/TEventList.cxx b/tree/src/TEventList.cxx
index d6afe3e6b0456a581fa6953692686db6508e2926..49e35fc8ad2f022afd4b4cd7679a401eab6f342d 100644
--- a/tree/src/TEventList.cxx
+++ b/tree/src/TEventList.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TEventList.cxx,v 1.3 2000/11/21 20:50:05 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TEventList.cxx,v 1.4 2000/12/11 22:17:19 brun Exp $
// Author: Rene Brun 11/02/97
/*************************************************************************
@@ -204,7 +204,7 @@ Int_t TEventList::GetIndex(Int_t entry) const
}
//______________________________________________________________________________
-void TEventList::Print(Option_t *option)
+void TEventList::Print(Option_t *option) const
{
// Print contents of this list
diff --git a/tree/src/TLeaf.cxx b/tree/src/TLeaf.cxx
index e8caf011886713717db54d19e24cee68fd4d83a8..4c1f5aa8e3098464e6011fb957d7055998cc7c7c 100644
--- a/tree/src/TLeaf.cxx
+++ b/tree/src/TLeaf.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeaf.cxx,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TLeaf.cxx,v 1.2 2000/11/21 20:50:21 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -100,7 +100,7 @@ void TLeaf::FillBasket(TBuffer &)
}
//______________________________________________________________________________
-TLeaf *TLeaf::GetLeafCounter(Int_t &countval)
+TLeaf *TLeaf::GetLeafCounter(Int_t &countval) const
{
//*-*-*-*-*-*-*Return Pointer to counter of referenced Leaf*-*-*-*-*-*-*-*
//*-* ============================================
diff --git a/tree/src/TLeafB.cxx b/tree/src/TLeafB.cxx
index 4e1aff4d40bcae756cf4439c4d9889e3b653998c..5fcb7de291a21149d3e588e65fb0552108462c79 100644
--- a/tree/src/TLeafB.cxx
+++ b/tree/src/TLeafB.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafB.cxx,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafB.cxx,v 1.2 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -109,17 +109,6 @@ void TLeafB::Import(TClonesArray *list, Int_t n)
}
-//______________________________________________________________________________
-void TLeafB::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Print a description of this leaf*-*-*-*-*-*-*-*-*
-//*-* ================================
-
- TLeaf::Print(option);
-
-}
-
-
//______________________________________________________________________________
void TLeafB::ReadBasket(TBuffer &b)
{
diff --git a/tree/src/TLeafC.cxx b/tree/src/TLeafC.cxx
index 9527f7d7f34b6150dcb659f7bba7b84b048b60e1..6ddae8dcc7ccfaff34b17e910dea2c330a0a6031 100644
--- a/tree/src/TLeafC.cxx
+++ b/tree/src/TLeafC.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafC.cxx,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafC.cxx,v 1.2 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 17/03/97
/*************************************************************************
@@ -106,18 +106,6 @@ void TLeafC::Import(TClonesArray *list, Int_t n)
}
}
-
-//______________________________________________________________________________
-void TLeafC::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Print a description of this leaf*-*-*-*-*-*-*-*-*
-//*-* ================================
-
- TLeaf::Print(option);
-
-}
-
-
//______________________________________________________________________________
void TLeafC::ReadBasket(TBuffer &b)
{
diff --git a/tree/src/TLeafD.cxx b/tree/src/TLeafD.cxx
index 8244a1ec880c83ff9d6b45b1238e265339e2d821..36b002574be98633421c3fa47f43f61fbbf6beeb 100644
--- a/tree/src/TLeafD.cxx
+++ b/tree/src/TLeafD.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafD.cxx,v 1.1.1.1 2000/05/16 17:00:45 rdm Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafD.cxx,v 1.2 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -97,17 +97,6 @@ void TLeafD::Import(TClonesArray *list, Int_t n)
}
}
-//______________________________________________________________________________
-void TLeafD::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Print a description of this leaf*-*-*-*-*-*-*-*-*
-//*-* ================================
-
- TLeaf::Print(option);
-
-}
-
-
//______________________________________________________________________________
void TLeafD::ReadBasket(TBuffer &b)
{
diff --git a/tree/src/TLeafF.cxx b/tree/src/TLeafF.cxx
index fb1979297e18e120e1130981e49057579e954d0c..ca7f387362b436a09d2b43e2cb79eabbfd623773 100644
--- a/tree/src/TLeafF.cxx
+++ b/tree/src/TLeafF.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafF.cxx,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafF.cxx,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -101,17 +101,6 @@ void TLeafF::Import(TClonesArray *list, Int_t n)
}
}
-//______________________________________________________________________________
-void TLeafF::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Print a description of this leaf*-*-*-*-*-*-*-*-*
-//*-* ================================
-
- TLeaf::Print(option);
-
-}
-
-
//______________________________________________________________________________
void TLeafF::ReadBasket(TBuffer &b)
{
diff --git a/tree/src/TLeafI.cxx b/tree/src/TLeafI.cxx
index 4de7ba7e7a91b2f855c2e1dbe47097a8fe9740f9..4b5e41e0002a390573bf5e1f44f4e8ce5bbedb56 100644
--- a/tree/src/TLeafI.cxx
+++ b/tree/src/TLeafI.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafI.cxx,v 1.2 2000/06/13 09:27:08 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafI.cxx,v 1.3 2000/09/29 07:51:12 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -102,7 +102,7 @@ const char *TLeafI::GetTypeName() const
//______________________________________________________________________________
-Double_t TLeafI::GetValue(Int_t i)
+Double_t TLeafI::GetValue(Int_t i) const
{
//*-*-*-*-*-*-*-*Returns current value of leaf*-*-*-*-*-*-*-*-*-*-*-*
//*-* =============================
@@ -130,16 +130,6 @@ void TLeafI::Import(TClonesArray *list, Int_t n)
}
}
-//______________________________________________________________________________
-void TLeafI::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Print a description of this leaf*-*-*-*-*-*-*-*-*
-//*-* ================================
-
- TLeaf::Print(option);
-
-}
-
//______________________________________________________________________________
void TLeafI::ReadBasket(TBuffer &b)
{
diff --git a/tree/src/TLeafS.cxx b/tree/src/TLeafS.cxx
index 16394c97e9869e3936e6e5d956f64f003d13e671..97c5687ba174bc7fa74dbfe3f4c3793f7e1ca43f 100644
--- a/tree/src/TLeafS.cxx
+++ b/tree/src/TLeafS.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TLeafS.cxx,v 1.3 2000/09/29 07:51:12 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TLeafS.cxx,v 1.4 2000/09/29 09:49:32 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -100,7 +100,7 @@ const char *TLeafS::GetTypeName() const
//______________________________________________________________________________
-Double_t TLeafS::GetValue(Int_t i)
+Double_t TLeafS::GetValue(Int_t i) const
{
//*-*-*-*-*-*-*-*Returns current value of leaf*-*-*-*-*-*-*-*-*-*-*-*
//*-* =============================
@@ -126,17 +126,6 @@ void TLeafS::Import(TClonesArray *list, Int_t n)
}
}
-//______________________________________________________________________________
-void TLeafS::Print(Option_t *option)
-{
-//*-*-*-*-*-*-*-*-*-*-*Print a description of this leaf*-*-*-*-*-*-*-*-*
-//*-* ================================
-
- TLeaf::Print(option);
-
-}
-
-
//______________________________________________________________________________
void TLeafS::ReadBasket(TBuffer &b)
{
diff --git a/tree/src/TTree.cxx b/tree/src/TTree.cxx
index 2b08337e2dbb5d0953ee2ae2e292e8cc2a90f801..cb92bfcd8e682d75aa907b1897417eeb91a5e31f 100644
--- a/tree/src/TTree.cxx
+++ b/tree/src/TTree.cxx
@@ -1,4 +1,4 @@
-// @(#)root/tree:$Name: $:$Id: TTree.cxx,v 1.30 2000/12/05 10:52:01 brun Exp $
+// @(#)root/tree:$Name: $:$Id: TTree.cxx,v 1.31 2000/12/10 17:18:08 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -464,7 +464,7 @@ TBranch *TTree::Branch(const char *name, const char *classname, void *addobj, In
TDataMember *dm = rd->GetDataMember();
if (rd->IsObject()) {
//printf("found IsObject:%s, class:%s\n",dm->GetName(),dm->GetFullTypeName());
- TClass *clm = gROOT->GetClass(dm->GetFullTypeName());
+ //TClass *clm = gROOT->GetClass(dm->GetFullTypeName());
//We should build the StreamerInfo in this case.
//However, there is a problem in case one cannot call class->New !!
//if (clm) BuildStreamerInfo(clm,obj+rd->GetThisOffset());
@@ -1296,7 +1296,7 @@ TBranch *TTree::GetBranch(const char *name)
}
}
}
- TObjArray *leaves = GetListOfLeaves();
+ TObjArray *leaves = ((TTree*)this)->GetListOfLeaves();
Int_t nleaves = leaves->GetEntriesFast();
for (i=0;i<nleaves;i++) {
TLeaf *leaf = (TLeaf*)leaves->UncheckedAt(i);
@@ -1308,7 +1308,7 @@ TBranch *TTree::GetBranch(const char *name)
//______________________________________________________________________________
-TFile *TTree::GetCurrentFile()
+TFile *TTree::GetCurrentFile() const
{
//*-*-*-*-*-*Return pointer to the current file*-*-*-*-*-*-*-*
//*-* ==================================
@@ -1341,7 +1341,7 @@ Int_t TTree::GetEntry(Int_t entry, Int_t getall)
//______________________________________________________________________________
-Int_t TTree::GetEntryNumber(Int_t entry)
+Int_t TTree::GetEntryNumber(Int_t entry) const
{
//*-*-*-*-*-*Return entry number corresponding to entry*-*-*
//*-* ==========================================
@@ -1354,7 +1354,7 @@ Int_t TTree::GetEntryNumber(Int_t entry)
//______________________________________________________________________________
-Int_t TTree::GetEntryNumberWithIndex(Int_t major, Int_t minor)
+Int_t TTree::GetEntryNumberWithIndex(Int_t major, Int_t minor) const
{
// Return entry number corresponding to major and minor number
// Note that this function returns only the entry number, not the data
@@ -1394,7 +1394,7 @@ Int_t TTree::GetEntryWithIndex(Int_t major, Int_t minor)
//______________________________________________________________________________
-TLeaf *TTree::GetLeaf(const char *name)
+TLeaf *TTree::GetLeaf(const char *name)
{
//*-*-*-*-*-*Return pointer to the 1st Leaf named name in any Branch-*-*-*-*-*
//*-* =======================================================
@@ -1406,12 +1406,12 @@ TLeaf *TTree::GetLeaf(const char *name)
//______________________________________________________________________________
-Double_t TTree::GetMaximum(const char *columname)
+Double_t TTree::GetMaximum(const char *columname) const
{
//*-*-*-*-*-*-*-*-*Return maximum of column with name columname*-*-*-*-*-*-*
//*-* ============================================
- TLeaf *leaf = GetLeaf(columname);
+ TLeaf *leaf = ((TTree*)this)->GetLeaf(columname);
if (!leaf) return 0;
TBranch *branch = leaf->GetBranch();
Double_t cmax = -FLT_MAX; //in float.h
@@ -1425,12 +1425,12 @@ Double_t TTree::GetMaximum(const char *columname)
//______________________________________________________________________________
-Double_t TTree::GetMinimum(const char *columname)
+Double_t TTree::GetMinimum(const char *columname) const
{
//*-*-*-*-*-*-*-*-*Return minimum of column with name columname*-*-*-*-*-*-*
//*-* ============================================
- TLeaf *leaf = GetLeaf(columname);
+ TLeaf *leaf = ((TTree*)this)->GetLeaf(columname);
if (!leaf) return 0;
TBranch *branch = leaf->GetBranch();
Double_t cmin = FLT_MAX; //in float.h
@@ -1444,7 +1444,7 @@ Double_t TTree::GetMinimum(const char *columname)
//______________________________________________________________________________
-const char *TTree::GetNameByIndex(TString &varexp, Int_t *index,Int_t colindex)
+const char *TTree::GetNameByIndex(TString &varexp, Int_t *index,Int_t colindex) const
{
//*-*-*-*-*-*-*-*-*Return name corresponding to colindex in varexp*-*-*-*-*-*
//*-* ===============================================
@@ -1677,7 +1677,7 @@ TPrincipal *TTree::Principal(const char *varexp, const char *selection, Option_t
}
//______________________________________________________________________________
-void TTree::Print(Option_t *option)
+void TTree::Print(Option_t *option) const
{
// Print a summary of the Tree contents. In case options are "p" or "pa"
// print information about the TPacketGenerator ("pa" is equivalent to
@@ -1713,7 +1713,7 @@ void TTree::Print(Option_t *option)
Printf("* : : Tree compression factor = %6.2f *",cx);
Printf("******************************************************************************");
- fBranches.Print(option);
+ ((TTree*)this)->GetListOfBranches()->Print(option);
}
//______________________________________________________________________________
diff --git a/treeplayer/inc/TPacketGenerator.h b/treeplayer/inc/TPacketGenerator.h
index 056fd204168b5747970f481259916ff526cac73f..249e6f017ff3764c92912f452d1f2c0c2a178e6d 100644
--- a/treeplayer/inc/TPacketGenerator.h
+++ b/treeplayer/inc/TPacketGenerator.h
@@ -1,4 +1,4 @@
-// @(#)root/treeplayer:$Name$:$Id$
+// @(#)root/treeplayer:$Name: $:$Id: TPacketGenerator.h,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 28/03/97
/*************************************************************************
@@ -79,7 +79,7 @@ public:
void SetMinPacketSize(Int_t minps);
- void Print(Option_t *option="");
+ void Print(Option_t *option="") const;
void Reset(Stat_t firstEntry, Stat_t lastEntry, TList *slaves);
ClassDef(TPacketGenerator,0) //Generate packets of entries for parallel processing
diff --git a/treeplayer/inc/TTreeFormula.h b/treeplayer/inc/TTreeFormula.h
index 29020095626f4ce362d2f6173901f53862151aed..09b3f1b08c59708019d52be9e76d0f50179faf8c 100644
--- a/treeplayer/inc/TTreeFormula.h
+++ b/treeplayer/inc/TTreeFormula.h
@@ -1,4 +1,4 @@
-// @(#)root/treeplayer:$Name: $:$Id: TTreeFormula.h,v 1.5 2000/08/11 20:10:12 brun Exp $
+// @(#)root/treeplayer:$Name: $:$Id: TTreeFormula.h,v 1.6 2000/11/21 20:54:17 brun Exp $
// Author: Rene Brun 19/01/96
/*************************************************************************
@@ -67,14 +67,14 @@ public:
TTreeFormula(const char *name,const char *formula, TTree *tree);
virtual ~TTreeFormula();
virtual Int_t DefinedVariable(TString &variable);
- virtual Double_t EvalInstance(Int_t i=0);
- TMethodCall *GetMethodCall(Int_t code);
- virtual Int_t GetMultiplicity() {return fMultiplicity;}
- virtual TLeaf *GetLeaf(Int_t n);
- virtual Int_t GetNcodes() {return fNcodes;}
- virtual Int_t GetNdata();
- virtual Double_t GetValueLeafObject(Int_t i, TLeafObject *leaf);
- virtual char *PrintValue(Int_t mode=0);
+ virtual Double_t EvalInstance(Int_t i=0) const;
+ TMethodCall *GetMethodCall(Int_t code) const;
+ virtual Int_t GetMultiplicity() const {return fMultiplicity;}
+ virtual TLeaf *GetLeaf(Int_t n) const;
+ virtual Int_t GetNcodes() const {return fNcodes;}
+ virtual Int_t GetNdata() const;
+ virtual Double_t GetValueLeafObject(Int_t i, TLeafObject *leaf) const;
+ virtual char *PrintValue(Int_t mode=0) const;
virtual void SetTree(TTree *tree) {fTree = tree;}
ClassDef(TTreeFormula,1) //The Tree formula
diff --git a/treeplayer/inc/TTreePlayer.h b/treeplayer/inc/TTreePlayer.h
index 54f4092586b920ce1d5ba754523badd12addce8e..40a26a61f4cd51ce5f2be6362df5744a0f91b44b 100644
--- a/treeplayer/inc/TTreePlayer.h
+++ b/treeplayer/inc/TTreePlayer.h
@@ -1,4 +1,4 @@
-// @(#)root/treeplayer:$Name: $:$Id: TTreePlayer.h,v 1.9 2000/08/17 09:47:00 brun Exp $
+// @(#)root/treeplayer:$Name: $:$Id: TTreePlayer.h,v 1.10 2000/11/21 20:56:47 brun Exp $
// Author: Rene Brun 12/01/96
/*************************************************************************
@@ -90,22 +90,22 @@ public:
void FindGoodLimits(Int_t nbins, Int_t &newbins, Double_t &xmin, Double_t &xmax);
virtual Int_t Fit(const char *formula ,const char *varexp, const char *selection,Option_t *option ,Option_t *goption
,Int_t nentries, Int_t firstentry);
- virtual Int_t GetDimension() {return fDimension;}
- TH1 *GetHistogram() {return fHistogram;}
- TTreeFormula *GetMultiplicity() {return fMultiplicity;}
+ virtual Int_t GetDimension() const {return fDimension;}
+ TH1 *GetHistogram() const {return fHistogram;}
+ TTreeFormula *GetMultiplicity() const {return fMultiplicity;}
virtual void GetNextPacket(TSlave *sl, Int_t &nentries, Stat_t &firstentry, Stat_t &processed);
TPacketGenerator *GetPacketGenerator() const { return fPacketGen; }
virtual Int_t GetPacketSize() const {return fPacketSize;}
- TTreeFormula *GetSelect() {return fSelect;}
- virtual Int_t GetSelectedRows() {return fSelectedRows;}
- TTreeFormula *GetVar1() {return fVar1;}
- TTreeFormula *GetVar2() {return fVar2;}
- TTreeFormula *GetVar3() {return fVar3;}
- TTreeFormula *GetVar4() {return fVar4;}
- virtual Double_t *GetV1() {return fV1;}
- virtual Double_t *GetV2() {return fV2;}
- virtual Double_t *GetV3() {return fV3;}
- virtual Double_t *GetW() {return fW;}
+ TTreeFormula *GetSelect() const {return fSelect;}
+ virtual Int_t GetSelectedRows() const {return fSelectedRows;}
+ TTreeFormula *GetVar1() const {return fVar1;}
+ TTreeFormula *GetVar2() const {return fVar2;}
+ TTreeFormula *GetVar3() const {return fVar3;}
+ TTreeFormula *GetVar4() const {return fVar4;}
+ virtual Double_t *GetV1() const {return fV1;}
+ virtual Double_t *GetV2() const {return fV2;}
+ virtual Double_t *GetV3() const {return fV3;}
+ virtual Double_t *GetW() const {return fW;}
virtual void Loop(Option_t *option="",Int_t nentries=1000000000, Int_t firstentry=0);
virtual Int_t MakeClass(const char *classname=0, Option_t *option="");
virtual Int_t MakeCode(const char *filename=0);
diff --git a/treeplayer/src/TPacketGenerator.cxx b/treeplayer/src/TPacketGenerator.cxx
index 2753ee2353a0c1652480beb4eff7e61063739bc1..e52088c62b27d93855926118fa315d85e85ea9c9 100644
--- a/treeplayer/src/TPacketGenerator.cxx
+++ b/treeplayer/src/TPacketGenerator.cxx
@@ -1,4 +1,4 @@
-// @(#)root/treeplayer:$Name$:$Id$
+// @(#)root/treeplayer:$Name: $:$Id: TPacketGenerator.cxx,v 1.1.1.1 2000/05/16 17:00:44 rdm Exp $
// Author: Fons Rademakers 28/03/97
/*************************************************************************
@@ -225,7 +225,7 @@ Int_t TPacketGenerator::GetNoPackets() const
}
//______________________________________________________________________________
-void TPacketGenerator::Print(Option_t *option)
+void TPacketGenerator::Print(Option_t *option) const
{
// Prints info about the packet generator. If option is "all", print also
// info about all packets.
diff --git a/treeplayer/src/TTreeFormula.cxx b/treeplayer/src/TTreeFormula.cxx
index 22027ecb314f4ad3294721653408498be4462b0f..2c1bb0d4bb71c52606d6127d4ec8072ec45c0269 100644
--- a/treeplayer/src/TTreeFormula.cxx
+++ b/treeplayer/src/TTreeFormula.cxx
@@ -1,4 +1,4 @@
-// @(#)root/treeplayer:$Name: $:$Id: TTreeFormula.cxx,v 1.19 2000/11/21 20:58:28 brun Exp $
+// @(#)root/treeplayer:$Name: $:$Id: TTreeFormula.cxx,v 1.20 2000/12/08 08:00:38 brun Exp $
// Author: Rene Brun 19/01/96
/*************************************************************************
@@ -467,7 +467,7 @@ Int_t TTreeFormula::DefinedVariable(TString &name)
}
//______________________________________________________________________________
-Double_t TTreeFormula::EvalInstance(Int_t instance)
+Double_t TTreeFormula::EvalInstance(Int_t instance) const
{
//*-*-*-*-*-*-*-*-*-*-*Evaluate this treeformula*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* =========================
@@ -705,7 +705,7 @@ Double_t TTreeFormula::EvalInstance(Int_t instance)
}
//______________________________________________________________________________
-TLeaf *TTreeFormula::GetLeaf(Int_t n)
+TLeaf *TTreeFormula::GetLeaf(Int_t n) const
{
//*-*-*-*-*-*-*-*Return leaf corresponding to serial number n*-*-*-*-*-*
//*-* ============================================
@@ -715,7 +715,7 @@ TLeaf *TTreeFormula::GetLeaf(Int_t n)
}
//______________________________________________________________________________
-TMethodCall *TTreeFormula::GetMethodCall(Int_t code)
+TMethodCall *TTreeFormula::GetMethodCall(Int_t code) const
{
//*-*-*-*-*-*-*-*Return methodcall corresponding to code*-*-*-*-*-*
//*-* =======================================
@@ -728,7 +728,7 @@ TMethodCall *TTreeFormula::GetMethodCall(Int_t code)
}
//______________________________________________________________________________
-Int_t TTreeFormula::GetNdata()
+Int_t TTreeFormula::GetNdata() const
{
//*-*-*-*-*-*-*-*Return number of data words in the leaf*-*-*-*-*-*-*-*
//*-*-*-*-*-*-*-*Changed to Return number of available instances in the formula*-*-*-*-*-*-*-*
@@ -771,7 +771,7 @@ Int_t TTreeFormula::GetNdata()
}
//______________________________________________________________________________
-Double_t TTreeFormula::GetValueLeafObject(Int_t i, TLeafObject *leaf)
+Double_t TTreeFormula::GetValueLeafObject(Int_t i, TLeafObject *leaf) const
{
//*-*-*-*-*-*-*-*Return result of a leafobject method*-*-*-*-*-*-*-*
//*-* ====================================
@@ -800,7 +800,7 @@ Double_t TTreeFormula::GetValueLeafObject(Int_t i, TLeafObject *leaf)
}
//______________________________________________________________________________
-char *TTreeFormula::PrintValue(Int_t mode)
+char *TTreeFormula::PrintValue(Int_t mode) const
{
//*-*-*-*-*-*-*-*Return value of variable as a string*-*-*-*-*-*-*-*
//*-* ====================================