From 502897b2df15d00b833759b791c3eda891663970 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 26 May 2006 15:13:03 +0000
Subject: [PATCH] one more round of code cleanup: change NULL by 0 in all C++
code.
git-svn-id: http://root.cern.ch/svn/root/trunk@15181 27541ba8-7e3a-0410-8455-c3a389f83636
---
base/inc/TBrowserImp.h | 6 +-
base/inc/TPluginManager.h | 13 ++--
base/inc/TQObject.h | 14 ++---
base/inc/TString.h | 4 +-
base/inc/TVirtualProof.h | 6 +-
base/src/TFile.cxx | 6 +-
base/src/TRandom1.cxx | 54 ++++++++---------
clarens/src/TClSession.cxx | 35 ++++++-----
cont/inc/THashTable.h | 6 +-
cont/inc/TList.h | 20 +++----
foam/src/TFoamVect.cxx | 6 +-
ged/inc/TGedFrame.h | 16 ++---
ged/src/TGedToolBox.cxx | 60 +++++++++----------
gpad/src/TCreatePrimitives.cxx | 6 +-
gpad/src/TPad.cxx | 20 +++----
gui/inc/TGLayout.h | 4 +-
gui/inc/TGMenu.h | 16 ++---
gui/inc/TGObject.h | 8 +--
gui/inc/TGPicture.h | 4 +-
gui/inc/TGWindow.h | 32 +++++-----
gui/src/TGMdiDecorFrame.cxx | 10 ++--
gui/src/TRootCanvas.cxx | 60 +++++++++----------
hist/inc/TLimit.h | 26 ++++----
hist/src/TConfidenceLevel.cxx | 28 ++++-----
hist/src/THStack.cxx | 56 +++++++++---------
hist/src/TLimit.cxx | 12 ++--
io/src/TFile.cxx | 6 +-
krb5auth/src/TKSocket.cxx | 4 +-
math/src/TRandom1.cxx | 54 ++++++++---------
matrix/inc/TVectorT.h | 5 +-
minuit/src/TLinearFitter.cxx | 98 +++++++++++++++----------------
mlp/inc/TMultiLayerPerceptron.h | 20 +++----
mlp/src/TMLPAnalyzer.cxx | 54 ++++++++---------
mlp/src/TMultiLayerPerceptron.cxx | 88 +++++++++++++--------------
mlp/src/TNeuron.cxx | 18 +++---
mlp/src/TSynapse.cxx | 6 +-
net/inc/TNetFile.h | 9 ++-
net/inc/TServerSocket.h | 4 +-
proof/inc/TProof.h | 6 +-
proof/src/TProof.cxx | 12 ++--
rpdutils/src/globus.cxx | 20 +++----
ruby/src/TRuby.cxx | 36 ++++++------
table/src/TPolyLineShape.cxx | 12 ++--
treeplayer/src/TSelectorDraw.cxx | 8 +--
treeviewer/src/TSessionViewer.cxx | 28 ++++-----
x3d/src/TViewerX3D.cxx | 40 ++++++-------
46 files changed, 526 insertions(+), 530 deletions(-)
diff --git a/base/inc/TBrowserImp.h b/base/inc/TBrowserImp.h
index 371232eceb4..17b71ae8dc0 100644
--- a/base/inc/TBrowserImp.h
+++ b/base/inc/TBrowserImp.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TBrowserImp.h,v 1.6 2006/05/12 12:25:45 brun Exp $
+// @(#)root/base:$Name: $:$Id: TBrowserImp.h,v 1.7 2006/05/23 04:47:35 brun Exp $
// Author: Fons Rademakers 15/11/95
/*************************************************************************
@@ -64,8 +64,8 @@ public:
};
inline TBrowserImp::TBrowserImp(TBrowser *, const char *, UInt_t, UInt_t)
- : fBrowser(NULL), fShowCycles(kFALSE) { }
+ : fBrowser(0), fShowCycles(kFALSE) { }
inline TBrowserImp::TBrowserImp(TBrowser *, const char *, Int_t, Int_t, UInt_t, UInt_t)
- : fBrowser(NULL), fShowCycles(kFALSE) { }
+ : fBrowser(0), fShowCycles(kFALSE) { }
#endif
diff --git a/base/inc/TPluginManager.h b/base/inc/TPluginManager.h
index b868cb90632..1fe5d1fa526 100644
--- a/base/inc/TPluginManager.h
+++ b/base/inc/TPluginManager.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TPluginManager.h,v 1.5 2003/04/04 00:10:15 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TPluginManager.h,v 1.6 2006/05/23 04:47:35 brun Exp $
// Author: Fons Rademakers 26/1/2002
/*************************************************************************
@@ -92,14 +92,13 @@ private:
Bool_t fIsMacro; // plugin is a macro and not a library
Bool_t fIsGlobal; // plugin ctor is a global function
- TPluginHandler():
- fBase(), fRegexp(), fClass(), fPlugin(), fCtor(), fCallEnv(NULL),
- fMethod(NULL), fCanCall(0), fIsMacro(kTRUE), fIsGlobal(kTRUE) { }
+ TPluginHandler() :
+ fCallEnv(0), fMethod(0), fCanCall(0), fIsMacro(kTRUE), fIsGlobal(kTRUE) { }
TPluginHandler(const char *base, const char *regexp,
const char *className, const char *pluginName,
const char *ctor);
- TPluginHandler(const TPluginHandler&);
- TPluginHandler& operator=(const TPluginHandler&);
+ TPluginHandler(const TPluginHandler&);
+ TPluginHandler& operator=(const TPluginHandler&);
~TPluginHandler();
@@ -134,7 +133,7 @@ protected:
return *this;}
public:
- TPluginManager(): fHandlers(NULL) { }
+ TPluginManager() : fHandlers(0) { }
~TPluginManager();
void LoadHandlersFromEnv(TEnv *env);
diff --git a/base/inc/TQObject.h b/base/inc/TQObject.h
index c7867bc6534..9237f28fd40 100644
--- a/base/inc/TQObject.h
+++ b/base/inc/TQObject.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: v5-11-02 $:$Id: TQObject.h,v 1.28 2006/03/21 05:20:33 pcanal Exp $
+// @(#)root/base:$Name: $:$Id: TQObject.h,v 1.29 2006/05/23 04:47:35 brun Exp $
// Author: Valeriy Onuchin & Fons Rademakers 15/10/2000
/*************************************************************************
@@ -76,13 +76,13 @@ protected:
TClass *sender_class, const char *signal,
TClass *receiver_class, const char *slot);
- TQObject(const TQObject& tqo):
- fListOfSignals(tqo.fListOfSignals),
- fListOfConnections(tqo.fListOfConnections) {}
+ TQObject(const TQObject& tqo):
+ fListOfSignals(tqo.fListOfSignals),
+ fListOfConnections(tqo.fListOfConnections) {}
TQObject& operator=(const TQObject& tqo) {
if(this!=&tqo) {
- fListOfSignals=tqo.fListOfSignals;
+ fListOfSignals=tqo.fListOfSignals;
fListOfConnections=tqo.fListOfConnections;
} return *this;}
@@ -194,7 +194,7 @@ protected:
virtual const char *GetSenderClassName() const { return fSenderClass; }
public:
- TQObjSender() : TQObject(), fSender(NULL), fSenderClass() { }
+ TQObjSender() : TQObject(), fSender(0), fSenderClass() { }
virtual ~TQObjSender() { Disconnect(); }
virtual void SetSender(void *sender) { fSender = sender; }
@@ -212,7 +212,7 @@ public:
extern Bool_t ConnectCINT(TQObject *sender, const char *signal,
const char *slot);
-// This include is no longer necessary but is kept to be
+// This include is no longer necessary but is kept to be
// backward compatible with user code.
#include "TQClass.h"
diff --git a/base/inc/TString.h b/base/inc/TString.h
index 7fe05211595..a345dd2e6d3 100644
--- a/base/inc/TString.h
+++ b/base/inc/TString.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TString.h,v 1.43 2005/12/09 01:14:20 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TString.h,v 1.44 2006/05/23 04:47:35 brun Exp $
// Author: Fons Rademakers 04/08/95
/*************************************************************************
@@ -224,7 +224,7 @@ public:
TString(const char *s); // Copy to embedded null
TString(const char *s, Ssiz_t n); // Copy past any embedded nulls
TString(const std::string &s);
- TString(char c): fData(NULL) { InitChar(c); }
+ TString(char c) : fData(0) { InitChar(c); }
TString(char c, Ssiz_t s);
TString(const TSubString &sub);
diff --git a/base/inc/TVirtualProof.h b/base/inc/TVirtualProof.h
index fb59d5a7627..31230e1742c 100644
--- a/base/inc/TVirtualProof.h
+++ b/base/inc/TVirtualProof.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TVirtualProof.h,v 1.29 2006/04/19 10:57:44 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TVirtualProof.h,v 1.30 2006/04/29 17:57:43 rdm Exp $
// Author: Fons Rademakers 16/09/02
/*************************************************************************
@@ -140,8 +140,8 @@ public:
const char *files,
const char *dest,
Int_t opt = kAskUser,
- TList *skippedFiles = NULL) = 0;
-
+ TList *skippedFiles = 0) = 0;
+
virtual Int_t UploadDataSetFromFile(const char *file,
const char *dest,
const char *dataset,
diff --git a/base/src/TFile.cxx b/base/src/TFile.cxx
index 14f5798509a..d10db590a09 100644
--- a/base/src/TFile.cxx
+++ b/base/src/TFile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.158 2006/05/22 11:13:33 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.159 2006/05/22 12:41:23 rdm Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -1275,11 +1275,11 @@ Bool_t TFile::ReadBuffer(char *buf, Int_t len)
}
//______________________________________________________________________________
-Bool_t TFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)
+Bool_t TFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)
{
// Read the nbuf blocks described in arrays pos and len,
// where pos[i] is the seek position of block i of length len[i].
- // Note that for nbuf=1, this call is equivalent to TFile::ReafBuffer
+ // Note that for nbuf=1, this call is equivalent to TFile::ReafBuffer.
// This function is overloaded by TNetFile, TWebFile, etc.
// Returns kTRUE in case of failure.
diff --git a/base/src/TRandom1.cxx b/base/src/TRandom1.cxx
index 6c3bc227d6c..bcf4b2bccdf 100644
--- a/base/src/TRandom1.cxx
+++ b/base/src/TRandom1.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TRandom1.cxx,v 1.3 2006/05/15 06:31:19 brun Exp $
+// @(#)root/base:$Name: $:$Id: TRandom1.cxx,v 1.4 2006/05/18 07:34:25 brun Exp $
// Author: Rene Brun from CLHEP & CERNLIB 04/05/2006
//////////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@ int TRandom1::fgNumEngines = 0;
int TRandom1::fgMaxIndex = 215;
#ifndef __CINT__
const Long64_t fgSeedTable[215][2] = {
- { 9876, 54321 },
+ { 9876, 54321 },
{ 1299961164, 253987020 },
{ 669708517, 2079157264 },
{ 190904760, 417696270 },
@@ -242,7 +242,7 @@ const Long64_t fgSeedTable[215][2] = {
{ 242242374, 1863206182 },
{ 957935844, 1490681416 }};
#endif
-
+
ClassImp(TRandom1)
//______________________________________________________________________________
@@ -266,7 +266,7 @@ TRandom1::TRandom1(Long64_t seed, Int_t lux)
fTheSeeds = &fTheSeed;
fLuxury = lux;
SetSeed2(seed, fLuxury);
-
+
// setSeeds() wants a zero terminated array!
seedlist[0]=fTheSeed;
seedlist[1]=0;
@@ -292,7 +292,7 @@ TRandom1::TRandom1()
GetTableSeeds( seedlist, curIndex );
seed = seedlist[0]^mask;
SetSeed2(seed, fLuxury);
-
+
// setSeeds() wants a zero terminated array!
seedlist[0]=fTheSeed; //<=============
seedlist[1]=0;
@@ -318,7 +318,7 @@ TRandom1::TRandom1(int rowIndex, int colIndex, int lux)
GetTableSeeds( seedlist, row );
seed = ( seedlist[col] )^mask;
SetSeed2(seed, fLuxury);
-
+
// setSeeds() wants a zero terminated array!
seedlist[0]=fTheSeed;
seedlist[1]=0;
@@ -326,7 +326,7 @@ TRandom1::TRandom1(int rowIndex, int colIndex, int lux)
}
//______________________________________________________________________________
-TRandom1::~TRandom1()
+TRandom1::~TRandom1()
{
//destructor
}
@@ -339,11 +339,11 @@ void TRandom1::GetTableSeeds(Long64_t* seeds, Int_t index)
seeds[0] = fgSeedTable[index][0];
seeds[1] = fgSeedTable[index][1];
}
- else seeds = NULL;
+ else seeds = 0;
}
//______________________________________________________________________________
-Double_t TRandom1::Rndm(Int_t)
+Double_t TRandom1::Rndm(Int_t)
{
//return a random number in ]0,1]
float next_random;
@@ -390,7 +390,7 @@ Double_t TRandom1::Rndm(Int_t)
if(fIlag < 0)fIlag = 23;
if(fJlag < 0) fJlag = 23;
}
- }
+ }
return (double) next_random;
}
@@ -454,11 +454,11 @@ void TRandom1::RndmArray(const Int_t size, Double_t *vect)
}
}
}
-}
+}
//______________________________________________________________________________
-void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
+void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
{
//set seeds
const int ecuyer_a = 53668;
@@ -470,11 +470,11 @@ void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
int i;
Long64_t int_seed_table[24];
Long64_t k_multiple,next_seed;
- const Long64_t *seedptr;
+ const Long64_t *seedptr;
fTheSeeds = seeds;
seedptr = seeds;
-
+
if(seeds == 0) {
SetSeed2(fTheSeed,lux);
fTheSeeds = &fTheSeed;
@@ -496,21 +496,21 @@ void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
fLuxury = lux;
fNskip = lux_levels[fLuxury];
}
-
+
for( i = 0;(i != 24)&&(*seedptr != 0);i++) {
int_seed_table[i] = *seedptr % fIntModulus;
seedptr++;
- }
+ }
if(i != 24){
next_seed = int_seed_table[i-1];
for(;i != 24;i++) {
k_multiple = next_seed / ecuyer_a;
- next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
+ next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
- k_multiple * ecuyer_c ;
if(next_seed < 0)next_seed += ecuyer_d;
int_seed_table[i] = next_seed % fIntModulus;
- }
+ }
}
for(i = 0;i != 24;i++)
@@ -521,15 +521,15 @@ void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
fCarry = 0. ;
if( fFloatSeedTable[23] == 0. ) fCarry = fMantissaBit24;
-
+
fCount24 = 0;
}
//______________________________________________________________________________
-void TRandom1::SetSeed2(Long64_t seed, int lux)
+void TRandom1::SetSeed2(Long64_t seed, int lux)
{
// The initialisation is carried out using a Multiplicative
-// Congruential generator using formula constants of L'Ecuyer
+// Congruential generator using formula constants of L'Ecuyer
// as described in "A review of pseudorandom number generators"
// (Fred James) published in Computer Physics Communications 60 (1990)
// pages 329-344
@@ -539,13 +539,13 @@ void TRandom1::SetSeed2(Long64_t seed, int lux)
const int ecuyer_c = 12211;
const int ecuyer_d = 2147483563;
- const int lux_levels[5] = {0,24,73,199,365};
+ const int lux_levels[5] = {0,24,73,199,365};
Long64_t int_seed_table[24];
Long64_t next_seed = seed;
Long64_t k_multiple;
int i;
-
+
// number of additional random numbers that need to be 'thrown away'
// every 24 numbers is set using fLuxury level variable.
@@ -561,14 +561,14 @@ void TRandom1::SetSeed2(Long64_t seed, int lux)
fNskip = lux_levels[fLuxury];
}
-
+
for(i = 0;i != 24;i++) {
k_multiple = next_seed / ecuyer_a;
- next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
+ next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
- k_multiple * ecuyer_c ;
if(next_seed < 0)next_seed += ecuyer_d;
int_seed_table[i] = next_seed % fIntModulus;
- }
+ }
for(i = 0;i != 24;i++)
fFloatSeedTable[i] = int_seed_table[i] * fMantissaBit24;
@@ -578,7 +578,7 @@ void TRandom1::SetSeed2(Long64_t seed, int lux)
fCarry = 0. ;
if( fFloatSeedTable[23] == 0. ) fCarry = fMantissaBit24;
-
+
fCount24 = 0;
}
diff --git a/clarens/src/TClSession.cxx b/clarens/src/TClSession.cxx
index 05720e14b49..74c25fd0c1f 100644
--- a/clarens/src/TClSession.cxx
+++ b/clarens/src/TClSession.cxx
@@ -1,4 +1,4 @@
-// @(#)root/clarens:$Name: $:$Id: TClSession.cxx,v 1.1 2005/02/07 18:02:36 rdm Exp $
+// @(#)root/clarens:$Name: $:$Id: TClSession.cxx,v 1.2 2006/05/10 14:06:06 rdm Exp $
// Author: Maarten Ballintijn 25/10/2004
/*************************************************************************
@@ -42,23 +42,26 @@ ClassImp(TClSession)
Bool_t TClSession::fgInitialized = kFALSE;
-void *TClSession::fgPrivRSA = 0;
-void *TClSession::fgPubRSA = 0;
+void *TClSession::fgPrivRSA = 0;
+void *TClSession::fgPubRSA = 0;
TString TClSession::fgUserCert;
-// Utility function that encodes instring in base64, and returns a new
-// string with its own memory reference. Free this memory upon deconstruction
+//______________________________________________________________________________
unsigned char *B64Encode(xmlrpc_env *env,unsigned char *instring,int len)
{
+ // Utility function that encodes instring in base64, and returns a new
+ // string with its own memory reference. Free this memory upon
+ // deconstruction.
+
xmlrpc_mem_block *mem;
mem=xmlrpc_base64_encode (env,instring,len);
if (env->fault_occurred) {
cerr<<"XML-RPC Fault: "<<env->fault_string<<"("<< env->fault_code<<")"<<endl;
if (mem) xmlrpc_mem_block_free (mem);
- return NULL;
+ return 0;
}
- if (!mem) return NULL;
+ if (!mem) return 0;
int olen=xmlrpc_mem_block_size (mem);
unsigned char *outstring=new unsigned char[olen+1];
@@ -69,19 +72,22 @@ unsigned char *B64Encode(xmlrpc_env *env,unsigned char *instring,int len)
return outstring;
}
-// Utility function that encodes instring in base64, and returns a new
-// string with its own memory reference. Free this memory upon deconstruction
+//______________________________________________________________________________
unsigned char *B64Decode(xmlrpc_env *env, unsigned char *instring,int *len)
{
+ // Utility function that encodes instring in base64, and returns a new
+ // string with its own memory reference. Free this memory upon
+ // deconstruction.
+
xmlrpc_mem_block *mem;
mem=xmlrpc_base64_decode (env,(char *)instring,strlen((const char *)instring));
if (env->fault_occurred) {
cerr<<"XML-RPC Fault: "<<env->fault_string<<"("<< env->fault_code<<")"<<endl;
if (mem) xmlrpc_mem_block_free (mem);
- return NULL;
+ return 0;
}
- if (!mem) return NULL;
+ if (!mem) return 0;
int olen=xmlrpc_mem_block_size (mem);
unsigned char *outstring=new unsigned char[olen+1];
memcpy((void *) outstring,(void *)xmlrpc_mem_block_contents(mem),olen);
@@ -91,7 +97,6 @@ unsigned char *B64Decode(xmlrpc_env *env, unsigned char *instring,int *len)
return outstring;
}
-
//______________________________________________________________________________
TClSession::TClSession(const Char_t *url, const Char_t *user, const Char_t *pw,
xmlrpc_server_info *info, void *serverPubRSA)
@@ -99,7 +104,6 @@ TClSession::TClSession(const Char_t *url, const Char_t *user, const Char_t *pw,
{
}
-
//______________________________________________________________________________
TClSession *TClSession::Create(const Char_t *url)
{
@@ -217,7 +221,6 @@ TClSession *TClSession::Create(const Char_t *url)
return new TClSession(url, user, password, info, serverPubRSA);
}
-
//______________________________________________________________________________
Bool_t TClSession::InitAuthentication()
{
@@ -257,7 +260,7 @@ Bool_t TClSession::InitAuthentication()
if (gDebug > 0) ::Info("TClSession::InitAuthentication",
"using public key: '%s'", certFile.Data());
- X509* userCert = PEM_read_bio_X509(bio, NULL,NULL,NULL);
+ X509* userCert = PEM_read_bio_X509(bio, 0,0,0);
if (!userCert) {
::Error("TClSession::InitAuthentication", "reading user public key: %s (%ld)",
ERR_reason_error_string(ERR_get_error()), ERR_get_error());
@@ -330,7 +333,7 @@ Bool_t TClSession::InitAuthentication()
if (gDebug > 0) ::Info("TClSession::InitAuthentication",
"using private key: '%s'", privfile.Data());
- fgPrivRSA = PEM_read_bio_RSAPrivateKey(bio, NULL, NULL, NULL);
+ fgPrivRSA = PEM_read_bio_RSAPrivateKey(bio, 0, 0, 0);
BIO_free(bio);
if (fgPrivRSA == 0) {
diff --git a/cont/inc/THashTable.h b/cont/inc/THashTable.h
index 490408e0039..8457880ed81 100644
--- a/cont/inc/THashTable.h
+++ b/cont/inc/THashTable.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: $:$Id: THashTable.h,v 1.10 2005/03/26 06:47:32 brun Exp $
+// @(#)root/cont:$Name: $:$Id: THashTable.h,v 1.11 2006/05/23 04:47:36 brun Exp $
// Author: Fons Rademakers 27/09/95
/*************************************************************************
@@ -52,7 +52,7 @@ private:
protected:
- THashTable(const THashTable&);
+ THashTable(const THashTable&);
THashTable& operator=(const THashTable&);
public:
@@ -112,7 +112,7 @@ private:
TListIter *fListCursor; //current position in collision list
Bool_t fDirection; //iteration direction
- THashTableIter() : fTable(0), fCursor(0), fListCursor(NULL), fDirection(kIterForward) { }
+ THashTableIter() : fTable(0), fCursor(0), fListCursor(0), fDirection(kIterForward) { }
Int_t NextSlot();
public:
diff --git a/cont/inc/TList.h b/cont/inc/TList.h
index 14dcf182281..851e3258b6a 100644
--- a/cont/inc/TList.h
+++ b/cont/inc/TList.h
@@ -1,4 +1,4 @@
-// @(#)root/cont:$Name: v5-11-02 $:$Id: TList.h,v 1.12 2006/04/11 17:51:58 rdm Exp $
+// @(#)root/cont:$Name: $:$Id: TList.h,v 1.13 2006/05/23 04:47:36 brun Exp $
// Author: Fons Rademakers 10/08/95
/*************************************************************************
@@ -46,8 +46,8 @@ protected:
TObjLink *fCache; //! cache to speedup sequential calling of Before() and After() functions
Bool_t fAscending; //! sorting order (when calling Sort() or for TSortedList)
- TList(const TList&);
- TList& operator=(const TList&);
+ TList(const TList&);
+ TList& operator=(const TList&);
TObjLink *LinkAt(Int_t idx) const;
TObjLink *FindLink(const TObject *obj, Int_t &idx) const;
@@ -58,10 +58,8 @@ protected:
virtual void DeleteLink(TObjLink *lnk);
public:
- TList():
- fFirst(NULL), fLast(NULL), fCache(NULL), fAscending(kTRUE) { }
- TList(TObject *):
- fFirst(NULL), fLast(NULL), fCache(NULL), fAscending(kTRUE) { } // for backward compatibility, don't use
+ TList() : fFirst(0), fLast(0), fCache(0), fAscending(kTRUE) { }
+ TList(TObject *) : fFirst(0), fLast(0), fCache(0), fAscending(kTRUE) { } // for backward compatibility, don't use
virtual ~TList();
virtual void Clear(Option_t *option="");
virtual void Delete(Option_t *option="");
@@ -119,8 +117,7 @@ private:
TObjLink& operator=(const TObjLink&); // Not implemented
protected:
- TObjLink():
- fNext(this), fPrev(this), fObject(0) { }
+ TObjLink() : fNext(0), fPrev(0), fObject(0) { fNext = fPrev = this; }
public:
TObjLink(TObject *obj) : fNext(0), fPrev(0), fObject(obj) { }
@@ -177,9 +174,8 @@ protected:
Bool_t fDirection; //iteration direction
Bool_t fStarted; //iteration started
- TListIter():
- fList(NULL), fCurCursor(NULL), fCursor(NULL), fDirection(kTRUE),
- fStarted(kFALSE) { }
+ TListIter() : fList(0), fCurCursor(0), fCursor(0), fDirection(kTRUE),
+ fStarted(kFALSE) { }
public:
TListIter(const TList *l, Bool_t dir = kIterForward);
diff --git a/foam/src/TFoamVect.cxx b/foam/src/TFoamVect.cxx
index 594f1305c48..5a13fad877c 100644
--- a/foam/src/TFoamVect.cxx
+++ b/foam/src/TFoamVect.cxx
@@ -1,4 +1,4 @@
-// @(#)root/foam:$Name: $:$Id: TFoamVect.cxx,v 1.10 2006/05/13 15:40:17 brun Exp $
+// @(#)root/foam:$Name: $:$Id: TFoamVect.cxx,v 1.11 2006/05/14 07:18:41 brun Exp $
// Author: S. Jadach <mailto:Stanislaw.jadach@ifj.edu.pl>, P.Sawicki <mailto:Pawel.Sawicki@ifj.edu.pl>
//_____________________________________________________________________________
@@ -41,7 +41,7 @@ TFoamVect::TFoamVect(Int_t n)
if (n>0) {
fCoords = new Double_t[fDim];
if(gDebug) {
- if(fCoords == NULL)
+ if(fCoords == 0)
Error("TFoamVect", "Constructor failed to allocate\n");
}
for (i=0; i<n; i++) *(fCoords+i)=0.0;
@@ -60,7 +60,7 @@ TFoamVect::TFoamVect(const TFoamVect &Vect): TObject(Vect)
fCoords = 0;
if(fDim>0) fCoords = new Double_t[fDim];
if(gDebug) {
- if(fCoords == NULL) {
+ if(fCoords == 0) {
Error("TFoamVect", "Constructor failed to allocate fCoords\n");
}
}
diff --git a/ged/inc/TGedFrame.h b/ged/inc/TGedFrame.h
index 8b7a34f41c0..6aec281a4d5 100644
--- a/ged/inc/TGedFrame.h
+++ b/ged/inc/TGedFrame.h
@@ -1,4 +1,4 @@
-// @(#)root/ged:$Name: $:$Id: TGedFrame.h,v 1.5 2005/11/11 15:38:30 brun Exp $
+// @(#)root/ged:$Name: $:$Id: TGedFrame.h,v 1.6 2006/05/23 04:47:36 brun Exp $
// Author: Ilka Antcheva 10/05/04
/*************************************************************************
@@ -40,13 +40,13 @@ protected:
TObject *fModel; //selected object, if exists
TVirtualPad *fPad; //selected pad, if exists
Bool_t fInit; //init flag for setting signals/slots
- TGTab *fTab; //pointer to the parent tab
+ TGTab *fTab; //pointer to the parent tab
- TGedFrame(const TGedFrame&);
- TGedFrame& operator=(const TGedFrame&);
+ TGedFrame(const TGedFrame&);
+ TGedFrame& operator=(const TGedFrame&);
virtual void MakeTitle(const char *title);
-
+
public:
TGedFrame(const TGWindow *p, Int_t id,
Int_t width = 140, Int_t height = 30,
@@ -68,7 +68,7 @@ public:
};
-// The GUI editors and corresponding canvases will be registered
+// The GUI editors and corresponding canvases will be registered
// in the list TClass::fClassEditors via the class TGedElement
class TGedElement : public TObject {
@@ -80,11 +80,11 @@ protected:
fCanvas=ge.fCanvas;} return *this;}
public:
- TGedElement(): fGedFrame(NULL), fCanvas(NULL) { }
+ TGedElement(): fGedFrame(0), fCanvas(0) { }
TGedFrame *fGedFrame; //object editor
TObject *fCanvas; //connected canvas (0 if disconnected)
-
+
ClassDef(TGedElement, 0); //editor element
};
diff --git a/ged/src/TGedToolBox.cxx b/ged/src/TGedToolBox.cxx
index 355ea464745..8959c057a27 100644
--- a/ged/src/TGedToolBox.cxx
+++ b/ged/src/TGedToolBox.cxx
@@ -1,4 +1,4 @@
-// @(#)root/ged:$Name: $:$Id: TGedToolBox.cxx,v 1.5 2005/05/14 00:19:58 rdm Exp $
+// @(#)root/ged:$Name: $:$Id: TGedToolBox.cxx,v 1.6 2005/09/05 10:01:46 brun Exp $
// Author: Marek Biskup, Ilka Antcheva 17/07/2003
/*************************************************************************
@@ -53,31 +53,31 @@ enum EToolBox {
static ToolBarData_t gToolBoxData[] = {
// { filename, tooltip, staydown, id, button}
- { "pointer.xpm", "Modify", kFALSE, kToolModify, NULL },
- { "arc.xpm", "Arc", kFALSE, kToolArc, NULL },
- { "line.xpm", "Line", kFALSE, kToolLine, NULL },
- { "arrow.xpm", "Arrow", kFALSE, kToolArrow, NULL },
- { "button.xpm", "Button", kFALSE, kToolButton, NULL },
- { "diamond.xpm", "Diamond", kFALSE, kToolDiamond, NULL },
- { "ellipse.xpm", "Ellipse", kFALSE, kToolEllipse, NULL },
- { "pad.xpm", "Pad", kFALSE, kToolPad, NULL },
- { "pave.xpm", "Pave", kFALSE, kToolPave, NULL },
- { "pavelabel.xpm", "Pave Label", kFALSE, kToolPLabel, NULL },
- { "pavetext.xpm", "Pave Text", kFALSE, kToolPText, NULL },
- { "pavestext.xpm", "Paves Text", kFALSE, kToolPsText, NULL },
- { "graph.xpm", "Graph", kFALSE, kToolGraph, NULL },
- { "curlyline.xpm", "Curly Line", kFALSE, kToolCurlyLine,NULL },
- { "curlyarc.xpm", "Curly Arc", kFALSE, kToolCurlyArc, NULL },
- { "latex.xpm", "Text/Latex", kFALSE, kToolLatex, NULL },
- { "marker.xpm", "Marker", kFALSE, kToolMarker, NULL },
- { "cut.xpm", "Graphical Cut", kFALSE, kToolCutG, NULL },
- { 0, 0, kFALSE, 0, NULL }
+ { "pointer.xpm", "Modify", kFALSE, kToolModify, 0 },
+ { "arc.xpm", "Arc", kFALSE, kToolArc, 0 },
+ { "line.xpm", "Line", kFALSE, kToolLine, 0 },
+ { "arrow.xpm", "Arrow", kFALSE, kToolArrow, 0 },
+ { "button.xpm", "Button", kFALSE, kToolButton, 0 },
+ { "diamond.xpm", "Diamond", kFALSE, kToolDiamond, 0 },
+ { "ellipse.xpm", "Ellipse", kFALSE, kToolEllipse, 0 },
+ { "pad.xpm", "Pad", kFALSE, kToolPad, 0 },
+ { "pave.xpm", "Pave", kFALSE, kToolPave, 0 },
+ { "pavelabel.xpm", "Pave Label", kFALSE, kToolPLabel, 0 },
+ { "pavetext.xpm", "Pave Text", kFALSE, kToolPText, 0 },
+ { "pavestext.xpm", "Paves Text", kFALSE, kToolPsText, 0 },
+ { "graph.xpm", "Graph", kFALSE, kToolGraph, 0 },
+ { "curlyline.xpm", "Curly Line", kFALSE, kToolCurlyLine,0 },
+ { "curlyarc.xpm", "Curly Arc", kFALSE, kToolCurlyArc, 0 },
+ { "latex.xpm", "Text/Latex", kFALSE, kToolLatex, 0 },
+ { "marker.xpm", "Marker", kFALSE, kToolMarker, 0 },
+ { "cut.xpm", "Graphical Cut", kFALSE, kToolCutG, 0 },
+ { 0, 0, kFALSE, 0, 0 }
};
-
+
//______________________________________________________________________________
-TGedToolBox::TGedToolBox(const TGWindow *p, UInt_t w,
- UInt_t h, UInt_t options, ULong_t back)
+TGedToolBox::TGedToolBox(const TGWindow *p, UInt_t w,
+ UInt_t h, UInt_t options, ULong_t back)
: TGToolBar(p, w, h, options, back)
{
// Create toolbox widget.
@@ -93,7 +93,7 @@ void TGedToolBox::CreateButtons(ToolBarData_t buttons[])
// Adds buttons described by buttons table to the ToolBox.
// the last element of buttons[] table has zero in the filed
// fPixmap.
-
+
for (int i = 0; buttons[i].fPixmap; i++)
AddButton(this, &buttons[i], 0);
@@ -107,14 +107,14 @@ Bool_t TGedToolBox::ProcessMessage(Long_t msg, Long_t parm1, Long_t)
switch (GET_MSG(msg)) {
case kC_COMMAND:
-
+
switch (GET_SUBMSG(msg)) {
case kCM_BUTTON:
case kCM_MENU:
-
+
switch(parm1) {
-
+
case kToolModify:
gROOT->SetEditorMode();
break;
@@ -186,9 +186,9 @@ Bool_t TGedToolBox::ProcessMessage(Long_t msg, Long_t parm1, Long_t)
void TGedToolBox::SavePrimitive(ofstream &out, Option_t *option)
{
// Save the tool box widget as a C++ statement(s) on output stream out
-
+
TGToolBar::SavePrimitive(out, option);
-
+
// setting layout manager
out << " " << GetName() <<"->SetLayoutManager(";
GetLayoutManager()->SavePrimitive(out,option);
@@ -196,4 +196,4 @@ void TGedToolBox::SavePrimitive(ofstream &out, Option_t *option)
out << " " << GetName() <<"->Resize();" << endl;
}
-
+
diff --git a/gpad/src/TCreatePrimitives.cxx b/gpad/src/TCreatePrimitives.cxx
index f282e3b7e1f..a3df7bfbfd0 100644
--- a/gpad/src/TCreatePrimitives.cxx
+++ b/gpad/src/TCreatePrimitives.cxx
@@ -174,7 +174,7 @@ void TCreatePrimitives::Line(Int_t event, Int_t px, Int_t py, Int_t mode)
gPad->GetCanvas()->Selected((TPad*)gPad, line, event);
}
if (mode == kArrow) {
- arrow = new TArrow(x0,y0,x1,y1
+ arrow = new TArrow(x0,y0,x1,y1
, TArrow::GetDefaultArrowSize()
, TArrow::GetDefaultOption());
arrow->Draw();
@@ -384,7 +384,7 @@ void TCreatePrimitives::PolyLine(Int_t event, Int_t px, Int_t py, Int_t mode)
static Int_t npoints = 0;
static Int_t linedrawn = 0;
Int_t dp;
- static TGraph *gr = NULL;
+ static TGraph *gr = 0;
switch (event) {
@@ -412,7 +412,7 @@ void TCreatePrimitives::PolyLine(Int_t event, Int_t px, Int_t py, Int_t mode)
}
npoints = 0;
linedrawn = 0;
- gr = NULL;
+ gr = 0;
gROOT->SetEditorMode();
break;
}
diff --git a/gpad/src/TPad.cxx b/gpad/src/TPad.cxx
index ef03210c512..77cae950eed 100644
--- a/gpad/src/TPad.cxx
+++ b/gpad/src/TPad.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name: $:$Id: TPad.cxx,v 1.228 2006/04/29 17:50:57 brun Exp $
+// @(#)root/gpad:$Name: $:$Id: TPad.cxx,v 1.229 2006/05/12 07:40:47 brun Exp $
// Author: Rene Brun 12/12/94
/*************************************************************************
@@ -872,8 +872,8 @@ void TPad::CopyPixmap()
int px, py;
XYtoAbsPixel(fX1, fY2, px, py);
-
- if (fPixmapID != -1)
+
+ if (fPixmapID != -1)
gVirtualX->CopyPixmap(fPixmapID, px, py);
if (this == gPad) HighLight(gPad->GetHighLightColor());
@@ -1022,7 +1022,7 @@ void TPad::Divide(Int_t nx, Int_t ny, Float_t xmargin, Float_t ymargin, Int_t co
void *arr[7];
arr[1] = this; arr[2] = (void*)&nx;arr[3] = (void*)& ny;
arr[4] = (void*)&xmargin; arr[5] = (void *)& ymargin; arr[6] = (void *)&color;
- if ((*gThreadXAR)("PDCD", 7, arr, NULL)) return;
+ if ((*gThreadXAR)("PDCD", 7, arr, 0)) return;
}
TPad *padsav = (TPad*)gPad;
@@ -2495,7 +2495,7 @@ void TPad::Paint(Option_t * /*option*/)
fViewer3D->EndScene();
}
- // Generate the PS output using gl2ps
+ // Generate the PS output using gl2ps
if (GetGLDevice()!=-1 && gVirtualPS) {
gPad = this;
gGLManager->PrintViewer(GetViewer3D());
@@ -5493,16 +5493,16 @@ TVirtualViewer3D *TPad::GetViewer3D(Option_t *type)
// (if any), otherwise a default 'pad' type is returned
Bool_t validType = kFALSE;
-
+
if ( (!type || !type[0] || (strstr(type, "gl") && !strstr(type, "ogl"))) && ! fCanvas->UseGL())
type = "pad";
-
+
if (type && type[0]) {
// Extract plugins types supporting TVirtualViewer3D - cannot be done
// directly with plugin manager at present
TString pluginStr = gEnv->GetValue("Plugin.TVirtualViewer3D","");
TObjArray *pluginTypes = pluginStr.Tokenize(" ");
-
+
// Each plugin has 4 entries, 'type' (URI in plugin manager terminology) is zeroth
Int_t i = 0;
while (i < pluginTypes->GetSize() && !validType) {
@@ -5550,13 +5550,13 @@ TVirtualViewer3D *TPad::GetViewer3D(Option_t *type)
// Return the existing viewer
return fViewer3D;
}
-
+
if (strstr(type, "gl") && !strstr(type, "ogl"))
fEmbeddedGL = kTRUE, fCopyGLDevice = kTRUE;
else
createdExternal = kTRUE;
- } else
+ } else
newViewer = new TViewer3DPad(*this);
// If we had a previous viewer destroy it now
diff --git a/gui/inc/TGLayout.h b/gui/inc/TGLayout.h
index 5aadeea4cb2..5cedf45c877 100644
--- a/gui/inc/TGLayout.h
+++ b/gui/inc/TGLayout.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGLayout.h,v 1.12 2006/05/15 11:01:14 rdm Exp $
+// @(#)root/gui:$Name: $:$Id: TGLayout.h,v 1.13 2006/05/23 04:47:38 brun Exp $
// Author: Fons Rademakers 02/01/98
/*************************************************************************
@@ -126,7 +126,7 @@ public:
Int_t fState; // EFrameState defined in TGFrame.h
TGLayoutHints *fLayout; // layout hints used in layout
- TGFrameElement(): fFrame(NULL), fState(0), fLayout(NULL) { }
+ TGFrameElement() : fFrame(0), fState(0), fLayout(0) { }
TGFrameElement(TGFrame *f, TGLayoutHints *l);
~TGFrameElement();
diff --git a/gui/inc/TGMenu.h b/gui/inc/TGMenu.h
index b6145884d2a..0d05d9e362c 100644
--- a/gui/inc/TGMenu.h
+++ b/gui/inc/TGMenu.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGMenu.h,v 1.34 2006/05/15 07:43:34 brun Exp $
+// @(#)root/gui:$Name: $:$Id: TGMenu.h,v 1.35 2006/05/23 04:47:38 brun Exp $
// Author: Fons Rademakers 09/01/98
/*************************************************************************
@@ -91,12 +91,12 @@ protected:
const TGPicture *fPic; // menu entry icon
TGPopupMenu *fPopup; // pointer to popup menu (in case of cascading menus)
- TGMenuEntry(const TGMenuEntry&);
- TGMenuEntry& operator=(const TGMenuEntry&);
+ TGMenuEntry(const TGMenuEntry&);
+ TGMenuEntry& operator=(const TGMenuEntry&);
public:
- TGMenuEntry(): fEntryId(0), fUserData(NULL), fType(), fStatus(0), fEx(0), fEy(0),
- fEw(0), fEh(0), fLabel(NULL), fPic(NULL), fPopup(NULL) { }
+ TGMenuEntry(): fEntryId(0), fUserData(0), fType(), fStatus(0),
+ fEx(0), fEy(0), fEw(0), fEh(0), fLabel(0), fPic(0), fPopup(0) { }
virtual ~TGMenuEntry() { if (fLabel) delete fLabel; }
Int_t GetEntryId() const { return fEntryId; }
@@ -105,12 +105,12 @@ public:
EMenuEntryType GetType() const { return fType; }
TGPopupMenu *GetPopup() const { return fPopup; }
TGHotString *GetLabel() const { return fLabel; }
- Int_t GetEx() const { return fEx; }
+ Int_t GetEx() const { return fEx; }
Int_t GetEy() const { return fEy; }
UInt_t GetEw() const { return fEw; }
UInt_t GetEh() const { return fEh; }
const TGPicture *GetPic() const { return fPic; }
- void *GetUserData() const { return fUserData; }
+ void *GetUserData() const { return fUserData; }
ClassDef(TGMenuEntry,0); // Menu entry class
};
@@ -148,7 +148,7 @@ protected:
Cursor_t fDefaultCursor; // right pointing cursor
const TGWindow *fMsgWindow; // window which handles menu events
TGMenuBar *fMenuBar; // menu bar (if any)
- UInt_t fEntrySep; // separation distance between ebtris
+ UInt_t fEntrySep; // separation distance between ebtris
static const TGFont *fgDefaultFont;
static const TGFont *fgHilightFont;
diff --git a/gui/inc/TGObject.h b/gui/inc/TGObject.h
index 9aba8df31dd..d1f4926dd0d 100644
--- a/gui/inc/TGObject.h
+++ b/gui/inc/TGObject.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGObject.h,v 1.4 2006/05/15 07:43:34 brun Exp $
+// @(#)root/gui:$Name: $:$Id: TGObject.h,v 1.5 2006/05/23 04:47:38 brun Exp $
// Author: Fons Rademakers 27/12/97
/*************************************************************************
@@ -40,12 +40,12 @@ protected:
Handle_t fId; // X11/Win32 Window identifier
TGClient *fClient; // Connection to display server
- TGObject& operator=(const TGObject& tgo)
- {if(this!=&tgo) { TObject::operator=(tgo); fId=tgo.fId;
+ TGObject& operator=(const TGObject& tgo)
+ {if(this!=&tgo) { TObject::operator=(tgo); fId=tgo.fId;
fClient=tgo.fClient; } return *this; }
public:
- TGObject(): fId(0), fClient(NULL) { }
+ TGObject(): fId(0), fClient(0) { }
TGObject(const TGObject& tgo): TObject(tgo), fId(tgo.fId), fClient(tgo.fClient) { }
virtual ~TGObject() { }
diff --git a/gui/inc/TGPicture.h b/gui/inc/TGPicture.h
index 116ecb5f937..f43a663b5b7 100644
--- a/gui/inc/TGPicture.h
+++ b/gui/inc/TGPicture.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGPicture.h,v 1.11 2006/05/15 11:01:14 rdm Exp $
+// @(#)root/gui:$Name: $:$Id: TGPicture.h,v 1.12 2006/05/23 04:47:38 brun Exp $
// Author: Fons Rademakers 01/01/98
/*************************************************************************
@@ -119,7 +119,7 @@ protected:
public:
TGPicturePool(const TGClient *client, const char *path):
- fClient(client), fPath(path), fPicList(NULL) { }
+ fClient(client), fPath(path), fPicList(0) { }
virtual ~TGPicturePool();
const char *GetPath() const { return fPath; }
diff --git a/gui/inc/TGWindow.h b/gui/inc/TGWindow.h
index 02606729491..2b847241251 100644
--- a/gui/inc/TGWindow.h
+++ b/gui/inc/TGWindow.h
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGWindow.h,v 1.26 2006/05/18 16:32:01 antcheva Exp $
+// @(#)root/gui:$Name: $:$Id: TGWindow.h,v 1.27 2006/05/23 04:47:38 brun Exp $
// Author: Fons Rademakers 28/12/97
/*************************************************************************
@@ -46,28 +46,28 @@ protected:
static Int_t fgCounter; // counter of created windows in SavePrimitive
UInt_t fEditDisabled; // flags used for "guibuilding"
- TGWindow(Window_t id):
- fParent(NULL), fNeedRedraw(kFALSE), fName(), fEditDisabled(0) { fClient = 0; fId = id; }
- TGWindow(const TGWindow& tgw):
- TGObject(tgw), fParent(tgw.fParent), fNeedRedraw(tgw.fNeedRedraw),
- fName(tgw.fName), fEditDisabled(tgw.fEditDisabled) { }
+ TGWindow(Window_t id) :
+ fParent(0), fNeedRedraw(kFALSE), fEditDisabled(0) { fClient = 0; fId = id; }
+ TGWindow(const TGWindow& tgw) :
+ TGObject(tgw), fParent(tgw.fParent), fNeedRedraw(tgw.fNeedRedraw),
+ fName(tgw.fName), fEditDisabled(tgw.fEditDisabled) { }
TGWindow& operator=(const TGWindow& tgw)
- {if(this!=&tgw) { TGObject::operator=(tgw); fParent=tgw.fParent;
- fNeedRedraw=tgw.fNeedRedraw; fName=tgw.fName;
- fEditDisabled=tgw.fEditDisabled;} return *this;}
-
+ { if (this!=&tgw) { TGObject::operator=(tgw); fParent=tgw.fParent;
+ fNeedRedraw=tgw.fNeedRedraw; fName=tgw.fName;
+ fEditDisabled=tgw.fEditDisabled; } return *this; }
+
virtual void DoRedraw() { }
public:
- enum EEditMode {
+ enum EEditMode {
kEditEnable = 0, // allow edit of this window
kEditDisable = BIT(0), // disable edit of this window
kEditDisableEvents = BIT(1), // window events cannot be edited
- kEditDisableGrab = BIT(2), // window grab cannot be edited
- kEditDisableLayout = BIT(3), // window layout cannot be edited
- kEditDisableResize = BIT(4), // window size cannot be edited
- kEditDisableHeight = BIT(5), // window height cannot be edited
+ kEditDisableGrab = BIT(2), // window grab cannot be edited
+ kEditDisableLayout = BIT(3), // window layout cannot be edited
+ kEditDisableResize = BIT(4), // window size cannot be edited
+ kEditDisableHeight = BIT(5), // window height cannot be edited
kEditDisableWidth = BIT(6), // window width cannot be edited
kEditDisableBtnEnable = BIT(7) // window cannot be edited but can handle mouse button events
};
@@ -116,7 +116,7 @@ public:
virtual Bool_t IsEditable() const { return (fClient->GetRoot() == this); }
virtual UInt_t GetEditDisabled() const { return fEditDisabled; }
virtual void SetEditDisabled(UInt_t on = kEditDisable) { fEditDisabled = on; }
- virtual void SetEditable(Bool_t on = kTRUE)
+ virtual void SetEditable(Bool_t on = kTRUE)
{ if (!(fEditDisabled & kEditDisable)) fClient->SetRoot(on ? this : 0); }
virtual Int_t MustCleanup() const { return 0; }
virtual void Print(Option_t *option="") const;
diff --git a/gui/src/TGMdiDecorFrame.cxx b/gui/src/TGMdiDecorFrame.cxx
index 444cb551adf..1e439a643df 100644
--- a/gui/src/TGMdiDecorFrame.cxx
+++ b/gui/src/TGMdiDecorFrame.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TGMdiDecorFrame.cxx,v 1.15 2006/03/23 15:56:03 antcheva Exp $
+// @(#)root/gui:$Name: $:$Id: TGMdiDecorFrame.cxx,v 1.16 2006/05/11 12:50:07 antcheva Exp $
// Author: Bertrand Bellenot 20/08/2004
/*************************************************************************
@@ -338,12 +338,12 @@ TGMdiTitleBar::TGMdiTitleBar(const TGWindow *p, const TGWindow *mdiwin,
{
// TGMdiTitleBar constructor.
// the TGMdiTitleBar is the frame containing a title (window name)
- // an icon and MDI picture buttons as minimize, maximize, restore,
+ // an icon and MDI picture buttons as minimize, maximize, restore,
// close and help.
fMdiWin = mdiwin;
fEditDisabled = kTRUE;
- fWinName = NULL;
+ fWinName = 0;
fMidButPressed = fLeftButPressed = fRightButPressed = kFALSE;
AddInput(kButtonPressMask | kButtonReleaseMask | kButtonMotionMask);
@@ -683,7 +683,7 @@ TGMdiTitleIcon::TGMdiTitleIcon(const TGWindow *p, const TGWindow *titlebar,
TGIcon(p, pic, w, h)
{
// TGMdiTitleIcon constructor.
- // the TGMdiTitleIcon is the left icon used also for the MDI
+ // the TGMdiTitleIcon is the left icon used also for the MDI
// popup menu allowing access to MDI commands as : restore,
// move, size, minimize and close.
@@ -763,7 +763,7 @@ TGMdiWinResizer::TGMdiWinResizer(const TGWindow *p, const TGWindow *mdiwin,
// TGMdiWinResizer constructor.
// The TGMdiWinResizer is a frame allowing to resize MDI window.
// Could be horizontal, vertical or corner resizer (see derived classes
- // TGMdiVerticalWinResizer, TGMdiHorizontalWinResizer, and
+ // TGMdiVerticalWinResizer, TGMdiHorizontalWinResizer, and
// TGMdiCornerWinResizer).
fWidgetFlags = kWidgetIsEnabled;
diff --git a/gui/src/TRootCanvas.cxx b/gui/src/TRootCanvas.cxx
index 48a561d7eb6..933ece18760 100644
--- a/gui/src/TRootCanvas.cxx
+++ b/gui/src/TRootCanvas.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gui:$Name: $:$Id: TRootCanvas.cxx,v 1.99 2006/04/28 08:32:35 antcheva Exp $
+// @(#)root/gui:$Name: $:$Id: TRootCanvas.cxx,v 1.100 2006/05/09 07:53:32 antcheva Exp $
// Author: Fons Rademakers 15/01/98
/*************************************************************************
@@ -170,38 +170,38 @@ static const char *gSaveAsTypes[] = { "PostScript", "*.ps",
static ToolBarData_t gToolBarData[] = {
// { filename, tooltip, staydown, id, button}
- { "newcanvas.xpm", "New", kFALSE, kFileNewCanvas, NULL },
- { "open.xpm", "Open", kFALSE, kFileOpen, NULL },
- { "save.xpm", "Save As", kFALSE, kFileSaveAs, NULL },
- { "printer.xpm", "Print", kFALSE, kFilePrint, NULL },
- { "", "", kFALSE, -1, NULL },
- { "interrupt.xpm", "Interrupt", kFALSE, kOptionInterrupt,NULL },
- { "refresh2.xpm", "Refresh", kFALSE, kOptionRefresh, NULL },
- { "", "", kFALSE, -1, NULL },
- { "inspect.xpm", "Inspect", kFALSE, kInspectRoot, NULL },
- { "browser.xpm", "Browser", kFALSE, kInspectBrowser, NULL },
- { 0, 0, kFALSE, 0, NULL }
+ { "newcanvas.xpm", "New", kFALSE, kFileNewCanvas, 0 },
+ { "open.xpm", "Open", kFALSE, kFileOpen, 0 },
+ { "save.xpm", "Save As", kFALSE, kFileSaveAs, 0 },
+ { "printer.xpm", "Print", kFALSE, kFilePrint, 0 },
+ { "", "", kFALSE, -1, 0 },
+ { "interrupt.xpm", "Interrupt", kFALSE, kOptionInterrupt,0 },
+ { "refresh2.xpm", "Refresh", kFALSE, kOptionRefresh, 0 },
+ { "", "", kFALSE, -1, 0 },
+ { "inspect.xpm", "Inspect", kFALSE, kInspectRoot, 0 },
+ { "browser.xpm", "Browser", kFALSE, kInspectBrowser, 0 },
+ { 0, 0, kFALSE, 0, 0 }
};
static ToolBarData_t gToolBarData1[] = {
- { "pointer.xpm", "Modify", kFALSE, kToolModify, NULL },
- { "arc.xpm", "Arc", kFALSE, kToolArc, NULL },
- { "line.xpm", "Line", kFALSE, kToolLine, NULL },
- { "arrow.xpm", "Arrow", kFALSE, kToolArrow, NULL },
- { "diamond.xpm", "Diamond", kFALSE, kToolDiamond, NULL },
- { "ellipse.xpm", "Ellipse", kFALSE, kToolEllipse, NULL },
- { "pad.xpm", "Pad", kFALSE, kToolPad, NULL },
- { "pave.xpm", "Pave", kFALSE, kToolPave, NULL },
- { "pavelabel.xpm", "Pave Label", kFALSE, kToolPLabel, NULL },
- { "pavetext.xpm", "Pave Text", kFALSE, kToolPText, NULL },
- { "pavestext.xpm", "Paves Text", kFALSE, kToolPsText, NULL },
- { "graph.xpm", "Graph", kFALSE, kToolGraph, NULL },
- { "curlyline.xpm", "Curly Line", kFALSE, kToolCurlyLine, NULL },
- { "curlyarc.xpm", "Curly Arc", kFALSE, kToolCurlyArc, NULL },
- { "latex.xpm", "Text/Latex", kFALSE, kToolLatex, NULL },
- { "marker.xpm", "Marker", kFALSE, kToolMarker, NULL },
- { "cut.xpm", "Graphical Cut", kFALSE, kToolCutG, NULL },
- { 0, 0, kFALSE, 0, NULL }
+ { "pointer.xpm", "Modify", kFALSE, kToolModify, 0 },
+ { "arc.xpm", "Arc", kFALSE, kToolArc, 0 },
+ { "line.xpm", "Line", kFALSE, kToolLine, 0 },
+ { "arrow.xpm", "Arrow", kFALSE, kToolArrow, 0 },
+ { "diamond.xpm", "Diamond", kFALSE, kToolDiamond, 0 },
+ { "ellipse.xpm", "Ellipse", kFALSE, kToolEllipse, 0 },
+ { "pad.xpm", "Pad", kFALSE, kToolPad, 0 },
+ { "pave.xpm", "Pave", kFALSE, kToolPave, 0 },
+ { "pavelabel.xpm", "Pave Label", kFALSE, kToolPLabel, 0 },
+ { "pavetext.xpm", "Pave Text", kFALSE, kToolPText, 0 },
+ { "pavestext.xpm", "Paves Text", kFALSE, kToolPsText, 0 },
+ { "graph.xpm", "Graph", kFALSE, kToolGraph, 0 },
+ { "curlyline.xpm", "Curly Line", kFALSE, kToolCurlyLine, 0 },
+ { "curlyarc.xpm", "Curly Arc", kFALSE, kToolCurlyArc, 0 },
+ { "latex.xpm", "Text/Latex", kFALSE, kToolLatex, 0 },
+ { "marker.xpm", "Marker", kFALSE, kToolMarker, 0 },
+ { "cut.xpm", "Graphical Cut", kFALSE, kToolCutG, 0 },
+ { 0, 0, kFALSE, 0, 0 }
};
//////////////////////////////////////////////////////////////////////////
diff --git a/hist/inc/TLimit.h b/hist/inc/TLimit.h
index ddf89792263..3d228552a6e 100644
--- a/hist/inc/TLimit.h
+++ b/hist/inc/TLimit.h
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TLimit.h,v 1.7 2005/11/29 06:16:16 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TLimit.h,v 1.8 2006/01/15 22:03:51 brun Exp $
// Author: Christophe.Delaere@cern.ch 21/08/2002
#ifndef ROOT_TLimit
@@ -41,31 +41,31 @@ public:
TLimit() {}
virtual ~TLimit() {}
static TConfidenceLevel *ComputeLimit(TLimitDataSource * data,
- Int_t nmc =50000,
+ Int_t nmc =50000,
bool stat = false,
- TRandom * generator = NULL,
+ TRandom * generator = 0,
Double_t(*statistic) (Double_t, Double_t,Double_t) = &(TLimit::LogLikelihood));
static TConfidenceLevel *ComputeLimit(Double_t s, Double_t b, Int_t d,
- Int_t nmc =50000,
+ Int_t nmc =50000,
bool stat = false,
- TRandom * generator = NULL,
+ TRandom * generator = 0,
Double_t(*statistic) (Double_t, Double_t,Double_t) = &(TLimit::LogLikelihood));
- static TConfidenceLevel *ComputeLimit(Double_t s, Double_t b, Int_t d,
+ static TConfidenceLevel *ComputeLimit(Double_t s, Double_t b, Int_t d,
TVectorD* se, TVectorD* be, TObjArray*,
- Int_t nmc =50000,
+ Int_t nmc =50000,
bool stat = false,
- TRandom * generator = NULL,
+ TRandom * generator = 0,
Double_t(*statistic) (Double_t, Double_t,Double_t) = &(TLimit::LogLikelihood));
static TConfidenceLevel *ComputeLimit(TH1* s, TH1* b, TH1* d,
- Int_t nmc =50000,
+ Int_t nmc =50000,
bool stat = false,
- TRandom * generator = NULL,
+ TRandom * generator = 0,
Double_t(*statistic) (Double_t, Double_t,Double_t) = &(TLimit::LogLikelihood));
- static TConfidenceLevel *ComputeLimit(TH1* s, TH1* b, TH1* d,
+ static TConfidenceLevel *ComputeLimit(TH1* s, TH1* b, TH1* d,
TVectorD* se, TVectorD* be, TObjArray*,
- Int_t nmc =50000,
+ Int_t nmc =50000,
bool stat = false,
- TRandom * generator = NULL,
+ TRandom * generator = 0,
Double_t(*statistic) (Double_t, Double_t,Double_t) = &(TLimit::LogLikelihood));
private:
static TArrayD *fgTable; // a log table... just to speed up calculation
diff --git a/hist/src/TConfidenceLevel.cxx b/hist/src/TConfidenceLevel.cxx
index a684547b813..4540a71326a 100644
--- a/hist/src/TConfidenceLevel.cxx
+++ b/hist/src/TConfidenceLevel.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TConfidenceLevel.cxx,v 1.5 2005/11/03 17:08:32 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TConfidenceLevel.cxx,v 1.6 2006/05/17 16:37:25 couet Exp $
// Author: Christophe.Delaere@cern.ch 21/08/2002
///////////////////////////////////////////////////////////////////////////
@@ -6,7 +6,7 @@
// TConfidenceLevel
//
// Class to compute 95% CL limits
-//
+//
///////////////////////////////////////////////////////////////////////////
/*************************************************************************
@@ -43,14 +43,14 @@ TConfidenceLevel::TConfidenceLevel()
fBtot = 0;
fDtot = 0;
fTSD = 0;
- fTSB = NULL;
- fTSS = NULL;
- fLRS = NULL;
- fLRB = NULL;
+ fTSB = 0;
+ fTSS = 0;
+ fLRS = 0;
+ fLRB = 0;
fNMC = 0;
fNNMC = 0;
- fISS = NULL;
- fISB = NULL;
+ fISS = 0;
+ fISB = 0;
fMCL3S = fgMCL3S1S;
fMCL5S = fgMCL5S1S;
}
@@ -67,10 +67,10 @@ TConfidenceLevel::TConfidenceLevel(Int_t mc, bool onesided)
fBtot = 0;
fDtot = 0;
fTSD = 0;
- fTSB = NULL;
- fTSS = NULL;
- fLRS = NULL;
- fLRB = NULL;
+ fTSB = 0;
+ fTSS = 0;
+ fLRS = 0;
+ fLRB = 0;
fNMC = mc;
fNNMC = mc;
fISS = new Int_t[mc];
@@ -261,7 +261,7 @@ Double_t TConfidenceLevel::GetExpectedCLsb_b(Int_t sigma) const
//______________________________________________________________________________
Double_t TConfidenceLevel::GetExpectedCLb_sb(Int_t sigma) const
{
- // Get the expected Confidence Level for the background only
+ // Get the expected Confidence Level for the background only
// if there is signal and background.
Double_t result = 0;
@@ -421,7 +421,7 @@ Double_t TConfidenceLevel::Get5sProbability() const
void TConfidenceLevel::Draw(const Option_t*)
{
// Display sort of a "canonical" -2lnQ plot.
- // This results in a plot with 2 elements:
+ // This results in a plot with 2 elements:
// - The histogram of -2lnQ for background hypothesis (full)
// - The histogram of -2lnQ for signal and background hypothesis (dashed)
// The 2 histograms are respectively named b_hist and sb_hist.
diff --git a/hist/src/THStack.cxx b/hist/src/THStack.cxx
index 5c7047a15f4..6f6ba8dcf9d 100644
--- a/hist/src/THStack.cxx
+++ b/hist/src/THStack.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: THStack.cxx,v 1.44 2006/05/23 04:47:40 brun Exp $
+// @(#)root/hist:$Name: $:$Id: THStack.cxx,v 1.45 2006/05/24 14:55:26 brun Exp $
// Author: Rene Brun 10/12/2001
/*************************************************************************
@@ -77,28 +77,28 @@ THStack::THStack(const char *name, const char *title)
fHistogram = 0;
fMaximum = -1111;
fMinimum = -1111;
- gROOT->GetListOfCleanups()->Add(this);
+ gROOT->GetListOfCleanups()->Add(this);
}
//______________________________________________________________________________
-THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
+THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
const char *name /*=0*/, const char *title /*=0*/,
- Int_t firstbin /*=-1*/, Int_t lastbin /*=-1*/,
- Int_t firstbin2 /*=-1*/, Int_t lastbin2 /*=-1*/,
+ Int_t firstbin /*=-1*/, Int_t lastbin /*=-1*/,
+ Int_t firstbin2 /*=-1*/, Int_t lastbin2 /*=-1*/,
Option_t* proj_option /*=""*/, Option_t* draw_option /*=""*/): TNamed(name, title) {
// Creates a new THStack from a TH2 or TH3
// It is filled with the 1D histograms from GetProjectionX or GetProjectionY
-// for each bin of the histogram. It illustrates the differences and total
+// for each bin of the histogram. It illustrates the differences and total
// sum along an axis.
-//
+//
// Parameters:
-// - hist: the histogram used for the projections. Can be an object deriving
+// - hist: the histogram used for the projections. Can be an object deriving
// from TH2 or TH3.
// - axis: for TH2: "x" for ProjectionX, "y" for ProjectionY.
// for TH3: see TH3::Project3D.
-// - name: fName is set to name if given, otherwise to histo's name with
-// "_stack_<axis>" appended, where <axis> is the value of the
+// - name: fName is set to name if given, otherwise to histo's name with
+// "_stack_<axis>" appended, where <axis> is the value of the
// parameter axis.
// - title: fTitle is set to title if given, otherwise to histo's title
// with ", stack of <axis> projections" appended.
@@ -110,7 +110,7 @@ THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
// Other axis range for TH3::Project3D, defaults to "all bins".
// Ignored for TH2s
// - proj_option:
-// option passed to TH2::ProjectionX/Y and TH3::Project3D (along
+// option passed to TH2::ProjectionX/Y and TH3::Project3D (along
// with axis)
// - draw_option:
// option passed to THStack::Add.
@@ -119,7 +119,7 @@ THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
fHistogram = 0;
fMaximum = -1111;
fMinimum = -1111;
- gROOT->GetListOfCleanups()->Add(this);
+ gROOT->GetListOfCleanups()->Add(this);
if (!axis) {
Warning("THStack", "Need an axis.");
@@ -163,9 +163,9 @@ THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
if (lastbin > nbins+1) lastbin = nbins;
for (Int_t iBin=firstbin; iBin<=lastbin; iBin++) {
TH1* hProj=0;
- if (useX) hProj=hist2->ProjectionX(Form("%s_px%d",hist2->GetName(), iBin),
+ if (useX) hProj=hist2->ProjectionX(Form("%s_px%d",hist2->GetName(), iBin),
iBin, iBin, proj_option);
- else hProj=hist2->ProjectionY(Form("%s_py%d",hist2->GetName(), iBin),
+ else hProj=hist2->ProjectionY(Form("%s_py%d",hist2->GetName(), iBin),
iBin, iBin, proj_option);
Add(hProj, draw_option);
}
@@ -183,11 +183,11 @@ THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
if (dim==1) {
TAxis* haxis = 0;
// look for the haxis _not_ in axis
- if (sAxis.First('x')==kNPOS)
+ if (sAxis.First('x')==kNPOS)
haxis=hist->GetXaxis();
- else if (sAxis.First('y')==kNPOS)
+ else if (sAxis.First('y')==kNPOS)
haxis=hist->GetYaxis();
- else if (sAxis.First('z')==kNPOS)
+ else if (sAxis.First('z')==kNPOS)
haxis=hist->GetZaxis();
if (!haxis) {
Warning("HStack","Histogram axis is NULL");
@@ -203,7 +203,7 @@ THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
for (Int_t iBin=firstbin; iBin<=lastbin; iBin++) {
haxis->SetRange(iBin, iBin);
// build projection named axis_iBin (passed through "option")
- TH1* hProj=hist3->Project3D(Form("%s_%s%s_%d", hist3->GetName(),
+ TH1* hProj=hist3->Project3D(Form("%s_%s%s_%d", hist3->GetName(),
axis, proj_option, iBin));
Add(hProj, draw_option);
}
@@ -245,7 +245,7 @@ THStack::THStack(const TH1* hist, Option_t *axis /*="x"*/,
for (Int_t jBin=firstbin2; jBin<=lastbin2; jBin++) {
haxis2->SetRange(jBin, jBin);
// build projection named axis_iBin (passed through "option")
- TH1* hProj=hist3->Project3D(Form("%s_%s%s_%d", hist3->GetName(),
+ TH1* hProj=hist3->Project3D(Form("%s_%s%s_%d", hist3->GetName(),
axis, proj_option, iBin));
Add(hProj, draw_option);
}
@@ -262,7 +262,7 @@ THStack::~THStack()
// THStack destructor
- gROOT->GetListOfCleanups()->Remove(this);
+ gROOT->GetListOfCleanups()->Remove(this);
if (!fHists) return;
fHists->Clear("nodelete");
delete fHists;
@@ -273,13 +273,13 @@ THStack::~THStack()
}
//______________________________________________________________________________
-THStack::THStack(const THStack &hstack) :
- TNamed(hstack),
- fHists(NULL),
- fStack(NULL),
- fHistogram(NULL),
- fMaximum(hstack.fMaximum),
- fMinimum(hstack.fMinimum)
+THStack::THStack(const THStack &hstack) :
+ TNamed(hstack),
+ fHists(0),
+ fStack(0),
+ fHistogram(0),
+ fMaximum(hstack.fMaximum),
+ fMinimum(hstack.fMinimum)
{
// THStack copy constructor
@@ -709,7 +709,7 @@ void THStack::Paint(Option_t *option)
}
h1 = (TH1*)fStack->At(nhists-i-1);
if (i>0) {
- // Erase before drawing the histogram
+ // Erase before drawing the histogram
h1col = h1->GetFillColor();
h1fill = h1->GetFillStyle();
h1->SetFillColor(1000);
diff --git a/hist/src/TLimit.cxx b/hist/src/TLimit.cxx
index 36210032a5b..c6db877488f 100644
--- a/hist/src/TLimit.cxx
+++ b/hist/src/TLimit.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TLimit.cxx,v 1.18 2006/02/03 21:55:39 pcanal Exp $
+// @(#)root/hist:$Name: $:$Id: TLimit.cxx,v 1.19 2006/05/17 16:37:26 couet Exp $
// Author: Christophe.Delaere@cern.ch 21/08/2002
///////////////////////////////////////////////////////////////////////////
@@ -237,7 +237,7 @@ bool TLimit::Fluctuate(TLimitDataSource * input, TLimitDataSource * output,
delete fgSystNames;
fgSystNames = new TOrdCollection();
while ((listofnames = ((TObjArray *) errornames->Next()))) {
- TObjString *name = NULL;
+ TObjString *name = 0;
TIterator *loniter = listofnames->MakeIterator();
while ((name = (TObjString *) (loniter->Next())))
if ((fgSystNames->IndexOf(name)) < 0)
@@ -277,8 +277,8 @@ bool TLimit::Fluctuate(TLimitDataSource * input, TLimitDataSource * output,
// goes negative. (background = 0 is bad too, so put a little protection
// around it -- must have at least 10% of the bg estimate).
Bool_t retoss = kTRUE;
- Double_t *serrf = NULL;
- Double_t *berrf = NULL;
+ Double_t *serrf = 0;
+ Double_t *berrf = 0;
do {
Double_t *toss = new Double_t[fgSystNames->GetSize()];
for (Int_t i = 0; i < fgSystNames->GetSize(); i++)
@@ -314,10 +314,10 @@ bool TLimit::Fluctuate(TLimitDataSource * input, TLimitDataSource * output,
TH1 *newsignal = (TH1*)(output->GetSignal()->At(channel));
TH1 *oldsignal = (TH1*)(input->GetSignal()->At(channel));
if(stat)
- for(int i=1; i<=newsignal->GetNbinsX(); i++)
+ for(int i=1; i<=newsignal->GetNbinsX(); i++)
newsignal->SetBinContent(i,oldsignal->GetBinContent(i)+generator->Gaus(0,oldsignal->GetBinError(i)));
else
- for(int i=1; i<=newsignal->GetNbinsX(); i++)
+ for(int i=1; i<=newsignal->GetNbinsX(); i++)
newsignal->SetBinContent(i,oldsignal->GetBinContent(i));
newsignal->Scale(1 + serrf[channel]);
newsignal->SetDirectory(0);
diff --git a/io/src/TFile.cxx b/io/src/TFile.cxx
index 14f5798509a..d10db590a09 100644
--- a/io/src/TFile.cxx
+++ b/io/src/TFile.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.158 2006/05/22 11:13:33 brun Exp $
+// @(#)root/base:$Name: $:$Id: TFile.cxx,v 1.159 2006/05/22 12:41:23 rdm Exp $
// Author: Rene Brun 28/11/94
/*************************************************************************
@@ -1275,11 +1275,11 @@ Bool_t TFile::ReadBuffer(char *buf, Int_t len)
}
//______________________________________________________________________________
-Bool_t TFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)
+Bool_t TFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)
{
// Read the nbuf blocks described in arrays pos and len,
// where pos[i] is the seek position of block i of length len[i].
- // Note that for nbuf=1, this call is equivalent to TFile::ReafBuffer
+ // Note that for nbuf=1, this call is equivalent to TFile::ReafBuffer.
// This function is overloaded by TNetFile, TWebFile, etc.
// Returns kTRUE in case of failure.
diff --git a/krb5auth/src/TKSocket.cxx b/krb5auth/src/TKSocket.cxx
index 95d794b48cc..cbc70d08d5d 100644
--- a/krb5auth/src/TKSocket.cxx
+++ b/krb5auth/src/TKSocket.cxx
@@ -1,4 +1,4 @@
-// @(#)root/krb5auth:$Name: $:$Id: TKSocket.cxx,v 1.6 2005/10/03 08:41:23 rdm Exp $
+// @(#)root/krb5auth:$Name: $:$Id: TKSocket.cxx,v 1.7 2006/05/15 09:45:03 brun Exp $
// Author: Maarten Ballintijn 27/10/2003
#include <stdlib.h>
@@ -110,7 +110,7 @@ TKSocket *TKSocket::Connect(const char *server, Int_t port)
AP_OPTS_MUTUAL_REQUIRED,
&cksum_data,
0, /* no creds, use ccache instead */
- fgCCDef, &err_ret, &rep_ret, NULL);
+ fgCCDef, &err_ret, &rep_ret, 0);
delete [] cksum_data.data;
diff --git a/math/src/TRandom1.cxx b/math/src/TRandom1.cxx
index 6c3bc227d6c..bcf4b2bccdf 100644
--- a/math/src/TRandom1.cxx
+++ b/math/src/TRandom1.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TRandom1.cxx,v 1.3 2006/05/15 06:31:19 brun Exp $
+// @(#)root/base:$Name: $:$Id: TRandom1.cxx,v 1.4 2006/05/18 07:34:25 brun Exp $
// Author: Rene Brun from CLHEP & CERNLIB 04/05/2006
//////////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@ int TRandom1::fgNumEngines = 0;
int TRandom1::fgMaxIndex = 215;
#ifndef __CINT__
const Long64_t fgSeedTable[215][2] = {
- { 9876, 54321 },
+ { 9876, 54321 },
{ 1299961164, 253987020 },
{ 669708517, 2079157264 },
{ 190904760, 417696270 },
@@ -242,7 +242,7 @@ const Long64_t fgSeedTable[215][2] = {
{ 242242374, 1863206182 },
{ 957935844, 1490681416 }};
#endif
-
+
ClassImp(TRandom1)
//______________________________________________________________________________
@@ -266,7 +266,7 @@ TRandom1::TRandom1(Long64_t seed, Int_t lux)
fTheSeeds = &fTheSeed;
fLuxury = lux;
SetSeed2(seed, fLuxury);
-
+
// setSeeds() wants a zero terminated array!
seedlist[0]=fTheSeed;
seedlist[1]=0;
@@ -292,7 +292,7 @@ TRandom1::TRandom1()
GetTableSeeds( seedlist, curIndex );
seed = seedlist[0]^mask;
SetSeed2(seed, fLuxury);
-
+
// setSeeds() wants a zero terminated array!
seedlist[0]=fTheSeed; //<=============
seedlist[1]=0;
@@ -318,7 +318,7 @@ TRandom1::TRandom1(int rowIndex, int colIndex, int lux)
GetTableSeeds( seedlist, row );
seed = ( seedlist[col] )^mask;
SetSeed2(seed, fLuxury);
-
+
// setSeeds() wants a zero terminated array!
seedlist[0]=fTheSeed;
seedlist[1]=0;
@@ -326,7 +326,7 @@ TRandom1::TRandom1(int rowIndex, int colIndex, int lux)
}
//______________________________________________________________________________
-TRandom1::~TRandom1()
+TRandom1::~TRandom1()
{
//destructor
}
@@ -339,11 +339,11 @@ void TRandom1::GetTableSeeds(Long64_t* seeds, Int_t index)
seeds[0] = fgSeedTable[index][0];
seeds[1] = fgSeedTable[index][1];
}
- else seeds = NULL;
+ else seeds = 0;
}
//______________________________________________________________________________
-Double_t TRandom1::Rndm(Int_t)
+Double_t TRandom1::Rndm(Int_t)
{
//return a random number in ]0,1]
float next_random;
@@ -390,7 +390,7 @@ Double_t TRandom1::Rndm(Int_t)
if(fIlag < 0)fIlag = 23;
if(fJlag < 0) fJlag = 23;
}
- }
+ }
return (double) next_random;
}
@@ -454,11 +454,11 @@ void TRandom1::RndmArray(const Int_t size, Double_t *vect)
}
}
}
-}
+}
//______________________________________________________________________________
-void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
+void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
{
//set seeds
const int ecuyer_a = 53668;
@@ -470,11 +470,11 @@ void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
int i;
Long64_t int_seed_table[24];
Long64_t k_multiple,next_seed;
- const Long64_t *seedptr;
+ const Long64_t *seedptr;
fTheSeeds = seeds;
seedptr = seeds;
-
+
if(seeds == 0) {
SetSeed2(fTheSeed,lux);
fTheSeeds = &fTheSeed;
@@ -496,21 +496,21 @@ void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
fLuxury = lux;
fNskip = lux_levels[fLuxury];
}
-
+
for( i = 0;(i != 24)&&(*seedptr != 0);i++) {
int_seed_table[i] = *seedptr % fIntModulus;
seedptr++;
- }
+ }
if(i != 24){
next_seed = int_seed_table[i-1];
for(;i != 24;i++) {
k_multiple = next_seed / ecuyer_a;
- next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
+ next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
- k_multiple * ecuyer_c ;
if(next_seed < 0)next_seed += ecuyer_d;
int_seed_table[i] = next_seed % fIntModulus;
- }
+ }
}
for(i = 0;i != 24;i++)
@@ -521,15 +521,15 @@ void TRandom1::SetSeeds(const Long64_t *seeds, int lux)
fCarry = 0. ;
if( fFloatSeedTable[23] == 0. ) fCarry = fMantissaBit24;
-
+
fCount24 = 0;
}
//______________________________________________________________________________
-void TRandom1::SetSeed2(Long64_t seed, int lux)
+void TRandom1::SetSeed2(Long64_t seed, int lux)
{
// The initialisation is carried out using a Multiplicative
-// Congruential generator using formula constants of L'Ecuyer
+// Congruential generator using formula constants of L'Ecuyer
// as described in "A review of pseudorandom number generators"
// (Fred James) published in Computer Physics Communications 60 (1990)
// pages 329-344
@@ -539,13 +539,13 @@ void TRandom1::SetSeed2(Long64_t seed, int lux)
const int ecuyer_c = 12211;
const int ecuyer_d = 2147483563;
- const int lux_levels[5] = {0,24,73,199,365};
+ const int lux_levels[5] = {0,24,73,199,365};
Long64_t int_seed_table[24];
Long64_t next_seed = seed;
Long64_t k_multiple;
int i;
-
+
// number of additional random numbers that need to be 'thrown away'
// every 24 numbers is set using fLuxury level variable.
@@ -561,14 +561,14 @@ void TRandom1::SetSeed2(Long64_t seed, int lux)
fNskip = lux_levels[fLuxury];
}
-
+
for(i = 0;i != 24;i++) {
k_multiple = next_seed / ecuyer_a;
- next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
+ next_seed = ecuyer_b * (next_seed - k_multiple * ecuyer_a)
- k_multiple * ecuyer_c ;
if(next_seed < 0)next_seed += ecuyer_d;
int_seed_table[i] = next_seed % fIntModulus;
- }
+ }
for(i = 0;i != 24;i++)
fFloatSeedTable[i] = int_seed_table[i] * fMantissaBit24;
@@ -578,7 +578,7 @@ void TRandom1::SetSeed2(Long64_t seed, int lux)
fCarry = 0. ;
if( fFloatSeedTable[23] == 0. ) fCarry = fMantissaBit24;
-
+
fCount24 = 0;
}
diff --git a/matrix/inc/TVectorT.h b/matrix/inc/TVectorT.h
index dda7bda11df..235178a31d0 100644
--- a/matrix/inc/TVectorT.h
+++ b/matrix/inc/TVectorT.h
@@ -1,4 +1,4 @@
-// @(#)root/matrix:$Name: $:$Id: TVectorT.h,v 1.8 2006/05/17 06:22:06 brun Exp $
+// @(#)root/matrix:$Name: $:$Id: TVectorT.h,v 1.9 2006/05/23 04:47:40 brun Exp $
// Authors: Fons Rademakers, Eddy Offermann Nov 2003
/*************************************************************************
@@ -56,8 +56,7 @@ protected:
public:
- TVectorT() :
- fNrows(0), fRowLwb(0), fElements(NULL), fIsOwner(kTRUE) { }
+ TVectorT() : fNrows(0), fRowLwb(0), fElements(0), fIsOwner(kTRUE) { }
explicit TVectorT(Int_t n);
TVectorT(Int_t lwb,Int_t upb);
TVectorT(Int_t n,const Element *elements);
diff --git a/minuit/src/TLinearFitter.cxx b/minuit/src/TLinearFitter.cxx
index 3832c62e6e0..fb12c205059 100644
--- a/minuit/src/TLinearFitter.cxx
+++ b/minuit/src/TLinearFitter.cxx
@@ -1,4 +1,4 @@
-// @(#)root/minuit:$Name: $:$Id: TLinearFitter.cxx,v 1.25 2006/05/23 04:47:40 brun Exp $
+// @(#)root/minuit:$Name: $:$Id: TLinearFitter.cxx,v 1.26 2006/05/24 15:10:46 brun Exp $
// Author: Anna Kreshuk 04/03/2005
/*************************************************************************
@@ -161,20 +161,20 @@ ClassImp(TLinearFitter)
// Even a single gross outlier can greatly influence the results of least-
// squares fitting procedure, and in this case use of robust(resistant) methods
// is recommended.
-//
+//
// The method implemented here is based on the article and algorithm:
-// "Computing LTS Regression for Large Data Sets" by
+// "Computing LTS Regression for Large Data Sets" by
// P.J.Rousseeuw and Katrien Van Driessen
// The idea of the method is to find the fitting coefficients for a subset
// of h observations (out of n) with the smallest sum of squared residuals.
-// The size of the subset h should lie between (npoints + nparameters +1)/2
+// The size of the subset h should lie between (npoints + nparameters +1)/2
// and n, and represents the minimal number of good points in the dataset.
// The default value is set to (npoints + nparameters +1)/2, but of course
// if you are sure that the data contains less outliers it's better to change
// h according to your data.
-//
+//
// To perform a robust fit, call EvalRobust() function instead of Eval() after
-// adding the points and setting the fitting function.
+// adding the points and setting the fitting function.
// Note, that standard errors on parameters are not computed!
//
//////////////////////////////////////////////////////////////////////////
@@ -229,7 +229,7 @@ TLinearFitter::TLinearFitter(Int_t ndim, const char *formula, Option_t *opt)
//Second parameter is the fitting formula: see class description for formula syntax
//Options:
//The option is to store or not to store the data
- //If you don't want to store the data, choose "" for the option, or run
+ //If you don't want to store the data, choose "" for the option, or run
//StoreData(kFalse) member function after the constructor
fNdim=ndim;
@@ -286,7 +286,7 @@ TLinearFitter::TLinearFitter(const TLinearFitter& tlf):
fH(tlf.fH),
fRobust(tlf.fRobust),
fFitsample(tlf.fFitsample)
-{
+{
//copy constructor
}
@@ -329,7 +329,7 @@ TLinearFitter& TLinearFitter::operator=(const TLinearFitter& tlf)
fH=tlf.fH;
fRobust=tlf.fRobust;
fFitsample=tlf.fFitsample;
- }
+ }
return *this;
}
@@ -338,7 +338,7 @@ TLinearFitter::TLinearFitter(TFormula *function, Option_t *opt)
{
//This constructor uses a linear function. How to create it?
//TFormula now accepts formulas of the following kind:
- //TFormula("f", "x++y++z++x*x") or
+ //TFormula("f", "x++y++z++x*x") or
//TFormula("f", "x[0]++x[1]++x[2]*x[2]");
//Other than the look, it's in no
//way different from the regular formula, it can be evaluated,
@@ -380,7 +380,7 @@ TLinearFitter::~TLinearFitter()
if (fFormula)
delete [] fFormula;
-
+
fFormula = 0;
if (fFixedParams) delete [] fFixedParams;
fFixedParams = 0;
@@ -518,14 +518,14 @@ void TLinearFitter::AddToDesign(Double_t *x, Double_t y, Double_t e)
fDesignTemp2+=fDesignTemp3;
fDesignTemp3.Zero();
fAtbTemp2+=fAtbTemp3;
- fAtbTemp3.Zero();
+ fAtbTemp3.Zero();
if (fNpoints % 10000 == 0 && fNpoints>10000){
fDesignTemp+=fDesignTemp2;
fDesignTemp2.Zero();
fAtbTemp+=fAtbTemp2;
fAtbTemp2.Zero();
fY2+=fY2Temp;
- fY2Temp=0;
+ fY2Temp=0;
if (fNpoints % 1000000 == 0 && fNpoints>1000000){
fDesign+=fDesignTemp;
fDesignTemp.Zero();
@@ -885,7 +885,7 @@ void TLinearFitter::GetConfidenceIntervals(Int_t n, Int_t ndim, const Double_t *
//Parameters:
//n - number of points
//ndim - dimensions of points
-//x - points, at which to compute the intervals, for ndim > 1
+//x - points, at which to compute the intervals, for ndim > 1
// should be in order: (x0,y0, x1, y1, ... xn, yn)
//ci - computed intervals are returned in this array
//cl - confidence level, default=0.95
@@ -895,7 +895,7 @@ void TLinearFitter::GetConfidenceIntervals(Int_t n, Int_t ndim, const Double_t *
Double_t *sum_vector = new Double_t[fNfunctions];
Double_t c=0;
Int_t df = fNpoints-fNfunctions+fNfixed;
- Double_t t = TMath::StudentQuantile(cl, df);
+ Double_t t = TMath::StudentQuantile(cl, df);
Double_t chidf = TMath::Sqrt(fChisquare/df);
for (Int_t ipoint=0; ipoint<n; ipoint++){
@@ -992,7 +992,7 @@ void TLinearFitter::GetConfidenceIntervals(TObject *obj, Double_t cl)
Double_t *sum_vector = new Double_t[fNfunctions];
Double_t *x = gr2->GetX();
Double_t *y = gr2->GetY();
- Double_t t = TMath::StudentQuantile(cl, ((TF1*)(fInputFunction))->GetNDF());
+ Double_t t = TMath::StudentQuantile(cl, ((TF1*)(fInputFunction))->GetNDF());
Double_t chidf = TMath::Sqrt(fChisquare/((TF1*)(fInputFunction))->GetNDF());
Double_t c = 0;
for (Int_t ipoint=0; ipoint<np; ipoint++){
@@ -1042,16 +1042,16 @@ void TLinearFitter::GetConfidenceIntervals(TObject *obj, Double_t cl)
Double_t *sum_vector = new Double_t[fNfunctions];
Double_t x[3];
Int_t hxfirst = hfit->GetXaxis()->GetFirst();
- Int_t hxlast = hfit->GetXaxis()->GetLast();
+ Int_t hxlast = hfit->GetXaxis()->GetLast();
Int_t hyfirst = hfit->GetYaxis()->GetFirst();
- Int_t hylast = hfit->GetYaxis()->GetLast();
+ Int_t hylast = hfit->GetYaxis()->GetLast();
Int_t hzfirst = hfit->GetZaxis()->GetFirst();
- Int_t hzlast = hfit->GetZaxis()->GetLast();
+ Int_t hzlast = hfit->GetZaxis()->GetLast();
TAxis *xaxis = hfit->GetXaxis();
TAxis *yaxis = hfit->GetYaxis();
TAxis *zaxis = hfit->GetZaxis();
- Double_t t = TMath::StudentQuantile(cl, ((TF1*)(fInputFunction))->GetNDF());
+ Double_t t = TMath::StudentQuantile(cl, ((TF1*)(fInputFunction))->GetNDF());
Double_t chidf = TMath::Sqrt(fChisquare/((TF1*)(fInputFunction))->GetNDF());
Double_t c=0;
for (Int_t binz=hzfirst; binz<=hzlast; binz++){
@@ -1077,11 +1077,11 @@ void TLinearFitter::GetConfidenceIntervals(TObject *obj, Double_t cl)
}
delete [] grad;
delete [] sum_vector;
- }
+ }
else {
Error("GetConfidenceIntervals", "This object type is not supported");
return;
- }
+ }
}
//______________________________________________________________________________
@@ -1140,7 +1140,7 @@ Int_t TLinearFitter::GetParameter(Int_t ipar,char* name,Double_t& value,Double_t
value = fParams(ipar);
if (fInputFunction)
strcpy(name, fInputFunction->GetParName(ipar));
- else
+ else
name = "";
return 1;
}
@@ -1254,7 +1254,7 @@ void TLinearFitter::SetFormula(const char *formula)
//in case of a hyperplane:
char *fstring;
fstring = (char *)strstr(fFormula, "hyp");
- if (fstring!=NULL){
+ if (fstring!=0){
isHyper = kTRUE;
fstring+=3;
sscanf(fstring, "%d", &size);
@@ -1301,7 +1301,7 @@ void TLinearFitter::SetFormula(const char *formula)
special=f->GetNumber();
fFunctions.Add(f);
}
-
+
if ((fNfunctions==1)&&(special>299)&&(special<310)){
//if fitting a polynomial
size=special-299;
@@ -1406,9 +1406,9 @@ Bool_t TLinearFitter::UpdateMatrix()
AddToDesign(TMatrixDRow(fX, i).GetPtr(), fY(i), fE(i));
}
return 1;
- } else
+ } else
return 0;
-
+
}
//______________________________________________________________________________
@@ -1442,12 +1442,12 @@ void TLinearFitter::PrintResults(Int_t level, Double_t /*amin*/) const
if (level==3){
if (!fRobust){
- printf("Fitting results:\nParameters:\nNO.\t\tVALUE\t\tERROR\n");
+ printf("Fitting results:\nParameters:\nNO.\t\tVALUE\t\tERROR\n");
for (Int_t i=0; i<fNfunctions; i++){
printf("%d\t%f\t%f\n", i, fParams(i), TMath::Sqrt(fParCovar(i, i)));
}
} else {
- printf("Fitting results:\nParameters:\nNO.\t\tVALUE\n");
+ printf("Fitting results:\nParameters:\nNO.\t\tVALUE\n");
for (Int_t i=0; i<fNfunctions; i++){
printf("%d\t%f\n", i, fParams(i));
}
@@ -1492,7 +1492,7 @@ void TLinearFitter::GraphLinearFitter(Double_t h)
EvalRobust(h);
return;
}
-
+
Eval();
//calculate the precise chisquare
@@ -1614,7 +1614,7 @@ void TLinearFitter::MultiGraphLinearFitter(Double_t h)
if (fitOption.Robust){
fRobust=kTRUE;
StoreData(kTRUE);
- }
+ }
SetFormula(f1);
TGraph *gr;
@@ -1709,7 +1709,7 @@ void TLinearFitter::HistLinearFitter()
} else {
eu = hfit->GetBinError(bin);
if (eu <= 0) continue;
- }
+ }
AddPoint(x, cu, eu);
}
@@ -1753,10 +1753,10 @@ void TLinearFitter::HistLinearFitter()
void TLinearFitter::EvalRobust(Double_t h)
{
//Finds the parameters of the fitted function in case data contains
- //outliers.
+ //outliers.
//Parameter h stands for the minimal fraction of good points in the
- //dataset (h < 1, i.e. for 70% of good points take h=0.7).
- //The default value of h*Npoints is (Npoints + Nparameters+1)/2
+ //dataset (h < 1, i.e. for 70% of good points take h=0.7).
+ //The default value of h*Npoints is (Npoints + Nparameters+1)/2
//If the user provides a value of h smaller than above, default is taken
//See class description for the algorithm details
@@ -1799,7 +1799,7 @@ void TLinearFitter::EvalRobust(Double_t h)
maxind = TMath::LocMax(nbest, bestchi2);
if (chi2 < bestchi2[maxind]) {
bestchi2[maxind] = chi2;
- for (i=0; i<fNfunctions; i++)
+ for (i=0; i<fNfunctions; i++)
cstock(i, maxind) = fParams(i);
}
}
@@ -1845,10 +1845,10 @@ void TLinearFitter::EvalRobust(Double_t h)
delete [] bestindex;
delete [] residuals;
return;
- }
+ }
//if n is large, the dataset should be partitioned
Int_t indsubdat[5];
- for (i=0; i<5; i++)
+ for (i=0; i<5; i++)
indsubdat[i] = 0;
Int_t nsub = Partition(nmini, indsubdat);
@@ -1898,7 +1898,7 @@ void TLinearFitter::EvalRobust(Double_t h)
maxind = TMath::LocMax(nbest, bestchi2);
if (chi2 < bestchi2[maxind]){
beststock[maxind] = k;
- bestchi2[maxind] = chi2;
+ bestchi2[maxind] = chi2;
}
}
@@ -1910,7 +1910,7 @@ void TLinearFitter::EvalRobust(Double_t h)
chi2 = CStep(2, fH, residuals, index, index, -1, -1);
bestchi2[k] = chi2;
}
-
+
maxind = TMath::LocMin(nbest, bestchi2);
for (i=0; i<fNfunctions; i++)
fParams(i)=cstockbig(i, beststock[maxind]);
@@ -1931,7 +1931,7 @@ void TLinearFitter::EvalRobust(Double_t h)
((TF1*)fInputFunction)->SetChisquare(bestchi2[maxind]);
((TF1*)fInputFunction)->SetNumberFitPoints(fH);
((TF1*)fInputFunction)->SetNDF(fH-fNfunctions);
- }
+ }
delete [] subdat;
delete [] beststock;
@@ -1973,7 +1973,7 @@ void TLinearFitter::CreateSubset(Int_t ntotal, Int_t h, Int_t *index)
nindex++;
}
}
-
+
//compute the coefficients of a hyperplane through the p-subset
fDesign.Zero();
fAtb.Zero();
@@ -1984,7 +1984,7 @@ void TLinearFitter::CreateSubset(Int_t ntotal, Int_t h, Int_t *index)
ok = Linf();
- //if the chosen points don't define a hyperplane, add more
+ //if the chosen points don't define a hyperplane, add more
while (!ok && (nindex < h)) {
repeat=kFALSE;
do{
@@ -2081,7 +2081,7 @@ Double_t TLinearFitter::CStep(Int_t step, Int_t h, Double_t *residuals, Int_t *i
}
}
}
- }
+ }
residuals[i] = (fY(i) - func)*(fY(i) - func)/(fE(i)*fE(i));
}
}
@@ -2092,7 +2092,7 @@ Double_t TLinearFitter::CStep(Int_t step, Int_t h, Double_t *residuals, Int_t *i
fAtb.Zero();
for (i=0; i<h; i++)
AddToDesign(TMatrixDRow(fX, index[i]).GetPtr(), fY(index[i]), fE(index[i]));
-
+
Linf();
//don't calculate the chisquare at the 1st cstep
@@ -2162,13 +2162,13 @@ Double_t TLinearFitter::CStep(Int_t step, Int_t h, Double_t *residuals, Int_t *i
}
}
}
- }
-
+ }
+
sum+=(fY(index[i])-func)*(fY(index[i])-func)/(fE(index[i])*fE(index[i]));
}
}
- return sum;
+ return sum;
}
//____________________________________________________________________________
@@ -2264,7 +2264,7 @@ void TLinearFitter::RDraw(Int_t *subdat, Int_t *indsubdat)
{
//Draws ngroup nonoverlapping subdatasets out of a dataset of size n
//such that the selected case numbers are uniformly distributed from 1 to n
-
+
Int_t jndex = 0;
Int_t nrand;
Int_t i, k, m, j;
diff --git a/mlp/inc/TMultiLayerPerceptron.h b/mlp/inc/TMultiLayerPerceptron.h
index cebbc11cf8c..0c23a108e56 100644
--- a/mlp/inc/TMultiLayerPerceptron.h
+++ b/mlp/inc/TMultiLayerPerceptron.h
@@ -1,4 +1,4 @@
-// @(#)root/mlp:$Name: $:$Id: TMultiLayerPerceptron.h,v 1.9 2005/07/18 12:02:02 brun Exp $
+// @(#)root/mlp:$Name: $:$Id: TMultiLayerPerceptron.h,v 1.10 2006/01/09 15:47:30 brun Exp $
// Author: Christophe.Delaere@cern.ch 20/07/03
/*************************************************************************
@@ -63,26 +63,26 @@ class TMultiLayerPerceptron : public TObject {
kRibierePolak, kFletcherReeves, kBFGS };
enum DataSet { kTraining, kTest };
TMultiLayerPerceptron();
- TMultiLayerPerceptron(const char* layout, TTree* data = NULL,
+ TMultiLayerPerceptron(const char* layout, TTree* data = 0,
const char* training = "Entry$%2==0",
- const char* test = "",
+ const char* test = "",
TNeuron::NeuronType type = TNeuron::kSigmoid,
const char* extF = "", const char* extD = "");
- TMultiLayerPerceptron(const char* layout,
- const char* weight, TTree* data = NULL,
+ TMultiLayerPerceptron(const char* layout,
+ const char* weight, TTree* data = 0,
const char* training = "Entry$%2==0",
- const char* test = "",
+ const char* test = "",
TNeuron::NeuronType type = TNeuron::kSigmoid,
const char* extF = "", const char* extD = "");
TMultiLayerPerceptron(const char* layout, TTree* data,
TEventList* training,
- TEventList* test,
+ TEventList* test,
TNeuron::NeuronType type = TNeuron::kSigmoid,
const char* extF = "", const char* extD = "");
- TMultiLayerPerceptron(const char* layout,
+ TMultiLayerPerceptron(const char* layout,
const char* weight, TTree* data,
TEventList* training,
- TEventList* test,
+ TEventList* test,
TNeuron::NeuronType type = TNeuron::kSigmoid,
const char* extF = "", const char* extD = "");
virtual ~TMultiLayerPerceptron();
@@ -156,7 +156,7 @@ class TMultiLayerPerceptron : public TObject {
TString fStructure; // String containing the network structure
TString fWeight; // String containing the event weight
TNeuron::NeuronType fType; // Type of hidden neurons
- TNeuron::NeuronType fOutType; // Type of output neurons
+ TNeuron::NeuronType fOutType; // Type of output neurons
TString fextF; // String containing the function name
TString fextD; // String containing the derivative name
TEventList *fTraining; //! EventList defining the events in the training dataset
diff --git a/mlp/src/TMLPAnalyzer.cxx b/mlp/src/TMLPAnalyzer.cxx
index 89cf3fe728a..d08de6c0f6c 100644
--- a/mlp/src/TMLPAnalyzer.cxx
+++ b/mlp/src/TMLPAnalyzer.cxx
@@ -1,4 +1,4 @@
-// @(#)root/mlp:$Name: $:$Id: TMLPAnalyzer.cxx,v 1.14 2005/09/04 10:22:34 brun Exp $
+// @(#)root/mlp:$Name: $:$Id: TMLPAnalyzer.cxx,v 1.15 2006/01/09 15:47:30 brun Exp $
// Author: Christophe.Delaere@cern.ch 25/04/04
/*************************************************************************
@@ -40,9 +40,9 @@
ClassImp(TMLPAnalyzer)
//______________________________________________________________________________
-TMLPAnalyzer::~TMLPAnalyzer()
+TMLPAnalyzer::~TMLPAnalyzer()
{
- // Destructor
+ // Destructor
delete fAnalysisTree;
delete fIOTree;
}
@@ -122,7 +122,7 @@ TString TMLPAnalyzer::GetNeuronFormula(Int_t idx)
}
//______________________________________________________________________________
-const char* TMLPAnalyzer::GetInputNeuronTitle(Int_t in)
+const char* TMLPAnalyzer::GetInputNeuronTitle(Int_t in)
{
// Returns the name of any neuron from the input layer
TNeuron* neuron=(TNeuron*)fNetwork->fFirstLayer[in];
@@ -130,7 +130,7 @@ const char* TMLPAnalyzer::GetInputNeuronTitle(Int_t in)
}
//______________________________________________________________________________
-const char* TMLPAnalyzer::GetOutputNeuronTitle(Int_t out)
+const char* TMLPAnalyzer::GetOutputNeuronTitle(Int_t out)
{
// Returns the name of any neuron from the output layer
TNeuron* neuron=(TNeuron*)fNetwork->fLastLayer[out];
@@ -292,7 +292,7 @@ void TMLPAnalyzer::DrawDInputs()
THStack* stack = new THStack("differences","differences (impact of variables on ANN)");
TLegend* legend = new TLegend(0.75,0.75,0.95,0.95);
- TH1F* tmp = NULL;
+ TH1F* tmp = 0;
char var[64], sel[64];
for(Int_t i = 0; i < GetNeurons(1); i++) {
sprintf(var, "diff>>tmp%d", i);
@@ -357,7 +357,7 @@ void TMLPAnalyzer::DrawNetwork(Int_t neuron, const char* signal, const char* bg)
TLegend *legend = new TLegend(.75, .80, .95, .95);
legend->AddEntry(bgh, "Background");
legend->AddEntry(sigh,"Signal");
- stack->Draw("nostack");
+ stack->Draw("nostack");
legend->Draw();
// restore the default event list
data->SetEventList(current);
@@ -366,13 +366,13 @@ void TMLPAnalyzer::DrawNetwork(Int_t neuron, const char* signal, const char* bg)
}
//______________________________________________________________________________
-TProfile* TMLPAnalyzer::DrawTruthDeviation(Int_t outnode /*=0*/,
- Option_t *option /*=""*/)
+TProfile* TMLPAnalyzer::DrawTruthDeviation(Int_t outnode /*=0*/,
+ Option_t *option /*=""*/)
{
// Create a profile of the difference of the MLP output minus the
- // true value for a given output node outnode, vs the true value for
- // outnode, for all test data events. This method is mainly useful
- // when doing regression analysis with the MLP (i.e. not classification,
+ // true value for a given output node outnode, vs the true value for
+ // outnode, for all test data events. This method is mainly useful
+ // when doing regression analysis with the MLP (i.e. not classification,
// but continuous truth values).
// The resulting TProfile histogram is returned.
// It is not drawn if option "goff" is specified.
@@ -381,7 +381,7 @@ TProfile* TMLPAnalyzer::DrawTruthDeviation(Int_t outnode /*=0*/,
if (!fIOTree) GatherInformations();
TString pipehist=Form("MLP_truthdev_%d",outnode);
TString drawline;
- drawline.Form("Out.Out%d-True.True%d:True.True%d>>",
+ drawline.Form("Out.Out%d-True.True%d:True.True%d>>",
outnode, outnode, outnode);
fIOTree->Draw(drawline+pipehist+"(20)", "", "goff prof");
TProfile* h=(TProfile*)gDirectory->Get(pipehist);
@@ -402,9 +402,9 @@ TProfile* TMLPAnalyzer::DrawTruthDeviation(Int_t outnode /*=0*/,
THStack* TMLPAnalyzer::DrawTruthDeviations(Option_t *option /*=""*/)
{
// Creates TProfiles of the difference of the MLP output minus the
- // true value vs the true value, one for each output, filled with the
- // test data events. This method is mainly useful when doing regression
- // analysis with the MLP (i.e. not classification, but continuous truth
+ // true value vs the true value, one for each output, filled with the
+ // test data events. This method is mainly useful when doing regression
+ // analysis with the MLP (i.e. not classification, but continuous truth
// values).
// The returned THStack contains all the TProfiles. It is drawn unless
// the option "goff" is specified.
@@ -419,8 +419,8 @@ THStack* TMLPAnalyzer::DrawTruthDeviations(Option_t *option /*=""*/)
const char* xAxisTitle=0;
- // create profile for each input neuron,
- // adding them into the THStack and the TLegend
+ // create profile for each input neuron,
+ // adding them into the THStack and the TLegend
for (Int_t outnode=0; outnode<GetNeurons(GetLayers()); outnode++) {
TProfile* h=DrawTruthDeviation(outnode, "goff");
h->SetLineColor(1+outnode);
@@ -443,8 +443,8 @@ THStack* TMLPAnalyzer::DrawTruthDeviations(Option_t *option /*=""*/)
}
//______________________________________________________________________________
-TProfile* TMLPAnalyzer::DrawTruthDeviationInOut(Int_t innode,
- Int_t outnode /*=0*/,
+TProfile* TMLPAnalyzer::DrawTruthDeviationInOut(Int_t innode,
+ Int_t outnode /*=0*/,
Option_t *option /*=""*/)
{
// Creates a profile of the difference of the MLP output outnode minus
@@ -457,7 +457,7 @@ TProfile* TMLPAnalyzer::DrawTruthDeviationInOut(Int_t innode,
if (!fIOTree) GatherInformations();
TString pipehist=Form("MLP_truthdev_i%d_o%d", innode, outnode);
TString drawline;
- drawline.Form("Out.Out%d-True.True%d:In.In%d>>",
+ drawline.Form("Out.Out%d-True.True%d:In.In%d>>",
outnode, outnode, innode);
fIOTree->Draw(drawline+pipehist+"(50)", "", "goff prof");
TProfile* h=(TProfile*)gROOT->FindObject(pipehist);
@@ -467,7 +467,7 @@ TProfile* TMLPAnalyzer::DrawTruthDeviationInOut(Int_t innode,
h->SetTitle(Form("#Delta(output - truth) of %s vs. input %s",
titleOutNeuron, titleInNeuron));
h->GetXaxis()->SetTitle(Form("%s", titleInNeuron));
- h->GetYaxis()->SetTitle(Form("#Delta(output - truth) for %s",
+ h->GetYaxis()->SetTitle(Form("#Delta(output - truth) for %s",
titleOutNeuron));
if (!strstr(option,"goff"))
h->Draw(option);
@@ -475,13 +475,13 @@ TProfile* TMLPAnalyzer::DrawTruthDeviationInOut(Int_t innode,
}
//______________________________________________________________________________
-THStack* TMLPAnalyzer::DrawTruthDeviationInsOut(Int_t outnode /*=0*/,
+THStack* TMLPAnalyzer::DrawTruthDeviationInsOut(Int_t outnode /*=0*/,
Option_t *option /*=""*/)
{
// Creates a profile of the difference of the MLP output outnode minus the
// true value of outnode vs the input value, stacked for all inputs, for
// all test data events.
- // The returned THStack contains all the TProfiles. It is drawn unless
+ // The returned THStack contains all the TProfiles. It is drawn unless
// the option "goff" is specified.
// Options are passed to TProfile::Draw.
TString sName;
@@ -498,8 +498,8 @@ THStack* TMLPAnalyzer::DrawTruthDeviationInsOut(Int_t outnode /*=0*/,
Form("#Delta(output - truth) of %s vs. input for:",
outputNodeTitle));
- // create profile for each input neuron,
- // adding them into the THStack and the TLegend
+ // create profile for each input neuron,
+ // adding them into the THStack and the TLegend
Int_t numInNodes=GetNeurons(1);
Int_t innode=0;
for (innode=0; innode<numInNodes; innode++) {
@@ -514,7 +514,7 @@ THStack* TMLPAnalyzer::DrawTruthDeviationInsOut(Int_t outnode /*=0*/,
leg->Draw();
// gotta draw before accessing the axes
hs->GetXaxis()->SetTitle("Input value");
- hs->GetYaxis()->SetTitle(Form("#Delta(output - truth) for %s",
+ hs->GetYaxis()->SetTitle(Form("#Delta(output - truth) for %s",
outputNodeTitle));
}
diff --git a/mlp/src/TMultiLayerPerceptron.cxx b/mlp/src/TMultiLayerPerceptron.cxx
index 3fe39a7df3a..b2edec37ed5 100644
--- a/mlp/src/TMultiLayerPerceptron.cxx
+++ b/mlp/src/TMultiLayerPerceptron.cxx
@@ -1,4 +1,4 @@
-// @(#)root/mlp:$Name: $:$Id: TMultiLayerPerceptron.cxx,v 1.35 2006/04/19 08:22:24 rdm Exp $
+// @(#)root/mlp:$Name: $:$Id: TMultiLayerPerceptron.cxx,v 1.36 2006/05/11 09:42:41 brun Exp $
// Author: Christophe.Delaere@cern.ch 20/07/03
/*************************************************************************
@@ -269,15 +269,15 @@ TMultiLayerPerceptron::TMultiLayerPerceptron()
fFirstLayer.SetOwner(false);
fLastLayer.SetOwner(false);
fSynapses.SetOwner(true);
- fData = NULL;
+ fData = 0;
fCurrentTree = -1;
fCurrentTreeWeight = 1;
- fTraining = NULL;
+ fTraining = 0;
fTrainingOwner = false;
- fTest = NULL;
+ fTest = 0;
fTestOwner = false;
- fEventWeight = NULL;
- fManager = NULL;
+ fEventWeight = 0;
+ fManager = 0;
fLearningMethod = TMultiLayerPerceptron::kBFGS;
fEta = .1;
fEtaDecay = 1;
@@ -739,10 +739,10 @@ void TMultiLayerPerceptron::Train(Int_t nEpoch, Option_t * option)
}
if (opt.Contains("current"))
newCanvas = false;
- TVirtualPad *canvas = NULL;
- TMultiGraph *residual_plot = NULL;
- TGraph *train_residual_plot = NULL;
- TGraph *test_residual_plot = NULL;
+ TVirtualPad *canvas = 0;
+ TMultiGraph *residual_plot = 0;
+ TGraph *train_residual_plot = 0;
+ TGraph *test_residual_plot = 0;
if ((!fData) || (!fTraining) || (!fTest)) {
Error("Train","Training/Test samples still not defined. Cannot train the neural network");
return;
@@ -818,8 +818,8 @@ void TMultiLayerPerceptron::Train(Int_t nEpoch, Option_t * option)
onorm += dir[i] * dir[i];
Double_t prod = 0;
Int_t idx = 0;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
Int_t nentries = fNetwork.GetEntriesFast();
for (i=0;i<nentries;i++) {
neuron = (TNeuron *) fNetwork.UncheckedAt(i);
@@ -848,8 +848,8 @@ void TMultiLayerPerceptron::Train(Int_t nEpoch, Option_t * option)
Double_t onorm = 0;
for (i = 0; i < els; i++)
onorm += dir[i] * dir[i];
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
Int_t nentries = fNetwork.GetEntriesFast();
for (i=0;i<nentries;i++) {
neuron = (TNeuron *) fNetwork.UncheckedAt(i);
@@ -1186,7 +1186,7 @@ void TMultiLayerPerceptron::AttachData()
// performance for classification jobs.
// Normalisation can be requested by putting '@' in front of the formula.
Int_t j = 0;
- TNeuron *neuron = NULL;
+ TNeuron *neuron = 0;
Bool_t normalize = false;
fManager = new TTreeFormulaManager;
//first layer
@@ -1312,7 +1312,7 @@ void TMultiLayerPerceptron::BuildFirstLayer(TString & input)
const TObjArray *inpL = input.Tokenize(", ");
const Int_t nneurons =inpL->GetLast()+1;
- TNeuron *neuron = NULL;
+ TNeuron *neuron = 0;
Int_t i = 0;
TString name;
for (i = 0; i<nneurons; i++) {
@@ -1333,8 +1333,8 @@ void TMultiLayerPerceptron::BuildHiddenLayers(TString & hidden)
Int_t prevStart = 0;
Int_t prevStop = fNetwork.GetEntriesFast();
Int_t layer = 1;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
TString name;
Int_t i,j;
while (end != -1) {
@@ -1442,7 +1442,7 @@ void TMultiLayerPerceptron::DrawResult(Int_t index, Option_t * option) const
if (!opt.Contains("nocanv"))
new TCanvas("NNresult", "Neural Net output");
const Double_t *norm = out->GetNormalisation();
- TEventList *events = NULL;
+ TEventList *events = 0;
TString setname;
Int_t i;
if (opt.Contains("train")) {
@@ -1512,7 +1512,7 @@ void TMultiLayerPerceptron::DumpWeights(Option_t * filename) const
output = &cout;
else
output = new ofstream(filen.Data());
- TNeuron *neuron = NULL;
+ TNeuron *neuron = 0;
*output << "#input normalization" << endl;
Int_t nentries = fFirstLayer.GetEntriesFast();
Int_t j=0;
@@ -1534,7 +1534,7 @@ void TMultiLayerPerceptron::DumpWeights(Option_t * filename) const
*output << neuron->GetWeight() << endl;
delete it;
it = (TObjArrayIter *) fSynapses.MakeIterator();
- TSynapse *synapse = NULL;
+ TSynapse *synapse = 0;
*output << "#synapses weights" << endl;
while ((synapse = (TSynapse *) it->Next()))
*output << synapse->GetWeight() << endl;
@@ -1560,7 +1560,7 @@ void TMultiLayerPerceptron::LoadWeights(Option_t * filename)
input.getline(buff, 100);
TObjArrayIter *it = (TObjArrayIter *) fFirstLayer.MakeIterator();
Float_t n1,n2;
- TNeuron *neuron = NULL;
+ TNeuron *neuron = 0;
while ((neuron = (TNeuron *) it->Next())) {
input >> n1 >> n2;
neuron->SetNormalisation(n2,n1);
@@ -1586,7 +1586,7 @@ void TMultiLayerPerceptron::LoadWeights(Option_t * filename)
// synapse weights
input.getline(buff, 100);
it = (TObjArrayIter *) fSynapses.MakeIterator();
- TSynapse *synapse = NULL;
+ TSynapse *synapse = 0;
while ((synapse = (TSynapse *) it->Next())) {
input >> w;
synapse->SetWeight(w);
@@ -1696,7 +1696,7 @@ void TMultiLayerPerceptron::Export(Option_t * filename, Option_t * language) con
<< "() {" << endl;
sourcefile << " double input = " << neuron->GetWeight()
<< ";" << endl;
- TSynapse *syn = NULL;
+ TSynapse *syn = 0;
Int_t n = 0;
while ((syn = neuron->GetPre(n++))) {
sourcefile << " input += synapse" << syn << "();" << endl;
@@ -1750,7 +1750,7 @@ void TMultiLayerPerceptron::Export(Option_t * filename, Option_t * language) con
}
}
delete it;
- TSynapse *synapse = NULL;
+ TSynapse *synapse = 0;
it = (TObjArrayIter *) fSynapses.MakeIterator();
while ((synapse = (TSynapse *) it->Next())) {
headerfile << " double synapse" << synapse << "();" << endl;
@@ -1887,7 +1887,7 @@ void TMultiLayerPerceptron::Export(Option_t * filename, Option_t * language) con
// Synapses
sourcefile << "C --- Synapses" << endl;
- TSynapse *synapse = NULL;
+ TSynapse *synapse = 0;
it = (TObjArrayIter *) fSynapses.MakeIterator();
while ((synapse = (TSynapse *) it->Next())) {
sourcefile << " double precision function " << "synapse"
@@ -1984,7 +1984,7 @@ void TMultiLayerPerceptron::Export(Option_t * filename, Option_t * language) con
}
}
delete it;
- TSynapse *synapse = NULL;
+ TSynapse *synapse = 0;
it = (TObjArrayIter *) fSynapses.MakeIterator();
while ((synapse = (TSynapse *) it->Next())) {
pythonfile << "\tdef synapse" << synapse << "(self):" << endl;
@@ -2075,7 +2075,7 @@ void TMultiLayerPerceptron::MLP_Batch(Double_t * buffer)
fEta *= fEtaDecay;
Int_t cnt = 0;
TObjArrayIter *it = (TObjArrayIter *) fNetwork.MakeIterator();
- TNeuron *neuron = NULL;
+ TNeuron *neuron = 0;
// Step for all neurons
while ((neuron = (TNeuron *) it->Next())) {
buffer[cnt] = (-fEta) * (neuron->GetDEDw() + fDelta)
@@ -2084,7 +2084,7 @@ void TMultiLayerPerceptron::MLP_Batch(Double_t * buffer)
}
delete it;
it = (TObjArrayIter *) fSynapses.MakeIterator();
- TSynapse *synapse = NULL;
+ TSynapse *synapse = 0;
// Step for all synapses
while ((synapse = (TSynapse *) it->Next())) {
buffer[cnt] = (-fEta) * (synapse->GetDEDw() + fDelta)
@@ -2101,8 +2101,8 @@ void TMultiLayerPerceptron::MLP_Line(Double_t * origin, Double_t * dir, Double_t
// Weights are set to [origin + (dist * dir)].
Int_t idx = 0;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
TObjArrayIter *it = (TObjArrayIter *) fNetwork.MakeIterator();
while ((neuron = (TNeuron *) it->Next())) {
neuron->SetWeight(origin[idx] + (dir[idx] * dist));
@@ -2122,8 +2122,8 @@ void TMultiLayerPerceptron::SteepestDir(Double_t * dir)
{
// Sets the search direction to steepest descent.
Int_t idx = 0;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
TObjArrayIter *it = (TObjArrayIter *) fNetwork.MakeIterator();
while ((neuron = (TNeuron *) it->Next()))
dir[idx++] = -neuron->GetDEDw();
@@ -2144,8 +2144,8 @@ bool TMultiLayerPerceptron::LineSearch(Double_t * direction, Double_t * buffer)
Int_t idx = 0;
Int_t j,nentries;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
// store weights before line search
Double_t *origin = new Double_t[fNetwork.GetEntriesFast() +
fSynapses.GetEntriesFast()];
@@ -2247,8 +2247,8 @@ void TMultiLayerPerceptron::ConjugateGradientsDir(Double_t * dir, Double_t beta)
Int_t idx = 0;
Int_t j,nentries;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
nentries = fNetwork.GetEntriesFast();
for (j=0;j<nentries;j++) {
neuron = (TNeuron *) fNetwork.UncheckedAt(j);
@@ -2301,8 +2301,8 @@ void TMultiLayerPerceptron::SetGammaDelta(TMatrixD & gamma, TMatrixD & delta,
Int_t els = fNetwork.GetEntriesFast() + fSynapses.GetEntriesFast();
Int_t idx = 0;
Int_t j,nentries;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
nentries = fNetwork.GetEntriesFast();
for (j=0;j<nentries;j++) {
neuron = (TNeuron *) fNetwork.UncheckedAt(j);
@@ -2339,8 +2339,8 @@ Double_t TMultiLayerPerceptron::DerivDir(Double_t * dir)
Int_t idx = 0;
Int_t j,nentries;
Double_t output = 0;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
nentries = fNetwork.GetEntriesFast();
for (j=0;j<nentries;j++) {
neuron = (TNeuron *) fNetwork.UncheckedAt(j);
@@ -2364,8 +2364,8 @@ void TMultiLayerPerceptron::BFGSDir(TMatrixD & bfgsh, Double_t * dir)
TMatrixD dedw(els, 1);
Int_t idx = 0;
Int_t j,nentries;
- TNeuron *neuron = NULL;
- TSynapse *synapse = NULL;
+ TNeuron *neuron = 0;
+ TSynapse *synapse = 0;
nentries = fNetwork.GetEntriesFast();
for (j=0;j<nentries;j++) {
neuron = (TNeuron *) fNetwork.UncheckedAt(j);
@@ -2441,7 +2441,7 @@ void TMultiLayerPerceptron::Draw(Option_t * /*option*/)
Float_t yStep_this = 1./(nNeurons_this+1.);
Float_t yStep_next = 1./(nNeurons_next+1.);
TObjArrayIter* it = (TObjArrayIter *) fSynapses.MakeIterator();
- TSynapse *theSynapse = NULL;
+ TSynapse *theSynapse = 0;
Float_t maxWeight = 0;
while ((theSynapse = (TSynapse *) it->Next()))
maxWeight = maxWeight < theSynapse->GetWeight() ? theSynapse->GetWeight() : maxWeight;
diff --git a/mlp/src/TNeuron.cxx b/mlp/src/TNeuron.cxx
index b03c71a1ead..11ab7fecd84 100644
--- a/mlp/src/TNeuron.cxx
+++ b/mlp/src/TNeuron.cxx
@@ -1,4 +1,4 @@
-// @(#)root/mlp:$Name: $:$Id: TNeuron.cxx,v 1.18 2006/05/11 09:42:42 brun Exp $
+// @(#)root/mlp:$Name: $:$Id: TNeuron.cxx,v 1.19 2006/05/12 08:19:02 brun Exp $
// Author: Christophe.Delaere@cern.ch 20/07/03
/*************************************************************************
@@ -20,7 +20,7 @@
// sigmoid (1/(1+exp(-x)), tanh or gaussian.
// An external function can also be used, together with its derivative.
// In a Multi Layer Perceptron, the input layer is made of
-// inactive neurons (returning the normalized input) and output neurons
+// inactive neurons (returning the normalized input) and output neurons
// are linear. Hidden neurons may be anything, the default being sigmoids.
//
// This implementation contains several methods to compute the value,
@@ -62,7 +62,7 @@ TNeuron::TNeuron(TNeuron::NeuronType type /*= kSigmoid*/,
fNewValue = true;
fNewDeriv = true;
fNewDeDw = true;
- fFormula = NULL;
+ fFormula = 0;
fDeDw = 0;
fDEDw = 0;
fValue = 0;
@@ -893,7 +893,7 @@ TTreeFormula* TNeuron::UseBranch(TTree* input, const char* formula)
fNorm[0] = tmp.GetRMS();
if(fNorm[0]<1e-15) fNorm[0]=1.;
fNorm[1] = tmp.GetMean();
- // Check the dimensionality
+ // Check the dimensionality
if(fFormula->GetNdata()>1 && fIndex==0)
Warning("TNeuron::UseBranch()","all indices in arrays must be specified, otherwise the first element will be assumed.");
return fFormula;
@@ -1085,21 +1085,21 @@ Double_t TNeuron::GetDeDw() const
// non-softmax
for (Int_t i = 0; i < nEntries; i++) {
TSynapse *postSynapse = (TSynapse*)fpost.UncheckedAt(i);
- ((TNeuron*)this)->fDeDw +=
- postSynapse->GetWeight() *
+ ((TNeuron*)this)->fDeDw +=
+ postSynapse->GetWeight() *
postSynapse->GetPost()->GetDeDw();
}
} else {
// softmax derivative can be taken care of correcting the forward weight
for (Int_t i = 0; i < nEntries; i++) {
TSynapse *postSynapse = (TSynapse*)fpost.UncheckedAt(i);
- ((TNeuron*)this)->fDeDw +=
- (postSynapse->GetWeight() - postSynapse->GetPost()->GetInput()) *
+ ((TNeuron*)this)->fDeDw +=
+ (postSynapse->GetWeight() - postSynapse->GetPost()->GetInput()) *
postSynapse->GetPost()->GetDeDw();
}
}
((TNeuron*)this)->fDeDw *= GetDerivative();
- }
+ }
return fDeDw;
}
diff --git a/mlp/src/TSynapse.cxx b/mlp/src/TSynapse.cxx
index 22062f7d026..f8cafc8d764 100644
--- a/mlp/src/TSynapse.cxx
+++ b/mlp/src/TSynapse.cxx
@@ -1,4 +1,4 @@
-// @(#)root/mlp:$Name: $:$Id: TSynapse.cxx,v 1.4 2004/05/04 07:59:33 brun Exp $
+// @(#)root/mlp:$Name: $:$Id: TSynapse.cxx,v 1.5 2004/09/29 10:55:55 rdm Exp $
// Author: Christophe.Delaere@cern.ch 21/08/2002
/*************************************************************************
@@ -30,8 +30,8 @@ ClassImp(TSynapse)
TSynapse::TSynapse()
{
// Default constructor
- fpre = NULL;
- fpost = NULL;
+ fpre = 0;
+ fpost = 0;
fweight = 1;
fDEDw = 0;
}
diff --git a/net/inc/TNetFile.h b/net/inc/TNetFile.h
index 2e8cdc5bfbf..e18ea5db492 100644
--- a/net/inc/TNetFile.h
+++ b/net/inc/TNetFile.h
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name: v5-11-02 $:$Id: TNetFile.h,v 1.23 2006/04/18 14:23:20 rdm Exp $
+// @(#)root/net:$Name: $:$Id: TNetFile.h,v 1.24 2006/05/23 04:47:40 brun Exp $
// Author: Fons Rademakers 14/08/97
/*************************************************************************
@@ -70,8 +70,7 @@ protected:
public:
TNetFile(const char *url, Option_t *option = "", const char *ftitle = "",
Int_t compress = 1, Int_t netopt = 0);
- TNetFile()
- : fEndpointUrl(), fUser(), fSocket(NULL), fProtocol(0), fErrorCode(0) { }
+ TNetFile() : fEndpointUrl(), fSocket(0), fProtocol(0), fErrorCode(0) { }
virtual ~TNetFile();
void Close(Option_t *option=""); // *MENU*
@@ -104,11 +103,11 @@ private:
void *GetDirPtr() const { return fDirp; }
protected:
- void Create(const char *url, TSocket *sock = 0);
+ void Create(const char *url, TSocket *sock = 0);
void InitRemoteEntity(const char *url);
TNetSystem(const TNetSystem&);
- TNetSystem& operator=(const TNetSystem&);
+ TNetSystem& operator=(const TNetSystem&);
public:
TNetSystem(Bool_t ftpowner = kTRUE);
diff --git a/net/inc/TServerSocket.h b/net/inc/TServerSocket.h
index 4685d88f09f..4df883084a4 100644
--- a/net/inc/TServerSocket.h
+++ b/net/inc/TServerSocket.h
@@ -1,4 +1,4 @@
-// @(#)root/net:$Name: $:$Id: TServerSocket.h,v 1.8 2005/07/18 16:20:52 rdm Exp $
+// @(#)root/net:$Name: $:$Id: TServerSocket.h,v 1.9 2006/05/23 04:47:40 brun Exp $
// Author: Fons Rademakers 18/12/96
/*************************************************************************
@@ -47,7 +47,7 @@ private:
static SrvClup_t fgSrvAuthClupHook;
static UChar_t fgAcceptOpt; // Default accept options
- TServerSocket() : fSecContexts(NULL) { }
+ TServerSocket() : fSecContexts(0) { }
TServerSocket(const TServerSocket &);
void operator=(const TServerSocket &);
Bool_t Authenticate(TSocket *);
diff --git a/proof/inc/TProof.h b/proof/inc/TProof.h
index 2178fd1c869..dd891d43fa9 100644
--- a/proof/inc/TProof.h
+++ b/proof/inc/TProof.h
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProof.h,v 1.77 2006/04/19 10:57:44 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProof.h,v 1.78 2006/04/29 17:57:43 rdm Exp $
// Author: Fons Rademakers 13/02/97
/*************************************************************************
@@ -458,12 +458,12 @@ public:
const char *files,
const char *dest,
Int_t opt = kAskUser,
- TList *skippedFiles = NULL);
+ TList *skippedFiles = 0);
Int_t UploadDataSetFromFile(const char *file,
const char *dest,
const char *dataset,
Int_t opt = kAskUser);
- TList *GetDataSets();
+ TList *GetDataSets();
void ShowDataSets();
void ShowDataSet(const char *dataset);
Int_t RemoveDataSet(const char *dateset);
diff --git a/proof/src/TProof.cxx b/proof/src/TProof.cxx
index 95d8912808e..8e8c5765854 100644
--- a/proof/src/TProof.cxx
+++ b/proof/src/TProof.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProof.cxx,v 1.143 2006/04/29 17:57:43 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProof.cxx,v 1.144 2006/05/02 13:03:18 rdm Exp $
// Author: Fons Rademakers 13/02/97
/*************************************************************************
@@ -4485,8 +4485,8 @@ void TProof::SetAlias(const char *alias)
}
//______________________________________________________________________________
-Int_t TProof::UploadDataSet(const char *dataSetName,
- const char *files,
+Int_t TProof::UploadDataSet(const char *dataSetName,
+ const char *files,
const char *desiredDest,
Int_t opt,
TList *skippedFiles)
@@ -4540,7 +4540,7 @@ Int_t TProof::UploadDataSet(const char *dataSetName,
return kError;
}
//If skippedFiles was provided but did not point to a TList the program would crash.
- if (skippedFiles && &skippedFiles)
+ if (skippedFiles && &skippedFiles)
if (skippedFiles->Class() != TList::Class()) {
Error("UploadDataSet",
"Provided skippedFiles argument does not point to a TList object.");
@@ -4747,7 +4747,7 @@ TList *TProof::GetDataSets()
master = ((TSlave*)(fActiveSlaves->First()))->GetSocket();
else {
Error("GetDataSets", "No connection to the master!");
- return NULL;
+ return 0;
}
Broadcast(kPROOF_QUERY_DATASETS);
TMessage *retMess;
@@ -4789,7 +4789,7 @@ TList *TProof::GetDataSet(const char *dataset)
master = ((TSlave*)(fActiveSlaves->First()))->GetSocket();
else {
Error("GetDataSet", "No connection to the master!");
- return NULL;
+ return 0;
}
TMessage nameMess(kPROOF_GET_DATASET);
nameMess << TString(dataset);
diff --git a/rpdutils/src/globus.cxx b/rpdutils/src/globus.cxx
index 50e49812f32..15cbe1dfbbb 100644
--- a/rpdutils/src/globus.cxx
+++ b/rpdutils/src/globus.cxx
@@ -1,4 +1,4 @@
-// @(#)root/rpdutils:$Name: $:$Id: globus.cxx,v 1.11 2005/09/21 10:51:24 brun Exp $
+// @(#)root/rpdutils:$Name: $:$Id: globus.cxx,v 1.12 2005/09/21 17:23:36 brun Exp $
// Author: Gerardo Ganis 7/4/2003
/*************************************************************************
@@ -251,7 +251,7 @@ int GlbsToolCheckCert(char *ClientIssuerName, char **SubjName)
strcpy(key_def, getenv("X509_USER_KEY"));
} else
strcpy(key_def, hostkey_default[id]);
-
+
// Expand for test if needed
cert_tmp = GlbsToolExpand(cert_def);
key_tmp = GlbsToolExpand(key_def);
@@ -825,10 +825,10 @@ int GlbsToolCheckProxy(char *ClientIssuerName, char **SubjName)
ErrorInfo("GlbsToolCheckProxy: unable to set X509_USER_PROXY ");
#ifdef R__GLBS22
- globus_gsi_cred_handle_t proxy_cred = NULL;
+ globus_gsi_cred_handle_t proxy_cred = 0;
// Init proxy cred handle
- if (globus_gsi_cred_handle_init(&proxy_cred, NULL)
+ if (globus_gsi_cred_handle_init(&proxy_cred, 0)
!= GLOBUS_SUCCESS) {
ErrorInfo("GlbsToolCheckProxy: %s",
"couldn't initialize proxy credential handle");
@@ -870,7 +870,7 @@ int GlbsToolCheckProxy(char *ClientIssuerName, char **SubjName)
return 1;
}
fclose(fcert);
- *SubjName = X509_NAME_oneline(X509_get_issuer_name(xcert), NULL, 0);
+ *SubjName = X509_NAME_oneline(X509_get_issuer_name(xcert), 0, 0);
if (gDebug > 3)
ErrorInfo("GlbsToolCheckProxy: %s %s",
"Proxy Issuer:", *SubjName);
@@ -884,25 +884,25 @@ int GlbsToolCheckProxy(char *ClientIssuerName, char **SubjName)
#else
// Old version: completly different ...
char * proxy_type;
- proxy_cred_desc * pcd = NULL;
+ proxy_cred_desc * pcd = 0;
time_t time_after;
time_t time_now;
time_t time_diff;
- ASN1_UTCTIME * asn1_time = NULL;
+ ASN1_UTCTIME * asn1_time = 0;
// Init credential descriptor
pcd = proxy_cred_desc_new();
// Load user proxy certificate
pcd->type=CRED_TYPE_PROXY;
- if (proxy_load_user_cert(pcd, proxy_file, NULL, NULL)) {
+ if (proxy_load_user_cert(pcd, proxy_file, 0, 0)) {
ErrorInfo("GlbsToolCheckProxy: ERROR: %s (%s)",
"cannot load proxy certificate",proxy_file);
return 1;
}
// Load user public key
- if ((pcd->upkey = X509_get_pubkey(pcd->ucert)) == NULL) {
+ if ((pcd->upkey = X509_get_pubkey(pcd->ucert)) == 0) {
ErrorInfo("GlbsToolCheckProxy: ERROR: %s",
"cannot get public key");
return 1;
@@ -923,7 +923,7 @@ int GlbsToolCheckProxy(char *ClientIssuerName, char **SubjName)
time_diff);
// Get issuer to be sent back to the client
- *SubjName = X509_NAME_oneline(X509_get_issuer_name(pcd->ucert), NULL, 0);
+ *SubjName = X509_NAME_oneline(X509_get_issuer_name(pcd->ucert), 0, 0);
if (gDebug > 3)
ErrorInfo("GlbsToolCheckProxy: %s %s",
"Proxy Issuer:", *SubjName);
diff --git a/ruby/src/TRuby.cxx b/ruby/src/TRuby.cxx
index 48fbdac0504..44d14082ec3 100644
--- a/ruby/src/TRuby.cxx
+++ b/ruby/src/TRuby.cxx
@@ -1,9 +1,9 @@
-// @(#)root/ruby:$Name: $:$Id: TRuby.cxx,v 1.1 2004/05/30 18:17:00 brun Exp $
+// @(#)root/ruby:$Name: $:$Id: TRuby.cxx,v 1.2 2004/05/31 16:44:25 brun Exp $
// Author: Elias Athanasopoulos, May 2004
//
-// Interface for the Ruby shell.
+// Interface for the Ruby shell.
//
-// (c) 2004 - Elias Athanasopoulos <elathan@phys.uoa.gr>
+// (c) 2004 - Elias Athanasopoulos <elathan@phys.uoa.gr>
//
//
@@ -16,7 +16,7 @@
extern VALUE cTObject;
-bool TRuby::Initialize()
+bool TRuby::Initialize()
{
static int IsInitialized = 0;
@@ -25,14 +25,14 @@ bool TRuby::Initialize()
ruby_init();
IsInitialized = 1;
}
-
+
return true;
}
void TRuby::Exec(const char *cmd)
-{
+{
int state = 0;
-
+
TRuby::Initialize();
rb_eval_string_protect(cmd, &state);
@@ -44,21 +44,21 @@ TObject *TRuby::Eval(const char* expr)
{
TObject *res;
int state = 0;
-
+
TRuby::Initialize();
VALUE ret = rb_eval_string_protect(expr, &state);
-
+
/* Print error if needed. */
if (state)
{
rb_eval_string("puts $!");
- return (TObject*)(NULL);
+ return (TObject*)(0);
}
-
- if (NIL_P(ret)) return (TObject*)NULL;
+
+ if (NIL_P(ret)) return (TObject*)0;
/* Return the instance pointer if it is a ROOT
- * object.
+ * object.
*/
VALUE ptr = rb_iv_get(ret, "__rr__");
if (!NIL_P(ptr))
@@ -66,19 +66,19 @@ TObject *TRuby::Eval(const char* expr)
Data_Get_Struct(rb_iv_get(ret, "__rr__"), TObject, res);
return res;
}
-
- return (TObject*)NULL;
+
+ return (TObject*)0;
}
bool TRuby::Bind(TObject *obj, const char *label)
{
VALUE *v = ALLOC(VALUE);
-
- *v = rb_class_new_instance (0, NULL, cTObject);
+
+ *v = rb_class_new_instance (0, 0, cTObject);
rb_iv_set(*v, "__rr__", Data_Wrap_Struct (cTObject, 0, 0, obj));
rb_define_variable(label, v);
-
+
return true;
}
diff --git a/table/src/TPolyLineShape.cxx b/table/src/TPolyLineShape.cxx
index 85fbed0a40b..45da1eb8eba 100644
--- a/table/src/TPolyLineShape.cxx
+++ b/table/src/TPolyLineShape.cxx
@@ -1,6 +1,6 @@
-// @(#)root/star:$Name: $:$Id: TPolyLineShape.cxx,v 1.5 2006/05/20 14:06:09 brun Exp $
-// Author:
-// $Id: TPolyLineShape.cxx,v 1.5 2006/05/20 14:06:09 brun Exp $
+// @(#)root/star:$Name: $:$Id: TPolyLineShape.cxx,v 1.6 2006/05/21 18:05:26 brun Exp $
+// Author:
+// $Id: TPolyLineShape.cxx,v 1.6 2006/05/21 18:05:26 brun Exp $
// ***********************************************************************
// * C++ class library to define an abstract 3D shape os STAR "event" geometry
// * Copyright(c) 1997~1999 [BNL] Brookhaven National Laboratory, STAR, All rights reserved
@@ -293,7 +293,7 @@ char *TPolyLineShape::GetObjectInfo(Int_t px, Int_t py) const
// forward the GetObjectInfo call to the decorated object
return fPoints ? fPoints->GetObjectInfo(px, py) : TShape::GetObjectInfo(px,py);
}
-
+
//______________________________________________________________________________
Size_t TPolyLineShape::GetSizeAttribute() const
{
@@ -530,7 +530,7 @@ void TPolyLineShape::PaintX3DLine(Option_t *)
fSizeX3D->numSegs = buff->numSegs = size-1;
fSizeX3D->numPolys = buff->numPolys = 0; //NOTE: Because of different structure, our
- buff->polys = NULL; // TPolyLine3D can't use polygons
+ buff->polys = 0; // TPolyLine3D can't use polygons
TPoints3D x3dPoints(size);
buff->points = fPoints->GetXYZ(x3dPoints.GetP(),0,size);
@@ -585,7 +585,7 @@ void TPolyLineShape::PaintX3DMarker(Option_t *)
fSizeX3D->numPoints = buff->numPoints = buff->numSegs*2;
fSizeX3D->numPolys = buff->numPolys = 0; //NOTE: Because of different structure, our
- buff->polys = NULL; // TPolyMarker3D can't use polygons
+ buff->polys = 0; // TPolyMarker3D can't use polygons
//*-* Allocate memory for points *-*
diff --git a/treeplayer/src/TSelectorDraw.cxx b/treeplayer/src/TSelectorDraw.cxx
index 5a4a9fa8154..b2c86643275 100644
--- a/treeplayer/src/TSelectorDraw.cxx
+++ b/treeplayer/src/TSelectorDraw.cxx
@@ -1,4 +1,4 @@
-// @(#)root/treeplayer:$Name: $:$Id: TSelectorDraw.cxx,v 1.60 2006/05/23 04:47:42 brun Exp $
+// @(#)root/treeplayer:$Name: $:$Id: TSelectorDraw.cxx,v 1.61 2006/05/24 15:10:47 brun Exp $
// Author: Rene Brun 08/01/2003
/*************************************************************************
@@ -164,7 +164,7 @@ TSelectorDraw& TSelectorDraw::operator=(const TSelectorDraw& sd)
fSelectMultiple=sd.fSelectMultiple;
fCleanElist=sd.fCleanElist;
fObjEval=sd.fObjEval;
- }
+ }
return *this;
}
@@ -293,7 +293,7 @@ void TSelectorDraw::Begin(TTree *tree)
pstart= strchr(hname,'(');
pend = strchr(hname,')');
- if (pstart != NULL ){ // found the bracket
+ if (pstart != 0 ) { // found the bracket
mustdelete=1;
@@ -304,7 +304,7 @@ void TSelectorDraw::Begin(TTree *tree)
ncomma=0;
cdummy = pstart;
cdummy = strchr(&cdummy[1],',');
- while (cdummy != NULL) {
+ while (cdummy != 0) {
cdummy = strchr(&cdummy[1],',');
ncomma++;
}
diff --git a/treeviewer/src/TSessionViewer.cxx b/treeviewer/src/TSessionViewer.cxx
index d3db8a667fb..8850497b4fd 100644
--- a/treeviewer/src/TSessionViewer.cxx
+++ b/treeviewer/src/TSessionViewer.cxx
@@ -1,4 +1,4 @@
-// @(#)root/treeviewer:$Name: $:$Id: TSessionViewer.cxx,v 1.59 2006/03/20 21:43:44 pcanal Exp $
+// @(#)root/treeviewer:$Name: $:$Id: TSessionViewer.cxx,v 1.60 2006/05/13 19:34:41 brun Exp $
// Author: Marek Biskup, Jakub Madejczyk, Bertrand Bellenot 10/08/2005
/*************************************************************************
@@ -167,19 +167,19 @@ const char *xpm_toolbar[] = {
};
ToolBarData_t tb_data[] = {
- { "", "Open Config File", kFALSE, kFileLoadConfig, NULL },
- { "", "Save Config File", kFALSE, kFileSaveConfig, NULL },
- { "", 0, 0, -1, NULL },
- { "", "Connect", kFALSE, kSessionConnect, NULL },
- { "", "Disconnect", kFALSE, kSessionDisconnect, NULL },
- { "", 0, 0, -1, NULL },
- { "", "New Query", kFALSE, kQueryNew, NULL },
- { "", "Submit Query", kFALSE, kQuerySubmit, NULL },
- { "", 0, 0, -1, NULL },
- { "", "About Root", kFALSE, kHelpAbout, NULL },
- { "", 0, 0, -1, NULL },
- { "", "Exit Root", kFALSE, kFileQuit, NULL },
- { 0, 0, 0, 0, NULL }
+ { "", "Open Config File", kFALSE, kFileLoadConfig, 0 },
+ { "", "Save Config File", kFALSE, kFileSaveConfig, 0 },
+ { "", 0, 0, -1, 0 },
+ { "", "Connect", kFALSE, kSessionConnect, 0 },
+ { "", "Disconnect", kFALSE, kSessionDisconnect, 0 },
+ { "", 0, 0, -1, 0 },
+ { "", "New Query", kFALSE, kQueryNew, 0 },
+ { "", "Submit Query", kFALSE, kQuerySubmit, 0 },
+ { "", 0, 0, -1, 0 },
+ { "", "About Root", kFALSE, kHelpAbout, 0 },
+ { "", 0, 0, -1, 0 },
+ { "", "Exit Root", kFALSE, kFileQuit, 0 },
+ { 0, 0, 0, 0, 0 }
};
diff --git a/x3d/src/TViewerX3D.cxx b/x3d/src/TViewerX3D.cxx
index c2335f482f5..38d3e92cf73 100644
--- a/x3d/src/TViewerX3D.cxx
+++ b/x3d/src/TViewerX3D.cxx
@@ -1,4 +1,4 @@
-// @(#)root/x3d:$Name: $:$Id: TViewerX3D.cxx,v 1.17 2005/09/04 09:16:25 brun Exp $
+// @(#)root/x3d:$Name: $:$Id: TViewerX3D.cxx,v 1.18 2005/11/11 16:12:18 couet Exp $
// Author: Rene Brun 05/09/99
/*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
@@ -143,7 +143,7 @@ ClassImp(TViewerX3D)
TViewerX3D::TViewerX3D(TVirtualPad *pad)
: TVirtualViewer3D(),
fCanvas(0), fContainer(0), fMenuBar(0), fFileMenu(0),
- fHelpMenu(0), fMenuBarLayout(0), fMenuBarItemLayout(0),
+ fHelpMenu(0), fMenuBarLayout(0), fMenuBarItemLayout(0),
fMenuBarHelpLayout(0), fCanvasLayout(0),
fPad(pad), fBuildingScene(kFALSE), fPass(kSize)
{
@@ -164,7 +164,7 @@ TViewerX3D::TViewerX3D(TVirtualPad *pad, Option_t *option, const char *title,
UInt_t width, UInt_t height)
: TVirtualViewer3D(),
fCanvas(0), fContainer(0), fMenuBar(0), fFileMenu(0),
- fHelpMenu(0), fMenuBarLayout(0), fMenuBarItemLayout(0),
+ fHelpMenu(0), fMenuBarLayout(0), fMenuBarItemLayout(0),
fMenuBarHelpLayout(0), fCanvasLayout(0),
fPad(pad), fBuildingScene(kFALSE), fPass(kSize)
{
@@ -185,7 +185,7 @@ TViewerX3D::TViewerX3D(TVirtualPad *pad, Option_t *option, const char *title,
Int_t x, Int_t y, UInt_t width, UInt_t height)
: TVirtualViewer3D(),
fCanvas(0), fContainer(0), fMenuBar(0), fFileMenu(0),
- fHelpMenu(0), fMenuBarLayout(0), fMenuBarItemLayout(0),
+ fHelpMenu(0), fMenuBarLayout(0), fMenuBarItemLayout(0),
fMenuBarHelpLayout(0), fCanvasLayout(0),
fPad(pad), fBuildingScene(kFALSE), fPass(kSize)
{
@@ -208,7 +208,7 @@ TViewerX3D::~TViewerX3D()
if (!fPad) return;
- if (fgCreated) {
+ if (fgCreated) {
DeleteX3DWindow();
}
delete fCanvasLayout;
@@ -217,7 +217,7 @@ TViewerX3D::~TViewerX3D()
delete fMenuBarLayout;
delete fHelpMenu;
delete fFileMenu;
- delete fMenuBar;
+ delete fMenuBar;
delete fContainer;
delete fCanvas;
delete fMainFrame;
@@ -230,7 +230,7 @@ void TViewerX3D::Close()
{
// Close X3D Viewer
assert(!fBuildingScene);
- fPad->ReleaseViewer3D();
+ fPad->ReleaseViewer3D();
delete this;
}
@@ -342,9 +342,9 @@ void TViewerX3D::BeginScene()
if (fgCreated) {
return;
}
-
+
fBuildingScene = kTRUE;
-
+
if (fPass == kSize) {
gSize3D.numPoints = 0;
gSize3D.numSegs = 0;
@@ -361,8 +361,8 @@ void TViewerX3D::EndScene()
return;
}
- fBuildingScene = kFALSE;
-
+ fBuildingScene = kFALSE;
+
// Size pass done - and some points actually added
if (gSize3D.numPoints != 0) {
if (fPass == kSize) {
@@ -371,12 +371,12 @@ void TViewerX3D::EndScene()
Error("InitX3DWindow", "x3d buffer allocation failure");
return;
}
-
+
// Enter draw pass and invoke another paint
fPass = kDraw;
fPad->Paint();
fPass = kSize;
- CreateViewer(fTitle);
+ CreateViewer(fTitle);
Show();
}
} else {
@@ -404,21 +404,21 @@ Int_t TViewerX3D::AddObject(const TBuffer3D & buffer, Bool_t * addChildren)
}
// Ensure we have the required sections
UInt_t reqSections = TBuffer3D::kCore|TBuffer3D::kRawSizes;
-
+
// Sizing does not require actual raw tesselation information
if (fPass == kDraw) {
reqSections |= TBuffer3D::kRaw;
}
-
+
if (!buffer.SectionsValid(reqSections)) {
return reqSections;
}
-
+
if (buffer.Type() == TBuffer3DTypes::kMarker) {
PaintPolyMarker(buffer);
return TBuffer3D::kNone;
}
-
+
switch(fPass) {
case(kSize): {
gSize3D.numPoints += buffer.NbPnts();
@@ -445,7 +445,7 @@ Int_t TViewerX3D::AddObject(const TBuffer3D & buffer, Bool_t * addChildren)
break;
}
}
-
+
return TBuffer3D::kNone;
}
@@ -484,10 +484,10 @@ void TViewerX3D::PaintPolyMarker(const TBuffer3D & buffer) const
x3dBuff->numPolys = 0;
x3dBuff->points = new Float_t[3*x3dBuff->numPoints];
x3dBuff->segs = new Int_t[3*x3dBuff->numSegs];
- x3dBuff->polys = NULL;
+ x3dBuff->polys = 0;
Double_t delta = 0.002;
-
+
for (UInt_t i = 0; i < buffer.NbPnts(); i++) {
for (UInt_t j = 0; j < mode; j++) {
for (UInt_t k = 0; k < 2; k++) {
--
GitLab