Cintex.h   Cintex.h 
// @(#)root/cintex:$Id: Cintex.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/cintex:$Id: Cintex.h 28276 2009-04-17 19:08:08Z pcanal $
// Author: Pere Mato 2005 // Author: Pere Mato 2005
// Copyright CERN, CH-1211 Geneva 23, 2004-2005, All rights reserved. // Copyright CERN, CH-1211 Geneva 23, 2004-2005, All rights reserved.
// //
// Permission to use, copy, modify, and distribute this software for any // Permission to use, copy, modify, and distribute this software for any
// purpose is hereby granted without fee, provided that this copyright and // purpose is hereby granted without fee, provided that this copyright and
// permissions notice appear in all copies and derivatives. // permissions notice appear in all copies and derivatives.
// //
// This software is provided "as is" without express or implied warranty. // This software is provided "as is" without express or implied warranty.
skipping to change at line 24 skipping to change at line 24
#include "Reflex/Callback.h" #include "Reflex/Callback.h"
#include "Reflex/Type.h" #include "Reflex/Type.h"
#include "Reflex/Member.h" #include "Reflex/Member.h"
// ROOT forward declarations // ROOT forward declarations
namespace ROOT { class TGenericClassInfo; } namespace ROOT { class TGenericClassInfo; }
class TClass; class TClass;
namespace ROOT { namespace ROOT {
class TGenericClassInfo;
namespace Cintex { namespace Cintex {
class Callback : public ROOT::Reflex::ICallback { class Callback : public ROOT::Reflex::ICallback {
public: public:
virtual void operator () ( const ROOT::Reflex::Type& t ); virtual void operator () ( const ROOT::Reflex::Type& t );
virtual void operator () ( const ROOT::Reflex::Member& m ); virtual void operator () ( const ROOT::Reflex::Member& m );
}; };
typedef TClass* (*ROOTCreator_t)( ROOT::Reflex::Type, ROOT::TGenericCla ssInfo* ); typedef TClass* (*ROOTCreator_t)( ROOT::Reflex::Type, ROOT::TGenericCla ssInfo* );
skipping to change at line 47 skipping to change at line 48
~Cintex(); ~Cintex();
static void Enable(); static void Enable();
static void SetROOTCreator(ROOTCreator_t); static void SetROOTCreator(ROOTCreator_t);
static ROOTCreator_t GetROOTCreator(); static ROOTCreator_t GetROOTCreator();
static int Debug(); static int Debug();
static void SetDebug(int); static void SetDebug(int);
static bool PropagateClassTypedefs(); static bool PropagateClassTypedefs();
static void SetPropagateClassTypedefs(bool); static void SetPropagateClassTypedefs(bool);
static bool PropagateClassEnums(); static bool PropagateClassEnums();
static void SetPropagateClassEnums(bool); static void SetPropagateClassEnums(bool);
static void Default_CreateClass(const char* name, TGenericClassInfo*
gci);
private: private:
static Cintex& Instance(); static Cintex& Instance();
Callback* fCallback; Callback* fCallback;
ROOTCreator_t fRootcreator; ROOTCreator_t fRootcreator;
int fDbglevel; int fDbglevel;
bool fPropagateClassTypedefs; bool fPropagateClassTypedefs;
bool fPropagateClassEnums; bool fPropagateClassEnums;
bool fEnabled; bool fEnabled;
}; };
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 CombinedCalculator.h   CombinedCalculator.h 
// @(#)root/roostats:$Id: CombinedCalculator.h 26964 2008-12-16 16:30:01Z m oneta $ // @(#)root/roostats:$Id: CombinedCalculator.h 28306 2009-04-21 10:04:57Z m oneta $
// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke // Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOSTATS_CombinedCalculator #ifndef ROOSTATS_CombinedCalculator
skipping to change at line 90 skipping to change at line 90
fOwnsWorkspace = false; fOwnsWorkspace = false;
} }
CombinedCalculator(RooWorkspace& ws, RooAbsData& data, RooAbsPdf& pdf , RooArgSet& paramsOfInterest, CombinedCalculator(RooWorkspace& ws, RooAbsData& data, RooAbsPdf& pdf , RooArgSet& paramsOfInterest,
Double_t size = 0.05, RooArgSet* nullParams = 0, R ooArgSet* altParams = 0){ Double_t size = 0.05, RooArgSet* nullParams = 0, R ooArgSet* altParams = 0){
// alternate constructor // alternate constructor
SetWorkspace(ws); SetWorkspace(ws);
SetData(data); SetData(data);
SetPdf(pdf); SetPdf(pdf);
SetParameters(paramsOfInterest); SetParameters(paramsOfInterest);
SetSize(size); SetTestSize(size);
if(nullParams ) if(nullParams )
SetNullParameters(*nullParams); SetNullParameters(*nullParams);
else else
SetNullParameters(paramsOfInterest); SetNullParameters(paramsOfInterest);
if (altParams) SetAlternateParameters(*altParams); if (altParams) SetAlternateParameters(*altParams);
fOwnsWorkspace = false; fOwnsWorkspace = false;
} }
CombinedCalculator(RooAbsData& data, RooAbsPdf& pdf, RooArgSet& param sOfInterest, CombinedCalculator(RooAbsData& data, RooAbsPdf& pdf, RooArgSet& param sOfInterest,
Double_t size = 0.05, RooArgSet* nullParams = 0, R ooArgSet* altParams = 0){ Double_t size = 0.05, RooArgSet* nullParams = 0, R ooArgSet* altParams = 0){
// alternate constructor // alternate constructor
fWS = new RooWorkspace(); fWS = new RooWorkspace();
fOwnsWorkspace = true; fOwnsWorkspace = true;
SetData(data); SetData(data);
SetPdf(pdf); SetPdf(pdf);
SetParameters(paramsOfInterest); SetParameters(paramsOfInterest);
SetSize(size); SetTestSize(size);
if(nullParams ) if(nullParams )
SetNullParameters(*nullParams); SetNullParameters(*nullParams);
else else
SetNullParameters(paramsOfInterest); SetNullParameters(paramsOfInterest);
if (altParams) SetAlternateParameters(*altParams); if (altParams) SetAlternateParameters(*altParams);
} }
virtual ~CombinedCalculator() { virtual ~CombinedCalculator() {
// destructor. // destructor.
if( fOwnsWorkspace && fWS) delete fWS; if( fOwnsWorkspace && fWS) delete fWS;
skipping to change at line 132 skipping to change at line 132
// if (fPOI) delete fPOI; // if (fPOI) delete fPOI;
// if (fNuisParams) delete fNuisParams; // if (fNuisParams) delete fNuisParams;
} }
// Main interface to get a ConfInterval, pure virtual // Main interface to get a ConfInterval, pure virtual
virtual ConfInterval* GetInterval() const = 0; virtual ConfInterval* GetInterval() const = 0;
// main interface to get a HypoTestResult, pure virtual // main interface to get a HypoTestResult, pure virtual
virtual HypoTestResult* GetHypoTest() const = 0; virtual HypoTestResult* GetHypoTest() const = 0;
// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval) // set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
virtual void SetSize(Double_t size) {fSize = size;} virtual void SetTestSize(Double_t size) {fSize = size;}
// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval) // set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;} virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}
// Get the size of the test (eg. rate of Type I error) // Get the size of the test (eg. rate of Type I error)
virtual Double_t Size() const {return fSize;} virtual Double_t Size() const {return fSize;}
// Get the Confidence level for the test // Get the Confidence level for the test
virtual Double_t ConfidenceLevel() const {return 1.-fSize;} virtual Double_t ConfidenceLevel() const {return 1.-fSize;}
// set a workspace that owns all the necessary components for the ana lysis // set a workspace that owns all the necessary components for the ana lysis
virtual void SetWorkspace(RooWorkspace & ws) { virtual void SetWorkspace(RooWorkspace & ws) {
if (!fWS) if (!fWS)
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 G__ci.h   G__ci.h 
skipping to change at line 369 skipping to change at line 369
#define G__STD_EXCEPTION #define G__STD_EXCEPTION
#endif #endif
#if defined(_WIN32) || defined(_WINDOWS) || defined(_Windows) || defined(_W INDOWS_) #if defined(_WIN32) || defined(_WINDOWS) || defined(_Windows) || defined(_W INDOWS_)
#ifndef G__WIN32 #ifndef G__WIN32
#define G__WIN32 #define G__WIN32
#endif #endif
#endif #endif
/* added by Fons Radamakers in 2000 Oct 2 */ /* added by Fons Radamakers in 2000 Oct 2 */
#if defined(__linux) || defined(__linux__) || defined(linux) #if (defined(__linux) || defined(__linux__) || defined(linux)) && ! defined (__CINT__)
# include <features.h> # include <features.h>
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 # if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
# define G__NONSCALARFPOS2 # define G__NONSCALARFPOS2
# endif # endif
#endif #endif
/*********************************************************************** /***********************************************************************
* Native long long support * Native long long support
***********************************************************************/ ***********************************************************************/
#if defined(G__WIN32) && !defined(__CINT__) #if defined(G__WIN32) && !defined(__CINT__)
skipping to change at line 391 skipping to change at line 391
typedef unsigned __int64 G__uint64; typedef unsigned __int64 G__uint64;
#else #else
typedef long long G__int64; typedef long long G__int64;
typedef unsigned long long G__uint64; typedef unsigned long long G__uint64;
#endif #endif
/*********************************************************************** /***********************************************************************
* Something that depends on platform * Something that depends on platform
***********************************************************************/ ***********************************************************************/
#define ENABLE_CPP_EXCEPTIONS 1
/* Exception */ /* Exception */
#if defined(G__WIN32) && !defined(G__STD_EXCEPTION) #if defined(G__WIN32) && !defined(G__STD_EXCEPTION)
#define G__STD_EXCEPTION #define G__STD_EXCEPTION
#endif #endif
#if defined(G__STD_EXCEPTION) && !defined(G__EXCEPTIONWRAPPER) && !defined( G__APIIF) #if defined(G__STD_EXCEPTION) && !defined(G__EXCEPTIONWRAPPER) && !defined( G__APIIF)
#define G__EXCEPTIONWRAPPER #define G__EXCEPTIONWRAPPER
#endif #endif
/* Error redirection , G__fprinterr */ /* Error redirection , G__fprinterr */
#if defined(G__WIN32) && !defined(G__ERRORCALLBACK) #if defined(G__WIN32) && !defined(G__ERRORCALLBACK)
skipping to change at line 1730 skipping to change at line 1732
extern G__EXPORT int G__memfunc_setup2 G__P((G__CONST char *funcname,int ha sh,G__CONST char *mangled_name,G__InterfaceMethod funcp,int type extern G__EXPORT int G__memfunc_setup2 G__P((G__CONST char *funcname,int ha sh,G__CONST char *mangled_name,G__InterfaceMethod funcp,int type
,int tagnum,int typenum,int reftype,int para_nu,int ansi,int access,int isc onst,G__CONST char *paras,G__CONST char *comment)); ,int tagnum,int typenum,int reftype,int para_nu,int ansi,int access,int isc onst,G__CONST char *paras,G__CONST char *comment));
#endif /* G__TRUEP2F */ #endif /* G__TRUEP2F */
extern G__EXPORT int G__memfunc_next G__P((void)); extern G__EXPORT int G__memfunc_next G__P((void));
extern G__EXPORT int G__memfunc_para_setup G__P((int ifn,int type,int tagnu m,int typenum,int reftype,G__value *para_default,char *para_def,char *para_ name)); extern G__EXPORT int G__memfunc_para_setup G__P((int ifn,int type,int tagnu m,int typenum,int reftype,G__value *para_default,char *para_def,char *para_ name));
extern G__EXPORT int G__tag_memfunc_reset G__P((void)); extern G__EXPORT int G__tag_memfunc_reset G__P((void));
extern G__EXPORT void G__letint G__P((G__value *buf,int type,long value)); extern G__EXPORT void G__letint G__P((G__value *buf,int type,long value));
extern G__EXPORT void G__letdouble G__P((G__value *buf,int type,double valu e)); extern G__EXPORT void G__letdouble G__P((G__value *buf,int type,double valu e));
extern G__EXPORT int G__value_get_type G__P((G__value* buf)); extern G__EXPORT int G__value_get_type G__P((G__value* buf));
extern G__EXPORT int G__value_get_tagnum G__P((G__value* buf));
extern G__EXPORT void G__store_tempobject G__P((G__value reg)); extern G__EXPORT void G__store_tempobject G__P((G__value reg));
extern G__EXPORT int G__inheritance_setup G__P((int tagnum,int basetagnum,l ong baseoffset,int baseaccess,int property)); extern G__EXPORT int G__inheritance_setup G__P((int tagnum,int basetagnum,l ong baseoffset,int baseaccess,int property));
extern G__EXPORT void G__add_compiledheader G__P((G__CONST char *headerfile )); extern G__EXPORT void G__add_compiledheader G__P((G__CONST char *headerfile ));
extern G__EXPORT void G__add_ipath G__P((G__CONST char *ipath)); extern G__EXPORT void G__add_ipath G__P((G__CONST char *ipath));
extern G__EXPORT int G__delete_ipath G__P((G__CONST char *ipath)); extern G__EXPORT int G__delete_ipath G__P((G__CONST char *ipath));
extern G__EXPORT struct G__includepath *G__getipathentry(); extern G__EXPORT struct G__includepath *G__getipathentry();
extern G__EXPORT void G__add_macro G__P((G__CONST char *macro)); extern G__EXPORT void G__add_macro G__P((G__CONST char *macro));
extern G__EXPORT void G__check_setup_version G__P((int version,G__CONST cha r *func)); extern G__EXPORT void G__check_setup_version G__P((int version,G__CONST cha r *func));
extern G__EXPORT long G__int G__P((G__value buf)); extern G__EXPORT long G__int G__P((G__value buf));
extern G__EXPORT long G__int_cast G__P((G__value buf)); extern G__EXPORT long G__int_cast G__P((G__value buf));
skipping to change at line 2486 skipping to change at line 2489
#ifndef __CINT__ #ifndef __CINT__
extern G__EXPORT G__int64 G__expr_strtoll G__P((const char *nptr,char **end ptr, register int base)); extern G__EXPORT G__int64 G__expr_strtoll G__P((const char *nptr,char **end ptr, register int base));
extern G__EXPORT G__uint64 G__expr_strtoull G__P((const char *nptr, char ** endptr, register int base)); extern G__EXPORT G__uint64 G__expr_strtoull G__P((const char *nptr, char ** endptr, register int base));
#endif #endif
/***********************************************************************/ /***********************************************************************/
#if defined(__cplusplus) && !defined(__CINT__) #if defined(__cplusplus) && !defined(__CINT__)
} /* extern C 3 */ } /* extern C 3 */
#endif #endif
/***********************************************************************/
#if defined(__cplusplus) && !defined(__CINT__)
// Helper class to avoid compiler warning about casting function pointer
// to void pointer.
class G__func2void {
typedef void (*funcptr_t)();
union funcptr_and_voidptr {
typedef void (*funcptr_t)();
void *read;
funcptr_t write;
};
funcptr_and_voidptr _tmp;
public:
template <typename T>
G__func2void( T vfp ) {
_tmp.write = ( funcptr_t )vfp;
}
operator void* () const {
return _tmp.read;
}
};
#endif
#endif /* __MAKECINT__ */ #endif /* __MAKECINT__ */
/************************************************************************** /**************************************************************************
* endif #ifndef G__MAKECINT * endif #ifndef G__MAKECINT
**************************************************************************/ **************************************************************************/
#endif /* G__CI_H */ #endif /* G__CI_H */
 End of changes. 4 change blocks. 
1 lines changed or deleted 29 lines changed or added


 IntervalCalculator.h   IntervalCalculator.h 
// @(#)root/roostats:$Id: IntervalCalculator.h 26964 2008-12-16 16:30:01Z m oneta $ // @(#)root/roostats:$Id: IntervalCalculator.h 28306 2009-04-21 10:04:57Z m oneta $
// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke // Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOSTATS_IntervalCalculator #ifndef ROOSTATS_IntervalCalculator
skipping to change at line 89 skipping to change at line 89
// specify the name of the dataset in the workspace to be used // specify the name of the dataset in the workspace to be used
virtual void SetData(const char* name) = 0; virtual void SetData(const char* name) = 0;
// specify the name of the PDF in the workspace to be used // specify the name of the PDF in the workspace to be used
virtual void SetPdf(const char* name) = 0; virtual void SetPdf(const char* name) = 0;
// specify the parameters of interest in the interval // specify the parameters of interest in the interval
virtual void SetParameters(RooArgSet&) = 0; virtual void SetParameters(RooArgSet&) = 0;
// specify the nuisance parameters (eg. the rest of the parameters) // specify the nuisance parameters (eg. the rest of the parameters)
virtual void SetNuisanceParameters(RooArgSet&) = 0; virtual void SetNuisanceParameters(RooArgSet&) = 0;
// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval) // set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
virtual void SetSize(Double_t size) = 0; virtual void SetTestSize(Double_t size) = 0;
// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval) // set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
virtual void SetConfidenceLevel(Double_t cl) = 0; virtual void SetConfidenceLevel(Double_t cl) = 0;
protected: protected:
ClassDef(IntervalCalculator,1) // Interface for tools setting limit s (producing confidence intervals) ClassDef(IntervalCalculator,1) // Interface for tools setting limit s (producing confidence intervals)
}; };
} }
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 Kernel.h   Kernel.h 
// @(#)root/reflex:$Id: Kernel.h 27579 2009-02-23 15:15:06Z pcanal $ // @(#)root/reflex:$Id: Kernel.h 28064 2009-04-02 13:31:29Z axel $
// Author: Stefan Roiser 2004 // Author: Stefan Roiser 2004
// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved. // Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
// //
// Permission to use, copy, modify, and distribute this software for any // Permission to use, copy, modify, and distribute this software for any
// purpose is hereby granted without fee, provided that this copyright and // purpose is hereby granted without fee, provided that this copyright and
// permissions notice appear in all copies and derivatives. // permissions notice appear in all copies and derivatives.
// //
// This software is provided "as is" without express or implied warranty. // This software is provided "as is" without express or implied warranty.
skipping to change at line 334 skipping to change at line 334
REPRES_ULONGLONG = 'm', REPRES_ULONGLONG = 'm',
REPRES_STRUCT = 'u', REPRES_STRUCT = 'u',
REPRES_CLASS = 'u', REPRES_CLASS = 'u',
REPRES_ENUM = 'i', // Intentionally equal to REPRES_IN T REPRES_ENUM = 'i', // Intentionally equal to REPRES_IN T
REPRES_NOTYPE = '\0' REPRES_NOTYPE = '\0'
// '1' is also a value used (for legacy implementation of function po inter) // '1' is also a value used (for legacy implementation of function po inter)
// 'E' is also a value used (for legacy implementation of FILE*) // 'E' is also a value used (for legacy implementation of FILE*)
// 'a', 'j', 'T', 'o', 'O', 'p', 'P', 'z', 'Z', '\011', '\001', 'w' a re also a value used (for support of various interpreter types) // 'a', 'j', 'T', 'o', 'O', 'p', 'P', 'z', 'Z', '\011', '\001', 'w' a re also a value used (for support of various interpreter types)
}; };
enum EMEMBERQUERY {
INHERITEDMEMBERS_DEFAULT, // NO by default, set to ALSO by UpdateMemb
ers()
INHERITEDMEMBERS_NO,
INHERITEDMEMBERS_ALSO
};
// Note TYPE and REPRESTYPE are 'small' enums and could be stored as 'ch ar' to save space // Note TYPE and REPRESTYPE are 'small' enums and could be stored as 'ch ar' to save space
/** the max unsigned int */ /** the max unsigned int */
size_t NPos(); size_t NPos();
/** /**
* typedef for function member type (necessary for return value of * typedef for function member type (necessary for return value of
* getter function) * getter function)
*/ */
typedef void (* StubFunction) ( void*, void *, const std::vector < void * > &, void *); typedef void (* StubFunction) ( void*, void *, const std::vector < void * > &, void *);
 End of changes. 2 change blocks. 
1 lines changed or deleted 8 lines changed or added


 MatrixInversion.icc   MatrixInversion.icc 
// @(#)root/smatrix:$Id: MatrixInversion.icc 26866 2008-12-12 10:50:07Z mon eta $ // @(#)root/smatrix:$Id: MatrixInversion.icc 28287 2009-04-20 14:46:21Z mon eta $
// Authors: CLHEP authors, L. Moneta 2006 // Authors: CLHEP authors, L. Moneta 2006
#ifndef ROOT_Math_MatrixInversion_icc #ifndef ROOT_Math_MatrixInversion_icc
#define ROOT_Math_MatrixInversion_icc #define ROOT_Math_MatrixInversion_icc
#include "Math/SVector.h" #include "Math/SVector.h"
#include <limits> #include <limits>
// inversion algorithms for matrices // inversion algorithms for matrices
// taken from CLHEP (L. Moneta May 2006) // taken from CLHEP (L. Moneta May 2006)
skipping to change at line 62 skipping to change at line 62
// so x[i] and piv[i] are optimally fast. // so x[i] and piv[i] are optimally fast.
mIter x = xvec.begin(); mIter x = xvec.begin();
// x[i] is used as helper storage, needs to have at least size nrow. // x[i] is used as helper storage, needs to have at least size nrow.
pivIter piv = pivv.begin(); pivIter piv = pivv.begin();
// piv[i] is used to store details of exchanges // piv[i] is used to store details of exchanges
double temp1, temp2; double temp1, temp2;
mIter ip, mjj, iq; mIter ip, mjj, iq;
double lambda, sigma; double lambda, sigma;
const double alpha = .6404; // = (1+sqrt(17))/8 const double alpha = .6404; // = (1+sqrt(17))/8
const double epsilon = 32*std::numeric_limits<T>::epsilon(); // LM (04/2009) remove this useless check (it is not in LAPACK) which fa
ils inversion of
// a matrix with values < epsilon in the diagonal
//
//const double epsilon = 32*std::numeric_limits<T>::epsilon();
// whenever a sum of two doubles is below or equal to epsilon // whenever a sum of two doubles is below or equal to epsilon
// it is set to zero. // it is set to zero.
// this constant could be set to zero but then the algorithm // this constant could be set to zero but then the algorithm
// doesn't neccessarily detect that a matrix is singular // doesn't neccessarily detect that a matrix is singular
for (i = 0; i < nrow; i++) for (i = 0; i < nrow; i++)
piv[i] = i+1; piv[i] = i+1;
ifail = 0; ifail = 0;
skipping to change at line 117 skipping to change at line 120
else else
{ {
sigma = 0; // compute sigma = max A(pivrow, j:pivrow-1) sigma = 0; // compute sigma = max A(pivrow, j:pivrow-1)
ip = rhs.Array() + pivrow*(pivrow-1)/2+j-1; ip = rhs.Array() + pivrow*(pivrow-1)/2+j-1;
for (k=j; k < pivrow; k++) for (k=j; k < pivrow; k++)
{ {
if (std::abs(*ip) > sigma) if (std::abs(*ip) > sigma)
sigma = std::abs(*ip); sigma = std::abs(*ip);
ip++; ip++;
} }
if (sigma * std::abs(*mjj) >= alpha * lambda * lambda) // sigma cannot be zero because it is at least lambda which is
not zero
if ( std::abs(*mjj) >= alpha * lambda * (lambda/ sigma) )
{ {
s=1; s=1;
pivrow = j; pivrow = j;
} }
else if (std::abs(*(rhs.Array()+pivrow*(pivrow-1)/2+pivrow-1)) else if (std::abs(*(rhs.Array()+pivrow*(pivrow-1)/2+pivrow-1))
>= alpha * sigma) >= alpha * sigma)
s=1; s=1;
else else
s=2; s=2;
} }
skipping to change at line 146 skipping to change at line 150
temp2 = *mjj = 1.0f/ *mjj; // invert D(j,j) temp2 = *mjj = 1.0f/ *mjj; // invert D(j,j)
// update A(j+1:n, j+1,n) // update A(j+1:n, j+1,n)
for (i=j+1; i <= nrow; i++) for (i=j+1; i <= nrow; i++)
{ {
temp1 = *(rhs.Array() + i*(i-1)/2 + j-1) * temp2; temp1 = *(rhs.Array() + i*(i-1)/2 + j-1) * temp2;
ip = rhs.Array()+i*(i-1)/2+j; ip = rhs.Array()+i*(i-1)/2+j;
for (k=j+1; k<=i; k++) for (k=j+1; k<=i; k++)
{ {
*ip -= static_cast<T> ( temp1 * *(rhs.Array() + k*(k-1)/2 + j-1) ); *ip -= static_cast<T> ( temp1 * *(rhs.Array() + k*(k-1)/2 + j-1) );
if (std::abs(*ip) <= epsilon) // if (std::abs(*ip) <= epsilon)
*ip=0; // *ip=0;
ip++; ip++;
} }
} }
// update L // update L
ip = rhs.Array() + (j+1)*j/2 + j-1; ip = rhs.Array() + (j+1)*j/2 + j-1;
for (i=j+1; i <= nrow; ip += i++) for (i=j+1; i <= nrow; ip += i++)
*ip *= static_cast<T> ( temp2 ); *ip *= static_cast<T> ( temp2 );
} }
else if (s==1) // 1x1 pivot else if (s==1) // 1x1 pivot
{ {
skipping to change at line 196 skipping to change at line 200
temp2 = *mjj = 1.0f / *mjj; // invert D(j,j) temp2 = *mjj = 1.0f / *mjj; // invert D(j,j)
// update A(j+1:n, j+1:n) // update A(j+1:n, j+1:n)
for (i = j+1; i <= nrow; i++) for (i = j+1; i <= nrow; i++)
{ {
temp1 = *(rhs.Array() + i*(i-1)/2 + j-1) * temp2; temp1 = *(rhs.Array() + i*(i-1)/2 + j-1) * temp2;
ip = rhs.Array()+i*(i-1)/2+j; ip = rhs.Array()+i*(i-1)/2+j;
for (k=j+1; k<=i; k++) for (k=j+1; k<=i; k++)
{ {
*ip -= static_cast<T> (temp1 * *(rhs.Array() + k*(k-1)/2 + j-1) ); *ip -= static_cast<T> (temp1 * *(rhs.Array() + k*(k-1)/2 + j-1) );
if (std::abs(*ip) <= epsilon) // if (std::abs(*ip) <= epsilon)
*ip=0; // *ip=0;
ip++; ip++;
} }
} }
// update L // update L
ip = rhs.Array() + (j+1)*j/2 + j-1; ip = rhs.Array() + (j+1)*j/2 + j-1;
for (i=j+1; i<=nrow; ip += i++) for (i=j+1; i<=nrow; ip += i++)
*ip *= static_cast<T>( temp2 ); *ip *= static_cast<T>( temp2 );
} }
else // s=2, ie use a 2x2 pivot else // s=2, ie use a 2x2 pivot
{ {
skipping to change at line 259 skipping to change at line 263
*(mjj + j + 1) = static_cast<T>( temp1 * temp2 ); *(mjj + j + 1) = static_cast<T>( temp1 * temp2 );
*(mjj + j) = static_cast<T>( - *(mjj + j) * temp2 ); *(mjj + j) = static_cast<T>( - *(mjj + j) * temp2 );
if (j < nrow-1) // otherwise do nothing if (j < nrow-1) // otherwise do nothing
{ {
// update A(j+2:n, j+2:n) // update A(j+2:n, j+2:n)
for (i=j+2; i <= nrow ; i++) for (i=j+2; i <= nrow ; i++)
{ {
ip = rhs.Array() + i*(i-1)/2 + j-1; ip = rhs.Array() + i*(i-1)/2 + j-1;
temp1 = *ip * *mjj + *(ip + 1) * *(mjj + j); temp1 = *ip * *mjj + *(ip + 1) * *(mjj + j);
if (std::abs(temp1 ) <= epsilon) // if (std::abs(temp1 ) <= epsilon)
temp1 = 0; // temp1 = 0;
temp2 = *ip * *(mjj + j) + *(ip + 1) * *(mjj + j + 1); temp2 = *ip * *(mjj + j) + *(ip + 1) * *(mjj + j + 1);
if (std::abs(temp2 ) <= epsilon) // if (std::abs(temp2 ) <= epsilon)
temp2 = 0; // temp2 = 0;
for (k = j+2; k <= i ; k++) for (k = j+2; k <= i ; k++)
{ {
ip = rhs.Array() + i*(i-1)/2 + k-1; ip = rhs.Array() + i*(i-1)/2 + k-1;
iq = rhs.Array() + k*(k-1)/2 + j-1; iq = rhs.Array() + k*(k-1)/2 + j-1;
*ip -= static_cast<T>( temp1 * *iq + temp2 * *(iq+1) ) ; *ip -= static_cast<T>( temp1 * *iq + temp2 * *(iq+1) ) ;
if (std::abs(*ip) <= epsilon) // if (std::abs(*ip) <= epsilon)
*ip = 0; // *ip = 0;
} }
} }
// update L // update L
for (i=j+2; i <= nrow ; i++) for (i=j+2; i <= nrow ; i++)
{ {
ip = rhs.Array() + i*(i-1)/2 + j-1; ip = rhs.Array() + i*(i-1)/2 + j-1;
temp1 = *ip * *mjj + *(ip+1) * *(mjj + j); temp1 = *ip * *mjj + *(ip+1) * *(mjj + j);
if (std::abs(temp1) <= epsilon) // if (std::abs(temp1) <= epsilon)
temp1 = 0; // temp1 = 0;
*(ip+1) = *ip * *(mjj + j) *(ip+1) = *ip * *(mjj + j)
+ *(ip+1) * *(mjj + j + 1); + *(ip+1) * *(mjj + j + 1);
if (std::abs(*(ip+1)) <= epsilon) // if (std::abs(*(ip+1)) <= epsilon)
*(ip+1) = 0; // *(ip+1) = 0;
*ip = static_cast<T>( temp1 ); *ip = static_cast<T>( temp1 );
} }
} }
} }
} }
} // end of main loop over columns } // end of main loop over columns
if (j == nrow) // the the last pivot is 1x1 if (j == nrow) // the the last pivot is 1x1
{ {
mjj = rhs.Array() + j*(j-1)/2 + j-1; mjj = rhs.Array() + j*(j-1)/2 + j-1;
skipping to change at line 439 skipping to change at line 443
int ifail, jfail; int ifail, jfail;
typedef T* mIter; typedef T* mIter;
double tf; double tf;
double g1 = 1.0e-19, g2 = 1.0e19; double g1 = 1.0e-19, g2 = 1.0e19;
double p, q, t; double p, q, t;
double s11, s12; double s11, s12;
double epsilon = 8*std::numeric_limits<T>::epsilon(); // LM (04.09) : remove useless check on epsilon and set it to zero
const double epsilon = 0.0;
//double epsilon = 8*std::numeric_limits<T>::epsilon();
// could be set to zero (like it was before) // could be set to zero (like it was before)
// but then the algorithm often doesn't detect // but then the algorithm often doesn't detect
// that a matrix is singular // that a matrix is singular
int normal = 0, imposs = -1; int normal = 0, imposs = -1;
int jrange = 0, jover = 1, junder = -1; int jrange = 0, jover = 1, junder = -1;
ifail = normal; ifail = normal;
jfail = jrange; jfail = jrange;
int nxch = 0; int nxch = 0;
det = 1.0; det = 1.0;
 End of changes. 11 change blocks. 
18 lines changed or deleted 26 lines changed or added


 Member.h   Member.h 
// @(#)root/reflex:$Id: Member.h 27509 2009-02-19 03:32:22Z pcanal $ // @(#)root/reflex:$Id: Member.h 27746 2009-03-10 11:52:01Z axel $
// Author: Stefan Roiser 2004 // Author: Stefan Roiser 2004
// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved. // Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
// //
// Permission to use, copy, modify, and distribute this software for any // Permission to use, copy, modify, and distribute this software for any
// purpose is hereby granted without fee, provided that this copyright and // purpose is hereby granted without fee, provided that this copyright and
// permissions notice appear in all copies and derivatives. // permissions notice appear in all copies and derivatives.
// //
// This software is provided "as is" without express or implied warranty. // This software is provided "as is" without express or implied warranty.
skipping to change at line 485 skipping to change at line 485
#include "Reflex/internal/MemberBase.h" #include "Reflex/internal/MemberBase.h"
#include "Reflex/Scope.h" #include "Reflex/Scope.h"
#include "Reflex/PropertyList.h" #include "Reflex/PropertyList.h"
#include "Reflex/Type.h" #include "Reflex/Type.h"
#include "Reflex/MemberTemplate.h" #include "Reflex/MemberTemplate.h"
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::Member::operator < ( const Member & rh ) const { inline bool Reflex::Member::operator < ( const Member & rh ) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( (*this) && rh ) if ( (*this) && (bool)rh )
return ( TypeOf() < rh.TypeOf() && Name() < rh.Name()); return ( TypeOf() < rh.TypeOf() && Name() < rh.Name());
return false; return false;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::Member::operator == ( const Member & rh ) const { inline bool Reflex::Member::operator == ( const Member & rh ) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( (*this) && rh ) if ( (*this) && (bool)rh )
return ( TypeOf() == rh.TypeOf() && 0==strcmp(Name_c_str(),rh.Name_c_ str()) ); return ( TypeOf() == rh.TypeOf() && 0==strcmp(Name_c_str(),rh.Name_c_ str()) );
// both invalid is equal, too // both invalid is equal, too
return (!(*this)) && (!rh); return (!(*this)) && (!rh);
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::Member::operator != ( const Member & rh ) const { inline bool Reflex::Member::operator != ( const Member & rh ) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ! ( *this == rh ); return ! ( *this == rh );
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 MethodBDT.h   MethodBDT.h 
// @(#)root/tmva $Id: MethodBDT.h 27320 2009-02-02 06:40:36Z brun $ // @(#)root/tmva $Id: MethodBDT.h 27912 2009-03-22 09:59:04Z pcanal $
// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss // Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss
/************************************************************************** ******** /************************************************************************** ********
* Project: TMVA - a Root-integrated toolkit for multivariate data analysis * * Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
* Package: TMVA * * Package: TMVA *
* Class : MethodBDT (Boosted Decision Trees) * * Class : MethodBDT (Boosted Decision Trees) *
* Web : http://tmva.sourceforge.net * * Web : http://tmva.sourceforge.net *
* * * *
* Description: * * Description: *
* Analysis of Boosted Decision Trees * * Analysis of Boosted Decision Trees *
skipping to change at line 133 skipping to change at line 133
Double_t Boost( std::vector<Event*>, DecisionTree *dt, Int_t iTree ); Double_t Boost( std::vector<Event*>, DecisionTree *dt, Int_t iTree );
// ranking of input variables // ranking of input variables
const Ranking* CreateRanking(); const Ranking* CreateRanking();
// the option handling methods // the option handling methods
void DeclareOptions(); void DeclareOptions();
void ProcessOptions(); void ProcessOptions();
// get the forest // get the forest
inline const std::vector<DecisionTree*> & GetForest() const; inline const std::vector<TMVA::DecisionTree*> & GetForest() const;
// get the forest // get the forest
inline const std::vector<Event*> & GetTrainingEvents() const; inline const std::vector<Event*> & GetTrainingEvents() const;
inline const std::vector<double> & GetBoostWeights() const; inline const std::vector<double> & GetBoostWeights() const;
//return the individual relative variable importance //return the individual relative variable importance
std::vector<Double_t> GetVariableImportance(); std::vector<Double_t> GetVariableImportance();
Double_t GetVariableImportance(UInt_t ivar); Double_t GetVariableImportance(UInt_t ivar);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 NewDelFunctions.h   NewDelFunctions.h 
// $Id: NewDelFunctions.h 2134 2007-11-30 18:07:51Z pcanal $ // $Id: NewDelFunctions.h 2134 2007-11-30 18:07:51Z pcanal $
#ifndef Reflex_NewDelFunctions #ifndef Reflex_NewDelFunctions
#define Reflex_NewFelFunctions #define Reflex_NewDelFunctions
/** /**
* @file NewDelFunctions.h * @file NewDelFunctions.h
*/ */
namespace Reflex { namespace Reflex {
typedef void* (*NewFunc_t)( void* ); typedef void* (*NewFunc_t)( void* );
typedef void* (*NewArrFunc_t)( size_t size, void *arena ); typedef void* (*NewArrFunc_t)( long size, void *arena );
typedef void (*DelFunc_t)( void* ); typedef void (*DelFunc_t)( void* );
typedef void (*DelArrFunc_t)( void* ); typedef void (*DelArrFunc_t)( void* );
typedef void (*DesFunc_t)( void* ); typedef void (*DesFunc_t)( void* );
struct RFLX_API NewDelFunctions { struct RFLX_API NewDelFunctions {
NewFunc_t fNew; //pointer to a function newing one obj ect. NewFunc_t fNew; //pointer to a function newing one obj ect.
NewArrFunc_t fNewArray; //pointer to a function newing an arra y of objects. NewArrFunc_t fNewArray; //pointer to a function newing an arra y of objects.
DelFunc_t fDelete; //pointer to a function deleting one o bject. DelFunc_t fDelete; //pointer to a function deleting one o bject.
DelArrFunc_t fDeleteArray; //pointer to a function deleting an ar ray of objects. DelArrFunc_t fDeleteArray; //pointer to a function deleting an ar ray of objects.
DesFunc_t fDestructor; //pointer to a function call an object 's destructor. DesFunc_t fDestructor; //pointer to a function call an object 's destructor.
}; };
template <class T> struct NewDelFunctionsT : public NewDelFunctions { template <class T> struct NewDelFunctionsT : public NewDelFunctions {
static void* new_T(void* p) { return p ? new(p) T : new T; } static void* new_T(void* p) { return p ? new(p) T : new T; }
static void* new_p_T(void* p) { return p ? new(p) T : ::new T; } static void* new_p_T(void* p) { return p ? new(p) T : ::new T; }
static void* new_np_T(void* p) { return p ? ::new(p) T : new T; } static void* new_np_T(void* p) { return p ? ::new(p) T : new T; }
static void* newArray_T(size_t size, void* p) { return p ? new (p) T[ size] : new T[size]; } static void* newArray_T(long size, void* p) { return p ? new (p) T[si ze] : new T[size]; }
static void* newArray_p_T(size_t size, void* p) { return p ? new (p) T[size] : ::new T[size]; } static void* newArray_p_T(size_t size, void* p) { return p ? new (p) T[size] : ::new T[size]; }
static void* newArray_np_T(size_t size, void* p) { return p ? ::new ( p) T[size] : new T[size]; } static void* newArray_np_T(size_t size, void* p) { return p ? ::new ( p) T[size] : new T[size]; }
static void delete_T(void *p) { delete (T*)p; } static void delete_T(void *p) { delete (T*)p; }
static void deleteArray_T(void* p) { delete [] (T*)p; } static void deleteArray_T(void* p) { delete [] (T*)p; }
static void destruct_T(void* p) { ((T*)p)->~T(); } static void destruct_T(void* p) { ((T*)p)->~T(); }
NewDelFunctionsT() { NewDelFunctionsT() {
fNew = new_T; fNew = new_T;
fNewArray = newArray_T; fNewArray = newArray_T;
fDelete = delete_T; fDelete = delete_T;
fDeleteArray = deleteArray_T; fDeleteArray = deleteArray_T;
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 OneDimFunctionAdapter.h   OneDimFunctionAdapter.h 
skipping to change at line 29 skipping to change at line 29
#ifndef ROOT_Math_IParamFunction #ifndef ROOT_Math_IParamFunction
#include "Math/IParamFunction.h" #include "Math/IParamFunction.h"
#endif #endif
#include <cassert> #include <cassert>
namespace ROOT { namespace ROOT {
namespace Math { namespace Math {
// struct using for evaluating the function
template<class MultiFuncType>
struct EvaluatorOneDim {
// evaluate function (in general case no param)
static double F (MultiFuncType f, const double * x, const double * = 0
) {
return f( x );
}
};
// specialized for param functions
template<>
struct EvaluatorOneDim< const ROOT::Math::IParamMultiFunction &> {
static double F ( const ROOT::Math::IParamMultiFunction & f, const doub
le * x, const double * p = 0 ) {
return f( x, p );
}
};
/** /**
OneDimMultiFunctionAdapter class to wrap a multidimensional function in OneDimMultiFunctionAdapter class to wrap a multidimensional function in
one dimensional one. one dimensional one.
Given a f(x1,x2,x3,....xn) transforms in a f( x_i) given the coordinate intex i and the vector x[] Given a f(x1,x2,x3,....xn) transforms in a f( x_i) given the coordinate intex i and the vector x[]
of the coordinates. of the coordinates.
It provides the possibility to copy and own the data array of the coordi nates or to maintain internally a pointer to an external array It provides the possibility to copy and own the data array of the coordi nates or to maintain internally a pointer to an external array
for being more efficient. In this last case the user must garantee the l ife of the given passed pointer for being more efficient. In this last case the user must garantee the l ife of the given passed pointer
@ingroup GenFunc @ingroup GenFunc
*/ */
template <class MultiFuncType = const ROOT::Math::IMultiGenFunction &> template <class MultiFuncType = const ROOT::Math::IMultiGenFunction &>
class OneDimMultiFunctionAdapter : public ROOT::Math::IGenFunction { class OneDimMultiFunctionAdapter : public ROOT::Math::IGenFunction {
public: public:
/** /**
Constructor from the function object , pointer to an external array o f x values Constructor from the function object , pointer to an external array o f x values
and coordinate we want to adapt and coordinate we want to adapt
*/ */
OneDimMultiFunctionAdapter (MultiFuncType f, const double * x, unsigned int icoord =0 ) : OneDimMultiFunctionAdapter (MultiFuncType f, const double * x, unsigned int icoord =0, const double * p = 0 ) :
fFunc(f), fFunc(f),
fX( const_cast<double *>(x) ), // wee need to modify x but then we re store it as before fX( const_cast<double *>(x) ), // wee need to modify x but then we re store it as before
fParams(p),
fCoord(icoord), fCoord(icoord),
fOwn(false), fDim(0),
fDim(0) fOwn(false)
{ {
assert(fX != 0); assert(fX != 0);
} }
/** /**
Constructor from the function object , dimension of the function and Constructor from the function object , dimension of the function and
and coordinate we want to adapt. and coordinate we want to adapt.
The coordinate cached vector is created inside and eventually the val ues must be passed The coordinate cached vector is created inside and eventually the val ues must be passed
later with the SetX which will copy them later with the SetX which will copy them
*/ */
OneDimMultiFunctionAdapter (MultiFuncType f, unsigned int dim = 1, unsig ned int icoord =0 ) : OneDimMultiFunctionAdapter (MultiFuncType f, unsigned int dim = 1, unsig ned int icoord =0, const double * p = 0 ) :
fFunc(f), fFunc(f),
fX(0 ), fX(0 ),
fParams(p),
fCoord(icoord), fCoord(icoord),
fOwn(true), fDim(dim),
fDim(dim) fOwn(true)
{ {
fX = new double[dim]; fX = new double[dim];
} }
/** /**
Destructor (no operations) Destructor (no operations)
*/ */
virtual ~OneDimMultiFunctionAdapter () { if (fOwn) delete [] fX; } virtual ~OneDimMultiFunctionAdapter () { if (fOwn) delete [] fX; }
/** /**
clone clone
*/ */
virtual OneDimMultiFunctionAdapter * Clone( ) const { virtual OneDimMultiFunctionAdapter * Clone( ) const {
if (fOwn) if (fOwn)
return new OneDimMultiFunctionAdapter( fFunc, fDim, fCoord); return new OneDimMultiFunctionAdapter( fFunc, fDim, fCoord, fParam s);
else else
return new OneDimMultiFunctionAdapter( fFunc, fX, fCoord); return new OneDimMultiFunctionAdapter( fFunc, fX, fCoord, fParams) ;
} }
public: public:
/** /**
Set X values in case vector is own, iterator size must muched previo us Set X values in case vector is own, iterator size must muched previo us
set dimension set dimension
*/ */
template<class Iterator> template<class Iterator>
void SetX(Iterator begin, Iterator end) { void SetX(Iterator begin, Iterator end) {
if (fOwn) std::copy(begin, end, fX); if (fOwn) std::copy(begin, end, fX);
} }
/** /**
set pointer without copying the values set pointer without copying the values
*/ */
void SetX(double * x) { void SetX(double * x) {
if (!fOwn) fX = x; if (!fOwn) fX = x;
} }
void SetCoord(int icoord) { fCoord=icoord;}
private: private:
/** /**
evaluate function at the values x[] given in the constructor and evaluate function at the values x[] given in the constructor and
as function of the coordinate fCoord. as function of the coordinate fCoord.
*/ */
double DoEval(double x) const { double DoEval(double x) const {
if (fOwn) { if (fOwn) {
fX[fCoord] = x; fX[fCoord] = x;
return fFunc( fX ); return EvaluatorOneDim<MultiFuncType>::F( fFunc, fX, fParams );
} }
else { else {
// case vector fX represents useful values needed later // case vector fX represents useful values needed later
// need to modify fX and restore afterwards the original values // need to modify fX and restore afterwards the original values
double xprev = fX[fCoord]; // keep original value to restore in fX double xprev = fX[fCoord]; // keep original value to restore in fX
fX[fCoord] = x; fX[fCoord] = x;
double y = fFunc( fX ); double y = EvaluatorOneDim<MultiFuncType>::F( fFunc, fX, fParams ) ;
// restore original values // restore original values
fX[fCoord] = xprev; fX[fCoord] = xprev;
return y; return y;
} }
} }
private: private:
MultiFuncType fFunc; MultiFuncType fFunc;
mutable double * fX; mutable double * fX;
const double * fParams;
unsigned int fCoord; unsigned int fCoord;
bool fOwn;
unsigned int fDim; unsigned int fDim;
bool fOwn;
}; };
/** /**
OneDimParamFunctionAdapter class to wrap a multi-dim parameteric functio n in OneDimParamFunctionAdapter class to wrap a multi-dim parameteric functio n in
one dimensional one. one dimensional one.
Given a f(x[],p1,...pn) transforms in a f( p_i) given the param index i and the vectors x[] and p[] Given a f(x[],p1,...pn) transforms in a f( p_i) given the param index i and the vectors x[] and p[]
of the coordinates and parameters of the coordinates and parameters
It has to be used carefully, since for efficiency reason it does not cop y the parameter object It has to be used carefully, since for efficiency reason it does not cop y the parameter object
but re-uses the given pointer for the p[] vector. but re-uses the given pointer for the p[] vector.
 End of changes. 15 change blocks. 
11 lines changed or deleted 33 lines changed or added


 RConfig.h   RConfig.h 
/* @(#)root/base:$Id: RConfig.h 26871 2008-12-12 12:21:08Z rdm $ */ /* @(#)root/base:$Id: RConfig.h 27658 2009-02-28 05:34:57Z pcanal $ */
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_RConfig #ifndef ROOT_RConfig
skipping to change at line 415 skipping to change at line 415
# define R__ANSISTREAM /* ANSI C++ Standard Library conformant */ # define R__ANSISTREAM /* ANSI C++ Standard Library conformant */
# endif # endif
# if __GNUC__ >= 3 && __GNUC_MINOR__ >=0 && __GNUC_MINOR__ < 8 # if __GNUC__ >= 3 && __GNUC_MINOR__ >=0 && __GNUC_MINOR__ < 8
# define R__SSTREAM /* use sstream or strstream header */ # define R__SSTREAM /* use sstream or strstream header */
# endif # endif
# if defined(__ia64__) && __GNUC__ < 3 /* gcc 2.9x (MINOR is 9!) * / # if defined(__ia64__) && __GNUC__ < 3 /* gcc 2.9x (MINOR is 9!) * /
# define R__VECNEWDELETE /* supports overloading of new[] and delet e[] */ # define R__VECNEWDELETE /* supports overloading of new[] and delet e[] */
# define R__PLACEMENTDELETE /* supports overloading placement delete * / # define R__PLACEMENTDELETE /* supports overloading placement delete * /
# define R__ANSISTREAM /* ANSI C++ Standard Library conformant */ # define R__ANSISTREAM /* ANSI C++ Standard Library conformant */
# endif # endif
# if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR > 1)
# define R__PRAGMA_DIAGNOSTIC
# endif
#endif #endif
/* allows symbols to be hidden from the shared library export symbol table */ /* allows symbols to be hidden from the shared library export symbol table */
/* use typically on file statics and private methods */ /* use typically on file statics and private methods */
#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) #if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
# define R__HIDDEN __attribute__((__visibility__("hidden"))) # define R__HIDDEN __attribute__((__visibility__("hidden")))
#else #else
# define R__HIDDEN # define R__HIDDEN
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 RVersion.h   RVersion.h 
skipping to change at line 17 skipping to change at line 17
* These macros can be used in the following way: * These macros can be used in the following way:
* *
* #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4) * #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4)
* #include <newheader.h> * #include <newheader.h>
* #else * #else
* #include <oldheader.h> * #include <oldheader.h>
* #endif * #endif
* *
*/ */
#define ROOT_RELEASE "5.23/02" #define ROOT_RELEASE "5.23/04"
#define ROOT_RELEASE_DATE "Feb 26 2009" #define ROOT_RELEASE_DATE "Apr 22 2009"
#define ROOT_RELEASE_TIME "08:11:01" #define ROOT_RELEASE_TIME "12:13:45"
#define ROOT_SVN_REVISION 27619 #define ROOT_SVN_REVISION 28330
#define ROOT_SVN_BRANCH "trunk" #define ROOT_SVN_BRANCH "trunk"
#define ROOT_VERSION_CODE 333570 #define ROOT_VERSION_CODE 333572
#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) #define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#endif #endif
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 lines changed or added


 RooAbsArg.h   RooAbsArg.h 
skipping to change at line 199 skipping to change at line 199
inline virtual void Print(Option_t *options= 0) const { inline virtual void Print(Option_t *options= 0) const {
// Printing interface (human readable) // Printing interface (human readable)
printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options)); printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));
} }
virtual void printName(ostream& os) const ; virtual void printName(ostream& os) const ;
virtual void printTitle(ostream& os) const ; virtual void printTitle(ostream& os) const ;
virtual void printClassName(ostream& os) const ; virtual void printClassName(ostream& os) const ;
virtual void printAddress(ostream& os) const ; virtual void printAddress(ostream& os) const ;
virtual void printArgs(ostream& os) const ; virtual void printArgs(ostream& os) const ;
virtual void printMetaArgs(ostream& /*os*/) const {} ;
virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const; virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const;
virtual void printTree(ostream& os, TString indent="") const ; virtual void printTree(ostream& os, TString indent="") const ;
virtual Int_t defaultPrintContents(Option_t* opt) const ; virtual Int_t defaultPrintContents(Option_t* opt) const ;
// Accessors to attributes // Accessors to attributes
void setAttribute(const char* name, Bool_t value=kTRUE) ; void setAttribute(const Text_t* name, Bool_t value=kTRUE) ;
Bool_t getAttribute(const char* name) const ; Bool_t getAttribute(const Text_t* name) const ;
inline const std::set<std::string>& attributes() const { inline const std::set<std::string>& attributes() const {
// Returns set of names of boolean attributes defined // Returns set of names of boolean attributes defined
return _boolAttrib ; return _boolAttrib ;
} }
void setStringAttribute(const char* key, const char* value) ; void setStringAttribute(const Text_t* key, const Text_t* value) ;
const char* getStringAttribute(const char* key) const ; const Text_t* getStringAttribute(const Text_t* key) const ;
inline const std::map<std::string,std::string>& stringAttributes() const { inline const std::map<std::string,std::string>& stringAttributes() const {
// Returns map<string,string> with all string attributes defined // Returns map<string,string> with all string attributes defined
return _stringAttrib ; return _stringAttrib ;
} }
// Accessors to transient attributes // Accessors to transient attributes
void setTransientAttribute(const char* name, Bool_t value=kTRUE) ; void setTransientAttribute(const Text_t* name, Bool_t value=kTRUE) ;
Bool_t getTransientAttribute(const char* name) const ; Bool_t getTransientAttribute(const Text_t* name) const ;
inline const std::set<std::string>& transientAttributes() const { inline const std::set<std::string>& transientAttributes() const {
// Return set of transient boolean attributes // Return set of transient boolean attributes
return _boolAttribTransient ; return _boolAttribTransient ;
} }
inline Bool_t isConstant() const { inline Bool_t isConstant() const {
// Returns true if 'Constant' attribute is set // Returns true if 'Constant' attribute is set
return getAttribute("Constant") ; return getAttribute("Constant") ;
} }
RooLinkedList getCloningAncestors() const ; RooLinkedList getCloningAncestors() const ;
skipping to change at line 374 skipping to change at line 375
virtual Bool_t redirectServersHook(const RooAbsCollection& /*newServerLis t*/, Bool_t /*mustReplaceAll*/, Bool_t /*nameChange*/, Bool_t /*isRecursive */) { return kFALSE ; } ; virtual Bool_t redirectServersHook(const RooAbsCollection& /*newServerLis t*/, Bool_t /*mustReplaceAll*/, Bool_t /*nameChange*/, Bool_t /*isRecursive */) { return kFALSE ; } ;
virtual void serverNameChangeHook(const RooAbsArg* /*oldServer*/, const R ooAbsArg* /*newServer*/) { } ; virtual void serverNameChangeHook(const RooAbsArg* /*oldServer*/, const R ooAbsArg* /*newServer*/) { } ;
void addServer(RooAbsArg& server, Bool_t valueProp=kTRUE, Bool_t shapePro p=kFALSE) ; void addServer(RooAbsArg& server, Bool_t valueProp=kTRUE, Bool_t shapePro p=kFALSE) ;
void addServerList(RooAbsCollection& serverList, Bool_t valueProp=kTRUE, Bool_t shapeProp=kFALSE) ; void addServerList(RooAbsCollection& serverList, Bool_t valueProp=kTRUE, Bool_t shapeProp=kFALSE) ;
void replaceServer(RooAbsArg& oldServer, RooAbsArg& newServer, Bool_t val ueProp, Bool_t shapeProp) ; void replaceServer(RooAbsArg& oldServer, RooAbsArg& newServer, Bool_t val ueProp, Bool_t shapeProp) ;
void changeServer(RooAbsArg& server, Bool_t valueProp, Bool_t shapeProp) ; void changeServer(RooAbsArg& server, Bool_t valueProp, Bool_t shapeProp) ;
void removeServer(RooAbsArg& server, Bool_t force=kFALSE) ; void removeServer(RooAbsArg& server, Bool_t force=kFALSE) ;
RooAbsArg *findNewServer(const RooAbsCollection &newSet, Bool_t nameChang e) const; RooAbsArg *findNewServer(const RooAbsCollection &newSet, Bool_t nameChang e) const;
RooExpensiveObjectCache& expensiveObjectCache() const ;
protected: protected:
// Proxy management // Proxy management
friend class RooAddModel ; friend class RooAddModel ;
friend class RooArgProxy ; friend class RooArgProxy ;
friend class RooSetProxy ; friend class RooSetProxy ;
friend class RooListProxy ; friend class RooListProxy ;
friend class RooObjectFactory ;
void registerProxy(RooArgProxy& proxy) ; void registerProxy(RooArgProxy& proxy) ;
void registerProxy(RooSetProxy& proxy) ; void registerProxy(RooSetProxy& proxy) ;
void registerProxy(RooListProxy& proxy) ; void registerProxy(RooListProxy& proxy) ;
void unRegisterProxy(RooArgProxy& proxy) ; void unRegisterProxy(RooArgProxy& proxy) ;
void unRegisterProxy(RooSetProxy& proxy) ; void unRegisterProxy(RooSetProxy& proxy) ;
void unRegisterProxy(RooListProxy& proxy) ; void unRegisterProxy(RooListProxy& proxy) ;
RooAbsProxy* getProxy(Int_t index) const ; RooAbsProxy* getProxy(Int_t index) const ;
void setProxyNormSet(const RooArgSet* nset) ; void setProxyNormSet(const RooArgSet* nset) ;
Int_t numProxies() const ; Int_t numProxies() const ;
// Attribute list // Attribute list
std::set<std::string> _boolAttrib ; // Boolean attributes std::set<std::string> _boolAttrib ; // Boolean attributes
std::map<std::string,std::string> _stringAttrib ; // String attributes std::map<std::string,std::string> _stringAttrib ; // String attributes
std::set<std::string> _boolAttribTransient ; //! Transient boolean attrib utes (not copied in ctor) std::set<std::string> _boolAttribTransient ; //! Transient boolean attrib utes (not copied in ctor)
void printAttribList(ostream& os) const; void printAttribList(ostream& os) const;
// Hooks for RooTreeData interface // Hooks for RooTreeData interface
friend class RooTreeData ; friend class RooTreeData ;
friend class RooDataSet ; friend class RooDataSet ;
friend class RooRealMPFE ; friend class RooRealMPFE ;
friend class RooHistPdf ;
virtual void syncCache(const RooArgSet* nset=0) = 0 ; virtual void syncCache(const RooArgSet* nset=0) = 0 ;
virtual void copyCache(const RooAbsArg* source) = 0 ; virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) = 0 ;
virtual void attachToTree(TTree& t, Int_t bufSize=32000) = 0 ; virtual void attachToTree(TTree& t, Int_t bufSize=32000) = 0 ;
virtual void setTreeBranchStatus(TTree& t, Bool_t active) = 0 ; virtual void setTreeBranchStatus(TTree& t, Bool_t active) = 0 ;
virtual void fillTreeBranch(TTree& t) = 0 ; virtual void fillTreeBranch(TTree& t) = 0 ;
TString cleanBranchName() const ; TString cleanBranchName() const ;
// Global // Global
friend ostream& operator<<(ostream& os, const RooAbsArg &arg); friend ostream& operator<<(ostream& os, const RooAbsArg &arg);
friend istream& operator>>(istream& is, RooAbsArg &arg) ; friend istream& operator>>(istream& is, RooAbsArg &arg) ;
// Debug stuff // Debug stuff
skipping to change at line 436 skipping to change at line 441
mutable Bool_t _shapeDirty ; // Flag set if value needs recalculating be cause input shapes modified mutable Bool_t _shapeDirty ; // Flag set if value needs recalculating be cause input shapes modified
mutable OperMode _operMode ; // Dirty state propagation mode mutable OperMode _operMode ; // Dirty state propagation mode
// Owned components // Owned components
RooArgSet* _ownedComponents ; //! Set of owned component RooArgSet* _ownedComponents ; //! Set of owned component
mutable Bool_t _prohibitServerRedirect ; //! Prohibit server redirects -- Debugging tool mutable Bool_t _prohibitServerRedirect ; //! Prohibit server redirects -- Debugging tool
void setExpensiveObjectCache(RooExpensiveObjectCache& cache) { _eocache = &cache ; } void setExpensiveObjectCache(RooExpensiveObjectCache& cache) { _eocache = &cache ; }
RooExpensiveObjectCache& expensiveObjectCache() const ;
mutable RooExpensiveObjectCache* _eocache ; // Pointer to global cache ma nager for any expensive components created by this object mutable RooExpensiveObjectCache* _eocache ; // Pointer to global cache ma nager for any expensive components created by this object
ClassDef(RooAbsArg,4) // Abstract variable ClassDef(RooAbsArg,4) // Abstract variable
}; };
ostream& operator<<(ostream& os, const RooAbsArg &arg); ostream& operator<<(ostream& os, const RooAbsArg &arg);
istream& operator>>(istream& is, RooAbsArg &arg) ; istream& operator>>(istream& is, RooAbsArg &arg) ;
#endif #endif
 End of changes. 10 change blocks. 
9 lines changed or deleted 13 lines changed or added


 RooAbsCachedPdf.h   RooAbsCachedPdf.h 
skipping to change at line 103 skipping to change at line 103
// Return name of binning to be used for creation of cache histogram // Return name of binning to be used for creation of cache histogram
return "cache" ; return "cache" ;
} }
virtual PdfCacheElem* createCache(const RooArgSet* nset) const { virtual PdfCacheElem* createCache(const RooArgSet* nset) const {
// Create cache storage element // Create cache storage element
return new PdfCacheElem(*this,nset) ; return new PdfCacheElem(*this,nset) ;
} }
virtual const char* inputBaseName() const = 0 ; virtual const char* inputBaseName() const = 0 ;
virtual RooArgSet* actualObservables(const RooArgSet& nset) const = 0 ; virtual RooArgSet* actualObservables(const RooArgSet& nset) const = 0 ;
virtual RooArgSet* actualParameters(const RooArgSet& nset) const = 0 ; virtual RooArgSet* actualParameters(const RooArgSet& nset) const = 0 ;
virtual RooAbsArg& pdfObservable(RooAbsArg& histObservable) const { retur n histObservable ; }
virtual void fillCacheObject(PdfCacheElem& cache) const = 0 ; virtual void fillCacheObject(PdfCacheElem& cache) const = 0 ;
mutable RooObjCacheManager _cacheMgr ; // The cache manager mutable RooObjCacheManager _cacheMgr ; // The cache manager
Int_t _ipOrder ; // Interpolation order for cache histograms Int_t _ipOrder ; // Interpolation order for cache histograms
TString cacheNameSuffix(const RooArgSet& nset) const ; TString cacheNameSuffix(const RooArgSet& nset) const ;
virtual TString histNameSuffix() const { return TString("") ; }
void disableCache(Bool_t flag) { void disableCache(Bool_t flag) {
// Flag to disable caching mechanism // Flag to disable caching mechanism
_disableCache = flag ; _disableCache = flag ;
} }
mutable RooAICRegistry _anaReg ; //! Registry for analytical integration codes mutable RooAICRegistry _anaReg ; //! Registry for analytical integration codes
class AnaIntConfig { class AnaIntConfig {
public: public:
RooArgSet _allVars ; RooArgSet _allVars ;
RooArgSet _anaVars ; RooArgSet _anaVars ;
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 RooAbsCategory.h   RooAbsCategory.h 
skipping to change at line 100 skipping to change at line 100
const RooCatType* defineType(const char* label) ; const RooCatType* defineType(const char* label) ;
const RooCatType* defineType(const char* label, Int_t index) ; const RooCatType* defineType(const char* label, Int_t index) ;
const RooCatType* defineTypeUnchecked(const char* label, Int_t index) ; const RooCatType* defineTypeUnchecked(const char* label, Int_t index) ;
const RooCatType* getOrdinal(UInt_t n, const char* rangeName=0) const; const RooCatType* getOrdinal(UInt_t n, const char* rangeName=0) const;
void clearTypes() ; void clearTypes() ;
virtual Bool_t isValid() const ; virtual Bool_t isValid() const ;
virtual Bool_t isValid(RooCatType value) const ; virtual Bool_t isValid(RooCatType value) const ;
virtual void syncCache(const RooArgSet* set=0) ; virtual void syncCache(const RooArgSet* set=0) ;
virtual void copyCache(const RooAbsArg* source) ; virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;
virtual void attachToTree(TTree& t, Int_t bufSize=32000) ; virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;
virtual void setTreeBranchStatus(TTree& t, Bool_t active) ; virtual void setTreeBranchStatus(TTree& t, Bool_t active) ;
virtual void fillTreeBranch(TTree& t) ; virtual void fillTreeBranch(TTree& t) ;
mutable UChar_t _byteValue ; //! Transient cache for byte values from tree branches mutable UChar_t _byteValue ; //! Transient cache for byte values from tree branches
mutable RooCatType _value ; // Current value mutable RooCatType _value ; // Current value
TObjArray _types ; // Array of allowed values TObjArray _types ; // Array of allowed values
TIterator* _typeIter ; //! TIterator* _typeIter ; //!
Bool_t _treeVar ; //! do not persist Bool_t _treeVar ; //! do not persist
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooAbsCategoryLValue.h   RooAbsCategoryLValue.h 
skipping to change at line 74 skipping to change at line 74
return kTRUE; return kTRUE;
} }
// I/O streaming interface (machine readable) // I/O streaming interface (machine readable)
virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ; virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ;
virtual void writeToStream(ostream& os, Bool_t compact) const ; virtual void writeToStream(ostream& os, Bool_t compact) const ;
protected: protected:
Bool_t setOrdinal(UInt_t index, const char* rangeName); Bool_t setOrdinal(UInt_t index, const char* rangeName);
void copyCache(const RooAbsArg* source) ; void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;
ClassDef(RooAbsCategoryLValue,1) // Abstract modifiable index variable ClassDef(RooAbsCategoryLValue,1) // Abstract modifiable index variable
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooAbsCollection.h   RooAbsCollection.h 
skipping to change at line 44 skipping to change at line 44
virtual TObject* Clone(const char* newname=0) const { virtual TObject* Clone(const char* newname=0) const {
return clone(newname?newname:GetName()) ; return clone(newname?newname:GetName()) ;
} }
virtual ~RooAbsCollection(); virtual ~RooAbsCollection();
// Create a copy of an existing list. New variables cannot be added // Create a copy of an existing list. New variables cannot be added
// to a copied list. The variables in the copied list are independent // to a copied list. The variables in the copied list are independent
// of the original variables. // of the original variables.
RooAbsCollection(const RooAbsCollection& other, const char *name=""); RooAbsCollection(const RooAbsCollection& other, const char *name="");
RooAbsCollection& operator=(const RooAbsCollection& other); RooAbsCollection& operator=(const RooAbsCollection& other);
RooAbsCollection& assignFast(const RooAbsCollection& other) ;
// Copy list and contents (and optionally 'deep' servers) // Copy list and contents (and optionally 'deep' servers)
RooAbsCollection *snapshot(Bool_t deepCopy=kTRUE) const ; RooAbsCollection *snapshot(Bool_t deepCopy=kTRUE) const ;
Bool_t snapshot(RooAbsCollection& output, Bool_t deepCopy=kTRUE) const ; Bool_t snapshot(RooAbsCollection& output, Bool_t deepCopy=kTRUE) const ;
// Hash table control // Hash table control
void setHashTableSize(Int_t i) { void setHashTableSize(Int_t i) {
// Set size of internal hash table to i (should be a prime number) // Set size of internal hash table to i (should be a prime number)
_list.setHashTableSize(i) ; _list.setHashTableSize(i) ;
} }
skipping to change at line 74 skipping to change at line 75
virtual Bool_t remove(const RooAbsArg& var, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ; virtual Bool_t remove(const RooAbsArg& var, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;
virtual void removeAll() ; virtual void removeAll() ;
virtual Bool_t add(const RooAbsCollection& list, Bool_t silent=kFALSE) ; virtual Bool_t add(const RooAbsCollection& list, Bool_t silent=kFALSE) ;
virtual Bool_t addOwned(const RooAbsCollection& list, Bool_t silent=kFALS E); virtual Bool_t addOwned(const RooAbsCollection& list, Bool_t silent=kFALS E);
virtual void addClone(const RooAbsCollection& list, Bool_t silent=kFALS E); virtual void addClone(const RooAbsCollection& list, Bool_t silent=kFALS E);
Bool_t replace(const RooAbsCollection &other); Bool_t replace(const RooAbsCollection &other);
Bool_t remove(const RooAbsCollection& list, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ; Bool_t remove(const RooAbsCollection& list, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;
// Group operations on AbsArgs // Group operations on AbsArgs
void setAttribAll(const char* name, Bool_t value=kTRUE) ; void setAttribAll(const Text_t* name, Bool_t value=kTRUE) ;
// List search methods // List search methods
RooAbsArg *find(const char *name) const ; RooAbsArg *find(const char *name) const ;
Bool_t contains(const RooAbsArg& var) const { Bool_t contains(const RooAbsArg& var) const {
// Returns true if var is contained in this collection // Returns true if var is contained in this collection
return (0 == find(var.GetName())) ? kFALSE:kTRUE; return (0 == find(var.GetName())) ? kFALSE:kTRUE;
} }
RooAbsCollection* selectByAttrib(const char* name, Bool_t value) const ; RooAbsCollection* selectByAttrib(const char* name, Bool_t value) const ;
RooAbsCollection* selectCommon(const RooAbsCollection& refColl) const ; RooAbsCollection* selectCommon(const RooAbsCollection& refColl) const ;
RooAbsCollection* selectByName(const char* nameList, Bool_t verbose=kFALS E) const ; RooAbsCollection* selectByName(const char* nameList, Bool_t verbose=kFALS E) const ;
skipping to change at line 143 skipping to change at line 144
// Does collection own contents? // Does collection own contents?
return _ownCont ; return _ownCont ;
} }
Bool_t allInRange(const char* rangeSpec) const ; Bool_t allInRange(const char* rangeSpec) const ;
void dump() const ; void dump() const ;
void releaseOwnership() { _ownCont = kFALSE ; } void releaseOwnership() { _ownCont = kFALSE ; }
void sort(Bool_t ascend=kTRUE) { _list.Sort(ascend) ; }
protected: protected:
friend class RooMultiCatIter ; friend class RooMultiCatIter ;
RooLinkedList _list ; // Actual object store RooLinkedList _list ; // Actual object store
Bool_t _ownCont; // Flag to identify a list that owns its contents. Bool_t _ownCont; // Flag to identify a list that owns its contents.
TString _name; // Our name. TString _name; // Our name.
void safeDeleteList() ; void safeDeleteList() ;
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 RooAbsData.h   RooAbsData.h 
skipping to change at line 55 skipping to change at line 55
RooCmdArg arg5=RooCmdArg(),RooCmdArg arg6=RooCmdArg(), RooCmdArg arg7=RooCmdArg(),RooCmdArg arg8=RooCmdArg()) ; RooCmdArg arg5=RooCmdArg(),RooCmdArg arg6=RooCmdArg(), RooCmdArg arg7=RooCmdArg(),RooCmdArg arg8=RooCmdArg()) ;
RooAbsData* reduce(const char* cut) ; RooAbsData* reduce(const char* cut) ;
RooAbsData* reduce(const RooFormulaVar& cutVar) ; RooAbsData* reduce(const RooFormulaVar& cutVar) ;
RooAbsData* reduce(const RooArgSet& varSubset, const char* cut=0) ; RooAbsData* reduce(const RooArgSet& varSubset, const char* cut=0) ;
RooAbsData* reduce(const RooArgSet& varSubset, const RooFormulaVar& cutVa r) ; RooAbsData* reduce(const RooArgSet& varSubset, const RooFormulaVar& cutVa r) ;
// Change name of observable // Change name of observable
virtual Bool_t changeObservableName(const char* from, const char* to) = 0 ; virtual Bool_t changeObservableName(const char* from, const char* to) = 0 ;
// Add one ore more rows of data // Add one ore more rows of data
virtual void add(const RooArgSet& row, Double_t weight=1) = 0 ; virtual void add(const RooArgSet& row, Double_t weight=1, Double_t weight Error=0) = 0 ;
virtual void fill() = 0 ; virtual void fill() = 0 ;
// Load a given row of data // Load a given row of data
virtual inline const RooArgSet* get() const { virtual inline const RooArgSet* get() const {
// Return current row of dataset // Return current row of dataset
return &_vars ; return &_vars ;
} }
virtual Double_t weight() const = 0 ; virtual Double_t weight() const = 0 ;
virtual Bool_t valid() const = 0 ; virtual Bool_t valid() const = 0 ;
enum ErrorType { Poisson, SumW2, None } ; enum ErrorType { Poisson, SumW2, None, Auto } ;
virtual Double_t weightError(ErrorType etype=Poisson) const ; virtual Double_t weightError(ErrorType etype=Poisson) const ;
virtual void weightError(Double_t& lo, Double_t& hi, ErrorType etype=Pois son) const ; virtual void weightError(Double_t& lo, Double_t& hi, ErrorType etype=Pois son) const ;
virtual const RooArgSet* get(Int_t index) const = 0 ; virtual const RooArgSet* get(Int_t index) const = 0 ;
virtual Int_t numEntries(Bool_t useWeights=kFALSE) const = 0 ; virtual Int_t numEntries() const = 0 ;
virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0 ) const = 0 ; virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0 ) const = 0 ;
virtual Bool_t isWeighted() const { virtual Bool_t isWeighted() const {
// Do events in dataset have weights? // Do events in dataset have weights?
return kFALSE ; return kFALSE ;
} }
virtual Bool_t isNonPoissonWeighted() const {
// Do events in dataset have non-integer weights?
return kFALSE ;
}
virtual void reset() = 0 ; virtual void reset() = 0 ;
virtual Bool_t getRange(RooRealVar& var, Double_t& lowest, Double_t& high est, Double_t marginFrac=0, Bool_t symMode=kFALSE) const = 0 ; virtual Bool_t getRange(RooRealVar& var, Double_t& lowest, Double_t& high est, Double_t marginFrac=0, Bool_t symMode=kFALSE) const = 0 ;
// Plot the distribution of a real valued arg // Plot the distribution of a real valued arg
virtual Roo1DTable* table(const RooArgSet& catSet, const char* cuts="", c onst char* opts="") const ; virtual Roo1DTable* table(const RooArgSet& catSet, const char* cuts="", c onst char* opts="") const ;
virtual Roo1DTable* table(const RooAbsCategory& cat, const char* cuts="", const char* opts="") const = 0; virtual Roo1DTable* table(const RooAbsCategory& cat, const char* cuts="", const char* opts="") const = 0;
virtual RooPlot* plotOn(RooPlot* frame, virtual RooPlot* plotOn(RooPlot* frame,
const RooCmdArg& arg1=RooCmdArg::none(), const Roo CmdArg& arg2=RooCmdArg::none(), const RooCmdArg& arg1=RooCmdArg::none(), const Roo CmdArg& arg2=RooCmdArg::none(),
const RooCmdArg& arg3=RooCmdArg::none(), const Roo CmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(), const Roo CmdArg& arg4=RooCmdArg::none(),
skipping to change at line 124 skipping to change at line 128
virtual Int_t defaultPrintContents(Option_t* opt) const ; virtual Int_t defaultPrintContents(Option_t* opt) const ;
void setDirtyProp(Bool_t flag) { void setDirtyProp(Bool_t flag) {
// Control propagation of dirty flags from observables in dataset // Control propagation of dirty flags from observables in dataset
_doDirtyProp = flag ; _doDirtyProp = flag ;
} }
protected: protected:
virtual void optimizeReadingWithCaching(RooAbsArg& arg, const RooArgSet& cacheList) =0 ; virtual void optimizeReadingWithCaching(RooAbsArg& arg, const RooArgSet& cacheList, const RooArgSet& keepObsList) =0 ;
// Constant term optimizer interface // Constant term optimizer interface
friend class RooAbsArg ; friend class RooAbsArg ;
friend class RooAbsReal ; friend class RooAbsReal ;
friend class RooAbsOptTestStatistic ; friend class RooAbsOptTestStatistic ;
friend class RooAbsCachedPdf ; friend class RooAbsCachedPdf ;
virtual RooAbsData* cacheClone(const RooArgSet* newCacheVars, const char* newName=0) = 0 ; virtual RooAbsData* cacheClone(const RooArgSet* newCacheVars, const char* newName=0) = 0 ;
virtual void cacheArgs(RooArgSet& varSet, const RooArgSet* nset=0) = 0 ; virtual void cacheArgs(RooArgSet& varSet, const RooArgSet* nset=0) = 0 ;
virtual void resetCache() = 0 ; virtual void resetCache() = 0 ;
 End of changes. 5 change blocks. 
4 lines changed or deleted 8 lines changed or added


 RooAbsFunc.h   RooAbsFunc.h 
skipping to change at line 26 skipping to change at line 26
#ifndef ROO_ABS_FUNC #ifndef ROO_ABS_FUNC
#define ROO_ABS_FUNC #define ROO_ABS_FUNC
#include "Rtypes.h" #include "Rtypes.h"
#include <list> #include <list>
class RooAbsRealLValue ; class RooAbsRealLValue ;
class RooAbsFunc { class RooAbsFunc {
public: public:
inline RooAbsFunc(UInt_t dimension) : _ncall(0), _dimension(dimension), _ valid(kTRUE) { } inline RooAbsFunc(UInt_t dimension) : _ncall(0), _dimension(dimension), _ valid(kTRUE) { }
inline RooAbsFunc(const RooAbsFunc& other) : _ncall(0), _dimension(other.
_dimension), _valid(kTRUE) { }
inline virtual ~RooAbsFunc() { } inline virtual ~RooAbsFunc() { }
inline UInt_t getDimension() const { inline UInt_t getDimension() const {
// Dimension of function // Dimension of function
return _dimension; return _dimension;
} }
inline Bool_t isValid() const { inline Bool_t isValid() const {
// Is function in valid state // Is function in valid state
return _valid; return _valid;
} }
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 RooAbsGenContext.h   RooAbsGenContext.h 
skipping to change at line 71 skipping to change at line 71
virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const; virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const;
virtual Int_t defaultPrintContents(Option_t* opt) const ; virtual Int_t defaultPrintContents(Option_t* opt) const ;
virtual StyleOption defaultPrintStyle(Option_t* opt) const ; virtual StyleOption defaultPrintStyle(Option_t* opt) const ;
protected: protected:
friend class RooConvGenContext ; friend class RooConvGenContext ;
friend class RooProdGenContext ; friend class RooProdGenContext ;
friend class RooAddGenContext ; friend class RooAddGenContext ;
friend class RooAddGenContextOrig ;
friend class RooSimGenContext ; friend class RooSimGenContext ;
friend class RooEffGenContext ; friend class RooEffGenContext ;
virtual void initGenerator(const RooArgSet &theEvent); virtual void initGenerator(const RooArgSet &theEvent);
virtual void generateEvent(RooArgSet &theEvent, Int_t remaining) = 0; virtual void generateEvent(RooArgSet &theEvent, Int_t remaining) = 0;
void resampleData(Double_t& ratio) ;
const RooDataSet *_prototype; // Pointer to prototype dataset const RooDataSet *_prototype; // Pointer to prototype dataset
RooArgSet *_theEvent; // Pointer to observable event being genera ted RooArgSet *_theEvent; // Pointer to observable event being genera ted
Bool_t _isValid; // Is context in valid state? Bool_t _isValid; // Is context in valid state?
Bool_t _verbose; // Verbose messaging? Bool_t _verbose; // Verbose messaging?
UInt_t _expectedEvents; // Number of expected events from extended p.d.f UInt_t _expectedEvents; // Number of expected events from extended p.d.f
RooArgSet _protoVars; // Prototype observables RooArgSet _protoVars; // Prototype observables
Int_t _nextProtoIndex; // Next prototype event to load according t o LUT Int_t _nextProtoIndex; // Next prototype event to load according t o LUT
RooAbsPdf::ExtendMode _extendMode ; // Extended mode capabilities of p.d .f. RooAbsPdf::ExtendMode _extendMode ; // Extended mode capabilities of p.d .f.
Int_t* _protoOrder ; // LUT with traversal order of prototype da ta Int_t* _protoOrder ; // LUT with traversal order of prototype da ta
RooDataSet* _genData ; //! Data being generated
ClassDef(RooAbsGenContext,0) // Abstract context for generating a dataset from a PDF ClassDef(RooAbsGenContext,0) // Abstract context for generating a dataset from a PDF
}; };
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 RooAbsIntegrator.h   RooAbsIntegrator.h 
skipping to change at line 61 skipping to change at line 61
virtual Double_t integral(const Double_t *yvec=0)=0 ; virtual Double_t integral(const Double_t *yvec=0)=0 ;
virtual Bool_t canIntegrate1D() const = 0 ; virtual Bool_t canIntegrate1D() const = 0 ;
virtual Bool_t canIntegrate2D() const = 0 ; virtual Bool_t canIntegrate2D() const = 0 ;
virtual Bool_t canIntegrateND() const = 0 ; virtual Bool_t canIntegrateND() const = 0 ;
virtual Bool_t canIntegrateOpenEnded() const = 0 ; virtual Bool_t canIntegrateOpenEnded() const = 0 ;
Bool_t printEvalCounter() const { return _printEvalCounter ; } Bool_t printEvalCounter() const { return _printEvalCounter ; }
void setPrintEvalCounter(Bool_t value) { _printEvalCounter = value ; } void setPrintEvalCounter(Bool_t value) { _printEvalCounter = value ; }
virtual Bool_t setLimits(Double_t*, Double_t*) { return kFALSE ; }
virtual Bool_t setLimits(Double_t xmin, Double_t xmax) ; virtual Bool_t setLimits(Double_t xmin, Double_t xmax) ;
virtual Bool_t setUseIntegrandLimits(Bool_t flag) ; virtual Bool_t setUseIntegrandLimits(Bool_t flag) ;
protected: protected:
const RooAbsFunc *_function; // Pointer to function binding of integrand const RooAbsFunc *_function; // Pointer to function binding of integrand
Bool_t _valid; // Is integrator in valid state? Bool_t _valid; // Is integrator in valid state?
Bool_t _printEvalCounter ; // If true print number of function evaluati on required for integration Bool_t _printEvalCounter ; // If true print number of function evaluati on required for integration
ClassDef(RooAbsIntegrator,0) // Abstract interface for real-valued functi on integrators ClassDef(RooAbsIntegrator,0) // Abstract interface for real-valued functi on integrators
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 RooAbsOptTestStatistic.h   RooAbsOptTestStatistic.h 
skipping to change at line 34 skipping to change at line 34
class RooAbsData ; class RooAbsData ;
class RooAbsReal ; class RooAbsReal ;
class RooAbsOptTestStatistic : public RooAbsTestStatistic { class RooAbsOptTestStatistic : public RooAbsTestStatistic {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
RooAbsOptTestStatistic() ; RooAbsOptTestStatistic() ;
RooAbsOptTestStatistic(const char *name, const char *title, RooAbsReal& r eal, RooAbsData& data, RooAbsOptTestStatistic(const char *name, const char *title, RooAbsReal& r eal, RooAbsData& data,
const RooArgSet& projDeps, const char* rangeName=0, const char* addCoefRangeName=0, const RooArgSet& projDeps, const char* rangeName=0, const char* addCoefRangeName=0,
Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verb Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verb
ose=kTRUE, Bool_t splitCutRange=kFALSE) ; ose=kTRUE, Bool_t splitCutRange=kFALSE,
Bool_t cloneInputData=kTRUE) ;
RooAbsOptTestStatistic(const RooAbsOptTestStatistic& other, const char* n ame=0); RooAbsOptTestStatistic(const RooAbsOptTestStatistic& other, const char* n ame=0);
virtual ~RooAbsOptTestStatistic(); virtual ~RooAbsOptTestStatistic();
virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const ; virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const ;
RooAbsReal& function() { return *_funcClone ; }
const RooAbsReal& function() const { return *_funcClone ; }
RooAbsData& data() { return *_dataClone ; }
const RooAbsData& data() const { return *_dataClone ; }
Bool_t setData(RooAbsData& data, Bool_t cloneData=kTRUE) ;
protected: protected:
friend class RooAbsReal ; friend class RooAbsReal ;
virtual Bool_t allowFunctionCache() { return kTRUE ; }
void constOptimizeTestStatistic(ConstOpCode opcode) ; void constOptimizeTestStatistic(ConstOpCode opcode) ;
virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ; virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;
virtual void printCompactTreeHook(ostream& os, const char* indent="") ; virtual void printCompactTreeHook(ostream& os, const char* indent="") ;
virtual RooArgSet requiredExtraObservables() const { return RooArgSet() ; }
void optimizeCaching() ; void optimizeCaching() ;
void optimizeConstantTerms(Bool_t) ; void optimizeConstantTerms(Bool_t) ;
RooArgSet* _normSet ; // Pointer to set with observables used for normal ization RooArgSet* _normSet ; // Pointer to set with observables used for normal ization
RooArgSet* _funcCloneSet ; // Set owning all components of internal clon e of input function RooArgSet* _funcCloneSet ; // Set owning all components of internal clon e of input function
RooAbsData* _dataClone ; // Pointer to internal clone if input data RooAbsData* _dataClone ; // Pointer to internal clone if input data
RooAbsReal* _funcClone ; // Pointer to internal clone of input function RooAbsReal* _funcClone ; // Pointer to internal clone of input function
RooArgSet* _projDeps ; // Set of projected observable RooArgSet* _projDeps ; // Set of projected observable
Bool_t _ownData ; // Do we own the dataset
ClassDef(RooAbsOptTestStatistic,1) // Abstract base class for optimized t est statistics ClassDef(RooAbsOptTestStatistic,2) // Abstract base class for optimized t est statistics
}; };
#endif #endif
 End of changes. 6 change blocks. 
4 lines changed or deleted 14 lines changed or added


 RooAbsPdf.h   RooAbsPdf.h 
skipping to change at line 37 skipping to change at line 37
class RooRealProxy ; class RooRealProxy ;
class RooAbsGenContext ; class RooAbsGenContext ;
class RooFitResult ; class RooFitResult ;
class RooExtendPdf ; class RooExtendPdf ;
class RooCategory ; class RooCategory ;
class TPaveText; class TPaveText;
class TH1F; class TH1F;
class TH2F; class TH2F;
class TList ; class TList ;
class RooLinkedList ; class RooLinkedList ;
class RooNumGenConfig ;
class RooAbsPdf : public RooAbsReal { class RooAbsPdf : public RooAbsReal {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
RooAbsPdf() ; RooAbsPdf() ;
RooAbsPdf(const char *name, const char *title=0) ; RooAbsPdf(const char *name, const char *title=0) ;
RooAbsPdf(const char *name, const char *title, Double_t minVal, Double_t maxVal) ; RooAbsPdf(const char *name, const char *title, Double_t minVal, Double_t maxVal) ;
// RooAbsPdf(const RooAbsPdf& other, const char* name=0); // RooAbsPdf(const RooAbsPdf& other, const char* name=0);
virtual ~RooAbsPdf(); virtual ~RooAbsPdf();
skipping to change at line 84 skipping to change at line 85
const RooCmdArg& arg7=RooCmdArg::none(), const R ooCmdArg& arg8=RooCmdArg::none()) ; const RooCmdArg& arg7=RooCmdArg::none(), const R ooCmdArg& arg8=RooCmdArg::none()) ;
virtual RooPlot* paramOn(RooPlot* frame, const RooAbsData* data, const ch ar *label= "", Int_t sigDigits = 2, virtual RooPlot* paramOn(RooPlot* frame, const RooAbsData* data, const ch ar *label= "", Int_t sigDigits = 2,
Option_t *options = "NELU", Double_t xmin=0.50, Option_t *options = "NELU", Double_t xmin=0.50,
Double_t xmax= 0.99,Double_t ymax=0.95) ; Double_t xmax= 0.99,Double_t ymax=0.95) ;
// Built-in generator support // Built-in generator support
virtual Int_t getGenerator(const RooArgSet& directVars, RooArgSet &genera teVars, Bool_t staticInitOK=kTRUE) const; virtual Int_t getGenerator(const RooArgSet& directVars, RooArgSet &genera teVars, Bool_t staticInitOK=kTRUE) const;
virtual void initGenerator(Int_t code) ; virtual void initGenerator(Int_t code) ;
virtual void generateEvent(Int_t code); virtual void generateEvent(Int_t code);
virtual Bool_t isDirectGenSafe(const RooAbsArg& arg) const ; virtual Bool_t isDirectGenSafe(const RooAbsArg& arg) const ;
// Interactions with a dataset // Configuration of MC generators used for this pdf
const RooNumGenConfig* getGeneratorConfig() const ;
static RooNumGenConfig* defaultGeneratorConfig() ;
RooNumGenConfig* specialGeneratorConfig() const ;
RooNumGenConfig* specialGeneratorConfig(Bool_t createOnTheFly) ;
void setGeneratorConfig() ;
void setGeneratorConfig(const RooNumGenConfig& config) ;
// -log(L) fits to binned and unbinned data
virtual RooFitResult* fitTo(RooAbsData& data, RooCmdArg arg1=RooCmdArg::n one(), RooCmdArg arg2=RooCmdArg::none(), virtual RooFitResult* fitTo(RooAbsData& data, RooCmdArg arg1=RooCmdArg::n one(), RooCmdArg arg2=RooCmdArg::none(),
RooCmdArg arg3=RooCmdArg::none(), RooCmdArg arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(), RooCmdArg arg3=RooCmdArg::none(), RooCmdArg arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(),
RooCmdArg arg6=RooCmdArg::none(), RooCmdArg arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ; RooCmdArg arg6=RooCmdArg::none(), RooCmdArg arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ;
virtual RooFitResult* fitTo(RooAbsData& data, const RooLinkedList& cmdLis t) ; virtual RooFitResult* fitTo(RooAbsData& data, const RooLinkedList& cmdLis t) ;
virtual RooFitResult* fitTo(RooAbsData& data, const RooArgSet& projDeps,
Option_t *fitOpt = "", Option_t *optOpt = "c",
const char* fitRange=0) ;
virtual RooFitResult* fitTo(RooAbsData& data, Option_t *fitOpt, Option_t
*optOpt = "c", const char* fitRange=0) ;
virtual RooAbsReal* createNLL(RooAbsData& data, const RooLinkedList& cmdL ist) ; virtual RooAbsReal* createNLL(RooAbsData& data, const RooLinkedList& cmdL ist) ;
virtual RooAbsReal* createNLL(RooAbsData& data, RooCmdArg arg1=RooCmdArg: :none(), RooCmdArg arg2=RooCmdArg::none(), virtual RooAbsReal* createNLL(RooAbsData& data, RooCmdArg arg1=RooCmdArg: :none(), RooCmdArg arg2=RooCmdArg::none(),
RooCmdArg arg3=RooCmdArg::none(), RooCmdArg arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(), RooCmdArg arg3=RooCmdArg::none(), RooCmdArg arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(),
RooCmdArg arg6=RooCmdArg::none(), RooCmdArg arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ; RooCmdArg arg6=RooCmdArg::none(), RooCmdArg arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ;
// Chi^2 fits to histograms
using RooAbsReal::chi2FitTo ;
using RooAbsReal::createChi2 ;
virtual RooFitResult* chi2FitTo(RooDataHist& data, const RooLinkedList& c
mdList) ;
virtual RooAbsReal* createChi2(RooDataHist& data, RooCmdArg arg1=RooCmdAr
g::none(), RooCmdArg arg2=RooCmdArg::none(),
RooCmdArg arg3=RooCmdArg::none(), RooCmdAr
g arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(),
RooCmdArg arg6=RooCmdArg::none(), RooCmdAr
g arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ;
// Chi^2 fits to X-Y datasets
virtual RooAbsReal* createChi2(RooDataSet& data, const RooLinkedList& cmd
List) ;
// Constraint management // Constraint management
virtual RooArgSet* getConstraints(const RooArgSet& /*observables*/, const RooArgSet& /*constrainedParams*/) const { virtual RooArgSet* getConstraints(const RooArgSet& /*observables*/, const RooArgSet& /*constrainedParams*/) const {
// Interface to retrieve constraint terms on this pdf. Default implemen tation returns null // Interface to retrieve constraint terms on this pdf. Default implemen tation returns null
return 0 ; return 0 ;
} }
virtual RooArgSet* getAllConstraints(const RooArgSet& observables, const RooArgSet& constrainedParams) const ; virtual RooArgSet* getAllConstraints(const RooArgSet& observables, const RooArgSet& constrainedParams) const ;
// Project p.d.f into lower dimensional p.d.f // Project p.d.f into lower dimensional p.d.f
virtual RooAbsPdf* createProjection(const RooArgSet& iset) ; virtual RooAbsPdf* createProjection(const RooArgSet& iset) ;
skipping to change at line 125 skipping to change at line 140
const RooCmdArg arg3=RooCmdArg::none(), const RooCmd Arg arg4=RooCmdArg::none(), const RooCmdArg arg3=RooCmdArg::none(), const RooCmd Arg arg4=RooCmdArg::none(),
const RooCmdArg arg5=RooCmdArg::none(), const RooCmd Arg arg6=RooCmdArg::none(), const RooCmdArg arg5=RooCmdArg::none(), const RooCmd Arg arg6=RooCmdArg::none(),
const RooCmdArg arg7=RooCmdArg::none(), const RooCmd Arg arg8=RooCmdArg::none()) ; const RooCmdArg arg7=RooCmdArg::none(), const RooCmd Arg arg8=RooCmdArg::none()) ;
RooAbsReal* createScanCdf(const RooArgSet& iset, const RooArgSet& nset, I nt_t numScanBins, Int_t intOrder) ; RooAbsReal* createScanCdf(const RooArgSet& iset, const RooArgSet& nset, I nt_t numScanBins, Int_t intOrder) ;
// Function evaluation support // Function evaluation support
virtual Bool_t traceEvalHook(Double_t value) const ; virtual Bool_t traceEvalHook(Double_t value) const ;
virtual Double_t getVal(const RooArgSet* set=0) const ; virtual Double_t getVal(const RooArgSet* set=0) const ;
virtual Double_t getLogVal(const RooArgSet* set=0) const ; virtual Double_t getLogVal(const RooArgSet* set=0) const ;
void setNormValueCaching(Int_t minNumIntDim, Int_t ipOrder=2) ;
Int_t minDimNormValueCaching() const { return _minDimNormValueCache ; }
Int_t intOrderNormValueCaching() const { return _valueCacheIntOrder ; }
Double_t getNorm(const RooArgSet& nset) const { Double_t getNorm(const RooArgSet& nset) const {
// Get p.d.f normalization term needed for observables 'nset' // Get p.d.f normalization term needed for observables 'nset'
return getNorm(&nset) ; return getNorm(&nset) ;
} }
virtual Double_t getNorm(const RooArgSet* set=0) const ; virtual Double_t getNorm(const RooArgSet* set=0) const ;
virtual void resetErrorCounters(Int_t resetValue=10) ; virtual void resetErrorCounters(Int_t resetValue=10) ;
void setTraceCounter(Int_t value, Bool_t allNodes=kFALSE) ; void setTraceCounter(Int_t value, Bool_t allNodes=kFALSE) ;
Bool_t traceEvalPdf(Double_t value) const ; Bool_t traceEvalPdf(Double_t value) const ;
skipping to change at line 219 skipping to change at line 238
friend class RooRealIntegral ; friend class RooRealIntegral ;
static Int_t _verboseEval ; static Int_t _verboseEval ;
virtual Bool_t syncNormalization(const RooArgSet* dset, Bool_t adjustProx ies=kTRUE) const ; virtual Bool_t syncNormalization(const RooArgSet* dset, Bool_t adjustProx ies=kTRUE) const ;
friend class RooAbsAnaConvPdf ; friend class RooAbsAnaConvPdf ;
mutable Double_t _rawValue ; mutable Double_t _rawValue ;
mutable RooAbsReal* _norm ; //! Normalization integral (owned by _ normMgr) mutable RooAbsReal* _norm ; //! Normalization integral (owned by _ normMgr)
mutable RooArgSet* _normSet ; //! Normalization set with for above i ntegral mutable RooArgSet* _normSet ; //! Normalization set with for above i ntegral
Int_t _minDimNormValueCache ; // Minimum number of numerically integ
rated dimensions to activate normalization value caching
Int_t _valueCacheIntOrder ; // Interpolation order for numeric int
egral value cache
class CacheElem : public RooAbsCacheElement { class CacheElem : public RooAbsCacheElement {
public: public:
CacheElem(RooAbsReal& norm) : _norm(&norm) {} ; CacheElem(RooAbsReal& norm) : _norm(&norm) {} ;
void operModeHook(RooAbsArg::OperMode) ; void operModeHook(RooAbsArg::OperMode) ;
virtual ~CacheElem() ; virtual ~CacheElem() ;
virtual RooArgList containedArgs(Action) { return RooArgList(*_norm) ; } virtual RooArgList containedArgs(Action) { return RooArgList(*_norm) ; }
RooAbsReal* _norm ; RooAbsReal* _norm ;
} ; } ;
mutable RooObjCacheManager _normMgr ; // The cache manager mutable RooObjCacheManager _normMgr ; // The cache manager
skipping to change at line 252 skipping to change at line 273
mutable Int_t _errorCount ; // Number of errors remaining to print mutable Int_t _errorCount ; // Number of errors remaining to print
mutable Int_t _traceCount ; // Number of traces remaining to print mutable Int_t _traceCount ; // Number of traces remaining to print
mutable Int_t _negCount ; // Number of negative probablities rem aining to print mutable Int_t _negCount ; // Number of negative probablities rem aining to print
Bool_t _selectComp ; // Component selection flag for RooAbs Pdf::plotCompOn Bool_t _selectComp ; // Component selection flag for RooAbs Pdf::plotCompOn
static void raiseEvalError() ; static void raiseEvalError() ;
static Bool_t _evalError ; static Bool_t _evalError ;
ClassDef(RooAbsPdf,1) // Abstract PDF with normalization support RooNumGenConfig* _specGeneratorConfig ; //! MC generator configuration sp
ecific for this object
ClassDef(RooAbsPdf,2) // Abstract PDF with normalization support
}; };
#endif #endif
 End of changes. 8 change blocks. 
9 lines changed or deleted 38 lines changed or added


 RooAbsProxy.h   RooAbsProxy.h 
skipping to change at line 58 skipping to change at line 58
// Return normalization set to be used for evaluation of contents // Return normalization set to be used for evaluation of contents
return _nset ; return _nset ;
} }
virtual void print(ostream& os, Bool_t addContents=kFALSE) const ; virtual void print(ostream& os, Bool_t addContents=kFALSE) const ;
protected: protected:
RooArgSet* _nset ; //! Normalization set to be used for evaluation of Roo AbsPdf contents RooArgSet* _nset ; //! Normalization set to be used for evaluation of Roo AbsPdf contents
friend class RooAbsArg ; friend class RooAbsArg ;
virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t friend class RooObjectFactory ;
nameChange=kFALSE) = 0 ; virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t
nameChange=kFALSE, Bool_t factoryInitMode=kFALSE) = 0 ;
friend class RooAbsPdf ; friend class RooAbsPdf ;
virtual void changeNormSet(const RooArgSet* newNormSet) ; virtual void changeNormSet(const RooArgSet* newNormSet) ;
ClassDef(RooAbsProxy,1) // Abstract proxy interface ClassDef(RooAbsProxy,1) // Abstract proxy interface
} ; } ;
#endif #endif
 End of changes. 1 change blocks. 
2 lines changed or deleted 3 lines changed or added


 RooAbsReal.h   RooAbsReal.h 
skipping to change at line 23 skipping to change at line 23
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_ABS_REAL #ifndef ROO_ABS_REAL
#define ROO_ABS_REAL #define ROO_ABS_REAL
#include "RooAbsArg.h" #include "RooAbsArg.h"
#include "RooCmdArg.h" #include "RooCmdArg.h"
#include "RooCurve.h" #include "RooCurve.h"
#include "RooArgSet.h" #include "RooArgSet.h"
#include "RooArgList.h"
class RooArgList ; class RooArgList ;
class RooDataSet ; class RooDataSet ;
class RooPlot; class RooPlot;
class RooRealVar; class RooRealVar;
class RooAbsFunc; class RooAbsFunc;
class RooAbsCategoryLValue ; class RooAbsCategoryLValue ;
class RooCategory ; class RooCategory ;
class RooLinkedList ; class RooLinkedList ;
class RooNumIntConfig ; class RooNumIntConfig ;
class RooDataHist ; class RooDataHist ;
class RooFunctor ;
class RooGenFunction ;
class RooMultiGenFunction ;
class RooFitResult ;
class TH1; class TH1;
class TH1F; class TH1F;
class TH2F; class TH2F;
class TH3F; class TH3F;
#include <list> #include <list>
#include <string> #include <string>
#include <iostream> #include <iostream>
skipping to change at line 62 skipping to change at line 67
virtual ~RooAbsReal(); virtual ~RooAbsReal();
// Return value and unit accessors // Return value and unit accessors
virtual Double_t getVal(const RooArgSet* set=0) const ; virtual Double_t getVal(const RooArgSet* set=0) const ;
inline Double_t getVal(const RooArgSet& set) const { inline Double_t getVal(const RooArgSet& set) const {
// Return value with given choice of observables // Return value with given choice of observables
return getVal(&set) ; return getVal(&set) ;
} }
Bool_t operator==(Double_t value) const ; Bool_t operator==(Double_t value) const ;
virtual Bool_t operator==(const RooAbsArg& other) ; virtual Bool_t operator==(const RooAbsArg& other) ;
inline const char *getUnit() const { inline const Text_t *getUnit() const {
// Return string with unit description // Return string with unit description
return _unit.Data(); return _unit.Data();
} }
inline void setUnit(const char *unit) { inline void setUnit(const char *unit) {
// Set unit description to given string // Set unit description to given string
_unit= unit; _unit= unit;
} }
TString getTitle(Bool_t appendUnit= kFALSE) const; TString getTitle(Bool_t appendUnit= kFALSE) const;
// Lightweight interface adaptors (caller takes ownership) // Lightweight interface adaptors (caller takes ownership)
skipping to change at line 94 skipping to change at line 99
// Interface to force RooRealIntegral to offer given observable for int ernal integration // Interface to force RooRealIntegral to offer given observable for int ernal integration
// even if this is deemed unsafe. This default implementation returns a lways flase // even if this is deemed unsafe. This default implementation returns a lways flase
return kFALSE ; return kFALSE ;
} }
virtual void forceNumInt(Bool_t flag=kTRUE) { virtual void forceNumInt(Bool_t flag=kTRUE) {
// If flag is true, all advertised analytical integrals will be ignored // If flag is true, all advertised analytical integrals will be ignored
// and all integrals are calculated numerically // and all integrals are calculated numerically
_forceNumInt = flag ; _forceNumInt = flag ;
} }
// Chi^2 fits to histograms
virtual RooFitResult* chi2FitTo(RooDataHist& data, RooCmdArg arg1=RooCmdA
rg::none(), RooCmdArg arg2=RooCmdArg::none(),
RooCmdArg arg3=RooCmdArg::none(), RooCmdArg
arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(),
RooCmdArg arg6=RooCmdArg::none(), RooCmdArg
arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ;
virtual RooFitResult* chi2FitTo(RooDataHist& data, const RooLinkedList& c
mdList) ;
virtual RooAbsReal* createChi2(RooDataHist& data, const RooLinkedList& cm
dList) ;
virtual RooAbsReal* createChi2(RooDataHist& data, RooCmdArg arg1=RooCmdAr
g::none(), RooCmdArg arg2=RooCmdArg::none(),
RooCmdArg arg3=RooCmdArg::none(), RooCmdAr
g arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(),
RooCmdArg arg6=RooCmdArg::none(), RooCmdAr
g arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ;
// Chi^2 fits to X-Y datasets
virtual RooFitResult* chi2FitTo(RooDataSet& xydata, RooCmdArg arg1=RooCmd
Arg::none(), RooCmdArg arg2=RooCmdArg::none(),
RooCmdArg arg3=RooCmdArg::none(), RooCmdArg
arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(),
RooCmdArg arg6=RooCmdArg::none(), RooCmdArg
arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ;
virtual RooFitResult* chi2FitTo(RooDataSet& xydata, const RooLinkedList&
cmdList) ;
virtual RooAbsReal* createChi2(RooDataSet& data, const RooLinkedList& cmd
List) ;
virtual RooAbsReal* createChi2(RooDataSet& data, RooCmdArg arg1=RooCmdArg
::none(), RooCmdArg arg2=RooCmdArg::none(),
RooCmdArg arg3=RooCmdArg::none(), RooCmd
Arg arg4=RooCmdArg::none(), RooCmdArg arg5=RooCmdArg::none(),
RooCmdArg arg6=RooCmdArg::none(), RooCmd
Arg arg7=RooCmdArg::none(), RooCmdArg arg8=RooCmdArg::none()) ;
virtual RooAbsReal* createProfile(const RooArgSet& paramsOfInterest) ; virtual RooAbsReal* createProfile(const RooArgSet& paramsOfInterest) ;
RooAbsReal* createIntegral(const RooArgSet& iset, const RooCmdArg arg1, c onst RooCmdArg arg2=RooCmdArg::none(), RooAbsReal* createIntegral(const RooArgSet& iset, const RooCmdArg arg1, c onst RooCmdArg arg2=RooCmdArg::none(),
const RooCmdArg arg3=RooCmdArg::none(), const RooCmdArg arg4=RooCmdArg::none(), const RooCmdArg arg3=RooCmdArg::none(), const RooCmdArg arg4=RooCmdArg::none(),
const RooCmdArg arg5=RooCmdArg::none(), const R ooCmdArg arg6=RooCmdArg::none(), const RooCmdArg arg5=RooCmdArg::none(), const R ooCmdArg arg6=RooCmdArg::none(),
const RooCmdArg arg7=RooCmdArg::none(), const R ooCmdArg arg8=RooCmdArg::none()) const ; const RooCmdArg arg7=RooCmdArg::none(), const R ooCmdArg arg8=RooCmdArg::none()) const ;
RooAbsReal* createIntegral(const RooArgSet& iset, const char* rangeName) const { RooAbsReal* createIntegral(const RooArgSet& iset, const char* rangeName) const {
// Create integral over observables in iset in range named rangeName // Create integral over observables in iset in range named rangeName
return createIntegral(iset,0,0,rangeName) ; return createIntegral(iset,0,0,rangeName) ;
skipping to change at line 131 skipping to change at line 158
RooAbsReal* createRunningIntegral(const RooArgSet& iset, const RooArgSet& nset=RooArgSet()) ; RooAbsReal* createRunningIntegral(const RooArgSet& iset, const RooArgSet& nset=RooArgSet()) ;
RooAbsReal* createRunningIntegral(const RooArgSet& iset, const RooCmdArg arg1, const RooCmdArg arg2=RooCmdArg::none(), RooAbsReal* createRunningIntegral(const RooArgSet& iset, const RooCmdArg arg1, const RooCmdArg arg2=RooCmdArg::none(),
const RooCmdArg arg3=RooCmdArg::none(), const RooCmd Arg arg4=RooCmdArg::none(), const RooCmdArg arg3=RooCmdArg::none(), const RooCmd Arg arg4=RooCmdArg::none(),
const RooCmdArg arg5=RooCmdArg::none(), const RooCmd Arg arg6=RooCmdArg::none(), const RooCmdArg arg5=RooCmdArg::none(), const RooCmd Arg arg6=RooCmdArg::none(),
const RooCmdArg arg7=RooCmdArg::none(), const RooCmd Arg arg8=RooCmdArg::none()) ; const RooCmdArg arg7=RooCmdArg::none(), const RooCmd Arg arg8=RooCmdArg::none()) ;
RooAbsReal* createIntRI(const RooArgSet& iset, const RooArgSet& nset=RooA rgSet()) ; RooAbsReal* createIntRI(const RooArgSet& iset, const RooArgSet& nset=RooA rgSet()) ;
RooAbsReal* createScanRI(const RooArgSet& iset, const RooArgSet& nset, In t_t numScanBins, Int_t intOrder) ; RooAbsReal* createScanRI(const RooArgSet& iset, const RooArgSet& nset, In t_t numScanBins, Int_t intOrder) ;
// Optimized accept/reject generator support // Optimized accept/reject generator support
virtual Int_t getMaxVal(const RooArgSet& vars) const ; virtual Int_t getMaxVal(const RooArgSet& vars) const ;
virtual Double_t maxVal(Int_t code) ; virtual Double_t maxVal(Int_t code) const ;
virtual Int_t minTrialSamples(const RooArgSet& /*arGenObs*/) const { retu
rn 0 ; }
// Plotting options // Plotting options
void setPlotLabel(const char *label); void setPlotLabel(const char *label);
const char *getPlotLabel() const; const char *getPlotLabel() const;
virtual Double_t defaultErrorLevel() const { virtual Double_t defaultErrorLevel() const {
// Return default level for MINUIT error analysis // Return default level for MINUIT error analysis
return 1.0 ; return 1.0 ;
} }
const RooNumIntConfig* getIntegratorConfig() const ; const RooNumIntConfig* getIntegratorConfig() const ;
RooNumIntConfig* getIntegratorConfig() ;
static RooNumIntConfig* defaultIntegratorConfig() ; static RooNumIntConfig* defaultIntegratorConfig() ;
RooNumIntConfig* specialIntegratorConfig() const ; RooNumIntConfig* specialIntegratorConfig() const ;
RooNumIntConfig* specialIntegratorConfig(Bool_t createOnTheFly) ;
void setIntegratorConfig() ; void setIntegratorConfig() ;
void setIntegratorConfig(const RooNumIntConfig& config) ; void setIntegratorConfig(const RooNumIntConfig& config) ;
virtual void fixAddCoefNormalization(const RooArgSet& addNormSet=RooArgSe t(),Bool_t force=kTRUE) ; virtual void fixAddCoefNormalization(const RooArgSet& addNormSet=RooArgSe t(),Bool_t force=kTRUE) ;
virtual void fixAddCoefRange(const char* rangeName=0,Bool_t force=kTRUE) ; virtual void fixAddCoefRange(const char* rangeName=0,Bool_t force=kTRUE) ;
virtual void preferredObservableScanOrder(const RooArgSet& obs, RooArgSet & orderedObs) const ; virtual void preferredObservableScanOrder(const RooArgSet& obs, RooArgSet & orderedObs) const ;
// User entry point for plotting // User entry point for plotting
enum ScaleType { Raw, Relative, NumEvent, RelativeExpected } ; enum ScaleType { Raw, Relative, NumEvent, RelativeExpected } ;
skipping to change at line 222 skipping to change at line 252
static EvalErrorIter evalErrorIter() { return _evalErrorList.begin() ; } static EvalErrorIter evalErrorIter() { return _evalErrorList.begin() ; }
static void clearEvalErrorLog() ; static void clearEvalErrorLog() ;
virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& /*obs*/, Double_t /*xlo*/, Double_t /*xhi*/) const { virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& /*obs*/, Double_t /*xlo*/, Double_t /*xhi*/) const {
// Interface for returning an optional hint for initial sampling points when constructing a curve // Interface for returning an optional hint for initial sampling points when constructing a curve
// projected on observable. // projected on observable.
return 0 ; return 0 ;
} }
RooGenFunction* iGenFunction(RooRealVar& x, const RooArgSet& nset=RooArgS
et()) ;
RooMultiGenFunction* iGenFunction(const RooArgSet& observables, const Roo
ArgSet& nset=RooArgSet()) ;
RooFunctor* functor(const RooArgList& obs, const RooArgList& pars=RooArgL
ist(), const RooArgSet& nset=RooArgSet()) const ;
TF1* asTF(const RooArgList& obs, const RooArgList& pars=RooArgList(), con
st RooArgSet& nset=RooArgSet()) const ;
RooAbsReal* derivative(RooRealVar& obs, Int_t order=1, Double_t eps=0.001
) ;
protected: protected:
// PlotOn with command list // PlotOn with command list
virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ; virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;
// Hook for objects with normalization-dependent parameters interperetati on // Hook for objects with normalization-dependent parameters interperetati on
virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ; virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;
virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ; virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;
// Helper functions for plotting // Helper functions for plotting
skipping to change at line 247 skipping to change at line 285
Bool_t isSelectedComp() const ; Bool_t isSelectedComp() const ;
public: public:
const RooAbsReal* createPlotProjection(const RooArgSet& depVars, const Ro oArgSet& projVars) const ; const RooAbsReal* createPlotProjection(const RooArgSet& depVars, const Ro oArgSet& projVars) const ;
const RooAbsReal* createPlotProjection(const RooArgSet& depVars, const Ro oArgSet& projVars, RooArgSet*& cloneSet) const ; const RooAbsReal* createPlotProjection(const RooArgSet& depVars, const Ro oArgSet& projVars, RooArgSet*& cloneSet) const ;
const RooAbsReal *createPlotProjection(const RooArgSet &dependentVars, co nst RooArgSet *projectedVars, const RooAbsReal *createPlotProjection(const RooArgSet &dependentVars, co nst RooArgSet *projectedVars,
RooArgSet *&cloneSet, const char* r angeName=0) const; RooArgSet *&cloneSet, const char* r angeName=0) const;
protected: protected:
RooFitResult* chi2FitDriver(RooAbsReal& fcn, RooLinkedList& cmdList) ;
// Support interface for subclasses to advertise their analytic integrati on // Support interface for subclasses to advertise their analytic integrati on
// and generator capabilities in their analticalIntegral() and generateEv ent() // and generator capabilities in their analticalIntegral() and generateEv ent()
// implementations. // implementations.
Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps, Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps,
const RooArgProxy& a) const ; const RooArgProxy& a) const ;
Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps, Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps,
const RooArgProxy& a, const RooArgProxy& b) const ; const RooArgProxy& a, const RooArgProxy& b) const ;
Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps, Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps,
const RooArgProxy& a, const RooArgProxy& b, const RooArgP roxy& c) const ; const RooArgProxy& a, const RooArgProxy& b, const RooArgP roxy& c) const ;
Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps, Bool_t matchArgs(const RooArgSet& allDeps, RooArgSet& numDeps,
skipping to change at line 281 skipping to change at line 321
Double_t traceEval(const RooArgSet* set) const ; Double_t traceEval(const RooArgSet* set) const ;
virtual Bool_t traceEvalHook(Double_t /*value*/) const { virtual Bool_t traceEvalHook(Double_t /*value*/) const {
// Hook function to add functionality to evaluation tracing in derived classes // Hook function to add functionality to evaluation tracing in derived classes
return kFALSE ; return kFALSE ;
} }
virtual Double_t evaluate() const = 0 ; virtual Double_t evaluate() const = 0 ;
// Hooks for RooDataSet interface // Hooks for RooDataSet interface
friend class RooRealIntegral ; friend class RooRealIntegral ;
virtual void syncCache(const RooArgSet* set=0) { getVal(set) ; } virtual void syncCache(const RooArgSet* set=0) { getVal(set) ; }
virtual void copyCache(const RooAbsArg* source) ; virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;
virtual void attachToTree(TTree& t, Int_t bufSize=32000) ; virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;
virtual void setTreeBranchStatus(TTree& t, Bool_t active) ; virtual void setTreeBranchStatus(TTree& t, Bool_t active) ;
virtual void fillTreeBranch(TTree& t) ; virtual void fillTreeBranch(TTree& t) ;
Double_t _plotMin ; // Minimum of plot range Double_t _plotMin ; // Minimum of plot range
Double_t _plotMax ; // Maximum of plot range Double_t _plotMax ; // Maximum of plot range
Int_t _plotBins ; // Number of plot bins Int_t _plotBins ; // Number of plot bins
mutable Double_t _value ; // Cache for current value of object mutable Double_t _value ; // Cache for current value of object
TString _unit ; // Unit for objects value TString _unit ; // Unit for objects value
TString _label ; // Plot label for objects value TString _label ; // Plot label for objects value
skipping to change at line 303 skipping to change at line 343
mutable Float_t _floatValue ; //! Transient cache for floating point valu es from tree branches mutable Float_t _floatValue ; //! Transient cache for floating point valu es from tree branches
mutable Int_t _intValue ; //! Transient cache for integer values from tree branches mutable Int_t _intValue ; //! Transient cache for integer values from tree branches
mutable UChar_t _byteValue ; //! Transient cache for byte values from tr ee branches mutable UChar_t _byteValue ; //! Transient cache for byte values from tr ee branches
mutable UInt_t _uintValue ; //! Transient cache for unsigned integer va lues from tree branches mutable UInt_t _uintValue ; //! Transient cache for unsigned integer va lues from tree branches
friend class RooAbsPdf ; friend class RooAbsPdf ;
friend class RooAbsAnaConvPdf ; friend class RooAbsAnaConvPdf ;
friend class RooRealProxy ; friend class RooRealProxy ;
RooNumIntConfig* _specIntegratorConfig ; //! Numeric integrator configura tion specific for this object RooNumIntConfig* _specIntegratorConfig ; // Numeric integrator configurat ion specific for this object
Bool_t _treeVar ; // !do not persist Bool_t _treeVar ; // !do not persist
static Bool_t _cacheCheck ; // If true, always validate contents of clean which outcome of evaluate() static Bool_t _cacheCheck ; // If true, always validate contents of clean which outcome of evaluate()
friend class RooDataProjBinding ; friend class RooDataProjBinding ;
friend class RooAbsOptGoodnessOfFit ; friend class RooAbsOptGoodnessOfFit ;
struct PlotOpt { struct PlotOpt {
PlotOpt() : drawOptions("L"), scaleFactor(1.0), stype(Relative), projDat a(0), binProjData(kFALSE), projSet(0), precision(1e-3), PlotOpt() : drawOptions("L"), scaleFactor(1.0), stype(Relative), projDat a(0), binProjData(kFALSE), projSet(0), precision(1e-3),
skipping to change at line 369 skipping to change at line 409
friend class RooAddPdf ; friend class RooAddPdf ;
friend class RooAddModel ; friend class RooAddModel ;
void selectComp(Bool_t flag) { void selectComp(Bool_t flag) {
// If flag is true, only selected component will be included in evaluat es of RooAddPdf components // If flag is true, only selected component will be included in evaluat es of RooAddPdf components
_selectComp = flag ; _selectComp = flag ;
} }
static void globalSelectComp(Bool_t flag) ; static void globalSelectComp(Bool_t flag) ;
Bool_t _selectComp ; //! Component selection flag for RooAb sPdf::plotCompOn Bool_t _selectComp ; //! Component selection flag for RooAb sPdf::plotCompOn
static Bool_t _globalSelectComp ; // Global activation switch for compon ent selection static Bool_t _globalSelectComp ; // Global activation switch for compon ent selection
ClassDef(RooAbsReal,1) // Abstract real-valued variable ClassDef(RooAbsReal,2) // Abstract real-valued variable
}; };
#endif #endif
 End of changes. 12 change blocks. 
5 lines changed or deleted 67 lines changed or added


 RooAbsRealLValue.h   RooAbsRealLValue.h 
skipping to change at line 142 skipping to change at line 142
friend class RooRealBinding ; friend class RooRealBinding ;
virtual void setValFast(Double_t value) { setVal(value) ; } virtual void setValFast(Double_t value) { setVal(value) ; }
virtual void setVal(Double_t value, const char* /*rangeName*/) { virtual void setVal(Double_t value, const char* /*rangeName*/) {
// Set object value to 'value' // Set object value to 'value'
return setVal(value) ; return setVal(value) ;
} }
Bool_t fitRangeOKForPlotting() const ; Bool_t fitRangeOKForPlotting() const ;
void copyCache(const RooAbsArg* source) ; void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;
ClassDef(RooAbsRealLValue,1) // Abstract modifiable real-valued object ClassDef(RooAbsRealLValue,1) // Abstract modifiable real-valued object
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooAbsString.h   RooAbsString.h 
skipping to change at line 59 skipping to change at line 59
// Function evaluation and error tracing // Function evaluation and error tracing
const char* traceEval() const ; const char* traceEval() const ;
virtual Bool_t traceEvalHook(const char* value) const ; virtual Bool_t traceEvalHook(const char* value) const ;
virtual TString evaluate() const { return 0 ; } virtual TString evaluate() const { return 0 ; }
// Internal consistency checking (needed by RooDataSet) // Internal consistency checking (needed by RooDataSet)
virtual Bool_t isValid() const ; virtual Bool_t isValid() const ;
virtual Bool_t isValidString(const char*, Bool_t printError=kFALSE) const ; virtual Bool_t isValidString(const char*, Bool_t printError=kFALSE) const ;
virtual void syncCache(const RooArgSet* nset=0) ; virtual void syncCache(const RooArgSet* nset=0) ;
void copyCache(const RooAbsArg* source) ; void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;
virtual void attachToTree(TTree& t, Int_t bufSize=32000) ; virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;
virtual void fillTreeBranch(TTree& t) ; virtual void fillTreeBranch(TTree& t) ;
virtual void setTreeBranchStatus(TTree& t, Bool_t active) ; virtual void setTreeBranchStatus(TTree& t, Bool_t active) ;
Int_t _len ; // Length of _value Int_t _len ; // Length of _value
mutable char *_value ; //[_len] Value mutable char *_value ; //[_len] Value
ClassDef(RooAbsString,1) // Abstract string-valued variable ClassDef(RooAbsString,1) // Abstract string-valued variable
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooAcceptReject.h   RooAcceptReject.h 
skipping to change at line 19 skipping to change at line 19
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_ACCEPT_REJECT #ifndef ROO_ACCEPT_REJECT
#define ROO_ACCEPT_REJECT #define ROO_ACCEPT_REJECT
#include "TNamed.h" #include "RooAbsNumGenerator.h"
#include "RooPrintable.h" #include "RooPrintable.h"
#include "RooArgSet.h" #include "RooArgSet.h"
class RooAbsReal; class RooAbsReal;
class RooRealVar; class RooRealVar;
class RooDataSet; class RooDataSet;
class RooRealBinding;
class RooNumGenFactory ;
class RooAcceptReject : public TNamed, public RooPrintable { class RooAcceptReject : public RooAbsNumGenerator {
public: public:
RooAcceptReject(const RooAbsReal &func, const RooArgSet &genVars, const R RooAcceptReject() {} ;
ooAbsReal* maxFuncVal=0, Bool_t verbose= kFALSE); RooAcceptReject(const RooAbsReal &func, const RooArgSet &genVars, const R
Bool_t isValid() const { ooNumGenConfig& config, Bool_t verbose=kFALSE, const RooAbsReal* maxFuncVal
// If true, generator is in a valid state =0);
return _isValid; RooAbsNumGenerator* clone(const RooAbsReal& func, const RooArgSet& genVar
s, const RooArgSet& /*condVars*/,
const RooNumGenConfig& config, Bool_t verbose=kF
ALSE, const RooAbsReal* maxFuncVal=0) const {
return new RooAcceptReject(func,genVars,config,verbose,maxFuncVal) ;
} }
virtual ~RooAcceptReject(); virtual ~RooAcceptReject();
inline void setVerbose(Bool_t verbose= kTRUE) { const RooArgSet *generateEvent(UInt_t remaining, Double_t& resampleRatio)
// If flag is true, verbose messaging will be active during generation ;
_verbose= verbose; Double_t getFuncMax() ;
}
inline Bool_t isVerbose() const {
// Return status of verbose messaging flag
return _verbose;
}
const RooArgSet *generateEvent(UInt_t remaining);
inline virtual void Print(Option_t *options= 0) const { // Advertisement of capabilities
// ascii printing interface virtual Bool_t canSampleConditional() const { return kTRUE ; }
printStream(defaultPrintStream(),defaultPrintContents(options),defaultP virtual Bool_t canSampleCategories() const { return kTRUE ; }
rintStyle(options));
}
virtual void printName(ostream& os) const ; protected:
virtual void printTitle(ostream& os) const ;
virtual void printClassName(ostream& os) const ;
virtual void printArgs(ostream& os) const ;
Double_t getFuncMax() ; friend class RooNumGenFactory ;
void attachParameters(const RooArgSet& vars) ; static void registerSampler(RooNumGenFactory& fact) ;
protected:
void addEventToCache(); void addEventToCache();
const RooArgSet *nextAcceptedEvent(); const RooArgSet *nextAcceptedEvent();
RooArgSet *_cloneSet; // Set owning clone of input functio
n
RooAbsReal *_funcClone; // Pointer to top level node of clon
ed function
const RooAbsReal *_funcMaxVal ; // Container for maximum function va
lue
RooArgSet _catVars,_realVars ; // Sets of discrete and real valued
observabeles
Bool_t _verbose, _isValid; // Verbose and valid flag
Double_t _maxFuncVal, _funcSum; // Maximum function value found, and sum of all samples made Double_t _maxFuncVal, _funcSum; // Maximum function value found, and sum of all samples made
UInt_t _realSampleDim,_catSampleMult;// Number of real and discrete dimen sions to be samplesd UInt_t _realSampleDim,_catSampleMult;// Number of real and discrete dimen sions to be samplesd
UInt_t _minTrials; // Minimum number of max.finding tri als, total number of samples UInt_t _minTrials; // Minimum number of max.finding tri als, total number of samples
UInt_t _totalEvents; // Total number of function samples UInt_t _totalEvents; // Total number of function samples
UInt_t _eventsUsed; // Accepted number of function sampl es UInt_t _eventsUsed; // Accepted number of function sampl es
RooRealVar *_funcValStore,*_funcValPtr; // RRVs storing function value in
context and in output dataset
RooDataSet *_cache; // Dataset holding generared values
of observables
TIterator *_nextCatVar; // Iterator of categories to be gene rated TIterator *_nextCatVar; // Iterator of categories to be gene rated
TIterator *_nextRealVar; // Iterator over variables to be gen erated TIterator *_nextRealVar; // Iterator over variables to be gen erated
static const UInt_t _maxSampleDim; // Number of filledelements in _ UInt_t _minTrialsArray[4]; // Minimum number of trials samples
minTrialsArray for 1,2,3 dimensional problems
static const UInt_t _minTrialsArray[]; // Minimum number of trials samp
les for 1,2,3 dimensional problems
ClassDef(RooAcceptReject,0) // Context for generating a dataset from a PD F ClassDef(RooAcceptReject,0) // Context for generating a dataset from a PD F
}; };
#endif #endif
 End of changes. 12 change blocks. 
46 lines changed or deleted 24 lines changed or added


 RooAdaptiveGaussKronrodIntegrator1D.h   RooAdaptiveGaussKronrodIntegrator1D.h 
skipping to change at line 38 skipping to change at line 38
RooAdaptiveGaussKronrodIntegrator1D() ; RooAdaptiveGaussKronrodIntegrator1D() ;
RooAdaptiveGaussKronrodIntegrator1D(const RooAbsFunc& function, const Roo NumIntConfig& config) ; RooAdaptiveGaussKronrodIntegrator1D(const RooAbsFunc& function, const Roo NumIntConfig& config) ;
RooAdaptiveGaussKronrodIntegrator1D(const RooAbsFunc& function, Double_t xmin, Double_t xmax, RooAdaptiveGaussKronrodIntegrator1D(const RooAbsFunc& function, Double_t xmin, Double_t xmax,
const RooNumIntConfig& config) ; const RooNumIntConfig& config) ;
virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ; virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ;
virtual ~RooAdaptiveGaussKronrodIntegrator1D(); virtual ~RooAdaptiveGaussKronrodIntegrator1D();
virtual Bool_t checkLimits() const; virtual Bool_t checkLimits() const;
virtual Double_t integral(const Double_t *yvec=0) ; virtual Double_t integral(const Double_t *yvec=0) ;
Bool_t setLimits(Double_t xmin, Double_t xmax); using RooAbsIntegrator::setLimits ;
Bool_t setLimits(Double_t* xmin, Double_t* xmax);
virtual Bool_t setUseIntegrandLimits(Bool_t flag) { virtual Bool_t setUseIntegrandLimits(Bool_t flag) {
// If flag is true, intergration limits are taken from definition in in put function binding // If flag is true, intergration limits are taken from definition in in put function binding
_useIntegrandLimits = flag ; return kTRUE ; _useIntegrandLimits = flag ; return kTRUE ;
} }
virtual Bool_t canIntegrate1D() const { virtual Bool_t canIntegrate1D() const {
// We can integrate 1-dimensional functions // We can integrate 1-dimensional functions
return kTRUE ; return kTRUE ;
} }
virtual Bool_t canIntegrate2D() const { virtual Bool_t canIntegrate2D() const {
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 RooAddGenContext.h   RooAddGenContext.h 
skipping to change at line 23 skipping to change at line 23
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_ADD_GEN_CONTEXT #ifndef ROO_ADD_GEN_CONTEXT
#define ROO_ADD_GEN_CONTEXT #define ROO_ADD_GEN_CONTEXT
#include "RooAbsGenContext.h" #include "RooAbsGenContext.h"
#include "RooArgSet.h" #include "RooArgSet.h"
class RooAddPdf; class RooAddPdf;
class RooAddModel;
class RooDataSet; class RooDataSet;
class RooRealIntegral; class RooRealIntegral;
class RooAcceptReject; class RooAcceptReject;
class TRandom; class TRandom;
class TIterator; class TIterator;
class RooAddGenContext : public RooAbsGenContext { class RooAddGenContext : public RooAbsGenContext {
public: public:
RooAddGenContext(const RooAddPdf &model, const RooArgSet &vars, const Roo DataSet *prototype= 0, RooAddGenContext(const RooAddPdf &model, const RooArgSet &vars, const Roo DataSet *prototype= 0,
const RooArgSet* auxProto=0, Bool_t _verbose= kFALSE); const RooArgSet* auxProto=0, Bool_t _verbose= kFALSE);
RooAddGenContext(const RooAddModel &model, const RooArgSet &vars, const R
ooDataSet *prototype= 0,
const RooArgSet* auxProto=0, Bool_t _verbose= kFALSE);
virtual ~RooAddGenContext(); virtual ~RooAddGenContext();
virtual void setProtoDataOrder(Int_t* lut) ; virtual void setProtoDataOrder(Int_t* lut) ;
virtual void attach(const RooArgSet& params) ; virtual void attach(const RooArgSet& params) ;
virtual void printMultiline(ostream &os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ; virtual void printMultiline(ostream &os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ;
protected: protected:
virtual void initGenerator(const RooArgSet &theEvent); virtual void initGenerator(const RooArgSet &theEvent);
virtual void generateEvent(RooArgSet &theEvent, Int_t remaining); virtual void generateEvent(RooArgSet &theEvent, Int_t remaining);
void updateThresholds() ; void updateThresholds() ;
RooAddGenContext(const RooAddGenContext& other) ; RooAddGenContext(const RooAddGenContext& other) ;
const RooArgSet* _vars ; const RooArgSet* _vars ;
RooArgSet* _pdfSet ; // Set owned all nodes of internal clone of p.d.f RooArgSet* _pdfSet ; // Set owned all nodes of internal clone of p.d.f
RooAddPdf *_pdf ; // Pointer to cloned p.d.f RooAbsPdf *_pdf ; // Pointer to cloned p.d.f
TList _gcList ; // List of component generator contexts TList _gcList ; // List of component generator contexts
Int_t _nComp ; // Number of PDF components Int_t _nComp ; // Number of PDF components
Double_t* _coefThresh ; //[_nComp] Array of coefficient thresholds Double_t* _coefThresh ; //[_nComp] Array of coefficient thresholds
Bool_t _isModel ; // Are we generating from a RooAddPdf or a RooAddModel
ClassDef(RooAddGenContext,0) // Specialized context for generating a data set from a RooAddPdf ClassDef(RooAddGenContext,0) // Specialized context for generating a data set from a RooAddPdf
}; };
#endif #endif
 End of changes. 4 change blocks. 
1 lines changed or deleted 6 lines changed or added


 RooAddModel.h   RooAddModel.h 
skipping to change at line 73 skipping to change at line 73
const RooArgList& pdfList() const { const RooArgList& pdfList() const {
// Return list of component p.d.fs // Return list of component p.d.fs
return _pdfList ; return _pdfList ;
} }
const RooArgList& coefList() const { const RooArgList& coefList() const {
// Return list of coefficients of component p.d.f.s // Return list of coefficients of component p.d.f.s
return _coefList ; return _coefList ;
} }
Bool_t isDirectGenSafe(const RooAbsArg& arg) const ;
Int_t getGenerator(const RooArgSet& directVars, RooArgSet &generateVars,
Bool_t staticInitOK=kTRUE) const;
void generateEvent(Int_t code);
void fixCoefNormalization(const RooArgSet& refCoefNorm) ; void fixCoefNormalization(const RooArgSet& refCoefNorm) ;
void fixCoefRange(const char* rangeName) ; void fixCoefRange(const char* rangeName) ;
virtual void resetErrorCounters(Int_t resetValue=10) ; virtual void resetErrorCounters(Int_t resetValue=10) ;
void printMetaArgs(ostream& os) const ;
protected: protected:
friend class RooAddGenContext ;
virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData
Set *prototype=0,
const RooArgSet* auxProto=0, Bool_t
verbose= kFALSE) const ;
virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ; virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;
virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ; virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;
mutable RooSetProxy _refCoefNorm ; //! Reference observable set for coe fficient interpretation mutable RooSetProxy _refCoefNorm ; //! Reference observable set for coe fficient interpretation
mutable TNamed* _refCoefRangeName ; //! Reference range name for coeffic ient interpreation mutable TNamed* _refCoefRangeName ; //! Reference range name for coeffic ient interpreation
Bool_t _projectCoefs ; // If true coefficients need to be project ed for use in evaluate() Bool_t _projectCoefs ; // If true coefficients need to be project ed for use in evaluate()
mutable Double_t* _coefCache ; //! Transiet cache with transformed values of coefficients mutable Double_t* _coefCache ; //! Transiet cache with transformed values of coefficients
class CacheElem : public RooAbsCacheElement { class CacheElem : public RooAbsCacheElement {
 End of changes. 3 change blocks. 
0 lines changed or deleted 14 lines changed or added


 RooAddPdf.h   RooAddPdf.h 
skipping to change at line 81 skipping to change at line 81
// Return list of coefficients of component p.d.f.s // Return list of coefficients of component p.d.f.s
return _coefList ; return _coefList ;
} }
void fixCoefNormalization(const RooArgSet& refCoefNorm) ; void fixCoefNormalization(const RooArgSet& refCoefNorm) ;
void fixCoefRange(const char* rangeName) ; void fixCoefRange(const char* rangeName) ;
virtual void resetErrorCounters(Int_t resetValue=10) ; virtual void resetErrorCounters(Int_t resetValue=10) ;
virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ; virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;
void printMetaArgs(ostream& os) const ;
protected: protected:
virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ; virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;
virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ; virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;
mutable RooSetProxy _refCoefNorm ; //! Reference observable set for coe fficient interpretation mutable RooSetProxy _refCoefNorm ; //! Reference observable set for coe fficient interpretation
mutable TNamed* _refCoefRangeName ; //! Reference range name for coeffic ient interpreation mutable TNamed* _refCoefRangeName ; //! Reference range name for coeffic ient interpreation
Bool_t _projectCoefs ; // If true coefficients need to be project ed for use in evaluate() Bool_t _projectCoefs ; // If true coefficients need to be project ed for use in evaluate()
mutable Double_t* _coefCache ; //! Transiet cache with transformed values of coefficients mutable Double_t* _coefCache ; //! Transiet cache with transformed values of coefficients
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 RooAddition.h   RooAddition.h 
skipping to change at line 38 skipping to change at line 38
RooAddition() ; RooAddition() ;
RooAddition(const char *name, const char *title, const RooArgSet& sumSet, Bool_t takeOwnerShip=kFALSE) ; RooAddition(const char *name, const char *title, const RooArgSet& sumSet, Bool_t takeOwnerShip=kFALSE) ;
RooAddition(const char *name, const char *title, const RooArgList& sumSet 1, const RooArgList& sumSet2, Bool_t takeOwnerShip=kFALSE) ; RooAddition(const char *name, const char *title, const RooArgList& sumSet 1, const RooArgList& sumSet2, Bool_t takeOwnerShip=kFALSE) ;
virtual ~RooAddition() ; virtual ~RooAddition() ;
RooAddition(const RooAddition& other, const char* name = 0); RooAddition(const RooAddition& other, const char* name = 0);
virtual TObject* clone(const char* newname) const { return new RooAdditio n(*this, newname); } virtual TObject* clone(const char* newname) const { return new RooAdditio n(*this, newname); }
virtual Double_t defaultErrorLevel() const ; virtual Double_t defaultErrorLevel() const ;
void printMetaArgs(ostream& os) const ;
protected: protected:
RooArgList _ownedList ; // List of owned components RooArgList _ownedList ; // List of owned components
RooListProxy _set1 ; // First set of terms to be summed RooListProxy _set1 ; // First set of terms to be summed
RooListProxy _set2 ; // Second set of terms to be summed RooListProxy _set2 ; // Second set of terms to be summed
mutable TIterator* _setIter1 ; //! Iterator over set1 mutable TIterator* _setIter1 ; //! Iterator over set1
mutable TIterator* _setIter2 ; //! Iterator over set2 mutable TIterator* _setIter2 ; //! Iterator over set2
Double_t evaluate() const; Double_t evaluate() const;
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 RooArgProxy.h   RooArgProxy.h 
skipping to change at line 30 skipping to change at line 30
#include "RooAbsProxy.h" #include "RooAbsProxy.h"
#include "RooAbsArg.h" #include "RooAbsArg.h"
class RooArgProxy : public TNamed, public RooAbsProxy { class RooArgProxy : public TNamed, public RooAbsProxy {
public: public:
// Constructors, assignment etc. // Constructors, assignment etc.
RooArgProxy() : _owner(0), _arg(0), _ownArg(kFALSE) { RooArgProxy() : _owner(0), _arg(0), _ownArg(kFALSE) {
// Default constructor // Default constructor
} ; } ;
RooArgProxy(const char* name, const char* desc, RooAbsArg* owner,
Bool_t valueServer, Bool_t shapeServer, Bool_t proxyOwnsArg=kF
ALSE) ;
RooArgProxy(const char* name, const char* desc, RooAbsArg* owner, RooAbsA rg& arg, RooArgProxy(const char* name, const char* desc, RooAbsArg* owner, RooAbsA rg& arg,
Bool_t valueServer, Bool_t shapeServer, Bool_t proxyOwnsArg=kF ALSE) ; Bool_t valueServer, Bool_t shapeServer, Bool_t proxyOwnsArg=kF ALSE) ;
RooArgProxy(const char* name, RooAbsArg* owner, const RooArgProxy& other) ; RooArgProxy(const char* name, RooAbsArg* owner, const RooArgProxy& other) ;
virtual ~RooArgProxy() ; virtual ~RooArgProxy() ;
inline RooAbsArg* absArg() const { inline RooAbsArg* absArg() const {
// Return pointer to contained argument // Return pointer to contained argument
return _arg ; return _arg ;
} }
virtual const char* name() const { virtual const char* name() const {
skipping to change at line 66 skipping to change at line 68
friend class RooAbsArg ; friend class RooAbsArg ;
inline Bool_t isValueServer() const { inline Bool_t isValueServer() const {
// Returns true of contents is value server of owner // Returns true of contents is value server of owner
return _valueServer ; return _valueServer ;
} }
inline Bool_t isShapeServer() const { inline Bool_t isShapeServer() const {
// Returns true if contents is shape server of owner // Returns true if contents is shape server of owner
return _shapeServer ; return _shapeServer ;
} }
virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t nameChange=kFALSE) ; virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t nameChange=kFALSE, Bool_t factoryInitMode=kFALSE) ;
virtual void changeDataSet(const RooArgSet* newNormSet) ; virtual void changeDataSet(const RooArgSet* newNormSet) ;
ClassDef(RooArgProxy,1) // Abstract proxy for RooAbsArg objects ClassDef(RooArgProxy,1) // Abstract proxy for RooAbsArg objects
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 RooArgSet.h   RooArgSet.h 
skipping to change at line 41 skipping to change at line 41
void* operator new (size_t bytes); void* operator new (size_t bytes);
void operator delete (void *ptr); void operator delete (void *ptr);
#endif #endif
// Constructors, assignment etc. // Constructors, assignment etc.
RooArgSet(); RooArgSet();
RooArgSet(const RooArgList& list) ; RooArgSet(const RooArgList& list) ;
RooArgSet(const RooArgList& list, const RooAbsArg* var1) ; RooArgSet(const RooArgList& list, const RooAbsArg* var1) ;
explicit RooArgSet(const TCollection& tcoll, const char* name="") ; explicit RooArgSet(const TCollection& tcoll, const char* name="") ;
explicit RooArgSet(const char *name); explicit RooArgSet(const char *name);
RooArgSet(const RooArgSet& set1, const RooArgSet& set2,
const char *name="");
RooArgSet(const RooAbsArg& var1, RooArgSet(const RooAbsArg& var1,
const char *name=""); const char *name="");
RooArgSet(const RooAbsArg& var1, const RooAbsArg& var2, RooArgSet(const RooAbsArg& var1, const RooAbsArg& var2,
const char *name=""); const char *name="");
RooArgSet(const RooAbsArg& var1, const RooAbsArg& var2, RooArgSet(const RooAbsArg& var1, const RooAbsArg& var2,
const RooAbsArg& var3, const RooAbsArg& var3,
const char *name=""); const char *name="");
RooArgSet(const RooAbsArg& var1, const RooAbsArg& var2, RooArgSet(const RooAbsArg& var1, const RooAbsArg& var2,
const RooAbsArg& var3, const RooAbsArg& var4, const RooAbsArg& var3, const RooAbsArg& var4,
const char *name=""); const char *name="");
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 RooCBShape.h   RooCBShape.h 
skipping to change at line 41 skipping to change at line 41
RooCBShape(const RooCBShape& other, const char* name = 0); RooCBShape(const RooCBShape& other, const char* name = 0);
virtual TObject* clone(const char* newname) const { return new RooCBShape (*this,newname); } virtual TObject* clone(const char* newname) const { return new RooCBShape (*this,newname); }
inline virtual ~RooCBShape() { } inline virtual ~RooCBShape() { }
virtual Int_t getAnalyticalIntegral( RooArgSet& allVars, RooArgSet& anal Vars, const char* rangeName=0 ) const; virtual Int_t getAnalyticalIntegral( RooArgSet& allVars, RooArgSet& anal Vars, const char* rangeName=0 ) const;
virtual Double_t analyticalIntegral( Int_t code, const char* rangeName=0 ) const; virtual Double_t analyticalIntegral( Int_t code, const char* rangeName=0 ) const;
// Optimized accept/reject generator support // Optimized accept/reject generator support
virtual Int_t getMaxVal(const RooArgSet& vars) const ; virtual Int_t getMaxVal(const RooArgSet& vars) const ;
virtual Double_t maxVal(Int_t code) ; virtual Double_t maxVal(Int_t code) const ;
protected: protected:
Double_t ApproxErf(Double_t arg) const ; Double_t ApproxErf(Double_t arg) const ;
RooRealProxy m; RooRealProxy m;
RooRealProxy m0; RooRealProxy m0;
RooRealProxy sigma; RooRealProxy sigma;
RooRealProxy alpha; RooRealProxy alpha;
RooRealProxy n; RooRealProxy n;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooCacheManager.h   RooCacheManager.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooCacheManager.h 24269 2008-06-13 15:37:03Z wouter $ * File: $Id: RooCacheManager.h 28259 2009-04-16 16:21:16Z wouter $
* Authors: * * Authors: *
* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu * * WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
* DK, David Kirkby, UC Irvine, dkirkby@uci.edu * * DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
* * * *
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
skipping to change at line 219 skipping to change at line 219
// Check if object is already registered // Check if object is already registered
Int_t sterileIdx(-1) ; Int_t sterileIdx(-1) ;
if (getObj(nset,iset,&sterileIdx,isetRangeName)) { if (getObj(nset,iset,&sterileIdx,isetRangeName)) {
return lastIndex() ; return lastIndex() ;
} }
if (sterileIdx>=0) { if (sterileIdx>=0) {
// Found sterile slot that can should be recycled [ sterileIndex only s et if isetRangeName matches ] // Found sterile slot that can should be recycled [ sterileIndex only s et if isetRangeName matches ]
_object[sterileIdx] = obj ; _object[sterileIdx] = obj ;
// Allow optional post-processing of object inserted in cache
insertObjectHook(*obj) ;
return lastIndex() ; return lastIndex() ;
} }
if (_size==_maxSize) { if (_size==_maxSize) {
return -1 ; return -1 ;
} }
_nsetCache[_size].autoCache(_owner,nset,iset,isetRangeName,kTRUE) ; _nsetCache[_size].autoCache(_owner,nset,iset,isetRangeName,kTRUE) ;
if (_object[_size]) { if (_object[_size]) {
delete _object[_size] ; delete _object[_size] ;
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 RooCachedReal.h   RooCachedReal.h 
skipping to change at line 21 skipping to change at line 21
#ifndef ROOCACHEDREAL #ifndef ROOCACHEDREAL
#define ROOCACHEDREAL #define ROOCACHEDREAL
#include "RooAbsCachedReal.h" #include "RooAbsCachedReal.h"
#include "RooRealProxy.h" #include "RooRealProxy.h"
#include "RooAbsReal.h" #include "RooAbsReal.h"
class RooCachedReal : public RooAbsCachedReal { class RooCachedReal : public RooAbsCachedReal {
public: public:
RooCachedReal() {}
RooCachedReal(const char *name, const char *title, RooAbsReal& _func, con
st RooArgSet& cacheObs);
RooCachedReal(const char *name, const char *title, RooAbsReal& _func); RooCachedReal(const char *name, const char *title, RooAbsReal& _func);
RooCachedReal(const RooCachedReal& other, const char* name=0) ; RooCachedReal(const RooCachedReal& other, const char* name=0) ;
virtual TObject* clone(const char* newname) const { return new RooCachedR eal(*this,newname); } virtual TObject* clone(const char* newname) const { return new RooCachedR eal(*this,newname); }
virtual ~RooCachedReal() ; virtual ~RooCachedReal() ;
void setCdfBoundaries(Bool_t flag) { void setCdfBoundaries(Bool_t flag) {
// If flag is true the RooHistFunc that represent the cache histogram // If flag is true the RooHistFunc that represent the cache histogram
// will use special boundary conditions for use with cumulative distrib ution // will use special boundary conditions for use with cumulative distrib ution
// functions: at the lower bound the function is forced to converge at zero and the upper // functions: at the lower bound the function is forced to converge at zero and the upper
// bound is the function is forced to converge at 1.0 // bound is the function is forced to converge at 1.0
skipping to change at line 44 skipping to change at line 46
// If true the c.d.f boundary mode is active // If true the c.d.f boundary mode is active
return _useCdfBoundaries ; return _useCdfBoundaries ;
} }
protected: protected:
virtual const char* inputBaseName() const { virtual const char* inputBaseName() const {
// Return base name for caches, i.e. the name of the cached function // Return base name for caches, i.e. the name of the cached function
return func.arg().GetName() ; return func.arg().GetName() ;
} ; } ;
virtual RooArgSet* actualObservables(const RooArgSet& nset) const { virtual RooArgSet* actualObservables(const RooArgSet& nset) const ;
// Return the observables to be cached, i.e. the observable of the cach virtual RooArgSet* actualParameters(const RooArgSet& nset) const ;
ed function
return func.arg().getObservables(nset) ;
}
virtual RooArgSet* actualParameters(const RooArgSet& nset) const {
// Return the parameters on which the cache contents depends, i.e. the
parameters of the cached function
return func.arg().getParameters(nset) ;
}
virtual void fillCacheObject(FuncCacheElem& cacheFunc) const ; virtual void fillCacheObject(FuncCacheElem& cacheFunc) const ;
virtual Double_t evaluate() const { virtual Double_t evaluate() const {
// Dummy evaluate, it is never called // Dummy evaluate, it is never called
return 0 ; return 0 ;
} }
RooRealProxy func ; // Proxy to function being cached RooRealProxy func ; // Proxy to function being cached
RooSetProxy _cacheObs ; // Variables to be cached
Bool_t _useCdfBoundaries ; // Are c.d.f boundary conditions used by th e RooHistFuncs? Bool_t _useCdfBoundaries ; // Are c.d.f boundary conditions used by th e RooHistFuncs?
private: private:
ClassDef(RooCachedReal,1) // P.d.f class that wraps another p.d.f and cac hes its output ClassDef(RooCachedReal,1) // P.d.f class that wraps another p.d.f and cac hes its output
}; };
#endif #endif
 End of changes. 3 change blocks. 
10 lines changed or deleted 6 lines changed or added


 RooCatType.h   RooCatType.h 
skipping to change at line 45 skipping to change at line 45
TObject(other), RooPrintable(other), _value(other._value) { TObject(other), RooPrintable(other), _value(other._value) {
// Copy constructor // Copy constructor
strcpy(_label,other._label) ; strcpy(_label,other._label) ;
} ; } ;
virtual ~RooCatType() { virtual ~RooCatType() {
// Destructor // Destructor
} ; } ;
virtual TObject* Clone(const char*) const { return new RooCatType(*this); } virtual TObject* Clone(const char*) const { return new RooCatType(*this); }
virtual const char* GetName() const { virtual const Text_t* GetName() const {
// Return state name // Return state name
return _label ; return _label ;
} }
virtual void SetName(const char* name) ; virtual void SetName(const Text_t* name) ;
inline RooCatType& operator=(const RooCatType& other) { inline RooCatType& operator=(const RooCatType& other) {
// Assignment operator from other RooCatType // Assignment operator from other RooCatType
if (&other==this) return *this ; if (&other==this) return *this ;
SetName(other.GetName()) ; SetName(other.GetName()) ;
_value = other._value ; _value = other._value ;
return *this ; } return *this ; }
inline Bool_t operator==(const RooCatType& other) { inline Bool_t operator==(const RooCatType& other) {
// Equality operator with other RooCatType // Equality operator with other RooCatType
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 RooCategory.h   RooCategory.h 
skipping to change at line 76 skipping to change at line 76
return isStateInRange(rangeName,getLabel()) ; return isStateInRange(rangeName,getLabel()) ;
} }
virtual Bool_t hasRange(const char* rangeName) const { virtual Bool_t hasRange(const char* rangeName) const {
// Returns true if category has range with given name // Returns true if category has range with given name
return _sharedProp->_altRanges.FindObject(rangeName) ? kTRUE : kFALSE ; return _sharedProp->_altRanges.FindObject(rangeName) ? kTRUE : kFALSE ;
} }
protected: protected:
static RooSharedPropertiesList _sharedPropList; // List of properties sha red among clone sets static RooSharedPropertiesList _sharedPropList; // List of properties sha red among clone sets
RooCategorySharedProperties* _sharedProp ; // Shared properties associate static RooCategorySharedProperties _nullProp ; // Null property
d with this instance RooCategorySharedProperties* _sharedProp ; //! Shared properties associat
ed with this instance
virtual RooCatType evaluate() const { virtual RooCatType evaluate() const {
// Dummy implementation // Dummy implementation
return RooCatType() ; return RooCatType() ;
} }
ClassDef(RooCategory,1) // Discrete valued variable type ClassDef(RooCategory,2) // Discrete valued variable type
}; };
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 lines changed or added


 RooCategoryProxy.h   RooCategoryProxy.h 
skipping to change at line 30 skipping to change at line 30
#include "RooArgProxy.h" #include "RooArgProxy.h"
#include "RooAbsCategoryLValue.h" #include "RooAbsCategoryLValue.h"
class RooCategoryProxy : public RooArgProxy { class RooCategoryProxy : public RooArgProxy {
public: public:
// Constructors, assignment etc. // Constructors, assignment etc.
RooCategoryProxy() { RooCategoryProxy() {
// Default constructor // Default constructor
} ; } ;
RooCategoryProxy(const char* name, const char* desc, RooAbsArg* owner,
Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool
_t proxyOwnsArg=kFALSE) ;
RooCategoryProxy(const char* name, const char* desc, RooAbsArg* owner, Ro oAbsCategory& ref, RooCategoryProxy(const char* name, const char* desc, RooAbsArg* owner, Ro oAbsCategory& ref,
Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool _t proxyOwnsArg=kFALSE) ; Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool _t proxyOwnsArg=kFALSE) ;
RooCategoryProxy(const char* name, RooAbsArg* owner, const RooCategoryPro xy& other) ; RooCategoryProxy(const char* name, RooAbsArg* owner, const RooCategoryPro xy& other) ;
virtual TObject* Clone(const char* newName=0) const { return new RooCateg oryProxy(newName,_owner,*this); } virtual TObject* Clone(const char* newName=0) const { return new RooCateg oryProxy(newName,_owner,*this); }
virtual ~RooCategoryProxy(); virtual ~RooCategoryProxy();
// Accessors // Accessors
inline operator Int_t() const { inline operator Int_t() const {
// Facilitates use of proxy as integer // Facilitates use of proxy as integer
return ((RooAbsCategory*)_arg)->getIndex() ; return ((RooAbsCategory*)_arg)->getIndex() ;
skipping to change at line 54 skipping to change at line 56
} }
inline const RooAbsCategory& arg() const { inline const RooAbsCategory& arg() const {
// Return proxies argument // Return proxies argument
return (RooAbsCategory&)*_arg ; return (RooAbsCategory&)*_arg ;
} }
inline Bool_t hasRange(const char* rangeName) const { inline Bool_t hasRange(const char* rangeName) const {
// Returns true if proxied argument has range with given name // Returns true if proxied argument has range with given name
return arg().hasRange(rangeName) ; return arg().hasRange(rangeName) ;
} }
// Modifier
virtual Bool_t setArg(RooAbsCategory& newRef) ;
protected: protected:
RooAbsCategoryLValue* lvptr() const ; RooAbsCategoryLValue* lvptr() const ;
public: public:
// LValue operations // LValue operations
RooCategoryProxy& operator=(Int_t index) { RooCategoryProxy& operator=(Int_t index) {
// Assignment operator with index value // Assignment operator with index value
lvptr()->setIndex(index) ; return *this ; lvptr()->setIndex(index) ; return *this ;
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added


 RooCategorySharedProperties.h   RooCategorySharedProperties.h 
skipping to change at line 26 skipping to change at line 26
#ifndef ROO_CATEGORY_SHARED_PROPERTY #ifndef ROO_CATEGORY_SHARED_PROPERTY
#define ROO_CATEGORY_SHARED_PROPERTY #define ROO_CATEGORY_SHARED_PROPERTY
#include "RooSharedProperties.h" #include "RooSharedProperties.h"
#include "RooLinkedList.h" #include "RooLinkedList.h"
class RooCategorySharedProperties : public RooSharedProperties { class RooCategorySharedProperties : public RooSharedProperties {
public: public:
RooCategorySharedProperties() ; RooCategorySharedProperties() ;
RooCategorySharedProperties(const char* uuidstr) ;
RooCategorySharedProperties(const RooCategorySharedProperties& other) ;
virtual ~RooCategorySharedProperties() ; virtual ~RooCategorySharedProperties() ;
RooSharedProperties* clone() { return new RooCategorySharedProperties(*th
is) ; }
protected: protected:
friend class RooCategory ; friend class RooCategory ;
RooLinkedList _altRanges ; // Optional alternative ranges RooLinkedList _altRanges ; // Optional alternative ranges
ClassDef(RooCategorySharedProperties,1) // Shared properties of a RooCate gory clone set ClassDef(RooCategorySharedProperties,1) // Shared properties of a RooCate gory clone set
}; };
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 RooChi2Var.h   RooChi2Var.h 
skipping to change at line 29 skipping to change at line 29
#include "RooAbsOptTestStatistic.h" #include "RooAbsOptTestStatistic.h"
#include "RooCmdArg.h" #include "RooCmdArg.h"
#include "RooDataHist.h" #include "RooDataHist.h"
#include "RooAbsPdf.h" #include "RooAbsPdf.h"
class RooChi2Var : public RooAbsOptTestStatistic { class RooChi2Var : public RooAbsOptTestStatistic {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
RooChi2Var(const char *name, const char* title, RooAbsReal& func, RooData
Hist& data,
const RooCmdArg& arg1 , const RooCmdArg& arg2=Ro
oCmdArg::none(),const RooCmdArg& arg3=RooCmdArg::none(),
const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=
RooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none(),
const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=
RooCmdArg::none(),const RooCmdArg& arg9=RooCmdArg::none()) ;
RooChi2Var(const char *name, const char* title, RooAbsPdf& pdf, RooDataHi st& data, RooChi2Var(const char *name, const char* title, RooAbsPdf& pdf, RooDataHi st& data,
const RooCmdArg& arg1 , const RooCmdArg& arg2=Ro oCmdArg::none(),const RooCmdArg& arg3=RooCmdArg::none(), const RooCmdArg& arg1 , const RooCmdArg& arg2=Ro oCmdArg::none(),const RooCmdArg& arg3=RooCmdArg::none(),
const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5= RooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none(), const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5= RooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none(),
const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8= RooCmdArg::none(),const RooCmdArg& arg9=RooCmdArg::none()) ; const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8= RooCmdArg::none(),const RooCmdArg& arg9=RooCmdArg::none()) ;
enum FuncMode { Function, Pdf, ExtendedPdf } ;
RooChi2Var(const char *name, const char *title, RooAbsPdf& pdf, RooDataHi st& data, RooChi2Var(const char *name, const char *title, RooAbsPdf& pdf, RooDataHi st& data,
Bool_t extended=kFALSE, const char* rangeName=0, const char* add CoefRangeName=0, Bool_t extended=kFALSE, const char* rangeName=0, const char* add CoefRangeName=0,
Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, B ool_t splitCutRange=kTRUE) ; Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, B ool_t splitCutRange=kTRUE) ;
RooChi2Var(const char *name, const char *title, RooAbsPdf& pdf, RooDataHi RooChi2Var(const char *name, const char *title, RooAbsReal& func, RooData
st& data, Hist& data,
const RooArgSet& projDeps, Bool_t extended=kFALSE, const char* const RooArgSet& projDeps, FuncMode funcMode, const char* range
rangeName=0, const char* addCoefRangeName=0, Name=0, const char* addCoefRangeName=0,
Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, B ool_t splitCutRange=kTRUE) ; Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, B ool_t splitCutRange=kTRUE) ;
RooChi2Var(const RooChi2Var& other, const char* name=0); RooChi2Var(const RooChi2Var& other, const char* name=0);
virtual TObject* clone(const char* newname) const { return new RooChi2Var (*this,newname); } virtual TObject* clone(const char* newname) const { return new RooChi2Var (*this,newname); }
virtual RooAbsTestStatistic* create(const char *name, const char *title, RooAbsReal& pdf, RooAbsData& data, virtual RooAbsTestStatistic* create(const char *name, const char *title, RooAbsReal& pdf, RooAbsData& dhist,
const RooArgSet& projDeps, const char* rangeName=0, const char* addCoefRangeName=0, const RooArgSet& projDeps, const char* rangeName=0, const char* addCoefRangeName=0,
Int_t nCPU=1, Bool_t interleave=kFALSE ,Bool_t verbose=kTRUE, Bool_t splitCutRange=kTRUE) { Int_t nCPU=1, Bool_t interleave=kFALSE ,Bool_t verbose=kTRUE, Bool_t splitCutRange=kTRUE) {
// Virtual constructor // Virtual constructor
return new RooChi2Var(name,title,(RooAbsPdf&)pdf,(RooDataHist&)data,pro jDeps,_extended,rangeName, return new RooChi2Var(name,title,(RooAbsPdf&)pdf,(RooDataHist&)dhist,pr ojDeps,_funcMode,rangeName,
addCoefRangeName,nCPU,interleave,verbose, splitCut Range) ; addCoefRangeName,nCPU,interleave,verbose, splitCut Range) ;
} }
virtual ~RooChi2Var(); virtual ~RooChi2Var();
virtual Double_t defaultErrorLevel() const { virtual Double_t defaultErrorLevel() const {
// The default error level for MINUIT error analysis for a chi^2 is 1.0 // The default error level for MINUIT error analysis for a chi^2 is 1.0
return 1.0 ; return 1.0 ;
} }
protected: protected:
static RooArgSet _emptySet ; // Supports named argument constructo r static RooArgSet _emptySet ; // Supports named argument constructo r
RooDataHist::ErrorType _etype ; // Error type store in associated Roo DataHist RooDataHist::ErrorType _etype ; // Error type store in associated Roo DataHist
Bool_t _extended ; // Include extended term? FuncMode _funcMode ; // Function, P.d.f. or extended p.d.f
?
virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const ; virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const ;
ClassDef(RooChi2Var,1) // Chi^2 function of p.d.f w.r.t a binned dataset ClassDef(RooChi2Var,1) // Chi^2 function of p.d.f w.r.t a binned dataset
}; };
#endif #endif
 End of changes. 6 change blocks. 
7 lines changed or deleted 20 lines changed or added


 RooCintUtils.h   RooCintUtils.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooCintUtils.h 25184 2008-08-20 13:59:55Z wouter $ * File: $Id: RooCintUtils.h 28259 2009-04-16 16:21:16Z wouter $
* Authors: * * Authors: *
* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu * * WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
* DK, David Kirkby, UC Irvine, dkirkby@uci.edu * * DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
* * * *
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_CINT_UTILS #ifndef ROO_CINT_UTILS
#define ROO_CINT_UTILS #define ROO_CINT_UTILS
#include "Rtypes.h" #include "Rtypes.h"
#include <list>
#include <string>
namespace RooCintUtils { namespace RooCintUtils {
std::pair<std::list<std::string>,unsigned int> ctorArgs(const char* class
name, UInt_t nMinArgs=0) ;
Bool_t isEnum(const char* typeName) ;
Bool_t isValidEnumValue(const char* typeName, const char* value) ;
const char* functionName(void* func) ; const char* functionName(void* func) ;
Bool_t matchFuncPtrArgs(void* func, const char* args) ; Bool_t matchFuncPtrArgs(void* func, const char* args) ;
}; };
#endif #endif
 End of changes. 3 change blocks. 
2 lines changed or deleted 7 lines changed or added


 RooClassFactory.h   RooClassFactory.h 
skipping to change at line 23 skipping to change at line 23
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_CODE_FACTORY #ifndef ROO_CODE_FACTORY
#define ROO_CODE_FACTORY #define ROO_CODE_FACTORY
#include "TNamed.h" #include "TNamed.h"
#include "RooArgSet.h" #include "RooArgSet.h"
#include "RooPrintable.h" #include "RooPrintable.h"
#include "RooFactoryWSTool.h"
class RooAbsReal ; class RooAbsReal ;
class RooAbsPdf ; class RooAbsPdf ;
class RooClassFactory : public TNamed, public RooPrintable { class RooClassFactory : public TNamed, public RooPrintable {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
RooClassFactory() ; RooClassFactory() ;
virtual ~RooClassFactory() ; virtual ~RooClassFactory() ;
static RooAbsReal* makeFunctionInstance(const char* className, const char * name, const char* expression, const RooArgList& vars, const char* intExpr ession=0) ;
static RooAbsReal* makeFunctionInstance(const char* name, const char* exp ression, const RooArgList& vars, const char* intExpression=0) ; static RooAbsReal* makeFunctionInstance(const char* name, const char* exp ression, const RooArgList& vars, const char* intExpression=0) ;
static RooAbsPdf* makePdfInstance(const char* className, const char* name
, const char* expression, const RooArgList& vars, const char* intExpression
=0) ;
static RooAbsPdf* makePdfInstance(const char* name, const char* expressio n, const RooArgList& vars, const char* intExpression=0) ; static RooAbsPdf* makePdfInstance(const char* name, const char* expressio n, const RooArgList& vars, const char* intExpression=0) ;
static Bool_t makeAndCompilePdf(const char* name, const char* expression, const RooArgList& vars, const char* intExpression=0) ; static Bool_t makeAndCompilePdf(const char* name, const char* expression, const RooArgList& vars, const char* intExpression=0) ;
static Bool_t makeAndCompileFunction(const char* name, const char* expres sion, const RooArgList& args, const char* intExpression=0) ; static Bool_t makeAndCompileFunction(const char* name, const char* expres sion, const RooArgList& args, const char* intExpression=0) ;
static Bool_t makePdf(const char* name, const char* realArgNames=0, const char* catArgNames=0, static Bool_t makePdf(const char* name, const char* realArgNames=0, const char* catArgNames=0,
const char* expression="1.0", Bool_t hasAnaInt=kFALS E, Bool_t hasIntGen=kFALSE, const char* intExpression=0) ; const char* expression="1.0", Bool_t hasAnaInt=kFALS E, Bool_t hasIntGen=kFALSE, const char* intExpression=0) ;
static Bool_t makeFunction(const char* name, const char* realArgNames=0, const char* catArgNames=0, static Bool_t makeFunction(const char* name, const char* realArgNames=0, const char* catArgNames=0,
const char* expresion="1.0", Bool_t hasAnaInt=k FALSE, const char* intExpression=0) ; const char* expresion="1.0", Bool_t hasAnaInt=k FALSE, const char* intExpression=0) ;
static Bool_t makeClass(const char* className, const char* name, const ch ar* realArgNames=0, const char* catArgNames=0, static Bool_t makeClass(const char* className, const char* name, const ch ar* realArgNames=0, const char* catArgNames=0,
const char* expression="1.0", Bool_t hasAnaInt=kFA LSE, Bool_t hasIntGen=kFALSE, const char* intExpression=0) ; const char* expression="1.0", Bool_t hasAnaInt=kFA LSE, Bool_t hasIntGen=kFALSE, const char* intExpression=0) ;
class ClassFacIFace : public RooFactoryWSTool::IFace {
public:
std::string create(RooFactoryWSTool& ft, const char* typeName, const ch
ar* instanceName, std::vector<std::string> args) ;
} ;
protected: protected:
RooClassFactory(const RooClassFactory&) ; RooClassFactory(const RooClassFactory&) ;
ClassDef(RooClassFactory,0) // RooFit class code and instance factory ClassDef(RooClassFactory,0) // RooFit class code and instance factory
} ; } ;
#endif #endif
 End of changes. 4 change blocks. 
0 lines changed or deleted 12 lines changed or added


 RooCmdArg.h   RooCmdArg.h 
skipping to change at line 24 skipping to change at line 24
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_CMD_ARG #ifndef ROO_CMD_ARG
#define ROO_CMD_ARG #define ROO_CMD_ARG
#include "TNamed.h" #include "TNamed.h"
#include "TString.h" #include "TString.h"
#include "RooLinkedList.h" #include "RooLinkedList.h"
class RooAbsData ; class RooAbsData ;
class RooArgSet ;
class RooCmdArg : public TNamed { class RooCmdArg : public TNamed {
public: public:
RooCmdArg(); RooCmdArg();
RooCmdArg(const char* name, RooCmdArg(const char* name,
Int_t i1=0, Int_t i2=0, Int_t i1=0, Int_t i2=0,
Double_t d1=0, Double_t d2=0, Double_t d1=0, Double_t d2=0,
const char* s1=0, const char* s2=0, const char* s1=0, const char* s2=0,
const TObject* o1=0, const TObject* o2=0, const RooCmdArg* ca=0, const TObject* o1=0, const TObject* o2=0, const RooCmdArg* ca=0,
const char* s3=0) ; const char* s3=0,
const RooArgSet* c1=0, const RooArgSet* c2=0) ;
RooCmdArg(const RooCmdArg& other) ; RooCmdArg(const RooCmdArg& other) ;
RooCmdArg& operator=(const RooCmdArg& other) ; RooCmdArg& operator=(const RooCmdArg& other) ;
void addArg(const RooCmdArg& arg) ; void addArg(const RooCmdArg& arg) ;
void setProcessRecArgs(Bool_t flag) { void setProcessRecArgs(Bool_t flag) {
// If true flag this object as containing recursive arguments // If true flag this object as containing recursive arguments
_procSubArgs = flag ; _procSubArgs = flag ;
} }
RooLinkedList& subArgs() { RooLinkedList& subArgs() {
// Return list of sub-arguments in this RooCmdArg // Return list of sub-arguments in this RooCmdArg
skipping to change at line 74 skipping to change at line 76
} }
void setDouble(Int_t idx,Double_t value) { void setDouble(Int_t idx,Double_t value) {
_d[idx] = value ; _d[idx] = value ;
} }
void setString(Int_t idx,const char* value) { void setString(Int_t idx,const char* value) {
_s[idx] = value ; _s[idx] = value ;
} }
void setObject(Int_t idx,TObject* value) { void setObject(Int_t idx,TObject* value) {
_o[idx] = value ; _o[idx] = value ;
} }
void setSet(Int_t idx,const RooArgSet& set) ;
Int_t getInt(Int_t idx) const { Int_t getInt(Int_t idx) const {
// Return integer stored in slot idx // Return integer stored in slot idx
return _i[idx] ; return _i[idx] ;
} }
Double_t getDouble(Int_t idx) const { Double_t getDouble(Int_t idx) const {
// Return double stored in slot idx // Return double stored in slot idx
return _d[idx] ; return _d[idx] ;
} }
const char* getString(Int_t idx) const { const char* getString(Int_t idx) const {
// Return string stored in slot idx // Return string stored in slot idx
return _s[idx] ; return _s[idx] ;
} }
const TObject* getObject(Int_t idx) const { const TObject* getObject(Int_t idx) const {
// Return TObject stored in slot idx // Return TObject stored in slot idx
return _o[idx] ; return _o[idx] ;
} }
const RooArgSet* getSet(Int_t idx) const ;
protected: protected:
static const RooCmdArg _none ; // Static instance of null object static const RooCmdArg _none ; // Static instance of null object
friend class RooCmdConfig ; friend class RooCmdConfig ;
private: private:
friend class RooAbsCollection ; friend class RooAbsCollection ;
// Payload // Payload
Double_t _d[2] ; // Payload doubles Double_t _d[2] ; // Payload doubles
Int_t _i[2] ; // Payload integers Int_t _i[2] ; // Payload integers
const char* _s[3] ; // Payload strings const char* _s[3] ; // Payload strings
TObject* _o[2] ; // Payload objects TObject* _o[2] ; // Payload objects
Bool_t _procSubArgs ; // If true argument requires recursive processing Bool_t _procSubArgs ; // If true argument requires recursive processing
RooArgSet* _c ; // Payload RooArgSets
RooLinkedList _argList ; // Payload sub-arguments RooLinkedList _argList ; // Payload sub-arguments
ClassDef(RooCmdArg,0) // Generic named argument container ClassDef(RooCmdArg,0) // Generic named argument container
}; };
#endif #endif
 End of changes. 5 change blocks. 
2 lines changed or deleted 8 lines changed or added


 RooCmdConfig.h   RooCmdConfig.h 
skipping to change at line 56 skipping to change at line 56
void defineMutex(const char* argName1, const char* argName2, const char* argName3, const char* argName4) ; void defineMutex(const char* argName1, const char* argName2, const char* argName3, const char* argName4) ;
void defineRequiredArgs(const char* argName1, const char* argName2=0, void defineRequiredArgs(const char* argName1, const char* argName2=0,
const char* argName3=0, const char* argName4=0, const char* argName3=0, const char* argName4=0,
const char* argName5=0, const char* argName6=0, const char* argName5=0, const char* argName6=0,
const char* argName7=0, const char* argName8=0) ; const char* argName7=0, const char* argName8=0) ;
Bool_t defineInt(const char* name, const char* argName, Int_t intNum, Int _t defValue=0) ; Bool_t defineInt(const char* name, const char* argName, Int_t intNum, Int _t defValue=0) ;
Bool_t defineDouble(const char* name, const char* argName, Int_t doubleNu m, Double_t defValue=0.) ; Bool_t defineDouble(const char* name, const char* argName, Int_t doubleNu m, Double_t defValue=0.) ;
Bool_t defineString(const char* name, const char* argName, Int_t stringNu m, const char* defValue="",Bool_t appendMode=kFALSE) ; Bool_t defineString(const char* name, const char* argName, Int_t stringNu m, const char* defValue="",Bool_t appendMode=kFALSE) ;
Bool_t defineObject(const char* name, const char* argName, Int_t setNum, const TObject* obj=0, Bool_t isArray=kFALSE) ; Bool_t defineObject(const char* name, const char* argName, Int_t setNum, const TObject* obj=0, Bool_t isArray=kFALSE) ;
Bool_t defineSet(const char* name, const char* argName, Int_t setNum, con st RooArgSet* set=0) ;
Bool_t process(const RooCmdArg& arg) ; Bool_t process(const RooCmdArg& arg) ;
Bool_t process(const RooCmdArg& arg1, const RooCmdArg& arg2, Bool_t process(const RooCmdArg& arg1, const RooCmdArg& arg2,
const RooCmdArg& arg3=RooCmdArg::none(), const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(), const RooCmdArg& arg4=RooCmdArg::none(),
const RooCmdArg& arg5=RooCmdArg::none(), const RooCmdArg& arg6=RooCmdArg::none(), const RooCmdArg& arg5=RooCmdArg::none(), const RooCmdArg& arg6=RooCmdArg::none(),
const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=RooCmdArg::none()) ; const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=RooCmdArg::none()) ;
Bool_t process(const RooLinkedList& argList) ; Bool_t process(const RooLinkedList& argList) ;
Int_t getInt(const char* name, Int_t defaultValue=0) ; Int_t getInt(const char* name, Int_t defaultValue=0) ;
Double_t getDouble(const char* name, Double_t defaultValue=0) ; Double_t getDouble(const char* name, Double_t defaultValue=0) ;
const char* getString(const char* name, const char* defaultValue="",Bool_ t convEmptyToNull=kFALSE) ; const char* getString(const char* name, const char* defaultValue="",Bool_ t convEmptyToNull=kFALSE) ;
TObject* getObject(const char* name, TObject* obj=0) ; TObject* getObject(const char* name, TObject* obj=0) ;
RooArgSet* getSet(const char* name, RooArgSet* set=0) ;
const RooLinkedList& getObjectList(const char* name) ; const RooLinkedList& getObjectList(const char* name) ;
Bool_t ok(Bool_t verbose) const ; Bool_t ok(Bool_t verbose) const ;
const char* missingArgs() const ; const char* missingArgs() const ;
RooLinkedList filterCmdList(RooLinkedList& cmdInList, const char* cmdName List, Bool_t removeFromInList=kTRUE) ;
void stripCmdList(RooLinkedList& cmdList, const char* cmdsToPurge) ; void stripCmdList(RooLinkedList& cmdList, const char* cmdsToPurge) ;
Bool_t hasProcessed(const char* cmdName) const ; Bool_t hasProcessed(const char* cmdName) const ;
void print() ; void print() ;
static Int_t decodeIntOnTheFly(const char* callerID, const char* cmdArgNa me, Int_t intIdx, Int_t defVal, const RooCmdArg& arg1, static Int_t decodeIntOnTheFly(const char* callerID, const char* cmdArgNa me, Int_t intIdx, Int_t defVal, const RooCmdArg& arg1,
const RooCmdArg& arg2=RooCmdArg(), const Ro oCmdArg& arg3=RooCmdArg(), const RooCmdArg& arg4=RooCmdArg(), const RooCmdArg& arg2=RooCmdArg(), const Ro oCmdArg& arg3=RooCmdArg(), const RooCmdArg& arg4=RooCmdArg(),
const RooCmdArg& arg5=RooCmdArg(), const Ro oCmdArg& arg6=RooCmdArg(), const RooCmdArg& arg7=RooCmdArg(), const RooCmdArg& arg5=RooCmdArg(), const Ro oCmdArg& arg6=RooCmdArg(), const RooCmdArg& arg7=RooCmdArg(),
const RooCmdArg& arg8=RooCmdArg(), const Ro oCmdArg& arg9=RooCmdArg()) ; const RooCmdArg& arg8=RooCmdArg(), const Ro oCmdArg& arg9=RooCmdArg()) ;
skipping to change at line 105 skipping to change at line 108
TString _name ; TString _name ;
Bool_t _verbose ; Bool_t _verbose ;
Bool_t _error ; Bool_t _error ;
Bool_t _allowUndefined ; Bool_t _allowUndefined ;
TList _iList ; // Integer list TList _iList ; // Integer list
TList _dList ; // Double list TList _dList ; // Double list
TList _sList ; // String list TList _sList ; // String list
TList _oList ; // ArgSet list TList _oList ; // Object list
TList _cList ; // RooArgSet list
TList _rList ; // Required cmd list TList _rList ; // Required cmd list
TList _fList ; // Forbidden cmd list TList _fList ; // Forbidden cmd list
TList _mList ; // Mutex cmd list TList _mList ; // Mutex cmd list
TList _yList ; // Dependency cmd list TList _yList ; // Dependency cmd list
TList _pList ; // Processed cmd list TList _pList ; // Processed cmd list
TIterator* _iIter ; // Iterator over integer list TIterator* _iIter ; // Iterator over integer list
TIterator* _dIter ; // Iterator over double list TIterator* _dIter ; // Iterator over double list
TIterator* _sIter ; // Iterator over string list TIterator* _sIter ; // Iterator over string list
TIterator* _oIter ; // Iterator over object list TIterator* _oIter ; // Iterator over object list
TIterator* _cIter ; // Iterator over RooArgSet list
TIterator* _rIter ; // Iterator over required cmd list TIterator* _rIter ; // Iterator over required cmd list
TIterator* _fIter ; // Iterator over forbidden cmd list TIterator* _fIter ; // Iterator over forbidden cmd list
TIterator* _mIter ; // Iterator over mutex list TIterator* _mIter ; // Iterator over mutex list
TIterator* _yIter ; // Iterator over dependency list TIterator* _yIter ; // Iterator over dependency list
TIterator* _pIter ; // Iterator over processed cmd list TIterator* _pIter ; // Iterator over processed cmd list
ClassDef(RooCmdConfig,0) // Configurable parse of RooCmdArg objects ClassDef(RooCmdConfig,0) // Configurable parse of RooCmdArg objects
}; };
#endif #endif
 End of changes. 5 change blocks. 
1 lines changed or deleted 6 lines changed or added


 RooCustomizer.h   RooCustomizer.h 
skipping to change at line 26 skipping to change at line 26
#ifndef ROO_PDF_CUSTOMIZER #ifndef ROO_PDF_CUSTOMIZER
#define ROO_PDF_CUSTOMIZER #define ROO_PDF_CUSTOMIZER
#include "Rtypes.h" #include "Rtypes.h"
#include "TList.h" #include "TList.h"
#include "TNamed.h" #include "TNamed.h"
#include "TString.h" #include "TString.h"
#include "RooArgSet.h" #include "RooArgSet.h"
#include "RooPrintable.h" #include "RooPrintable.h"
#include "RooFactoryWSTool.h"
class RooAbsCategoryLValue ; class RooAbsCategoryLValue ;
class RooAbsCategory ; class RooAbsCategory ;
class RooAbsArg ; class RooAbsArg ;
class RooAbsPdf ; class RooAbsPdf ;
class RooCustomizer : public TNamed, public RooPrintable { class RooCustomizer : public TNamed, public RooPrintable {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
skipping to change at line 75 skipping to change at line 76
virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent= "") const; virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent= "") const;
inline virtual void Print(Option_t *options= 0) const { inline virtual void Print(Option_t *options= 0) const {
// Printing interface // Printing interface
printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options)); printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));
} }
// Releases ownership of list of cloned branch nodes // Releases ownership of list of cloned branch nodes
void setCloneBranchSet(RooArgSet& cloneBranchSet) ; void setCloneBranchSet(RooArgSet& cloneBranchSet) ;
// Factory interface
class CustIFace : public RooFactoryWSTool::IFace {
public:
virtual ~CustIFace() {} ;
std::string create(RooFactoryWSTool& ft, const char* typeName, const ch
ar* instanceName, std::vector<std::string> args) ;
} ;
protected: protected:
RooCustomizer(const RooCustomizer&) ; RooCustomizer(const RooCustomizer&) ;
void initialize() ; void initialize() ;
RooAbsArg* doBuild(const char* masterCatState, Bool_t verbose) ; RooAbsArg* doBuild(const char* masterCatState, Bool_t verbose) ;
Bool_t _sterile ; // If true we do not have as associated master category Bool_t _sterile ; // If true we do not have as associated master category
Bool_t _owning ; // If true we own all created components Bool_t _owning ; // If true we own all created components
TString _name ; // Name of this object TString _name ; // Name of this object
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added


 RooDataHist.h   RooDataHist.h 
skipping to change at line 80 skipping to change at line 80
void add(const RooAbsData& dset, const RooFormulaVar* cutVar=0, Double_t weight=1.0 ) ; void add(const RooAbsData& dset, const RooFormulaVar* cutVar=0, Double_t weight=1.0 ) ;
void add(const RooAbsData& dset, const char* cut, Double_t weight=1.0 ) ; void add(const RooAbsData& dset, const char* cut, Double_t weight=1.0 ) ;
virtual const RooArgSet* get() const { virtual const RooArgSet* get() const {
// Return set with coordinates of center of current bin // Return set with coordinates of center of current bin
return &_vars ; return &_vars ;
} }
virtual const RooArgSet* get(Int_t masterIdx) const ; virtual const RooArgSet* get(Int_t masterIdx) const ;
virtual const RooArgSet* get(const RooArgSet& coord) const ; virtual const RooArgSet* get(const RooArgSet& coord) const ;
virtual Int_t numEntries(Bool_t useWeights=kFALSE) const ; virtual Int_t numEntries() const ;
virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0 ) const ; virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0 ) const ;
virtual Bool_t isWeighted() const { virtual Bool_t isWeighted() const {
// Return true as all histograms have in principle events weight != 1 // Return true as all histograms have in principle events weight != 1
return kTRUE ; return kTRUE ;
} }
virtual Bool_t isNonPoissonWeighted() const ;
Double_t sum(Bool_t correctForBinSize) const ; Double_t sum(Bool_t correctForBinSize) const ;
Double_t sum(const RooArgSet& sumSet, const RooArgSet& sliceSet, Bool_t c orrectForBinSize) ; Double_t sum(const RooArgSet& sumSet, const RooArgSet& sliceSet, Bool_t c orrectForBinSize) ;
virtual Double_t weight() const { virtual Double_t weight() const {
// Return weight of current bin // Return weight of current bin
return _curWeight ; return _curWeight ;
} }
Double_t weight(const RooArgSet& bin, Int_t intOrder=1, Bool_t correctFor BinSize=kFALSE, Bool_t cdfBoundaries=kFALSE) ; Double_t weight(const RooArgSet& bin, Int_t intOrder=1, Bool_t correctFor BinSize=kFALSE, Bool_t cdfBoundaries=kFALSE) ;
Double_t binVolume() const { return _curVolume ; } Double_t binVolume() const { return _curVolume ; }
skipping to change at line 122 skipping to change at line 123
virtual void reset() ; virtual void reset() ;
void dump2() ; void dump2() ;
virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ; virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ;
virtual void printArgs(ostream& os) const ; virtual void printArgs(ostream& os) const ;
virtual void printValue(ostream& os) const ; virtual void printValue(ostream& os) const ;
void SetName(const char *name) ; void SetName(const char *name) ;
void SetNameTitle(const char *name, const char* title) ; void SetNameTitle(const char *name, const char* title) ;
Int_t getIndex(const RooArgSet& coord) ;
void removeSelfFromDir() { removeFromDir(this) ; }
protected: protected:
friend class RooAbsCachedPdf ; friend class RooAbsCachedPdf ;
friend class RooAbsCachedReal ; friend class RooAbsCachedReal ;
friend class RooDataHistSliceIter ; friend class RooDataHistSliceIter ;
friend class RooAbsOptTestStatistic ; friend class RooAbsOptTestStatistic ;
Int_t calcTreeIndex() const ;
void cacheValidEntries() ; void cacheValidEntries() ;
void setAllWeights(Double_t value) ; void setAllWeights(Double_t value) ;
void initialize(Bool_t fillTree=kTRUE) ; void initialize(const char* binningName=0,Bool_t fillTree=kTRUE) ;
RooDataHist(const char* name, const char* title, RooDataHist* h, const Ro oArgSet& varSubset, RooDataHist(const char* name, const char* title, RooDataHist* h, const Ro oArgSet& varSubset,
const RooFormulaVar* cutVar, const char* cutRange, Int_t nStar t, Int_t nStop, Bool_t copyCache) ; const RooFormulaVar* cutVar, const char* cutRange, Int_t nStar t, Int_t nStop, Bool_t copyCache) ;
RooAbsData* reduceEng(const RooArgSet& varSubset, const RooFormulaVar* cu tVar, const char* cutRange=0, RooAbsData* reduceEng(const RooArgSet& varSubset, const RooFormulaVar* cu tVar, const char* cutRange=0,
Int_t nStart=0, Int_t nStop=2000000000, Bool_t copyC ache=kTRUE) ; Int_t nStart=0, Int_t nStop=2000000000, Bool_t copyC ache=kTRUE) ;
Double_t interpolateDim(RooRealVar& dim, const RooAbsBinning* binning, Do uble_t xval, Int_t intOrder, Bool_t correctForBinSize, Bool_t cdfBoundaries ) ; Double_t interpolateDim(RooRealVar& dim, const RooAbsBinning* binning, Do uble_t xval, Int_t intOrder, Bool_t correctForBinSize, Bool_t cdfBoundaries ) ;
void calculatePartialBinVolume(const RooArgSet& dimSet) const ; void calculatePartialBinVolume(const RooArgSet& dimSet) const ;
void adjustBinning(const RooArgList& vars, TH1& href, Int_t* offset=0) ; void adjustBinning(const RooArgList& vars, TH1& href, Int_t* offset=0) ;
void importTH1(const RooArgList& vars, TH1& histo, Double_t initWgt) ; void importTH1(const RooArgList& vars, TH1& histo, Double_t initWgt) ;
void importTH1Set(const RooArgList& vars, RooCategory& indexCat, std::map <std::string,TH1*> hmap, Double_t initWgt) ; void importTH1Set(const RooArgList& vars, RooCategory& indexCat, std::map <std::string,TH1*> hmap, Double_t initWgt) ;
virtual RooAbsData* cacheClone(const RooArgSet* newCacheVars, const char* newName=0) ; virtual RooAbsData* cacheClone(const RooArgSet* newCacheVars, const char* newName=0) ;
Int_t calcTreeIndex() const ;
Int_t _arrSize ; // Size of the weight array Int_t _arrSize ; // Size of the weight array
Int_t* _idxMult ; //! Multiplier jump table for index calculation Int_t* _idxMult ; //! Multiplier jump table for index calculation
Double_t* _wgt ; //[_arrSize] Weight array Double_t* _wgt ; //[_arrSize] Weight array
Double_t* _errLo ; //[_arrSize] Low-side error on weight array Double_t* _errLo ; //[_arrSize] Low-side error on weight array
Double_t* _errHi ; //[_arrSize] High-side error on weight array Double_t* _errHi ; //[_arrSize] High-side error on weight array
Double_t* _sumw2 ; //[_arrSize] Sum of weights^2 Double_t* _sumw2 ; //[_arrSize] Sum of weights^2
Double_t* _binv ; //[_arrSize] Bin volume array Double_t* _binv ; //[_arrSize] Bin volume array
RooArgSet _realVars ; // Real dimensions of the dataset RooArgSet _realVars ; // Real dimensions of the dataset
TIterator* _realIter ; //! Iterator over realVars TIterator* _realIter ; //! Iterator over realVars
Bool_t* _binValid ; //! Valid bins with current range definition Bool_t* _binValid ; //! Valid bins with current range definition
mutable Double_t _curWeight ; // Weight associated with the current coord inate mutable Double_t _curWeight ; // Weight associated with the current coord inate
mutable Double_t _curWgtErrLo ; // Error on weight associated with the cu rrent coordinate mutable Double_t _curWgtErrLo ; // Error on weight associated with the cu rrent coordinate
mutable Double_t _curWgtErrHi ; // Error on weight associated with the cu rrent coordinate mutable Double_t _curWgtErrHi ; // Error on weight associated with the cu rrent coordinate
mutable Double_t _curSumW2 ; // Current sum of weights^2 mutable Double_t _curSumW2 ; // Current sum of weights^2
mutable Double_t _curVolume ; // Volume of bin enclosing current coordina te mutable Double_t _curVolume ; // Volume of bin enclosing current coordina te
mutable Int_t _curIndex ; // Current index mutable Int_t _curIndex ; // Current index
mutable std::vector<Double_t>* _pbinv ; //! Partial bin volume array mutable std::vector<Double_t>* _pbinv ; //! Partial bin volume array
mutable RooCacheManager<std::vector<Double_t> > _pbinvCacheMgr ; // Cache manager for arrays of partial bin volumes mutable RooCacheManager<std::vector<Double_t> > _pbinvCacheMgr ; //! Cach e manager for arrays of partial bin volumes
std::list<RooAbsLValue*> _lvvars ; //! List of observables casted as RooA bsLValue std::list<RooAbsLValue*> _lvvars ; //! List of observables casted as RooA bsLValue
std::list<const RooAbsBinning*> _lvbins ; //! List of used binnings assoc iated with lvalues std::list<const RooAbsBinning*> _lvbins ; //! List of used binnings assoc iated with lvalues
char* _binningName ; //!Name of binning to be used to defin
e grid
inline const char* bname() const {
// Return name of binning to be used for RooDataHist bin definition
return _binningName ;
}
private: private:
ClassDef(RooDataHist,2) // Binned data set ClassDef(RooDataHist,2) // Binned data set
}; };
#endif #endif
 End of changes. 8 change blocks. 
12 lines changed or deleted 9 lines changed or added


 RooDataSet.h   RooDataSet.h 
skipping to change at line 54 skipping to change at line 54
RooDataSet(const char *name, const char *filename, const char *treename, RooDataSet(const char *name, const char *filename, const char *treename,
const RooArgSet& vars, const char *cuts=0, const char* wgtVarNa me=0); const RooArgSet& vars, const char *cuts=0, const char* wgtVarNa me=0);
RooDataSet(RooDataSet const & other, const char* newname=0) ; RooDataSet(RooDataSet const & other, const char* newname=0) ;
virtual TObject* Clone(const char* newname=0) const { return new RooDataS et(*this,newname?newname:GetName()) ; } virtual TObject* Clone(const char* newname=0) const { return new RooDataS et(*this,newname?newname:GetName()) ; }
virtual ~RooDataSet() ; virtual ~RooDataSet() ;
virtual RooAbsData* emptyClone(const char* newName=0, const char* newTitl e=0, const RooArgSet* vars=0) const ; virtual RooAbsData* emptyClone(const char* newName=0, const char* newTitl e=0, const RooArgSet* vars=0) const ;
RooDataHist* binnedClone(const char* newName=0, const char* newTitle=0) c onst ; RooDataHist* binnedClone(const char* newName=0, const char* newTitle=0) c onst ;
virtual Int_t numEntries(Bool_t useWeights=kFALSE) const ; virtual Int_t numEntries() const ;
virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0 ) const ; virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0 ) const ;
virtual RooPlot* plotOnXY(RooPlot* frame,
const RooCmdArg& arg1=RooCmdArg::none(), const R
ooCmdArg& arg2=RooCmdArg::none(),
const RooCmdArg& arg3=RooCmdArg::none(), const R
ooCmdArg& arg4=RooCmdArg::none(),
const RooCmdArg& arg5=RooCmdArg::none(), const R
ooCmdArg& arg6=RooCmdArg::none(),
const RooCmdArg& arg7=RooCmdArg::none(), const R
ooCmdArg& arg8=RooCmdArg::none()) const ;
// Read data from a text file and create a dataset from it. // Read data from a text file and create a dataset from it.
// The possible options are: (D)ebug, (Q)uiet. // The possible options are: (D)ebug, (Q)uiet.
static RooDataSet *read(const char *filename, const RooArgList &variables , static RooDataSet *read(const char *filename, const RooArgList &variables ,
const char *opts= "", const char* commonPath="", const char *opts= "", const char* commonPath="",
const char *indexCatName=0) ; const char *indexCatName=0) ;
Bool_t write(const char* filename) ; Bool_t write(const char* filename) ;
void setWeightVar(const char* name=0) ; void setWeightVar(const char* name=0) ;
void setWeightVar(const RooAbsArg& arg) { void setWeightVar(const RooAbsArg& arg) {
// Interpret given argument as event weight // Interpret given argument as event weight
setWeightVar(arg.GetName()) ; setWeightVar(arg.GetName()) ;
} }
virtual Bool_t isWeighted() const { virtual Bool_t isWeighted() const {
// Return true if dataset contains weighted events // Return true if dataset contains weighted events
return _wgtVar ? kTRUE : kFALSE ; return _wgtVar ? kTRUE : kFALSE ;
} }
virtual Bool_t isNonPoissonWeighted() const ;
virtual Double_t weight() const ; virtual Double_t weight() const ;
virtual void weightError(Double_t& lo, Double_t& hi,ErrorType etype=SumW2
) const ;
Double_t weightError(ErrorType etype=SumW2) const ;
virtual const RooArgSet* get(Int_t index) const; virtual const RooArgSet* get(Int_t index) const;
virtual const RooArgSet* get() const ; virtual const RooArgSet* get() const ;
// Add one ore more rows of data // Add one ore more rows of data
virtual void add(const RooArgSet& row, Double_t weight=1.0); virtual void add(const RooArgSet& row, Double_t weight=1.0, Double_t weig
htError=0);
virtual void add(const RooArgSet& row, Double_t weight, Double_t weightEr
rorLo, Double_t weightErrorHi);
virtual void addFast(const RooArgSet& row, Double_t weight=1.0, Double_t
weightError=0);
void append(RooTreeData& data) ; void append(RooTreeData& data) ;
Bool_t merge(RooDataSet* data1, RooDataSet* data2=0, RooDataSet* data3=0, Bool_t merge(RooDataSet* data1, RooDataSet* data2=0, RooDataSet* data3=0,
RooDataSet* data4=0, RooDataSet* data5=0, RooDataSet* data6=0 ) ; RooDataSet* data4=0, RooDataSet* data5=0, RooDataSet* data6=0 ) ;
virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ; virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ;
virtual RooArgSet* addColumns(const RooArgList& varList) ; virtual RooArgSet* addColumns(const RooArgList& varList) ;
// Plot the distribution of a real valued arg // Plot the distribution of a real valued arg
using RooTreeData::createHistogram ; using RooTreeData::createHistogram ;
TH2F* createHistogram(const RooAbsRealLValue& var1, const RooAbsRealLValu e& var2, const char* cuts="", TH2F* createHistogram(const RooAbsRealLValue& var1, const RooAbsRealLValu e& var2, const char* cuts="",
 End of changes. 5 change blocks. 
2 lines changed or deleted 24 lines changed or added


 RooDataWeightedAverage.h   RooDataWeightedAverage.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooDataWeightedAverage.h 24269 2008-06-13 15:37:03Z wouter $ * File: $Id: RooDataWeightedAverage.h 28259 2009-04-16 16:21:16Z wouter $
* Authors: * * Authors: *
* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu * * WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
* DK, David Kirkby, UC Irvine, dkirkby@uci.edu * * DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
* * * *
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_NLL_VAR #ifndef ROO_DATA_WEIGHTED_AVERAGE
#define ROO_NLL_VAR #define ROO_DATA_WEIGHTED_AVERAGE
#include "RooAbsOptTestStatistic.h" #include "RooAbsOptTestStatistic.h"
#include "RooCmdArg.h" #include "RooCmdArg.h"
class RooDataWeightedAverage : public RooAbsOptTestStatistic { class RooDataWeightedAverage : public RooAbsOptTestStatistic {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
RooDataWeightedAverage() { RooDataWeightedAverage() {
// Default constructor // Default constructor
} ; } ;
RooDataWeightedAverage(const char *name, const char *title, RooAbsReal& r eal, RooAbsData& data, RooDataWeightedAverage(const char *name, const char *title, RooAbsReal& r eal, RooAbsData& data,
Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t show Progress=kFALSE, Bool_t verbose=kTRUE) ; Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t show Progress=kFALSE, Bool_t verbose=kTRUE) ;
RooDataWeightedAverage(const RooDataWeightedAverage& other, const char* n ame=0); RooDataWeightedAverage(const RooDataWeightedAverage& other, const char* n ame=0);
virtual TObject* clone(const char* newname) const { return new RooDataWei ghtedAverage(*this,newname); } virtual TObject* clone(const char* newname) const { return new RooDataWei ghtedAverage(*this,newname); }
virtual RooAbsTestStatistic* create(const char *name, const char *title, RooAbsReal& real, RooAbsData& data, virtual RooAbsTestStatistic* create(const char *name, const char *title, RooAbsReal& real, RooAbsData& adata,
const RooArgSet& /*projDeps*/, const c har* /*rangeName*/=0, const char* /*addCoefRangeName*/=0, const RooArgSet& /*projDeps*/, const c har* /*rangeName*/=0, const char* /*addCoefRangeName*/=0,
Int_t nCPU=1, Bool_t interleave=kFALSE , Bool_t verbose=kTRUE, Bool_t /*splitCutRange*/=kFALSE) { Int_t nCPU=1, Bool_t interleave=kFALSE , Bool_t verbose=kTRUE, Bool_t /*splitCutRange*/=kFALSE) {
// Virtual constructor // Virtual constructor
return new RooDataWeightedAverage(name,title,real,data,nCPU,interleave, verbose) ; return new RooDataWeightedAverage(name,title,real,adata,nCPU,interleave ,verbose) ;
} }
virtual Double_t globalNormalization() const ; virtual Double_t globalNormalization() const ;
virtual ~RooDataWeightedAverage(); virtual ~RooDataWeightedAverage();
protected: protected:
Double_t _sumWeight ; // Global sum of weights needed for normalization Double_t _sumWeight ; // Global sum of weights needed for normalization
Bool_t _showProgress ; // Show progress indication during evaluation if t rue Bool_t _showProgress ; // Show progress indication during evaluation if t rue
 End of changes. 4 change blocks. 
5 lines changed or deleted 5 lines changed or added


 RooExpensiveObjectCache.h   RooExpensiveObjectCache.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooExpensiveObjectCache.h 26185 2008-11-14 08:58:17Z woute r $ * File: $Id: RooExpensiveObjectCache.h 28259 2009-04-16 16:21:16Z woute r $
* Authors: * * Authors: *
* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu * * WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
* DK, David Kirkby, UC Irvine, dkirkby@uci.edu * * DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
* * * *
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
skipping to change at line 36 skipping to change at line 36
public: public:
RooExpensiveObjectCache() ; RooExpensiveObjectCache() ;
RooExpensiveObjectCache(const RooExpensiveObjectCache&) ; RooExpensiveObjectCache(const RooExpensiveObjectCache&) ;
virtual ~RooExpensiveObjectCache() ; virtual ~RooExpensiveObjectCache() ;
Bool_t registerObject(const char* ownerName, const char* objectName, TObj ect& cacheObject, TIterator* paramIter) ; Bool_t registerObject(const char* ownerName, const char* objectName, TObj ect& cacheObject, TIterator* paramIter) ;
Bool_t registerObject(const char* ownerName, const char* objectName, TObj ect& cacheObject, const RooArgSet& params) ; Bool_t registerObject(const char* ownerName, const char* objectName, TObj ect& cacheObject, const RooArgSet& params) ;
const TObject* retrieveObject(const char* name, TClass* tclass, const Roo ArgSet& params) ; const TObject* retrieveObject(const char* name, TClass* tclass, const Roo ArgSet& params) ;
const TObject* getObj(Int_t uniqueID) ;
Bool_t clearObj(Int_t uniqueID) ;
Bool_t setObj(Int_t uniqueID, TObject* obj) ;
void clearAll() ;
void importCacheObjects(RooExpensiveObjectCache& other, const char* owner Name, Bool_t verbose=kFALSE) ; void importCacheObjects(RooExpensiveObjectCache& other, const char* owner Name, Bool_t verbose=kFALSE) ;
static RooExpensiveObjectCache& instance() ; static RooExpensiveObjectCache& instance() ;
Int_t size() const { return _map.size() ; } Int_t size() const { return _map.size() ; }
static void cleanup() ; static void cleanup() ;
void print() const ; void print() const ;
class ExpensiveObject { class ExpensiveObject {
public: public:
ExpensiveObject() { _payload = 0 ; } ; ExpensiveObject() { _payload = 0 ; } ;
ExpensiveObject(const char* ownerName, TObject& payload, TIterator* par ExpensiveObject(Int_t uid, const char* ownerName, TObject& payload, TIt
amIter) ; erator* paramIter) ;
ExpensiveObject(const ExpensiveObject& other) ; ExpensiveObject(Int_t uid, const ExpensiveObject& other) ;
virtual ~ExpensiveObject() ; virtual ~ExpensiveObject() ;
Bool_t matches(TClass* tc, const RooArgSet& params) ; Bool_t matches(TClass* tc, const RooArgSet& params) ;
Int_t uid() const { return _uid ; }
const TObject* payload() const { return _payload ; } const TObject* payload() const { return _payload ; }
TObject* payload() { return _payload ; } TObject* payload() { return _payload ; }
void setPayload(TObject* obj) { _payload = obj ; }
const char* ownerName() const { return _ownerName.Data() ; } const char* ownerName() const { return _ownerName.Data() ; }
void print() ; void print() ;
protected: protected:
Int_t _uid ; // Unique element ID ;
TObject* _payload ; // Payload TObject* _payload ; // Payload
std::map<TString,Double_t> _realRefParams ; // Names and values of real -valued reference parameters std::map<TString,Double_t> _realRefParams ; // Names and values of real -valued reference parameters
std::map<TString,Int_t> _catRefParams ; // Names and values of discrete -valued reference parameters std::map<TString,Int_t> _catRefParams ; // Names and values of discrete -valued reference parameters
TString _ownerName ; // Name of RooAbsArg object that is associated to cache contents TString _ownerName ; // Name of RooAbsArg object that is associated to cache contents
ClassDef(ExpensiveObject,1) ; // Cache element containing expensive obj ect and parameter values for which object is valid ClassDef(ExpensiveObject,2) ; // Cache element containing expensive obj ect and parameter values for which object is valid
} ; } ;
protected: protected:
Int_t _nextUID ;
static RooExpensiveObjectCache* _instance ; //! static RooExpensiveObjectCache* _instance ; //!
std::map<TString,ExpensiveObject*> _map ; std::map<TString,ExpensiveObject*> _map ;
ClassDef(RooExpensiveObjectCache,1) // Singleton class that serves as ses sion repository for expensive objects ClassDef(RooExpensiveObjectCache,2) // Singleton class that serves as ses sion repository for expensive objects
}; };
#endif #endif
 End of changes. 9 change blocks. 
6 lines changed or deleted 16 lines changed or added


 RooFFTConvPdf.h   RooFFTConvPdf.h 
skipping to change at line 17 skipping to change at line 17
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROOFFTCONVPDF #ifndef ROOFFTCONVPDF
#define ROOFFTCONVPDF #define ROOFFTCONVPDF
#include "RooAbsCachedPdf.h" #include "RooAbsCachedPdf.h"
#include "RooRealProxy.h" #include "RooRealProxy.h"
#include "RooSetProxy.h"
#include "RooAbsReal.h" #include "RooAbsReal.h"
#include "RooHistPdf.h" #include "RooHistPdf.h"
#include "TVirtualFFT.h" #include "TVirtualFFT.h"
class RooRealVar ; class RooRealVar ;
#include <map> #include <map>
class RooFFTConvPdf : public RooAbsCachedPdf { class RooFFTConvPdf : public RooAbsCachedPdf {
public: public:
RooFFTConvPdf() {} ; RooFFTConvPdf() {} ;
RooFFTConvPdf(const char *name, const char *title, RooRealVar& convVar, R ooAbsPdf& pdf1, RooAbsPdf& pdf2, Int_t ipOrder=2); RooFFTConvPdf(const char *name, const char *title, RooRealVar& convVar, R ooAbsPdf& pdf1, RooAbsPdf& pdf2, Int_t ipOrder=2);
RooFFTConvPdf(const char *name, const char *title, RooAbsReal& pdfConvVar , RooRealVar& convVar, RooAbsPdf& pdf1, RooAbsPdf& pdf2, Int_t ipOrder=2);
RooFFTConvPdf(const RooFFTConvPdf& other, const char* name=0) ; RooFFTConvPdf(const RooFFTConvPdf& other, const char* name=0) ;
virtual TObject* clone(const char* newname) const { return new RooFFTConv Pdf(*this,newname); } virtual TObject* clone(const char* newname) const { return new RooFFTConv Pdf(*this,newname); }
virtual ~RooFFTConvPdf() ; virtual ~RooFFTConvPdf() ;
void setShift(Double_t val1, Double_t val2) { _shift1 = val1 ; _shift2 = val2 ; } void setShift(Double_t val1, Double_t val2) { _shift1 = val1 ; _shift2 = val2 ; }
void setCacheObservables(const RooArgSet& obs) { _cacheObs.removeAll() ;
_cacheObs.add(obs) ; }
const RooArgSet& cacheObservables() const { return _cacheObs ; }
Double_t bufferFraction() const { Double_t bufferFraction() const {
// Return value of buffer fraction applied in FFT calculation array bey ond either // Return value of buffer fraction applied in FFT calculation array bey ond either
// end of the observable domain to reduce cyclical effects // end of the observable domain to reduce cyclical effects
return _bufFrac ; return _bufFrac ;
} }
enum BufStrat { Extend=0, Mirror=1, Flat=2 } ;
BufStrat bufferStrategy() const {
// Return the strategy currently used to fill the buffer:
// 'Extend' means is that the input p.d.f convolution observable range
is widened to include the buffer range
// 'Flat' means that the buffer is filled with the p.d.f. value at the
boundary of the observable range
// 'Mirror' means that the buffer is filled with a mirror image of the
p.d.f. around the convolution observable boundary
return _bufStrat ;
}
void setBufferStrategy(BufStrat bs) ;
void setBufferFraction(Double_t frac) ; void setBufferFraction(Double_t frac) ;
void printMetaArgs(ostream& os) const ;
// Propagate maximum value estimate of pdf1 as convolution can only resul
t in lower max values
virtual Int_t getMaxVal(const RooArgSet& vars) const { return _pdf1.arg()
.getMaxVal(vars) ; }
virtual Double_t maxVal(Int_t code) const { return _pdf1.arg().maxVal(cod
e) ; }
protected: protected:
RooRealProxy _x ; // Convolution observable RooRealProxy _x ; // Convolution observable
RooRealProxy _xprime ; // Input function representing value of convoluti
on observable
RooRealProxy _pdf1 ; // First input p.d.f RooRealProxy _pdf1 ; // First input p.d.f
RooRealProxy _pdf2 ; // Second input p.d.f RooRealProxy _pdf2 ; // Second input p.d.f
RooSetProxy _params ; // Effective parameters of this p.d.f.
void calcParams() ;
Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t
mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;
Double_t* scanPdf(RooRealVar& obs, RooAbsPdf& pdf, const RooDataHist& hi st, const RooArgSet& slicePos, Int_t& N, Int_t& N2, Double_t shift) const ; Double_t* scanPdf(RooRealVar& obs, RooAbsPdf& pdf, const RooDataHist& hi st, const RooArgSet& slicePos, Int_t& N, Int_t& N2, Int_t& zeroBin, Double_ t shift) const ;
class FFTCacheElem : public PdfCacheElem { class FFTCacheElem : public PdfCacheElem {
public: public:
FFTCacheElem(const RooFFTConvPdf& self, const RooArgSet* nset) ; FFTCacheElem(const RooFFTConvPdf& self, const RooArgSet* nset) ;
~FFTCacheElem() ; ~FFTCacheElem() ;
virtual RooArgList containedArgs(Action) ; virtual RooArgList containedArgs(Action) ;
TVirtualFFT* fftr2c1 ; TVirtualFFT* fftr2c1 ;
TVirtualFFT* fftr2c2 ; TVirtualFFT* fftr2c2 ;
TVirtualFFT* fftc2r ; TVirtualFFT* fftc2r ;
RooAbsPdf* pdf1Clone ; RooAbsPdf* pdf1Clone ;
RooAbsPdf* pdf2Clone ; RooAbsPdf* pdf2Clone ;
RooAbsBinning* histBinning ;
RooAbsBinning* scanBinning ;
}; };
friend class FFTCacheElem ; friend class FFTCacheElem ;
virtual Double_t evaluate() const { RooArgSet dummy(_x.arg()) ; return ge tVal(&dummy) ; } ; // dummy virtual Double_t evaluate() const { RooArgSet dummy(_x.arg()) ; return ge tVal(&dummy) ; } ; // dummy
virtual const char* inputBaseName() const ; virtual const char* inputBaseName() const ;
virtual RooArgSet* actualObservables(const RooArgSet& nset) const ; virtual RooArgSet* actualObservables(const RooArgSet& nset) const ;
virtual RooArgSet* actualParameters(const RooArgSet& nset) const ; virtual RooArgSet* actualParameters(const RooArgSet& nset) const ;
virtual RooAbsArg& pdfObservable(RooAbsArg& histObservable) const ;
virtual void fillCacheObject(PdfCacheElem& cache) const ; virtual void fillCacheObject(PdfCacheElem& cache) const ;
void fillCacheSlice(FFTCacheElem& cache, const RooArgSet& slicePosition) const ; void fillCacheSlice(FFTCacheElem& cache, const RooArgSet& slicePosition) const ;
virtual PdfCacheElem* createCache(const RooArgSet* nset) const ; virtual PdfCacheElem* createCache(const RooArgSet* nset) const ;
virtual TString histNameSuffix() const ;
// mutable std::map<const RooHistPdf*,CacheAuxInfo*> _cacheAuxInfo ; //! Auxilary Cache information (do not persist) // mutable std::map<const RooHistPdf*,CacheAuxInfo*> _cacheAuxInfo ; //! Auxilary Cache information (do not persist)
Double_t _bufFrac ; // Sampling buffer size as fraction of domain size Double_t _bufFrac ; // Sampling buffer size as fraction of domain size
BufStrat _bufStrat ; // Strategy to fill the buffer
Double_t _shift1 ; Double_t _shift1 ;
Double_t _shift2 ; Double_t _shift2 ;
virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0, virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0,
const RooArgSet* auxProto=0, Bool_t verbose= kFALSE) const ; const RooArgSet* auxProto=0, Bool_t verbose= kFALSE) const ;
friend class RooConvGenContext ; friend class RooConvGenContext ;
RooSetProxy _cacheObs ; // Non-convolution observables that are also cac hed
private: private:
ClassDef(RooFFTConvPdf,1) // Convolution operator p.d.f based on numeric Fourier transforms ClassDef(RooFFTConvPdf,1) // Convolution operator p.d.f based on numeric Fourier transforms
}; };
#endif #endif
 End of changes. 13 change blocks. 
2 lines changed or deleted 43 lines changed or added


 RooFitResult.h   RooFitResult.h 
skipping to change at line 26 skipping to change at line 26
#ifndef ROO_FIT_RESULT #ifndef ROO_FIT_RESULT
#define ROO_FIT_RESULT #define ROO_FIT_RESULT
#include "Riosfwd.h" #include "Riosfwd.h"
#include "RooAbsArg.h" #include "RooAbsArg.h"
#include "RooPrintable.h" #include "RooPrintable.h"
#include "RooDirItem.h" #include "RooDirItem.h"
#include "RooArgList.h" #include "RooArgList.h"
#include "RVersion.h" #include "RVersion.h"
#if ROOT_VERSION_CODE >= 327680
#include "TMatrixFfwd.h" #include "TMatrixFfwd.h"
#include "TMatrixDSym.h"
#include "TRootIOCtor.h" #include "TRootIOCtor.h"
#else
class TMatrixF;
#endif
class RooArgSet ; class RooArgSet ;
class RooAbsPdf ;
class RooPlot; class RooPlot;
class TObject ; class TObject ;
class TH2 ; class TH2 ;
typedef RooArgSet* pRooArgSet ; typedef RooArgSet* pRooArgSet ;
class RooFitResult : public TNamed, public RooPrintable, public RooDirItem { class RooFitResult : public TNamed, public RooPrintable, public RooDirItem {
public: public:
// Constructors, assignment etc. // Constructors, assignment etc.
RooFitResult(const char* name=0, const char* title=0) ; RooFitResult(const char* name=0, const char* title=0) ;
skipping to change at line 66 skipping to change at line 64
void printMultiline(ostream& os, Int_t contents, Bool_t verbose=kFALSE, T String indent="") const ; void printMultiline(ostream& os, Int_t contents, Bool_t verbose=kFALSE, T String indent="") const ;
inline virtual void Print(Option_t *options= 0) const { inline virtual void Print(Option_t *options= 0) const {
// Printing interface // Printing interface
printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options)); printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));
} }
virtual Int_t defaultPrintContents(Option_t* opt) const ; virtual Int_t defaultPrintContents(Option_t* opt) const ;
virtual StyleOption defaultPrintStyle(Option_t* opt) const ; virtual StyleOption defaultPrintStyle(Option_t* opt) const ;
RooAbsPdf* createPdf(const RooArgSet& params) const ;
// Accessors // Accessors
inline Int_t status() const { inline Int_t status() const {
// Return MINUIT status code // Return MINUIT status code
return _status ; return _status ;
} }
inline Int_t covQual() const { inline Int_t covQual() const {
// Return MINUIT quality code of covariance matrix // Return MINUIT quality code of covariance matrix
return _covQual ; return _covQual ;
} }
inline Int_t numInvalidNLL() const { inline Int_t numInvalidNLL() const {
skipping to change at line 114 skipping to change at line 114
return correlation(par1.GetName(),par2.GetName()) ; return correlation(par1.GetName(),par2.GetName()) ;
} }
const RooArgList* correlation(const RooAbsArg& par) const { const RooArgList* correlation(const RooAbsArg& par) const {
// Return pointer to list of correlations of all parameters with par // Return pointer to list of correlations of all parameters with par
return correlation(par.GetName()) ; return correlation(par.GetName()) ;
} }
Double_t correlation(const char* parname1, const char* parname2) const ; Double_t correlation(const char* parname1, const char* parname2) const ;
const RooArgList* correlation(const char* parname) const ; const RooArgList* correlation(const char* parname) const ;
const TMatrixDSym& covarianceMatrix() const ;
const TMatrixDSym& correlationMatrix() const ;
// Global correlation accessors // Global correlation accessors
Double_t globalCorr(const RooAbsArg& par) { return globalCorr(par.GetName ()) ; } Double_t globalCorr(const RooAbsArg& par) { return globalCorr(par.GetName ()) ; }
Double_t globalCorr(const char* parname) ; Double_t globalCorr(const char* parname) ;
const RooArgList* globalCorr() ; const RooArgList* globalCorr() ;
// Add objects to a 2D plot // Add objects to a 2D plot
inline RooPlot *plotOn(RooPlot *frame, const RooAbsArg &par1, const RooAb sArg &par2, inline RooPlot *plotOn(RooPlot *frame, const RooAbsArg &par1, const RooAb sArg &par2,
const char *options= "ME") const { const char *options= "ME") const {
// Plot error ellipse in par1 and par2 on frame // Plot error ellipse in par1 and par2 on frame
return plotOn(frame,par1.GetName(),par2.GetName(),options); return plotOn(frame,par1.GetName(),par2.GetName(),options);
skipping to change at line 140 skipping to change at line 143
Bool_t isIdentical(const RooFitResult& other, Double_t tol=5e-5, Double_t tolCorr=1e-4, Bool_t verbose=kTRUE) const ; Bool_t isIdentical(const RooFitResult& other, Double_t tol=5e-5, Double_t tolCorr=1e-4, Bool_t verbose=kTRUE) const ;
void SetName(const char *name) ; void SetName(const char *name) ;
void SetNameTitle(const char *name, const char* title) ; void SetNameTitle(const char *name, const char* title) ;
protected: protected:
friend class RooMinuit ; friend class RooMinuit ;
friend class RooNag ; friend class RooNag ;
void setCovarianceMatrix(TMatrixDSym& V) ;
void setConstParList(const RooArgList& list) ; void setConstParList(const RooArgList& list) ;
void setInitParList(const RooArgList& list) ; void setInitParList(const RooArgList& list) ;
void setFinalParList(const RooArgList& list) ; void setFinalParList(const RooArgList& list) ;
inline void setMinNLL(Double_t val) { _minNLL = val ; } inline void setMinNLL(Double_t val) { _minNLL = val ; }
inline void setEDM(Double_t val) { _edm = val ; } inline void setEDM(Double_t val) { _edm = val ; }
inline void setStatus(Int_t val) { _status = val ; } inline void setStatus(Int_t val) { _status = val ; }
inline void setCovQual(Int_t val) { _covQual = val ; } inline void setCovQual(Int_t val) { _covQual = val ; }
inline void setNumInvalidNLL(Int_t val) { _numBadNLL=val ; } inline void setNumInvalidNLL(Int_t val) { _numBadNLL=val ; }
void fillCorrMatrix() ; void fillCorrMatrix() ;
skipping to change at line 167 skipping to change at line 171
Double_t _edm ; // Estimated distance to minimum Double_t _edm ; // Estimated distance to minimum
RooArgList* _constPars ; // List of constant parameters RooArgList* _constPars ; // List of constant parameters
RooArgList* _initPars ; // List of floating parameters with initial v alues RooArgList* _initPars ; // List of floating parameters with initial v alues
RooArgList* _finalPars ; // List of floating parameters with final val ues RooArgList* _finalPars ; // List of floating parameters with final val ues
RooArgList* _globalCorr ; // List of global correlation coefficients RooArgList* _globalCorr ; // List of global correlation coefficients
TList _corrMatrix ; // Correlation matrix (list of RooArgLists) TList _corrMatrix ; // Correlation matrix (list of RooArgLists)
mutable RooArgList *_randomPars; //! List of floating parameters with mos t recent random perturbation applied mutable RooArgList *_randomPars; //! List of floating parameters with mos t recent random perturbation applied
mutable TMatrixF* _Lt; //! triangular matrix used for generate random perturbations mutable TMatrixF* _Lt; //! triangular matrix used for generate random perturbations
TMatrixDSym* _CM ; //! Correlation matrix ;
TMatrixDSym* _VM ; //! Covariance matrix ;
ClassDef(RooFitResult,1) // Container class for fit result ClassDef(RooFitResult,1) // Container class for fit result
}; };
#endif #endif
 End of changes. 8 change blocks. 
4 lines changed or deleted 11 lines changed or added


 RooFormulaVar.h   RooFormulaVar.h 
skipping to change at line 53 skipping to change at line 53
// Return pointer to parameter at given index // Return pointer to parameter at given index
return _actualVars.at(index) ; return _actualVars.at(index) ;
} }
// I/O streaming interface (machine readable) // I/O streaming interface (machine readable)
virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ; virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ;
virtual void writeToStream(ostream& os, Bool_t compact) const ; virtual void writeToStream(ostream& os, Bool_t compact) const ;
// Printing interface (human readable) // Printing interface (human readable)
virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent= "") const ; virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent= "") const ;
void printMetaArgs(ostream& os) const ;
// Debugging // Debugging
void dumpFormula() { formula().dump() ; } void dumpFormula() { formula().dump() ; }
virtual Double_t getVal(const RooArgSet* set=0) const ; virtual Double_t getVal(const RooArgSet* set=0) const ;
virtual Double_t defaultErrorLevel() const ; virtual Double_t defaultErrorLevel() const ;
protected: protected:
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 RooGaussKronrodIntegrator1D.h   RooGaussKronrodIntegrator1D.h 
skipping to change at line 37 skipping to change at line 37
// Constructors, assignment etc // Constructors, assignment etc
RooGaussKronrodIntegrator1D() ; RooGaussKronrodIntegrator1D() ;
RooGaussKronrodIntegrator1D(const RooAbsFunc& function, const RooNumIntCo nfig& config) ; RooGaussKronrodIntegrator1D(const RooAbsFunc& function, const RooNumIntCo nfig& config) ;
RooGaussKronrodIntegrator1D(const RooAbsFunc& function, Double_t xmin, Do uble_t xmax, const RooNumIntConfig& config) ; RooGaussKronrodIntegrator1D(const RooAbsFunc& function, Double_t xmin, Do uble_t xmax, const RooNumIntConfig& config) ;
virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ; virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ;
virtual ~RooGaussKronrodIntegrator1D(); virtual ~RooGaussKronrodIntegrator1D();
virtual Bool_t checkLimits() const; virtual Bool_t checkLimits() const;
virtual Double_t integral(const Double_t *yvec=0) ; virtual Double_t integral(const Double_t *yvec=0) ;
Bool_t setLimits(Double_t xmin, Double_t xmax); using RooAbsIntegrator::setLimits ;
Bool_t setLimits(Double_t* xmin, Double_t* xmax);
virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; } virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; }
virtual Bool_t canIntegrate1D() const { return kTRUE ; } virtual Bool_t canIntegrate1D() const { return kTRUE ; }
virtual Bool_t canIntegrate2D() const { return kFALSE ; } virtual Bool_t canIntegrate2D() const { return kFALSE ; }
virtual Bool_t canIntegrateND() const { return kFALSE ; } virtual Bool_t canIntegrateND() const { return kFALSE ; }
virtual Bool_t canIntegrateOpenEnded() const { return kTRUE ; } virtual Bool_t canIntegrateOpenEnded() const { return kTRUE ; }
protected: protected:
friend class RooNumIntFactory ; friend class RooNumIntFactory ;
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 RooGenContext.h   RooGenContext.h 
skipping to change at line 28 skipping to change at line 28
#include "RooAbsGenContext.h" #include "RooAbsGenContext.h"
#include "RooArgSet.h" #include "RooArgSet.h"
class RooAbsPdf; class RooAbsPdf;
class RooDataSet; class RooDataSet;
class RooRealIntegral; class RooRealIntegral;
class RooAcceptReject; class RooAcceptReject;
class TRandom; class TRandom;
class RooRealVar ; class RooRealVar ;
class RooAbsNumGenerator ;
class RooGenContext : public RooAbsGenContext { class RooGenContext : public RooAbsGenContext {
public: public:
RooGenContext(const RooAbsPdf &model, const RooArgSet &vars, const RooDat aSet *prototype= 0, RooGenContext(const RooAbsPdf &model, const RooArgSet &vars, const RooDat aSet *prototype= 0,
const RooArgSet* auxProto=0, Bool_t verbose=kFALSE, const Ro oArgSet* forceDirect=0); const RooArgSet* auxProto=0, Bool_t verbose=kFALSE, const Ro oArgSet* forceDirect=0);
virtual ~RooGenContext(); virtual ~RooGenContext();
virtual void printMultiline(ostream &os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ; virtual void printMultiline(ostream &os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ;
virtual void attach(const RooArgSet& params) ; virtual void attach(const RooArgSet& params) ;
skipping to change at line 50 skipping to change at line 51
virtual void initGenerator(const RooArgSet &theEvent); virtual void initGenerator(const RooArgSet &theEvent);
virtual void generateEvent(RooArgSet &theEvent, Int_t remaining); virtual void generateEvent(RooArgSet &theEvent, Int_t remaining);
RooArgSet *_cloneSet; // Clone of all nodes of input p.d.f RooArgSet *_cloneSet; // Clone of all nodes of input p.d.f
RooAbsPdf *_pdfClone; // Clone of input p.d.f RooAbsPdf *_pdfClone; // Clone of input p.d.f
RooArgSet _directVars,_uniformVars,_otherVars; // List of observables gen erated internally, randomly, and by accept/reject sampling RooArgSet _directVars,_uniformVars,_otherVars; // List of observables gen erated internally, randomly, and by accept/reject sampling
Int_t _code; // Internal generation code Int_t _code; // Internal generation code
Double_t _maxProb, _area, _norm; // Maximum probability, p.d.f area an d normalization Double_t _maxProb, _area, _norm; // Maximum probability, p.d.f area an d normalization
RooRealIntegral *_acceptRejectFunc; // Projection function to be passed t o accept/reject sampler RooRealIntegral *_acceptRejectFunc; // Projection function to be passed t o accept/reject sampler
RooAcceptReject *_generator; // Accept/reject generation engine RooAbsNumGenerator *_generator; // MC sampling generation engine
RooRealVar *_maxVar ; // Variable holding maximum value of p.d.f RooRealVar *_maxVar ; // Variable holding maximum value of p.d.f
TIterator *_uniIter ; // Iterator over uniform observables TIterator *_uniIter ; // Iterator over uniform observables
Int_t _updateFMaxPerEvent ; // If true, maximum p.d.f value needs to be recalculated for each event Int_t _updateFMaxPerEvent ; // If true, maximum p.d.f value needs to be recalculated for each event
ClassDef(RooGenContext,0) // Universal context for generating toy MC data from any p.d.f ClassDef(RooGenContext,0) // Universal context for generating toy MC data from any p.d.f
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 RooGenericPdf.h   RooGenericPdf.h 
skipping to change at line 28 skipping to change at line 28
#include "RooAbsPdf.h" #include "RooAbsPdf.h"
#include "RooFormula.h" #include "RooFormula.h"
#include "RooListProxy.h" #include "RooListProxy.h"
class RooArgList ; class RooArgList ;
class RooGenericPdf : public RooAbsPdf { class RooGenericPdf : public RooAbsPdf {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
inline RooGenericPdf() { } inline RooGenericPdf() : _formula(0) { }
RooGenericPdf(const char *name, const char *title, const RooArgList& depe
ndents);
RooGenericPdf(const char *name, const char *title, const char* formula, c onst RooArgList& dependents); RooGenericPdf(const char *name, const char *title, const char* formula, c onst RooArgList& dependents);
RooGenericPdf(const char *name, const char *title, const RooArgList& depe ndents);
RooGenericPdf(const RooGenericPdf& other, const char* name=0); RooGenericPdf(const RooGenericPdf& other, const char* name=0);
virtual TObject* clone(const char* newname) const { return new RooGeneric Pdf(*this,newname); } virtual TObject* clone(const char* newname) const { return new RooGeneric Pdf(*this,newname); }
virtual ~RooGenericPdf(); virtual ~RooGenericPdf();
// I/O streaming interface (machine readable) // I/O streaming interface (machine readable)
virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ; virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ;
virtual void writeToStream(ostream& os, Bool_t compact) const ; virtual void writeToStream(ostream& os, Bool_t compact) const ;
// Printing interface (human readable) // Printing interface (human readable)
void printMultiline(ostream& os, Int_t content, Bool_t verbose=kFALSE, TS tring indent="") const ; void printMultiline(ostream& os, Int_t content, Bool_t verbose=kFALSE, TS tring indent="") const ;
void printMetaArgs(ostream& os) const ;
// Debugging // Debugging
void dumpFormula() { _formula.dump() ; } void dumpFormula() { formula().dump() ; }
protected: protected:
RooFormula& formula() const ;
// Function evaluation // Function evaluation
RooListProxy _actualVars ; RooListProxy _actualVars ;
virtual Double_t evaluate() const ; virtual Double_t evaluate() const ;
Bool_t setFormula(const char* formula) ; Bool_t setFormula(const char* formula) ;
// Post-processing of server redirection // Post-processing of server redirection
virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ; virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;
virtual Bool_t isValidReal(Double_t value, Bool_t printError) const ; virtual Bool_t isValidReal(Double_t value, Bool_t printError) const ;
mutable RooFormula _formula ; // Formula engine mutable RooFormula* _formula ; //! Formula engine
TString _formExpr ; // Formula expression string
ClassDef(RooGenericPdf,1) // Generic PDF defined by string expression and list of variables ClassDef(RooGenericPdf,1) // Generic PDF defined by string expression and list of variables
}; };
#endif #endif
 End of changes. 6 change blocks. 
5 lines changed or deleted 8 lines changed or added


 RooGlobalFunc.h   RooGlobalFunc.h 
skipping to change at line 85 skipping to change at line 85
RooCmdArg Binning(const RooAbsBinning& binning) ; RooCmdArg Binning(const RooAbsBinning& binning) ;
RooCmdArg Binning(const char* binningName) ; RooCmdArg Binning(const char* binningName) ;
RooCmdArg Binning(Int_t nBins, Double_t xlo=0., Double_t xhi=0.) ; RooCmdArg Binning(Int_t nBins, Double_t xlo=0., Double_t xhi=0.) ;
RooCmdArg MarkerStyle(Style_t style) ; RooCmdArg MarkerStyle(Style_t style) ;
RooCmdArg MarkerSize(Size_t size) ; RooCmdArg MarkerSize(Size_t size) ;
RooCmdArg MarkerColor(Color_t color) ; RooCmdArg MarkerColor(Color_t color) ;
RooCmdArg CutRange(const char* rangeName) ; RooCmdArg CutRange(const char* rangeName) ;
RooCmdArg XErrorSize(Double_t width) ; RooCmdArg XErrorSize(Double_t width) ;
RooCmdArg RefreshNorm() ; RooCmdArg RefreshNorm() ;
RooCmdArg Efficiency(const RooCategory& cat) ; RooCmdArg Efficiency(const RooCategory& cat) ;
RooCmdArg Rescale(Double_t factor) ;
// RooDataHist::ctor arguments // RooDataHist::ctor arguments
RooCmdArg Weight(Double_t wgt) ; RooCmdArg Weight(Double_t wgt) ;
RooCmdArg Index(RooCategory& icat) ; RooCmdArg Index(RooCategory& icat) ;
RooCmdArg Import(const char* state, TH1& histo) ; RooCmdArg Import(const char* state, TH1& histo) ;
RooCmdArg Import(TH1& histo) ; RooCmdArg Import(TH1& histo) ;
// RooDataSet::ctor arguments // RooDataSet::ctor arguments
RooCmdArg WeightVar(const char* name) ; RooCmdArg WeightVar(const char* name) ;
RooCmdArg WeightVar(const RooRealVar& arg) ; RooCmdArg WeightVar(const RooRealVar& arg) ;
RooCmdArg Import(const char* state, RooDataSet& data) ; RooCmdArg Import(const char* state, RooDataSet& data) ;
RooCmdArg Import(RooDataSet& data) ; RooCmdArg Import(RooDataSet& data) ;
RooCmdArg Import(TTree& tree) ; RooCmdArg Import(TTree& tree) ;
RooCmdArg StoreError(const RooArgSet& aset) ;
RooCmdArg StoreAsymError(const RooArgSet& aset) ;
// RooChi2Var::ctor arguments // RooChi2Var::ctor arguments
RooCmdArg Extended(Bool_t flag=kTRUE) ; RooCmdArg Extended(Bool_t flag=kTRUE) ;
RooCmdArg DataError(RooDataHist::ErrorType) ; RooCmdArg DataError(RooDataHist::ErrorType) ;
RooCmdArg NumCPU(Int_t nCPU, Bool_t interleave=kFALSE) ; RooCmdArg NumCPU(Int_t nCPU, Bool_t interleave=kFALSE) ;
// RooAbsPdf::printLatex arguments // RooAbsPdf::printLatex arguments
RooCmdArg Columns(Int_t ncol) ; RooCmdArg Columns(Int_t ncol) ;
RooCmdArg OutputFile(const char* fileName) ; RooCmdArg OutputFile(const char* fileName) ;
RooCmdArg Format(const char* format, Int_t sigDigit) ; RooCmdArg Format(const char* format, Int_t sigDigit) ;
skipping to change at line 149 skipping to change at line 152
RooCmdArg InitialHesse(Bool_t flag=kTRUE) ; RooCmdArg InitialHesse(Bool_t flag=kTRUE) ;
RooCmdArg Hesse(Bool_t flag=kTRUE) ; RooCmdArg Hesse(Bool_t flag=kTRUE) ;
RooCmdArg Minos(Bool_t flag=kTRUE) ; RooCmdArg Minos(Bool_t flag=kTRUE) ;
RooCmdArg Minos(const RooArgSet& minosArgs) ; RooCmdArg Minos(const RooArgSet& minosArgs) ;
RooCmdArg SplitRange(Bool_t flag=kTRUE) ; RooCmdArg SplitRange(Bool_t flag=kTRUE) ;
RooCmdArg SumCoefRange(const char* rangeName) ; RooCmdArg SumCoefRange(const char* rangeName) ;
RooCmdArg Constrain(const RooArgSet& params) ; RooCmdArg Constrain(const RooArgSet& params) ;
RooCmdArg ExternalConstraints(const RooArgSet& constraintPdfs) ; RooCmdArg ExternalConstraints(const RooArgSet& constraintPdfs) ;
RooCmdArg PrintEvalErrors(Int_t numErrors) ; RooCmdArg PrintEvalErrors(Int_t numErrors) ;
RooCmdArg EvalErrorWall(Bool_t flag) ; RooCmdArg EvalErrorWall(Bool_t flag) ;
RooCmdArg SumW2Error(Bool_t flag) ;
RooCmdArg CloneData(Bool_t flag) ;
RooCmdArg Integrate(Bool_t flag) ;
// RooAbsPdf::paramOn arguments // RooAbsPdf::paramOn arguments
RooCmdArg Label(const char* str) ; RooCmdArg Label(const char* str) ;
RooCmdArg Layout(Double_t xmin, Double_t xmax=0.99, Double_t ymin=0.95) ; RooCmdArg Layout(Double_t xmin, Double_t xmax=0.99, Double_t ymin=0.95) ;
RooCmdArg Parameters(const RooArgSet& params) ; RooCmdArg Parameters(const RooArgSet& params) ;
RooCmdArg ShowConstants(Bool_t flag=kTRUE) ; RooCmdArg ShowConstants(Bool_t flag=kTRUE) ;
// RooTreeData::statOn arguments // RooTreeData::statOn arguments
RooCmdArg What(const char* str) ; RooCmdArg What(const char* str) ;
// RooProdPdf::ctor arguments // RooProdPdf::ctor arguments
RooCmdArg Conditional(const RooArgSet& pdfSet, const RooArgSet& depSet) ; RooCmdArg Conditional(const RooArgSet& pdfSet, const RooArgSet& depSet, Boo l_t depsAreCond=kFALSE) ;
// RooAbsPdf::generate arguments // RooAbsPdf::generate arguments
RooCmdArg ProtoData(const RooDataSet& protoData, Bool_t randomizeOrder=kFAL SE, Bool_t resample=kFALSE) ; RooCmdArg ProtoData(const RooDataSet& protoData, Bool_t randomizeOrder=kFAL SE, Bool_t resample=kFALSE) ;
RooCmdArg NumEvents(Int_t numEvents) ; RooCmdArg NumEvents(Int_t numEvents) ;
// RooAbsRealLValue::createHistogram arguments // RooAbsRealLValue::createHistogram arguments
RooCmdArg YVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ; RooCmdArg YVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;
RooCmdArg ZVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ; RooCmdArg ZVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;
RooCmdArg AxisLabel(const char* name) ; RooCmdArg AxisLabel(const char* name) ;
RooCmdArg Scaling(Bool_t flag) ; RooCmdArg Scaling(Bool_t flag) ;
skipping to change at line 215 skipping to change at line 221
RooCmdArg TagName(const char* name) ; RooCmdArg TagName(const char* name) ;
RooCmdArg OutputStream(ostream& os) ; RooCmdArg OutputStream(ostream& os) ;
RooCmdArg Prefix(Bool_t flag) ; RooCmdArg Prefix(Bool_t flag) ;
RooCmdArg Color(Color_t color) ; RooCmdArg Color(Color_t color) ;
// RooWorkspace::import() arguments // RooWorkspace::import() arguments
RooCmdArg RenameConflictNodes(const char* suffix) ; RooCmdArg RenameConflictNodes(const char* suffix) ;
RooCmdArg RenameAllNodes(const char* suffix) ; RooCmdArg RenameAllNodes(const char* suffix) ;
RooCmdArg RenameAllVariables(const char* suffix) ; RooCmdArg RenameAllVariables(const char* suffix) ;
RooCmdArg RenameVariable(const char* inputName, const char* outputName) ; RooCmdArg RenameVariable(const char* inputName, const char* outputName) ;
RooCmdArg RenameDataset(const char* suffix) ; RooCmdArg Rename(const char* suffix) ;
RooCmdArg RecycleConflictNodes(Bool_t flag=kTRUE) ; RooCmdArg RecycleConflictNodes(Bool_t flag=kTRUE) ;
// RooSimCloneTool::build() arguments // RooSimCloneTool::build() arguments
RooCmdArg SplitParam(const char* varname, const char* catname) ; RooCmdArg SplitParam(const char* varname, const char* catname) ;
RooCmdArg SplitParam(const RooRealVar& var, const RooAbsCategory& cat) ; RooCmdArg SplitParam(const RooRealVar& var, const RooAbsCategory& cat) ;
RooCmdArg SplitParamConstrained(const char* varname, const char* catname, c onst char* rsname) ; RooCmdArg SplitParamConstrained(const char* varname, const char* catname, c onst char* rsname) ;
RooCmdArg SplitParamConstrained(const RooRealVar& var, const RooAbsCategory & cat, const char* rsname) ; RooCmdArg SplitParamConstrained(const RooRealVar& var, const RooAbsCategory & cat, const char* rsname) ;
RooCmdArg Restrict(const char* catName, const char* stateNameList) ; RooCmdArg Restrict(const char* catName, const char* stateNameList) ;
// RooAbsPdf::createCdf() arguments // RooAbsPdf::createCdf() arguments
 End of changes. 5 change blocks. 
2 lines changed or deleted 8 lines changed or added


 RooHist.h   RooHist.h 
skipping to change at line 29 skipping to change at line 29
#include "TGraphAsymmErrors.h" #include "TGraphAsymmErrors.h"
#include "RooPlotable.h" #include "RooPlotable.h"
#include "RooAbsData.h" #include "RooAbsData.h"
class TH1; class TH1;
class RooCurve ; class RooCurve ;
class RooHist : public TGraphAsymmErrors, public RooPlotable { class RooHist : public TGraphAsymmErrors, public RooPlotable {
public: public:
RooHist() {} ; RooHist() {} ;
RooHist(Double_t nominalBinWidth, Double_t nSigma= 1, Double_t xErrorFrac RooHist(Double_t nominalBinWidth, Double_t nSigma= 1, Double_t xErrorFrac
=1.0); =1.0, Double_t scaleFactor=1.0);
RooHist(const TH1 &data, Double_t nominalBinWidth= 0, Double_t nSigma= 1, RooHist(const TH1 &data, Double_t nominalBinWidth= 0, Double_t nSigma= 1,
RooAbsData::ErrorType=RooAbsData::Poisson, Double_t xErrorFrac=1.0, Bool_t RooAbsData::ErrorType=RooAbsData::Poisson,
correctForBinWidth=kTRUE); Double_t xErrorFrac=1.0, Bool_t correctForBinWidth=kTRUE, Double_t
RooHist(const TH1 &data1, const TH1 &data2, Double_t nominalBinWidth= 0, scaleFactor=1.);
Double_t nSigma= 1, Double_t xErrorFrac=1.0, Bool_t efficiency=kFALSE); RooHist(const TH1 &data1, const TH1 &data2, Double_t nominalBinWidth= 0,
RooHist(const RooHist& hist1, const RooHist& hist2, Double_t wgt1=1.0, Do Double_t nSigma= 1, Double_t xErrorFrac=1.0,
uble_t wgt2=1.0, RooAbsData::ErrorType etype=RooAbsData::Poisson, Double_t Bool_t efficiency=kFALSE, Double_t scaleFactor=1.0);
xErrorFrac=1.0) ; RooHist(const RooHist& hist1, const RooHist& hist2, Double_t wgt1=1.0, Do
uble_t wgt2=1.0,
RooAbsData::ErrorType etype=RooAbsData::Poisson, Double_t xErrorFr
ac=1.0) ;
virtual ~RooHist(); virtual ~RooHist();
// add a datapoint for a bin with n entries, using a Poisson error // add a datapoint for a bin with n entries, using a Poisson error
void addBin(Axis_t binCenter, Int_t n, Double_t binWidth= 0, Double_t xEr rorFrac=1.0); void addBin(Axis_t binCenter, Int_t n, Double_t binWidth= 0, Double_t xEr rorFrac=1.0, Double_t scaleFactor=1.0);
// add a datapoint for a bin with n entries, using a given error // add a datapoint for a bin with n entries, using a given error
void addBinWithError(Axis_t binCenter, Double_t n, Double_t elow, Double_ void addBinWithError(Axis_t binCenter, Double_t n, Double_t elow, Double_
t ehigh, Double_t binWidth= 0, Double_t xErrorFrac=1.0, Bool_t correctForBi t ehigh, Double_t binWidth= 0,
nWidth=kTRUE); Double_t xErrorFrac=1.0, Bool_t correctForBinWidth=kT
RUE, Double_t scaleFactor=1.0);
// add a datapoint for a bin with n entries, using a given x and y error
void addBinWithXYError(Axis_t binCenter, Double_t n, Double_t exlow, Doub
le_t exhigh, Double_t eylow, Double_t eyhigh,
Double_t scaleFactor=1.0);
// add a datapoint for the asymmetry (n1-n2)/(n1+n2), using a binomial er ror // add a datapoint for the asymmetry (n1-n2)/(n1+n2), using a binomial er ror
void addAsymmetryBin(Axis_t binCenter, Int_t n1, Int_t n2, Double_t binWi dth= 0, Double_t xErrorFrac=1.0); void addAsymmetryBin(Axis_t binCenter, Int_t n1, Int_t n2, Double_t binWi dth= 0, Double_t xErrorFrac=1.0, Double_t scaleFactor=1.0);
// add a datapoint for the efficiency (n1)/(n1+n2), using a binomial erro r // add a datapoint for the efficiency (n1)/(n1+n2), using a binomial erro r
void addEfficiencyBin(Axis_t binCenter, Int_t n1, Int_t n2, Double_t binW idth= 0, Double_t xErrorFrac=1.0); void addEfficiencyBin(Axis_t binCenter, Int_t n1, Int_t n2, Double_t binW idth= 0, Double_t xErrorFrac=1.0, Double_t scaleFactor=1.0);
virtual void printName(ostream& os) const ; virtual void printName(ostream& os) const ;
virtual void printTitle(ostream& os) const ; virtual void printTitle(ostream& os) const ;
virtual void printClassName(ostream& os) const ; virtual void printClassName(ostream& os) const ;
virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent= "") const; virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent= "") const;
inline virtual void Print(Option_t *options= 0) const { inline virtual void Print(Option_t *options= 0) const {
// Printing interface // Printing interface
printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options)); printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));
} }
 End of changes. 5 change blocks. 
16 lines changed or deleted 24 lines changed or added


 RooHistPdf.h   RooHistPdf.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooHistPdf.h 25209 2008-08-22 13:08:40Z wouter $ * File: $Id: RooHistPdf.h 28259 2009-04-16 16:21:16Z wouter $
* Authors: * * Authors: *
* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu * * WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
* DK, David Kirkby, UC Irvine, dkirkby@uci.edu * * DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
* * * *
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
skipping to change at line 32 skipping to change at line 32
#include "RooAICRegistry.h" #include "RooAICRegistry.h"
class RooRealVar; class RooRealVar;
class RooAbsReal; class RooAbsReal;
class RooDataHist ; class RooDataHist ;
class RooHistPdf : public RooAbsPdf { class RooHistPdf : public RooAbsPdf {
public: public:
RooHistPdf() ; RooHistPdf() ;
RooHistPdf(const char *name, const char *title, const RooArgSet& vars, co nst RooDataHist& dhist, Int_t intOrder=0); RooHistPdf(const char *name, const char *title, const RooArgSet& vars, co nst RooDataHist& dhist, Int_t intOrder=0);
RooHistPdf(const char *name, const char *title, const RooArgList& pdfObs, const RooArgList& histObs, const RooDataHist& dhist, Int_t intOrder=0);
RooHistPdf(const RooHistPdf& other, const char* name=0); RooHistPdf(const RooHistPdf& other, const char* name=0);
virtual TObject* clone(const char* newname) const { return new RooHistPdf (*this,newname); } virtual TObject* clone(const char* newname) const { return new RooHistPdf (*this,newname); }
inline virtual ~RooHistPdf() { } virtual ~RooHistPdf() ;
RooDataHist& dataHist() { RooDataHist& dataHist() {
// Return RooDataHist that is represented // Return RooDataHist that is represented
return *_dataHist ; return *_dataHist ;
} }
const RooDataHist& dataHist() const { const RooDataHist& dataHist() const {
// Return RooDataHist that is represented // Return RooDataHist that is represented
return *_dataHist ; return *_dataHist ;
} }
skipping to change at line 78 skipping to change at line 79
_unitNorm = flag ; _unitNorm = flag ;
} }
Bool_t haveUnitNorm() const { Bool_t haveUnitNorm() const {
// Return true if contents is declared to be unit normalized // Return true if contents is declared to be unit normalized
return _unitNorm ; return _unitNorm ;
} }
virtual Bool_t selfNormalized() const { return _unitNorm ; } virtual Bool_t selfNormalized() const { return _unitNorm ; }
virtual Int_t getMaxVal(const RooArgSet& vars) const ; virtual Int_t getMaxVal(const RooArgSet& vars) const ;
virtual Double_t maxVal(Int_t code) ; virtual Double_t maxVal(Int_t code) const ;
virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ; virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;
protected: protected:
Double_t evaluate() const; Double_t evaluate() const;
Double_t totalVolume() const ; Double_t totalVolume() const ;
friend class RooAbsCachedPdf ; friend class RooAbsCachedPdf ;
Double_t totVolume() const ; Double_t totVolume() const ;
RooSetProxy _depList ; // List of dependents defining dimensions RooSetProxy _histObsList ; // List of observables defining dimensio
of histogram ns of histogram
RooSetProxy _pdfObsList ; // List of observables mapped onto histo
gram observables
RooDataHist* _dataHist ; // Unowned pointer to underlying histogram RooDataHist* _dataHist ; // Unowned pointer to underlying histogram
TIterator* _histObsIter ; //!
TIterator* _pdfObsIter ; //!
mutable RooAICRegistry _codeReg ; //! Auxiliary class keeping tracking of analytical integration code mutable RooAICRegistry _codeReg ; //! Auxiliary class keeping tracking of analytical integration code
Int_t _intOrder ; // Interpolation order Int_t _intOrder ; // Interpolation order
Bool_t _cdfBoundaries ; // Use boundary conditions for CDFs. Bool_t _cdfBoundaries ; // Use boundary conditions for CDFs.
mutable Double_t _totVolume ; //! Total volume of space (product of rang es of observables) mutable Double_t _totVolume ; //! Total volume of space (product of rang es of observables)
Bool_t _unitNorm ; //! Assume contents is unit normalized (fo r use as pdf cache) Bool_t _unitNorm ; //! Assume contents is unit normalized (fo r use as pdf cache)
ClassDef(RooHistPdf,1) // Histogram based PDF ClassDef(RooHistPdf,2) // Histogram based PDF
}; };
#endif #endif
 End of changes. 7 change blocks. 
6 lines changed or deleted 11 lines changed or added


 RooImproperIntegrator1D.h   RooImproperIntegrator1D.h 
skipping to change at line 36 skipping to change at line 36
public: public:
RooImproperIntegrator1D() ; RooImproperIntegrator1D() ;
RooImproperIntegrator1D(const RooAbsFunc& function); RooImproperIntegrator1D(const RooAbsFunc& function);
RooImproperIntegrator1D(const RooAbsFunc& function, const RooNumIntConfig & config); RooImproperIntegrator1D(const RooAbsFunc& function, const RooNumIntConfig & config);
RooImproperIntegrator1D(const RooAbsFunc& function, Double_t xmin, Double _t xmax, const RooNumIntConfig& config); RooImproperIntegrator1D(const RooAbsFunc& function, Double_t xmin, Double _t xmax, const RooNumIntConfig& config);
virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ; virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ;
virtual ~RooImproperIntegrator1D(); virtual ~RooImproperIntegrator1D();
virtual Bool_t checkLimits() const; virtual Bool_t checkLimits() const;
Bool_t setLimits(Double_t xmin, Double_t xmax); using RooAbsIntegrator::setLimits ;
Bool_t setLimits(Double_t* xmin, Double_t* xmax);
virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; } virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; }
virtual Double_t integral(const Double_t* yvec=0) ; virtual Double_t integral(const Double_t* yvec=0) ;
virtual Bool_t canIntegrate1D() const { return kTRUE ; } virtual Bool_t canIntegrate1D() const { return kTRUE ; }
virtual Bool_t canIntegrate2D() const { return kFALSE ; } virtual Bool_t canIntegrate2D() const { return kFALSE ; }
virtual Bool_t canIntegrateND() const { return kFALSE ; } virtual Bool_t canIntegrateND() const { return kFALSE ; }
virtual Bool_t canIntegrateOpenEnded() const { return kTRUE ; } virtual Bool_t canIntegrateOpenEnded() const { return kTRUE ; }
protected: protected:
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 RooIntegrator1D.h   RooIntegrator1D.h 
skipping to change at line 44 skipping to change at line 44
RooIntegrator1D(const RooAbsFunc& function, const RooNumIntConfig& config ) ; RooIntegrator1D(const RooAbsFunc& function, const RooNumIntConfig& config ) ;
RooIntegrator1D(const RooAbsFunc& function, Double_t xmin, Double_t xmax, RooIntegrator1D(const RooAbsFunc& function, Double_t xmin, Double_t xmax,
const RooNumIntConfig& config) ; const RooNumIntConfig& config) ;
virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ; virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ;
virtual ~RooIntegrator1D(); virtual ~RooIntegrator1D();
virtual Bool_t checkLimits() const; virtual Bool_t checkLimits() const;
virtual Double_t integral(const Double_t *yvec=0) ; virtual Double_t integral(const Double_t *yvec=0) ;
Bool_t setLimits(Double_t xmin, Double_t xmax); using RooAbsIntegrator::setLimits ;
Bool_t setLimits(Double_t* xmin, Double_t* xmax);
virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; } virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; }
virtual Bool_t canIntegrate1D() const { return kTRUE ; } virtual Bool_t canIntegrate1D() const { return kTRUE ; }
virtual Bool_t canIntegrate2D() const { return kFALSE ; } virtual Bool_t canIntegrate2D() const { return kFALSE ; }
virtual Bool_t canIntegrateND() const { return kFALSE ; } virtual Bool_t canIntegrateND() const { return kFALSE ; }
virtual Bool_t canIntegrateOpenEnded() const { return kFALSE ; } virtual Bool_t canIntegrateOpenEnded() const { return kFALSE ; }
protected: protected:
friend class RooNumIntFactory ; friend class RooNumIntFactory ;
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 RooLinkedList.h   RooLinkedList.h 
skipping to change at line 65 skipping to change at line 65
void Delete(Option_t *o=0) ; void Delete(Option_t *o=0) ;
TObject* find(const char* name) const ; TObject* find(const char* name) const ;
TObject* FindObject(const char* name) const ; TObject* FindObject(const char* name) const ;
TObject* FindObject(const TObject* obj) const ; TObject* FindObject(const TObject* obj) const ;
Int_t IndexOf(const TObject* arg) const ; Int_t IndexOf(const TObject* arg) const ;
TObject* First() const { TObject* First() const {
return _first?_first->_arg:0 ; return _first?_first->_arg:0 ;
} }
void Print(const char* opt) const ; void Print(const char* opt) const ;
void Sort(Bool_t ascend) ; void Sort(Bool_t ascend=kTRUE) ;
protected: protected:
friend class RooLinkedListIter ; friend class RooLinkedListIter ;
virtual void Add(TObject* arg, Int_t refCount) ; virtual void Add(TObject* arg, Int_t refCount) ;
void swapWithNext(RooLinkedListElem* elem) ; void swapWithNext(RooLinkedListElem* elem) ;
RooLinkedListElem* findLink(const TObject* arg) const ; RooLinkedListElem* findLink(const TObject* arg) const ;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooListProxy.h   RooListProxy.h 
skipping to change at line 58 skipping to change at line 58
virtual void print(ostream& os, Bool_t addContents=kFALSE) const ; virtual void print(ostream& os, Bool_t addContents=kFALSE) const ;
protected: protected:
RooAbsArg* _owner ; // Pointer to owner RooAbsArg* _owner ; // Pointer to owner
Bool_t _defValueServer ; // Propagate value dirty flags? Bool_t _defValueServer ; // Propagate value dirty flags?
Bool_t _defShapeServer ; // Propagate shape dirty flags? Bool_t _defShapeServer ; // Propagate shape dirty flags?
TIterator* _iter ; //! do not persist TIterator* _iter ; //! do not persist
virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t nameChange=kFALSE) ; virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t nameChange=kFALSE, Bool_t factoryInitMode=kFALSE) ;
ClassDef(RooListProxy,1) // Proxy class for a RooArgList ClassDef(RooListProxy,1) // Proxy class for a RooArgList
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooMapCatEntry.h   RooMapCatEntry.h 
skipping to change at line 43 skipping to change at line 43
return ca ; return ca ;
} }
inline Bool_t ok() { return (_regexp.Status()==TRegexp::kOK) ; } inline Bool_t ok() { return (_regexp.Status()==TRegexp::kOK) ; }
Bool_t match(const char* testPattern) const ; Bool_t match(const char* testPattern) const ;
inline const RooCatType& outCat() const { return _cat ; } inline const RooCatType& outCat() const { return _cat ; }
protected: protected:
TString mangle(const char* exp) const ; TString mangle(const char* exp) const ;
TRegexp _regexp ; TRegexp _regexp ;
RooCatType _cat ; RooCatType _cat ;
ClassDef(RooMapCatEntry,1) // Utility class, holding a map expression fro m a index label regexp to a RooCatType ClassDef(RooMapCatEntry,1) // Utility class, holding a map expression fro m a index label regexp to a RooCatType
} ; } ;
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 RooMappedCategory.h   RooMappedCategory.h 
skipping to change at line 23 skipping to change at line 23
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_MAPPED_CATEGORY #ifndef ROO_MAPPED_CATEGORY
#define ROO_MAPPED_CATEGORY #define ROO_MAPPED_CATEGORY
#include "TObjArray.h" #include "TObjArray.h"
#include "RooAbsCategory.h" #include "RooAbsCategory.h"
#include "RooCategoryProxy.h" #include "RooCategoryProxy.h"
#include "RooCatType.h" #include "RooCatType.h"
#include "TRegexp.h"
#include <map>
#include <string>
class RooMappedCategory : public RooAbsCategory { class RooMappedCategory : public RooAbsCategory {
public: public:
// Constructors etc. // Constructors etc.
enum CatIdx { NoCatIdx=-99999 } ; enum CatIdx { NoCatIdx=-99999 } ;
inline RooMappedCategory() { } inline RooMappedCategory() : _defCat(0) { }
RooMappedCategory(const char *name, const char *title, RooAbsCategory& in putCat, const char* defCatName="NotMapped", Int_t defCatIdx=NoCatIdx); RooMappedCategory(const char *name, const char *title, RooAbsCategory& in putCat, const char* defCatName="NotMapped", Int_t defCatIdx=NoCatIdx);
RooMappedCategory(const RooMappedCategory& other, const char *name=0) ; RooMappedCategory(const RooMappedCategory& other, const char *name=0) ;
virtual TObject* clone(const char* newname) const { return new RooMappedC ategory(*this,newname); } virtual TObject* clone(const char* newname) const { return new RooMappedC ategory(*this,newname); }
virtual ~RooMappedCategory(); virtual ~RooMappedCategory();
// Mapping function // Mapping function
Bool_t map(const char* inKeyRegExp, const char* outKeyName, Int_t outKeyN um=NoCatIdx) ; Bool_t map(const char* inKeyRegExp, const char* outKeyName, Int_t outKeyN um=NoCatIdx) ;
// Printing interface (human readable) // Printing interface (human readable)
void printMultiline(ostream& os, Int_t content, Bool_t verbose=kFALSE, TS tring indent="") const ; void printMultiline(ostream& os, Int_t content, Bool_t verbose=kFALSE, TS tring indent="") const ;
void printMetaArgs(ostream& os) const ;
// I/O streaming interface (machine readable) // I/O streaming interface (machine readable)
virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ; virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ;
virtual void writeToStream(ostream& os, Bool_t compact) const ; virtual void writeToStream(ostream& os, Bool_t compact) const ;
class Entry {
public:
inline Entry() : _regexp(0), _cat() {}
virtual ~Entry() { delete _regexp ; } ;
Entry(const char* exp, const RooCatType* cat) : _expr(exp), _regexp(new
TRegexp(mangle(exp),kTRUE)), _cat(*cat) {}
Entry(const Entry& other) : _expr(other._expr), _regexp(new TRegexp(man
gle(other._expr.Data()),kTRUE)), _cat(other._cat) {}
inline Bool_t ok() { return (_regexp->Status()==TRegexp::kOK) ; }
Bool_t match(const char* testPattern) const { return (TString(testPatte
rn).Index(*_regexp)>=0) ; }
inline const RooCatType& outCat() const { return _cat ; }
Entry& operator=(const Entry& other);
protected:
TString mangle(const char* exp) const ;
TString _expr ;
TRegexp* _regexp ; //!
RooCatType _cat ;
ClassDef(Entry,1) // Map cat entry definition
} ;
protected: protected:
TObjArray _mapArray ; // Array of mapping rules
RooCatType* _defCat ; // Default (unmapped) output type RooCatType* _defCat ; // Default (unmapped) output type
RooCategoryProxy _inputCat ; // Input category RooCategoryProxy _inputCat ; // Input category
std::map<std::string,RooMappedCategory::Entry> _mapArray ; // List of ma pping rules
virtual RooCatType evaluate() const ; virtual RooCatType evaluate() const ;
ClassDef(RooMappedCategory,1) // Index varibiable, derived from another i ndex using pattern-matching based mapping ClassDef(RooMappedCategory,1) // Index variable, derived from another ind ex using pattern-matching based mapping
}; };
#endif #endif
 End of changes. 7 change blocks. 
3 lines changed or deleted 32 lines changed or added


 RooMinuit.h   RooMinuit.h 
skipping to change at line 22 skipping to change at line 22
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_MINUIT #ifndef ROO_MINUIT
#define ROO_MINUIT #define ROO_MINUIT
#include "TObject.h" #include "TObject.h"
#include "TStopwatch.h" #include "TStopwatch.h"
#include <fstream> #include <fstream>
#include "TMatrixDSymfwd.h"
class RooAbsReal ; class RooAbsReal ;
class RooFitResult ; class RooFitResult ;
class RooArgList ; class RooArgList ;
class RooRealVar ; class RooRealVar ;
class RooArgSet ; class RooArgSet ;
class TVirtualFitter ; class TVirtualFitter ;
class TH2F ; class TH2F ;
class RooPlot ; class RooPlot ;
skipping to change at line 75 skipping to change at line 76
Int_t setWarnLevel(Int_t newLevel) ; Int_t setWarnLevel(Int_t newLevel) ;
void setPrintEvalErrors(Int_t numEvalErrors) { _printEvalErrors = numEval Errors ; } void setPrintEvalErrors(Int_t numEvalErrors) { _printEvalErrors = numEval Errors ; }
void setVerbose(Bool_t flag=kTRUE) { _verbose = flag ; } void setVerbose(Bool_t flag=kTRUE) { _verbose = flag ; }
void setProfile(Bool_t flag=kTRUE) { _profile = flag ; } void setProfile(Bool_t flag=kTRUE) { _profile = flag ; }
Bool_t setLogFile(const char* logfile=0) ; Bool_t setLogFile(const char* logfile=0) ;
static void cleanup() ; static void cleanup() ;
protected: protected:
friend class RooAbsPdf ;
void applyCovarianceMatrix(TMatrixDSym& V) ;
friend void RooMinuitGlue(Int_t &np, Double_t *gin, Double_t &f, Double_t *par, Int_t flag) ; friend void RooMinuitGlue(Int_t &np, Double_t *gin, Double_t &f, Double_t *par, Int_t flag) ;
void profileStart() ; void profileStart() ;
void profileStop() ; void profileStop() ;
Bool_t synchronize(Bool_t verbose) ; Bool_t synchronize(Bool_t verbose) ;
void backProp() ; void backProp() ;
inline Int_t getNPar() const { return _nPar ; } inline Int_t getNPar() const { return _nPar ; }
inline ofstream* logfile() const { return _logfile ; } inline ofstream* logfile() const { return _logfile ; }
skipping to change at line 118 skipping to change at line 122
RooArgList* _constParamList ; RooArgList* _constParamList ;
RooArgList* _initConstParamList ; RooArgList* _initConstParamList ;
RooAbsReal* _func ; RooAbsReal* _func ;
Double_t _maxFCN ; Double_t _maxFCN ;
ofstream* _logfile ; ofstream* _logfile ;
Bool_t _verbose ; Bool_t _verbose ;
TStopwatch _timer ; TStopwatch _timer ;
TStopwatch _cumulTimer ; TStopwatch _cumulTimer ;
TMatrixDSym* _extV ;
static TVirtualFitter *_theFitter ; static TVirtualFitter *_theFitter ;
RooMinuit(const RooMinuit&) ; RooMinuit(const RooMinuit&) ;
ClassDef(RooMinuit,0) // RooFit minimizer based on MINUIT ClassDef(RooMinuit,0) // RooFit minimizer based on MINUIT
} ; } ;
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 6 lines changed or added


 RooNLLVar.h   RooNLLVar.h 
skipping to change at line 44 skipping to change at line 44
Bool_t extended=kFALSE, const char* rangeName=0, const char* add CoefRangeName=0, Bool_t extended=kFALSE, const char* rangeName=0, const char* add CoefRangeName=0,
Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, Bo ol_t splitRange=kFALSE) ; Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, Bo ol_t splitRange=kFALSE) ;
RooNLLVar(const char *name, const char *title, RooAbsPdf& pdf, RooAbsData & data, RooNLLVar(const char *name, const char *title, RooAbsPdf& pdf, RooAbsData & data,
const RooArgSet& projDeps, Bool_t extended=kFALSE, const char* r angeName=0, const RooArgSet& projDeps, Bool_t extended=kFALSE, const char* r angeName=0,
const char* addCoefRangeName=0, Int_t nCPU=1, Bool_t interleave= kFALSE, Bool_t verbose=kTRUE, Bool_t splitRange=kFALSE) ; const char* addCoefRangeName=0, Int_t nCPU=1, Bool_t interleave= kFALSE, Bool_t verbose=kTRUE, Bool_t splitRange=kFALSE) ;
RooNLLVar(const RooNLLVar& other, const char* name=0); RooNLLVar(const RooNLLVar& other, const char* name=0);
virtual TObject* clone(const char* newname) const { return new RooNLLVar( *this,newname); } virtual TObject* clone(const char* newname) const { return new RooNLLVar( *this,newname); }
virtual RooAbsTestStatistic* create(const char *name, const char *title, RooAbsReal& pdf, RooAbsData& data, virtual RooAbsTestStatistic* create(const char *name, const char *title, RooAbsReal& pdf, RooAbsData& adata,
const RooArgSet& projDeps, const char* rangeName, const char* addCoefRangeName=0, const RooArgSet& projDeps, const char* rangeName, const char* addCoefRangeName=0,
Int_t nCPU=1, Bool_t interleave=kFALSE , Bool_t verbose=kTRUE, Bool_t splitRange=kFALSE) { Int_t nCPU=1, Bool_t interleave=kFALSE , Bool_t verbose=kTRUE, Bool_t splitRange=kFALSE) {
return new RooNLLVar(name,title,(RooAbsPdf&)pdf,data,projDeps,_extended ,rangeName, addCoefRangeName, nCPU, interleave,verbose,splitRange) ; return new RooNLLVar(name,title,(RooAbsPdf&)pdf,adata,projDeps,_extende d,rangeName, addCoefRangeName, nCPU, interleave,verbose,splitRange) ;
} }
virtual ~RooNLLVar(); virtual ~RooNLLVar();
void applyWeightSquared(Bool_t flag) { _weightSq = flag ; setValueDirty()
; }
virtual Double_t defaultErrorLevel() const { return 0.5 ; } virtual Double_t defaultErrorLevel() const { return 0.5 ; }
protected: protected:
static RooArgSet _emptySet ; // Supports named argument constructor static RooArgSet _emptySet ; // Supports named argument constructor
Bool_t _extended ; Bool_t _extended ;
virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const ; virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const ;
Bool_t _weightSq ; // Apply weights squared?
ClassDef(RooNLLVar,1) // Function representing (extended) -log(L) of p.d. f and dataset ClassDef(RooNLLVar,1) // Function representing (extended) -log(L) of p.d. f and dataset
}; };
#endif #endif
 End of changes. 4 change blocks. 
2 lines changed or deleted 6 lines changed or added


 RooNumConvPdf.h   RooNumConvPdf.h 
skipping to change at line 29 skipping to change at line 29
#include "RooAbsPdf.h" #include "RooAbsPdf.h"
#include "RooNumConvolution.h" #include "RooNumConvolution.h"
class TH2 ; class TH2 ;
class RooArgSet ; class RooArgSet ;
class RooDataSet ; class RooDataSet ;
class RooNumConvPdf : public RooAbsPdf { class RooNumConvPdf : public RooAbsPdf {
public: public:
RooNumConvPdf() ;
RooNumConvPdf(const char *name, const char *title, RooNumConvPdf(const char *name, const char *title,
RooRealVar& convVar, RooAbsPdf& pdf, RooAbsPdf& resmodel) ; RooRealVar& convVar, RooAbsPdf& pdf, RooAbsPdf& resmodel) ;
RooNumConvPdf(const RooNumConvPdf& other, const char* name=0) ; RooNumConvPdf(const RooNumConvPdf& other, const char* name=0) ;
virtual TObject* clone(const char* newname) const { return new RooNumConv Pdf(*this,newname) ; } virtual TObject* clone(const char* newname) const { return new RooNumConv Pdf(*this,newname) ; }
virtual ~RooNumConvPdf() ; virtual ~RooNumConvPdf() ;
virtual Double_t evaluate() const ; virtual Double_t evaluate() const ;
skipping to change at line 50 skipping to change at line 52
inline RooNumIntConfig& convIntConfig() { return conv().convIntConfig() ; } inline RooNumIntConfig& convIntConfig() { return conv().convIntConfig() ; }
inline void clearConvolutionWindow() { conv().clearConvolutionWindow() ; } inline void clearConvolutionWindow() { conv().clearConvolutionWindow() ; }
inline void setConvolutionWindow(RooAbsReal& centerParam, RooAbsReal& wid thParam, Double_t widthScaleFactor=1) inline void setConvolutionWindow(RooAbsReal& centerParam, RooAbsReal& wid thParam, Double_t widthScaleFactor=1)
{ conv().setConvolutionWindow(centerParam,widthParam,widthScaleFacto r) ; } { conv().setConvolutionWindow(centerParam,widthParam,widthScaleFacto r) ; }
inline void setCallWarning(Int_t threshold=2000) { conv().setCallWarning( threshold) ; } inline void setCallWarning(Int_t threshold=2000) { conv().setCallWarning( threshold) ; }
inline void setCallProfiling(Bool_t flag, Int_t nbinX = 40, Int_t nbinCal l = 40, Int_t nCallHigh=1000) inline void setCallProfiling(Bool_t flag, Int_t nbinX = 40, Int_t nbinCal l = 40, Int_t nCallHigh=1000)
{ conv().setCallProfiling(flag,nbinX,nbinCall,nCallHigh) ; } { conv().setCallProfiling(flag,nbinX,nbinCall,nCallHigh) ; }
inline const TH2* profileData() const { return conv().profileData() ; } inline const TH2* profileData() const { return conv().profileData() ; }
// Access components // Access components
RooRealVar& var() const { return (RooRealVar&) _origVar.arg() ; } RooRealVar& var() const { return (RooRealVar&)(const_cast<RooAbsReal&>(_
RooAbsReal& pdf() const { return (RooAbsReal&) _origPdf.arg() ; } origVar.arg())) ; }
RooAbsReal& model() const { return (RooAbsReal&) _origModel.arg() ; } RooAbsReal& pdf() const { return const_cast<RooAbsReal&>(_origPdf.arg())
; }
RooAbsReal& model() const { return const_cast<RooAbsReal&>(_origModel.ar
g()) ; }
void printMetaArgs(ostream& os) const ;
protected: protected:
// WVE Store all properties of RooNumConvolution here so that can be take // WVE Store all properties of RooNumConvolution here so that can be take
// along in the copy ctor. // along in the copy ctor.
RooNumConvolution& conv() const { if (!_init) initialize() ; return *_con v ; } RooNumConvolution& conv() const { if (!_init) initialize() ; return *_con v ; }
mutable Bool_t _init ; mutable Bool_t _init ; //! do not persist
void initialize() const ; void initialize() const ;
mutable RooNumConvolution* _conv ; mutable RooNumConvolution* _conv ; //! Actual convolution calculation
RooRealProxy _origVar ; // Original convolution variable RooRealProxy _origVar ; // Original convolution variable
RooRealProxy _origPdf ; // Original input PDF RooRealProxy _origPdf ; // Original input PDF
RooRealProxy _origModel ; // Original resolution model RooRealProxy _origModel ; // Original resolution model
virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0, virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0,
const RooArgSet* auxProto=0, Bool_t verbose= kFALSE) const ; const RooArgSet* auxProto=0, Bool_t verbose= kFALSE) const ;
friend class RooConvGenContext ; friend class RooConvGenContext ;
ClassDef(RooNumConvPdf,0) // Operator PDF implementing numeric convol ution of 2 input PDFs ClassDef(RooNumConvPdf,1) // Operator PDF implementing numeric convol ution of 2 input PDFs
}; };
#endif #endif
 End of changes. 5 change blocks. 
6 lines changed or deleted 13 lines changed or added


 RooNumConvolution.h   RooNumConvolution.h 
skipping to change at line 32 skipping to change at line 32
#include "RooListProxy.h" #include "RooListProxy.h"
#include "RooNumIntConfig.h" #include "RooNumIntConfig.h"
class RooConvIntegrandBinding ; class RooConvIntegrandBinding ;
class RooAbsIntegrator ; class RooAbsIntegrator ;
class TH2 ; class TH2 ;
class RooNumConvolution : public RooAbsReal { class RooNumConvolution : public RooAbsReal {
public: public:
RooNumConvolution() ;
RooNumConvolution(const char *name, const char *title, RooNumConvolution(const char *name, const char *title,
RooRealVar& convVar, RooAbsReal& pdf, RooAbsReal& resmodel, const RooNumConvolution* proto=0) ; RooRealVar& convVar, RooAbsReal& pdf, RooAbsReal& resmodel, const RooNumConvolution* proto=0) ;
RooNumConvolution(const RooNumConvolution& other, const char* name=0) ; RooNumConvolution(const RooNumConvolution& other, const char* name=0) ;
virtual TObject* clone(const char* newname) const { return new RooNumConv olution(*this,newname) ; } virtual TObject* clone(const char* newname) const { return new RooNumConv olution(*this,newname) ; }
virtual ~RooNumConvolution() ; virtual ~RooNumConvolution() ;
Double_t evaluate() const ; Double_t evaluate() const ;
skipping to change at line 95 skipping to change at line 97
RooAbsReal& cloneModel() const { if (!_init) initialize() ; return (Roo AbsReal&) *_cloneModel ; } RooAbsReal& cloneModel() const { if (!_init) initialize() ; return (Roo AbsReal&) *_cloneModel ; }
Bool_t _useWindow ; // Switch to activate window convolution Bool_t _useWindow ; // Switch to activate window convolution
Double_t _windowScale ; // Scale factor for window parameter Double_t _windowScale ; // Scale factor for window parameter
RooListProxy _windowParam ; // Holder for optional convolution integr ation window scaling parameter RooListProxy _windowParam ; // Holder for optional convolution integr ation window scaling parameter
Int_t _verboseThresh ; // Call count threshold for verbose print ing Int_t _verboseThresh ; // Call count threshold for verbose print ing
Bool_t _doProf ; // Switch to activate profiling option Bool_t _doProf ; // Switch to activate profiling option
TH2* _callHist ; //! Histogram recording number of calls p er convolution integral calculation TH2* _callHist ; //! Histogram recording number of calls p er convolution integral calculation
ClassDef(RooNumConvolution,0) // Operator PDF implementing numeric conv olution of 2 input functions ClassDef(RooNumConvolution,1) // Operator PDF implementing numeric conv olution of 2 input functions
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 RooNumIntConfig.h   RooNumIntConfig.h 
skipping to change at line 68 skipping to change at line 68
void setPrintEvalCounter(Bool_t newVal) { _printEvalCounter = newVal ; } void setPrintEvalCounter(Bool_t newVal) { _printEvalCounter = newVal ; }
static RooNumIntConfig& defaultConfig() ; static RooNumIntConfig& defaultConfig() ;
Bool_t addConfigSection(const RooAbsIntegrator* proto, const RooArgSet& d efaultConfig) ; Bool_t addConfigSection(const RooAbsIntegrator* proto, const RooArgSet& d efaultConfig) ;
const RooArgSet& getConfigSection(const char* name) const ; const RooArgSet& getConfigSection(const char* name) const ;
RooArgSet& getConfigSection(const char* name) ; RooArgSet& getConfigSection(const char* name) ;
void printMultiline(ostream &os, Int_t content, Bool_t verbose, TString i ndent= "") const; void printMultiline(ostream &os, Int_t content, Bool_t verbose, TString i ndent= "") const;
virtual StyleOption defaultPrintStyle(Option_t* opt) const ;
inline virtual void Print(Option_t *options= 0) const { inline virtual void Print(Option_t *options= 0) const {
printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options)); printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));
} }
static void cleanup() ; static void cleanup() ;
protected: protected:
static RooNumIntConfig* _default ; static RooNumIntConfig* _default ;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 RooParamBinning.h   RooParamBinning.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooParamBinning.h 24280 2008-06-15 20:57:45Z wouter $ * File: $Id: RooParamBinning.h 28285 2009-04-20 14:33:36Z wouter $
* Authors: * * Authors: *
* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu * * WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
* DK, David Kirkby, UC Irvine, dkirkby@uci.edu * * DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
* * * *
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
skipping to change at line 63 skipping to change at line 63
virtual void removeHook(RooAbsRealLValue&) const ; virtual void removeHook(RooAbsRealLValue&) const ;
virtual Bool_t isShareable() const { return kFALSE ; } // parameterized b inning cannot be shared across instances virtual Bool_t isShareable() const { return kFALSE ; } // parameterized b inning cannot be shared across instances
virtual Bool_t isParameterized() const { return kTRUE ; } // binning is p arameterized, range will need special handling in integration virtual Bool_t isParameterized() const { return kTRUE ; } // binning is p arameterized, range will need special handling in integration
virtual RooAbsReal* lowBoundFunc() const { return xlo() ; } virtual RooAbsReal* lowBoundFunc() const { return xlo() ; }
virtual RooAbsReal* highBoundFunc() const { return xhi() ; } virtual RooAbsReal* highBoundFunc() const { return xhi() ; }
protected: protected:
mutable Double_t* _array ; //! do not persist mutable Double_t* _array ; //! do not persist
mutable RooAbsReal* _xlo ; mutable RooAbsReal* _xlo ; //!
mutable RooAbsReal* _xhi ; mutable RooAbsReal* _xhi ; //!
Int_t _nbins ; Int_t _nbins ;
Double_t _binw ; Double_t _binw ;
mutable RooListProxy* _lp ; //! mutable RooListProxy* _lp ; //
mutable RooAbsArg* _owner ; //! mutable RooAbsArg* _owner ; //
RooAbsReal* xlo() const { return _lp ? ((RooAbsReal*)_lp->at(0)) : _xlo ; } RooAbsReal* xlo() const { return _lp ? ((RooAbsReal*)_lp->at(0)) : _xlo ; }
RooAbsReal* xhi() const { return _lp ? ((RooAbsReal*)_lp->at(1)) : _xhi ; } RooAbsReal* xhi() const { return _lp ? ((RooAbsReal*)_lp->at(1)) : _xhi ; }
ClassDef(RooParamBinning,1) // Binning specification with ranges paramete rized by external RooAbsReal functions ClassDef(RooParamBinning,2) // Binning specification with ranges paramete rized by external RooAbsReal functions
}; };
#endif #endif
 End of changes. 4 change blocks. 
6 lines changed or deleted 6 lines changed or added


 RooPrintable.h   RooPrintable.h 
skipping to change at line 33 skipping to change at line 33
#include "TString.h" #include "TString.h"
class RooPrintable { class RooPrintable {
public: public:
inline RooPrintable() { } inline RooPrintable() { }
inline virtual ~RooPrintable() { } inline virtual ~RooPrintable() { }
// New-style printing // New-style printing
// Master print function // Master print function
enum ContentsOption { kName=1, kClassName=2, kValue=4, kArgs=8, kExtras=1 6, kAddress=32, kTitle=64 } ; // Can be ORed enum ContentsOption { kName=1, kClassName=2, kValue=4, kArgs=8, kExtras=1 6, kAddress=32, kTitle=64, kCollectionHeader=128} ; // Can be ORed
enum StyleOption { kInline=1, kSingleLine=2, kStandard=3, kVerbose=4, kTr eeStructure=5 } ; // Exclusive enum StyleOption { kInline=1, kSingleLine=2, kStandard=3, kVerbose=4, kTr eeStructure=5 } ; // Exclusive
virtual void printStream(ostream& os, Int_t contents, StyleOption style, TString indent="") const ; virtual void printStream(ostream& os, Int_t contents, StyleOption style, TString indent="") const ;
// Virtual hook function for class-specific content implementation // Virtual hook function for class-specific content implementation
virtual void printAddress(ostream& os) const ; virtual void printAddress(ostream& os) const ;
virtual void printName(ostream& os) const ; virtual void printName(ostream& os) const ;
virtual void printTitle(ostream& os) const ; virtual void printTitle(ostream& os) const ;
virtual void printClassName(ostream& os) const ; virtual void printClassName(ostream& os) const ;
virtual void printValue(ostream& os) const ; virtual void printValue(ostream& os) const ;
virtual void printArgs(ostream& os) const ; virtual void printArgs(ostream& os) const ;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooProdPdf.h   RooProdPdf.h 
skipping to change at line 81 skipping to change at line 81
virtual Int_t getGenerator(const RooArgSet& directVars, RooArgSet &genera teVars, Bool_t staticInitOK=kTRUE) const; virtual Int_t getGenerator(const RooArgSet& directVars, RooArgSet &genera teVars, Bool_t staticInitOK=kTRUE) const;
virtual void initGenerator(Int_t code) ; virtual void initGenerator(Int_t code) ;
virtual void generateEvent(Int_t code); virtual void generateEvent(Int_t code);
virtual Bool_t isDirectGenSafe(const RooAbsArg& arg) const ; virtual Bool_t isDirectGenSafe(const RooAbsArg& arg) const ;
// Constraint management // Constraint management
virtual RooArgSet* getConstraints(const RooArgSet& observables, const Roo ArgSet& constrainedParams) const ; virtual RooArgSet* getConstraints(const RooArgSet& observables, const Roo ArgSet& constrainedParams) const ;
virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ; virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;
void printMetaArgs(ostream& os) const ;
protected: protected:
void initializeFromCmdArgList(const RooArgSet& fullPdfSet, const RooLinke dList& l) ; void initializeFromCmdArgList(const RooArgSet& fullPdfSet, const RooLinke dList& l) ;
void factorizeProduct(const RooArgSet& normSet, const RooArgSet& intSet, void factorizeProduct(const RooArgSet& normSet, const RooArgSet& intSet,
RooLinkedList& termList, RooLinkedList& normList, RooLinkedList& termList, RooLinkedList& normList,
RooLinkedList& impDepList, RooLinkedList& crossDepL ist, RooLinkedList& impDepList, RooLinkedList& crossDepL ist,
RooLinkedList& intList) const; RooLinkedList& intList) const;
const char* makeRGPPName(const char* pfx, const RooArgSet& term, const Ro oArgSet& iset, const RooArgSet& nset, const char* isetRangeName) const ; const char* makeRGPPName(const char* pfx, const RooArgSet& term, const Ro oArgSet& iset, const RooArgSet& nset, const char* isetRangeName) const ;
void groupProductTerms(RooLinkedList& groupedTerms, RooArgSet& outerIntDe ps, void groupProductTerms(RooLinkedList& groupedTerms, RooArgSet& outerIntDe ps,
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 RooProduct.h   RooProduct.h 
skipping to change at line 48 skipping to change at line 48
virtual Bool_t forceAnalyticalInt(const RooAbsArg& dep) const ; virtual Bool_t forceAnalyticalInt(const RooAbsArg& dep) const ;
virtual Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& anal Vars, virtual Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& anal Vars,
const RooArgSet* normSet , const RooArgSet* normSet ,
const char* rangeName=0) const ; const char* rangeName=0) const ;
virtual Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const; virtual Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const;
virtual ~RooProduct() ; virtual ~RooProduct() ;
class ProdMap ; class ProdMap ;
void printMetaArgs(ostream& os) const ;
protected: protected:
RooSetProxy _compRSet ; RooSetProxy _compRSet ;
RooSetProxy _compCSet ; RooSetProxy _compCSet ;
TIterator* _compRIter ; //! do not persist TIterator* _compRIter ; //! do not persist
TIterator* _compCIter ; //! do not persist TIterator* _compCIter ; //! do not persist
class CacheElem : public RooAbsCacheElement { class CacheElem : public RooAbsCacheElement {
public: public:
virtual ~CacheElem(); virtual ~CacheElem();
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 RooProfileLL.h   RooProfileLL.h 
skipping to change at line 34 skipping to change at line 34
public: public:
RooProfileLL(const char *name, const char *title, RooAbsReal& nll, const RooArgSet& observables); RooProfileLL(const char *name, const char *title, RooAbsReal& nll, const RooArgSet& observables);
RooProfileLL(const RooProfileLL& other, const char* name=0) ; RooProfileLL(const RooProfileLL& other, const char* name=0) ;
virtual TObject* clone(const char* newname) const { return new RooProfile LL(*this,newname); } virtual TObject* clone(const char* newname) const { return new RooProfile LL(*this,newname); }
virtual ~RooProfileLL() ; virtual ~RooProfileLL() ;
void setAlwaysStartFromMin(Bool_t flag) { _startFromMin = flag ; } void setAlwaysStartFromMin(Bool_t flag) { _startFromMin = flag ; }
Bool_t alwaysStartFromMin() const { return _startFromMin ; } Bool_t alwaysStartFromMin() const { return _startFromMin ; }
RooAbsReal& nll() { return (RooAbsReal&) _nll.arg() ; } RooAbsReal& nll() { return const_cast<RooAbsReal&>(_nll.arg()) ; }
const RooArgSet& bestFitParams() const ; const RooArgSet& bestFitParams() const ;
virtual RooAbsReal* createProfile(const RooArgSet& paramsOfInterest) ; virtual RooAbsReal* createProfile(const RooArgSet& paramsOfInterest) ;
protected: protected:
void validateAbsMin() const ; void validateAbsMin() const ;
RooRealProxy _nll ; // Input -log(L) function RooRealProxy _nll ; // Input -log(L) function
RooSetProxy _obs ; // Parameters of profile likelihood RooSetProxy _obs ; // Parameters of profile likelihood
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooProjectedPdf.h   RooProjectedPdf.h 
skipping to change at line 46 skipping to change at line 46
Int_t getGenerator(const RooArgSet& directVars, RooArgSet &generateVars, Bool_t staticInitOK=kTRUE) const; Int_t getGenerator(const RooArgSet& directVars, RooArgSet &generateVars, Bool_t staticInitOK=kTRUE) const;
void initGenerator(Int_t /*code*/) {} ; // optional pre-generation initia lization void initGenerator(Int_t /*code*/) {} ; // optional pre-generation initia lization
void generateEvent(Int_t code); void generateEvent(Int_t code);
virtual Bool_t selfNormalized() const { return kTRUE ; } virtual Bool_t selfNormalized() const { return kTRUE ; }
// Handle projection of projection explicitly // Handle projection of projection explicitly
virtual RooAbsPdf* createProjection(const RooArgSet& iset) ; virtual RooAbsPdf* createProjection(const RooArgSet& iset) ;
void printMetaArgs(ostream& os) const ;
protected: protected:
RooRealProxy intpdf ; // p.d.f that is integrated RooRealProxy intpdf ; // p.d.f that is integrated
RooSetProxy intobs ; // observables that p.d.f is integrated over RooSetProxy intobs ; // observables that p.d.f is integrated over
RooSetProxy deps ; // dependents of this p.d.f RooSetProxy deps ; // dependents of this p.d.f
class CacheElem : public RooAbsCacheElement { class CacheElem : public RooAbsCacheElement {
public: public:
virtual ~CacheElem() { delete _projection ; } ; virtual ~CacheElem() { delete _projection ; } ;
// Payload // Payload
RooAbsReal* _projection ; RooAbsReal* _projection ;
// Cache management functions // Cache management functions
virtual RooArgList containedArgs(Action) ; virtual RooArgList containedArgs(Action) ;
virtual void printCompactTreeHook(std::ostream&, const char *, Int_t, I nt_t) ; virtual void printCompactTreeHook(std::ostream&, const char *, Int_t, I nt_t) ;
} ; } ;
mutable RooObjCacheManager _cacheMgr ; // The cache manager mutable RooObjCacheManager _cacheMgr ; //! The cache manager
Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t /*mustReplaceAll*/, Bool_t /*nameChange*/, Bool_t /*isRecursive*/) ; Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t /*mustReplaceAll*/, Bool_t /*nameChange*/, Bool_t /*isRecursive*/) ;
mutable RooArgSet* _curNormSet ; //! mutable RooArgSet* _curNormSet ; //!
const RooAbsReal* getProjection(const RooArgSet* iset, const RooArgSet* n set, int& code) const ; const RooAbsReal* getProjection(const RooArgSet* iset, const RooArgSet* n set, int& code) const ;
Double_t evaluate() const ; Double_t evaluate() const ;
private: private:
ClassDef(RooProjectedPdf,0) // Operator p.d.f calculating projection of a nother p.d.f ClassDef(RooProjectedPdf,1) // Operator p.d.f calculating projection of a nother p.d.f
}; };
#endif #endif
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added


 RooRangeBinning.h   RooRangeBinning.h 
skipping to change at line 45 skipping to change at line 45
virtual Double_t binHigh(Int_t) const { return _range[1] ; } virtual Double_t binHigh(Int_t) const { return _range[1] ; }
virtual void setRange(Double_t xlo, Double_t xhi) ; virtual void setRange(Double_t xlo, Double_t xhi) ;
virtual void setMin(Double_t xlo) { setRange(xlo,highBound()) ; } virtual void setMin(Double_t xlo) { setRange(xlo,highBound()) ; }
virtual void setMax(Double_t xhi) { setRange(lowBound(),xhi) ; } virtual void setMax(Double_t xhi) { setRange(lowBound(),xhi) ; }
virtual Double_t lowBound() const { return _range[0] ; } virtual Double_t lowBound() const { return _range[0] ; }
virtual Double_t highBound() const { return _range[1] ; } virtual Double_t highBound() const { return _range[1] ; }
virtual Double_t averageBinWidth() const { return binWidth(0) ; } virtual Double_t averageBinWidth() const { return binWidth(0) ; }
virtual Double_t* array() const { return (Double_t*) _range ; } virtual Double_t* array() const { return const_cast<Double_t*>(_range) ; }
protected: protected:
Double_t _range[2] ; Double_t _range[2] ;
ClassDef(RooRangeBinning,1) // Binning that only defines the total range ClassDef(RooRangeBinning,1) // Binning that only defines the total range
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooRealBinding.h   RooRealBinding.h 
skipping to change at line 28 skipping to change at line 28
#include "RooAbsFunc.h" #include "RooAbsFunc.h"
class RooAbsRealLValue; class RooAbsRealLValue;
class RooAbsReal; class RooAbsReal;
class RooArgSet; class RooArgSet;
class RooRealBinding : public RooAbsFunc { class RooRealBinding : public RooAbsFunc {
public: public:
RooRealBinding(const RooAbsReal& func, const RooArgSet &vars, const RooAr gSet* nset=0, Bool_t clipInvalid=kFALSE, const TNamed* rangeName=0); RooRealBinding(const RooAbsReal& func, const RooArgSet &vars, const RooAr gSet* nset=0, Bool_t clipInvalid=kFALSE, const TNamed* rangeName=0);
RooRealBinding(const RooRealBinding& other, const RooArgSet* nset=0) ;
virtual ~RooRealBinding(); virtual ~RooRealBinding();
virtual Double_t operator()(const Double_t xvector[]) const; virtual Double_t operator()(const Double_t xvector[]) const;
virtual Double_t getMinLimit(UInt_t dimension) const; virtual Double_t getMinLimit(UInt_t dimension) const;
virtual Double_t getMaxLimit(UInt_t dimension) const; virtual Double_t getMaxLimit(UInt_t dimension) const;
virtual void saveXVec() const ; virtual void saveXVec() const ;
virtual void restoreXVec() const ; virtual void restoreXVec() const ;
virtual const char* getName() const ; virtual const char* getName() const ;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 RooRealIntegral.h   RooRealIntegral.h 
skipping to change at line 47 skipping to change at line 47
RooRealIntegral() ; RooRealIntegral() ;
RooRealIntegral(const char *name, const char *title, const RooAbsReal& fu nction, const RooArgSet& depList, RooRealIntegral(const char *name, const char *title, const RooAbsReal& fu nction, const RooArgSet& depList,
const RooArgSet* funcNormSet=0, const RooNumIntConfig* con fig=0, const char* rangeName=0) ; const RooArgSet* funcNormSet=0, const RooNumIntConfig* con fig=0, const char* rangeName=0) ;
RooRealIntegral(const RooRealIntegral& other, const char* name=0); RooRealIntegral(const RooRealIntegral& other, const char* name=0);
virtual TObject* clone(const char* newname) const { return new RooRealInt egral(*this,newname); } virtual TObject* clone(const char* newname) const { return new RooRealInt egral(*this,newname); }
virtual ~RooRealIntegral(); virtual ~RooRealIntegral();
Bool_t isValid() const { return _valid; } Bool_t isValid() const { return _valid; }
void printMultiline(ostream& os, Int_t contents, Bool_t verbose=kFALSE, T String indent="") const ; void printMultiline(ostream& os, Int_t contents, Bool_t verbose=kFALSE, T String indent="") const ;
void printMetaArgs(ostream& os) const ;
const RooArgSet& numIntCatVars() const { return _sumList ; } const RooArgSet& numIntCatVars() const { return _sumList ; }
const RooArgSet& numIntRealVars() const { return _intList ; } const RooArgSet& numIntRealVars() const { return _intList ; }
const RooArgSet& anaIntVars() const { return _anaList ; } const RooArgSet& anaIntVars() const { return _anaList ; }
void setCacheExpensive(Bool_t flag) { void setCacheExpensive(Bool_t flag) {
// If true, expensive integrals (those with >1 dimension numerically in tegrated) // If true, expensive integrals (those with >1 dimension numerically in tegrated)
// have there values cached in the global expensive object repository // have there values cached in the global expensive object repository
_cacheExpensive = flag ; _cacheExpensive = flag ;
} }
skipping to change at line 69 skipping to change at line 70
// If true, expensive integrals (those with >1 dimension numerically in tegrated) // If true, expensive integrals (those with >1 dimension numerically in tegrated)
// have there values cached in the global expensive object repository // have there values cached in the global expensive object repository
return _cacheExpensive ; return _cacheExpensive ;
} }
virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const { virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const {
// Forward plot sampling hint of integrand // Forward plot sampling hint of integrand
return _function.arg().plotSamplingHint(obs,xlo,xhi) ; return _function.arg().plotSamplingHint(obs,xlo,xhi) ;
} }
virtual RooAbsReal* createIntegral(const RooArgSet& iset, const RooArgSet
* nset=0, const RooNumIntConfig* cfg=0, const char* rangeName=0) const ;
protected: protected:
mutable Bool_t _valid; mutable Bool_t _valid;
const RooArgSet& parameters() const ; const RooArgSet& parameters() const ;
enum IntOperMode { Hybrid, Analytic, PassThrough } ; enum IntOperMode { Hybrid, Analytic, PassThrough } ;
//friend class RooAbsPdf ; //friend class RooAbsPdf ;
Bool_t initNumIntegrator() const; Bool_t initNumIntegrator() const;
void autoSelectDirtyMode() ; void autoSelectDirtyMode() ;
virtual Double_t sum() const ; virtual Double_t sum() const ;
virtual Double_t integrate() const ; virtual Double_t integrate() const ;
virtual Double_t jacobianProduct() const ; virtual Double_t jacobianProduct() const ;
// Evaluation and validation implementation // Evaluation and validation implementation
Double_t evaluate() const ; Double_t evaluate() const ;
virtual Bool_t isValidReal(Double_t value, Bool_t printError=kFALSE) cons t ; virtual Bool_t isValidReal(Double_t value, Bool_t printError=kFALSE) cons t ;
Bool_t servesExclusively(const RooAbsArg* server,const RooArgSet& exclLVB ranches) const ; Bool_t servesExclusively(const RooAbsArg* server,const RooArgSet& exclLVB ranches, const RooArgSet& allBranches) const ;
virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList,
Bool_t mustReplaceAll, Bool_t nameChang e, Bool_t isRecursive) ; Bool_t mustReplaceAll, Bool_t nameChang e, Bool_t isRecursive) ;
// Function pointer and integrands list // Function pointer and integrands list
mutable RooSetProxy _sumList ; // Set of discrete observable over which i s summed numerically mutable RooSetProxy _sumList ; // Set of discrete observable over which i s summed numerically
mutable RooSetProxy _intList ; // Set of continuous observables over whic h is integrated numerically mutable RooSetProxy _intList ; // Set of continuous observables over whic h is integrated numerically
mutable RooSetProxy _anaList ; // Set of observables over which is integr ated/summed analytically mutable RooSetProxy _anaList ; // Set of observables over which is integr ated/summed analytically
mutable RooSetProxy _jacList ; // Set of lvalue observables over which is analytically integration that have a non-unit Jacobian mutable RooSetProxy _jacList ; // Set of lvalue observables over which is analytically integration that have a non-unit Jacobian
mutable RooSetProxy _facList ; // Set of observables on which function do es not depends, which are integrated nevertheless mutable RooSetProxy _facList ; // Set of observables on which function do es not depends, which are integrated nevertheless
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 RooRealProxy.h   RooRealProxy.h 
skipping to change at line 28 skipping to change at line 28
#include "RooAbsReal.h" #include "RooAbsReal.h"
#include "RooArgProxy.h" #include "RooArgProxy.h"
#include "RooAbsRealLValue.h" #include "RooAbsRealLValue.h"
class RooRealProxy : public RooArgProxy { class RooRealProxy : public RooArgProxy {
public: public:
// Constructors, assignment etc. // Constructors, assignment etc.
RooRealProxy() {} ; RooRealProxy() {} ;
RooRealProxy(const char* name, const char* desc, RooAbsArg* owner,
Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool_t p
roxyOwnsArg=kFALSE) ;
RooRealProxy(const char* name, const char* desc, RooAbsArg* owner, RooAbs Real& ref, RooRealProxy(const char* name, const char* desc, RooAbsArg* owner, RooAbs Real& ref,
Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool_t p roxyOwnsArg=kFALSE) ; Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool_t p roxyOwnsArg=kFALSE) ;
RooRealProxy(const char* name, RooAbsArg* owner, const RooRealProxy& othe r) ; RooRealProxy(const char* name, RooAbsArg* owner, const RooRealProxy& othe r) ;
virtual TObject* Clone(const char* newName=0) const { return new RooRealP roxy(newName,_owner,*this); } virtual TObject* Clone(const char* newName=0) const { return new RooRealP roxy(newName,_owner,*this); }
virtual ~RooRealProxy(); virtual ~RooRealProxy();
// Accessors // Accessors
inline operator Double_t() const { return _isFund?((RooAbsReal*)_arg)->_v alue:((RooAbsReal*)_arg)->getVal(_nset) ; } inline operator Double_t() const { return _isFund?((RooAbsReal*)_arg)->_v alue:((RooAbsReal*)_arg)->getVal(_nset) ; }
inline const RooAbsReal& arg() const { return (RooAbsReal&)*_arg ; } inline const RooAbsReal& arg() const { return (RooAbsReal&)*_arg ; }
// Modifier
virtual Bool_t setArg(RooAbsReal& newRef) ;
protected: protected:
RooAbsRealLValue* lvptr() const ; RooAbsRealLValue* lvptr() const ;
public: public:
// LValue operations // LValue operations
RooRealProxy& operator=(const Double_t& value) { lvptr()->setVal(value) ; return *this ; } RooRealProxy& operator=(const Double_t& value) { lvptr()->setVal(value) ; return *this ; }
Double_t min(const char* rname=0) const { return lvptr()->getMin(rname) ; } Double_t min(const char* rname=0) const { return lvptr()->getMin(rname) ; }
Double_t max(const char* rname=0) const { return lvptr()->getMax(rname) ; } Double_t max(const char* rname=0) const { return lvptr()->getMax(rname) ; }
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added


 RooRealSumPdf.h   RooRealSumPdf.h 
skipping to change at line 22 skipping to change at line 22
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_REAL_SUM_PDF #ifndef ROO_REAL_SUM_PDF
#define ROO_REAL_SUM_PDF #define ROO_REAL_SUM_PDF
#include "RooAbsPdf.h" #include "RooAbsPdf.h"
#include "RooListProxy.h" #include "RooListProxy.h"
#include "RooAICRegistry.h" #include "RooAICRegistry.h"
#include "RooObjCacheManager.h"
class RooRealSumPdf : public RooAbsPdf { class RooRealSumPdf : public RooAbsPdf {
public: public:
RooRealSumPdf() ; RooRealSumPdf() ;
RooRealSumPdf(const char *name, const char *title); RooRealSumPdf(const char *name, const char *title);
RooRealSumPdf(const char *name, const char *title, const RooArgList& func List, const RooArgList& coefList, Bool_t extended=kFALSE) ;
RooRealSumPdf(const char *name, const char *title, RooRealSumPdf(const char *name, const char *title,
RooAbsReal& func1, RooAbsReal& func2, RooAbsReal& coef1) ; RooAbsReal& func1, RooAbsReal& func2, RooAbsReal& coef1) ;
RooRealSumPdf(const char *name, const char *title, const RooArgList& func List, const RooArgList& coefList) ;
RooRealSumPdf(const RooRealSumPdf& other, const char* name=0) ; RooRealSumPdf(const RooRealSumPdf& other, const char* name=0) ;
virtual TObject* clone(const char* newname) const { return new RooRealSum Pdf(*this,newname) ; } virtual TObject* clone(const char* newname) const { return new RooRealSum Pdf(*this,newname) ; }
virtual ~RooRealSumPdf() ; virtual ~RooRealSumPdf() ;
Double_t evaluate() const ; Double_t evaluate() const ;
virtual Bool_t checkObservables(const RooArgSet* nset) const ; virtual Bool_t checkObservables(const RooArgSet* nset) const ;
virtual Bool_t forceAnalyticalInt(const RooAbsArg&) const { return kTRUE ; } virtual Bool_t forceAnalyticalInt(const RooAbsArg&) const { return kTRUE ; }
Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& numVars, con st RooArgSet* normSet, const char* rangeName=0) const ; Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& numVars, con st RooArgSet* normSet, const char* rangeName=0) const ;
Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ; Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ;
const RooArgList& funcList() const { return _funcList ; } const RooArgList& funcList() const { return _funcList ; }
const RooArgList& coefList() const { return _coefList ; } const RooArgList& coefList() const { return _coefList ; }
protected: virtual ExtendMode extendMode() const ;
virtual Double_t expectedEvents(const RooArgSet* nset) const ;
virtual Double_t expectedEvents(const RooArgSet& nset) const {
// Return expected number of events for extended likelihood calculation
// which is the sum of all coefficients
return expectedEvents(&nset) ;
}
mutable RooAICRegistry _codeReg ; //! Registry of component analytical i void printMetaArgs(ostream& os) const ;
ntegration codes
protected:
void syncFuncIntList(const RooArgSet* intSet) const ; class CacheElem : public RooAbsCacheElement {
void syncFuncNormList(const RooArgSet* normSet) const ; public:
mutable RooArgSet* _lastFuncIntSet ; //! CacheElem() {} ;
mutable RooArgSet* _lastFuncNormSet ; //! virtual ~CacheElem() {} ;
mutable RooArgList* _funcIntList ; //! virtual RooArgList containedArgs(Action) { RooArgList ret(_funcIntList)
mutable RooArgList* _funcNormList ; //! ; ret.add(_funcNormList) ; return ret ; }
RooArgList _funcIntList ;
RooArgList _funcNormList ;
} ;
mutable RooObjCacheManager _normIntMgr ; // The integration cache manager
Bool_t _haveLastCoef ; Bool_t _haveLastCoef ;
RooListProxy _funcList ; // List of component FUNCs RooListProxy _funcList ; // List of component FUNCs
RooListProxy _coefList ; // List of coefficients RooListProxy _coefList ; // List of coefficients
TIterator* _funcIter ; //! Iterator over FUNC list TIterator* _funcIter ; //! Iterator over FUNC list
TIterator* _coefIter ; //! Iterator over coefficient list TIterator* _coefIter ; //! Iterator over coefficient list
Bool_t _extended ; // Allow use as extended p.d.f.
private: private:
ClassDef(RooRealSumPdf,1) // PDF constructed from a sum of (non-pdf) func tions ClassDef(RooRealSumPdf,2) // PDF constructed from a sum of (non-pdf) func tions
}; };
#endif #endif
 End of changes. 8 change blocks. 
11 lines changed or deleted 25 lines changed or added


 RooRealVar.h   RooRealVar.h 
skipping to change at line 59 skipping to change at line 59
virtual void setVal(Double_t value); virtual void setVal(Double_t value);
inline Double_t getError() const { return _error>=0?_error:0. ; } inline Double_t getError() const { return _error>=0?_error:0. ; }
inline Bool_t hasError(Bool_t allowZero=kTRUE) const { return allowZero ? (_error>=0) : (_error>0) ; } inline Bool_t hasError(Bool_t allowZero=kTRUE) const { return allowZero ? (_error>=0) : (_error>0) ; }
inline void setError(Double_t value) { _error= value ; } inline void setError(Double_t value) { _error= value ; }
inline void removeError() { _error = -1 ; } inline void removeError() { _error = -1 ; }
inline Double_t getAsymErrorLo() const { return _asymErrLo<=0?_asymErrLo: 0. ; } inline Double_t getAsymErrorLo() const { return _asymErrLo<=0?_asymErrLo: 0. ; }
inline Double_t getAsymErrorHi() const { return _asymErrHi>=0?_asymErrHi: 0. ; } inline Double_t getAsymErrorHi() const { return _asymErrHi>=0?_asymErrHi: 0. ; }
inline Bool_t hasAsymError(Bool_t allowZero=kTRUE) const { return allowZe ro ? ((_asymErrHi>=0 && _asymErrLo<=0)) : ((_asymErrHi>0 && _asymErrLo<0)) ; } inline Bool_t hasAsymError(Bool_t allowZero=kTRUE) const { return allowZe ro ? ((_asymErrHi>=0 && _asymErrLo<=0)) : ((_asymErrHi>0 && _asymErrLo<0)) ; }
inline void removeAsymError() { _asymErrLo = 1 ; _asymErrHi = -1 ; } inline void removeAsymError() { _asymErrLo = 1 ; _asymErrHi = -1 ; }
inline void setAsymError(Double_t lo, Double_t hi) { _asymErrLo = lo ; _a symErrHi = hi ; } inline void setAsymError(Double_t lo, Double_t hi) { _asymErrLo = lo ; _a symErrHi = hi ; }
inline Double_t getErrorLo() const { return _asymErrLo<=0?_asymErrLo:-1*_
error ; }
inline Double_t getErrorHi() const { return _asymErrHi>=0?_asymErrHi:_err
or ; }
RooErrorVar* errorVar() const ; RooErrorVar* errorVar() const ;
// Set/get finite fit range limits // Set/get finite fit range limits
void setMin(const char* name, Double_t value) ; void setMin(const char* name, Double_t value) ;
void setMax(const char* name, Double_t value) ; void setMax(const char* name, Double_t value) ;
void setRange(const char* name, Double_t min, Double_t max) ; void setRange(const char* name, Double_t min, Double_t max) ;
void setRange(const char* name, RooAbsReal& min, RooAbsReal& max) ; void setRange(const char* name, RooAbsReal& min, RooAbsReal& max) ;
inline void setMin(Double_t value) { setMin(0,value) ; } inline void setMin(Double_t value) { setMin(0,value) ; }
inline void setMax(Double_t value) { setMax(0,value) ; } inline void setMax(Double_t value) { setMax(0,value) ; }
inline void setRange(Double_t min, Double_t max) { setRange(0,min,max) ; } inline void setRange(Double_t min, Double_t max) { setRange(0,min,max) ; }
skipping to change at line 119 skipping to change at line 122
protected: protected:
static Bool_t _printScientific ; static Bool_t _printScientific ;
static Int_t _printSigDigits ; static Int_t _printSigDigits ;
virtual void setVal(Double_t value, const char* rangeName) ; virtual void setVal(Double_t value, const char* rangeName) ;
virtual void setValFast(Double_t value) { _value = value ; setValueDirty( ) ; } virtual void setValFast(Double_t value) { _value = value ; setValueDirty( ) ; }
virtual Double_t evaluate() const { return _value ; } // dummy because we overloaded getVal() virtual Double_t evaluate() const { return _value ; } // dummy because we overloaded getVal()
virtual void copyCache(const RooAbsArg* source) ; virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;
virtual void attachToTree(TTree& t, Int_t bufSize=32000) ; virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;
virtual void fillTreeBranch(TTree& t) ; virtual void fillTreeBranch(TTree& t) ;
Double_t chopAt(Double_t what, Int_t where) const ; Double_t chopAt(Double_t what, Int_t where) const ;
Double_t _error; // Symmetric error associated with current value Double_t _error; // Symmetric error associated with current value
Double_t _asymErrLo ; // Low side of asymmetric error associated with cur rent value Double_t _asymErrLo ; // Low side of asymmetric error associated with cur rent value
Double_t _asymErrHi ; // High side of asymmetric error associated with cu rrent value Double_t _asymErrHi ; // High side of asymmetric error associated with cu rrent value
RooAbsBinning* _binning ; RooAbsBinning* _binning ;
RooLinkedList _altNonSharedBinning ; // Non-shareable alternative binning s RooLinkedList _altNonSharedBinning ; // Non-shareable alternative binning s
inline RooRealVarSharedProperties* sharedProp() const { inline RooRealVarSharedProperties* sharedProp() const {
if (!_sharedProp) { if (!_sharedProp) {
_sharedProp = (RooRealVarSharedProperties*) _sharedPropList.register _sharedProp = (RooRealVarSharedProperties*) _sharedPropList.registerP
Properties(new RooRealVarSharedProperties()) ; roperties(new RooRealVarSharedProperties()) ;
} }
return _sharedProp ; return _sharedProp ;
} }
static RooSharedPropertiesList _sharedPropList; // List of properties sha red among clone sets static RooSharedPropertiesList _sharedPropList; // List of properties sha red among clone sets
static RooRealVarSharedProperties _nullProp ; // Null property static RooRealVarSharedProperties _nullProp ; // Null property
mutable RooRealVarSharedProperties* _sharedProp ; //! Shared properties a ssociated with this instance mutable RooRealVarSharedProperties* _sharedProp ; //! Shared properties a ssociated with this instance
ClassDef(RooRealVar,4) // Real-valued variable ClassDef(RooRealVar,5) // Real-valued variable
}; };
#endif #endif
 End of changes. 4 change blocks. 
7 lines changed or deleted 12 lines changed or added


 RooRealVarSharedProperties.h   RooRealVarSharedProperties.h 
skipping to change at line 31 skipping to change at line 31
#include "RooLinkedList.h" #include "RooLinkedList.h"
class RooRealVarSharedProperties : public RooSharedProperties { class RooRealVarSharedProperties : public RooSharedProperties {
public: public:
RooRealVarSharedProperties() ; RooRealVarSharedProperties() ;
RooRealVarSharedProperties(const RooRealVarSharedProperties&) ; RooRealVarSharedProperties(const RooRealVarSharedProperties&) ;
RooRealVarSharedProperties(const char* uuidstr) ; RooRealVarSharedProperties(const char* uuidstr) ;
virtual ~RooRealVarSharedProperties() ; virtual ~RooRealVarSharedProperties() ;
RooSharedProperties* clone() { return new RooRealVarSharedProperties(*thi
s) ; }
protected: protected:
friend class RooRealVar ; friend class RooRealVar ;
RooLinkedList _altBinning ; // Optional alternative ranges and binnings RooLinkedList _altBinning ; // Optional alternative ranges and binnings
ClassDef(RooRealVarSharedProperties,1) // Shared properties of a RooRealV ar clone set ClassDef(RooRealVarSharedProperties,1) // Shared properties of a RooRealV ar clone set
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 RooResolutionModel.h   RooResolutionModel.h 
skipping to change at line 46 skipping to change at line 46
RooRealVar& convVar() const ; RooRealVar& convVar() const ;
const RooRealVar& basisConvVar() const ; const RooRealVar& basisConvVar() const ;
inline Bool_t isBasisSupported(const char* name) const { return basisCode (name)?kTRUE:kFALSE ; } inline Bool_t isBasisSupported(const char* name) const { return basisCode (name)?kTRUE:kFALSE ; }
virtual Int_t basisCode(const char* name) const = 0 ; virtual Int_t basisCode(const char* name) const = 0 ;
virtual void normLeafServerList(RooArgSet& list) const ; virtual void normLeafServerList(RooArgSet& list) const ;
Double_t getNorm(const RooArgSet* nset=0) const ; Double_t getNorm(const RooArgSet* nset=0) const ;
inline const RooFormulaVar& basis() const { return _basis?*_basis:*identi ty() ; } inline const RooFormulaVar& basis() const { return _basis?*_basis:*identi ty() ; }
Bool_t isConvolved() { return _basis ? kTRUE : kFALSE ; }
virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ; virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ;
static void cleanup() ; static void cleanup() ;
static RooFormulaVar* identity() ; static RooFormulaVar* identity() ;
protected: protected:
static RooFormulaVar* _identity ; // Identity basis function pointe static RooFormulaVar* _identity ; // Identity basis function pointe
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 RooSegmentedIntegrator1D.h   RooSegmentedIntegrator1D.h 
skipping to change at line 36 skipping to change at line 36
// Constructors, assignment etc // Constructors, assignment etc
RooSegmentedIntegrator1D() ; RooSegmentedIntegrator1D() ;
RooSegmentedIntegrator1D(const RooAbsFunc& function, const RooNumIntConfi g& config) ; RooSegmentedIntegrator1D(const RooAbsFunc& function, const RooNumIntConfi g& config) ;
RooSegmentedIntegrator1D(const RooAbsFunc& function, Double_t xmin, Doubl e_t xmax, const RooNumIntConfig& config) ; RooSegmentedIntegrator1D(const RooAbsFunc& function, Double_t xmin, Doubl e_t xmax, const RooNumIntConfig& config) ;
virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ; virtual RooAbsIntegrator* clone(const RooAbsFunc& function, const RooNumI ntConfig& config) const ;
virtual ~RooSegmentedIntegrator1D(); virtual ~RooSegmentedIntegrator1D();
virtual Bool_t checkLimits() const; virtual Bool_t checkLimits() const;
virtual Double_t integral(const Double_t *yvec=0) ; virtual Double_t integral(const Double_t *yvec=0) ;
Bool_t setLimits(Double_t xmin, Double_t xmax);
using RooAbsIntegrator::setLimits ;
Bool_t setLimits(Double_t *xmin, Double_t *xmax);
virtual Bool_t setUseIntegrandLimits(Bool_t flag) { _useIntegrandLimits = flag ; return kTRUE ; } virtual Bool_t setUseIntegrandLimits(Bool_t flag) { _useIntegrandLimits = flag ; return kTRUE ; }
virtual Bool_t canIntegrate1D() const { return kTRUE ; } virtual Bool_t canIntegrate1D() const { return kTRUE ; }
virtual Bool_t canIntegrate2D() const { return kFALSE ; } virtual Bool_t canIntegrate2D() const { return kFALSE ; }
virtual Bool_t canIntegrateND() const { return kFALSE ; } virtual Bool_t canIntegrateND() const { return kFALSE ; }
virtual Bool_t canIntegrateOpenEnded() const { return kFALSE ; } virtual Bool_t canIntegrateOpenEnded() const { return kFALSE ; }
protected: protected:
friend class RooNumIntFactory ; friend class RooNumIntFactory ;
 End of changes. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added


 RooSetPair.h   RooSetPair.h 
skipping to change at line 30 skipping to change at line 30
#include "RooArgSet.h" #include "RooArgSet.h"
class RooLinkedListElem ; class RooLinkedListElem ;
class TBuffer ; class TBuffer ;
class RooSetPair : public TObject { class RooSetPair : public TObject {
public: public:
// Initial element ctor // Initial element ctor
RooSetPair(const RooArgSet* set1=0, const RooArgSet* set2=0) : RooSetPair(const RooArgSet* set1=0, const RooArgSet* set2=0) :
_set1((RooArgSet*)set1), _set2((RooArgSet*)set2) { _set1(const_cast<RooArgSet*>(set1)), _set2(const_cast<RooArgSet*>(set2) ) {
} }
// Destructor // Destructor
virtual ~RooSetPair() { virtual ~RooSetPair() {
} }
RooArgSet* _set1 ; RooArgSet* _set1 ;
RooArgSet* _set2 ; RooArgSet* _set2 ;
virtual ULong_t Hash() const { virtual ULong_t Hash() const {
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooSetProxy.h   RooSetProxy.h 
skipping to change at line 66 skipping to change at line 66
RooSetProxy& operator=(const RooArgSet& other) ; RooSetProxy& operator=(const RooArgSet& other) ;
protected: protected:
RooAbsArg* _owner ; RooAbsArg* _owner ;
Bool_t _defValueServer ; Bool_t _defValueServer ;
Bool_t _defShapeServer ; Bool_t _defShapeServer ;
TIterator* _iter ; //! do not persist TIterator* _iter ; //! do not persist
virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t nameChange=kFALSE) ; virtual Bool_t changePointer(const RooAbsCollection& newServerSet, Bool_t nameChange=kFALSE, Bool_t factoryInitMode=kFALSE) ;
ClassDef(RooSetProxy,1) // Proxy class for a RooArgSet ClassDef(RooSetProxy,1) // Proxy class for a RooArgSet
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RooSharedProperties.h   RooSharedProperties.h 
skipping to change at line 30 skipping to change at line 30
#include "TUUID.h" #include "TUUID.h"
class RooSharedProperties : public TObject { class RooSharedProperties : public TObject {
public: public:
RooSharedProperties() ; RooSharedProperties() ;
RooSharedProperties(const char* uuidstr) ; RooSharedProperties(const char* uuidstr) ;
virtual ~RooSharedProperties() ; virtual ~RooSharedProperties() ;
Bool_t operator==(const RooSharedProperties& other) ; Bool_t operator==(const RooSharedProperties& other) ;
virtual RooSharedProperties* clone() = 0 ;
virtual void Print(Option_t* opts=0) const ; virtual void Print(Option_t* opts=0) const ;
protected: protected:
TUUID _uuid ; // Unique object ID TUUID _uuid ; // Unique object ID
ClassDef(RooSharedProperties,1) // Abstract interface for shared property implementations ClassDef(RooSharedProperties,1) // Abstract interface for shared property implementations
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 RooSimWSTool.h   RooSimWSTool.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooSimWSTool.h 24280 2008-06-15 20:57:45Z wouter $ * File: $Id: RooSimWSTool.h 28259 2009-04-16 16:21:16Z wouter $
* Authors: * * Authors: *
* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu * * WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
* DK, David Kirkby, UC Irvine, dkirkby@uci.edu * * DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
* * * *
* Copyright (c) 2000-2005, Regents of the University of California * * Copyright (c) 2000-2005, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, * * Redistribution and use in source and binary forms, *
* with or without modification, are permitted according to the terms * * with or without modification, are permitted according to the terms *
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_SIM_WS_TOOL_HH #ifndef ROO_SIM_WS_TOOL_HH
#define ROO_SIM_WS_TOOL_HH #define ROO_SIM_WS_TOOL_HH
#include "Rtypes.h" #include "Rtypes.h"
#include "RooWorkspace.h" #include "RooWorkspace.h"
#include "RooCmdArg.h" #include "RooCmdArg.h"
#include "RooFactoryWSTool.h"
#include <list> #include <list>
#include <map> #include <map>
#include <string> #include <string>
class RooAbsCategoryLValue ; class RooAbsCategoryLValue ;
class RooAbsCategory ; class RooAbsCategory ;
class RooAbsArg ; class RooAbsArg ;
class RooAbsPdf ; class RooAbsPdf ;
class RooCatType ; class RooCatType ;
class RooSimultaneous ; class RooSimultaneous ;
skipping to change at line 54 skipping to change at line 55
class SplitRule ; class SplitRule ;
class ObjBuildConfig ; class ObjBuildConfig ;
class ObjSplitRule ; class ObjSplitRule ;
RooSimultaneous* build(const char* simPdfName, const char* protoPdfName, RooSimultaneous* build(const char* simPdfName, const char* protoPdfName,
const RooCmdArg& arg1=RooCmdArg::none(),const RooCm dArg& arg2=RooCmdArg::none(), const RooCmdArg& arg1=RooCmdArg::none(),const RooCm dArg& arg2=RooCmdArg::none(),
const RooCmdArg& arg3=RooCmdArg::none(),const RooCm dArg& arg4=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(),const RooCm dArg& arg4=RooCmdArg::none(),
const RooCmdArg& arg5=RooCmdArg::none(),const RooCm dArg& arg6=RooCmdArg::none()) ; const RooCmdArg& arg5=RooCmdArg::none(),const RooCm dArg& arg6=RooCmdArg::none()) ;
RooSimultaneous* build(const char* simPdfName,BuildConfig& bc) ; RooSimultaneous* build(const char* simPdfName,BuildConfig& bc, Bool_t ver
bose=kTRUE) ;
class SimWSIFace : public RooFactoryWSTool::IFace {
public:
virtual ~SimWSIFace() {} ;
std::string create(RooFactoryWSTool& ft, const char* typeName, const ch
ar* instanceName, std::vector<std::string> args) ;
} ;
protected: protected:
RooSimWSTool(const RooSimWSTool&) ; RooSimWSTool(const RooSimWSTool&) ;
ObjBuildConfig* validateConfig(BuildConfig& bc) ; ObjBuildConfig* validateConfig(BuildConfig& bc) ;
RooSimultaneous* executeBuild(const char* simPdfName,ObjBuildConfig& obc) ; RooSimultaneous* executeBuild(const char* simPdfName,ObjBuildConfig& obc, Bool_t verbose=kTRUE) ;
std::string makeSplitName(const RooArgSet& splitCatSet) ; std::string makeSplitName(const RooArgSet& splitCatSet) ;
RooWorkspace* _ws ; RooWorkspace* _ws ;
ClassDef(RooSimWSTool,0) // Workspace oriented tool for customized clonin g of p.d.f. into a simultaneous p.d.f ClassDef(RooSimWSTool,0) // Workspace oriented tool for customized clonin g of p.d.f. into a simultaneous p.d.f
} ; } ;
class RooSimWSTool::BuildConfig class RooSimWSTool::BuildConfig
{ {
public: public:
 End of changes. 4 change blocks. 
3 lines changed or deleted 12 lines changed or added


 RooSimultaneous.h   RooSimultaneous.h 
skipping to change at line 28 skipping to change at line 28
//#include "THashList.h" //#include "THashList.h"
#include "TList.h" #include "TList.h"
#include "RooAbsPdf.h" #include "RooAbsPdf.h"
#include "RooCategoryProxy.h" #include "RooCategoryProxy.h"
#include "RooSetProxy.h" #include "RooSetProxy.h"
#include "RooAICRegistry.h" #include "RooAICRegistry.h"
#include "RooObjCacheManager.h" #include "RooObjCacheManager.h"
#include "RooAbsCacheElement.h" #include "RooAbsCacheElement.h"
#include "RooArgList.h" #include "RooArgList.h"
#include <map>
#include <string>
class RooAbsCategoryLValue ; class RooAbsCategoryLValue ;
class RooFitResult ; class RooFitResult ;
class RooPlot ; class RooPlot ;
class RooAbsData ; class RooAbsData ;
class RooLinkedList ; class RooLinkedList ;
class RooSimultaneous : public RooAbsPdf { class RooSimultaneous : public RooAbsPdf {
public: public:
// Constructors, assignment etc // Constructors, assignment etc
inline RooSimultaneous() : _plotCoefNormRange(0) { } inline RooSimultaneous() : _plotCoefNormRange(0) { }
RooSimultaneous(const char *name, const char *title, RooAbsCategoryLValue & indexCat) ; RooSimultaneous(const char *name, const char *title, RooAbsCategoryLValue & indexCat) ;
RooSimultaneous(const char *name, const char *title, std::map<std::string ,RooAbsPdf*> pdfMap, RooAbsCategoryLValue& inIndexCat) ;
RooSimultaneous(const char *name, const char *title, const RooArgList& pd fList, RooAbsCategoryLValue& indexCat) ; RooSimultaneous(const char *name, const char *title, const RooArgList& pd fList, RooAbsCategoryLValue& indexCat) ;
RooSimultaneous(const RooSimultaneous& other, const char* name=0); RooSimultaneous(const RooSimultaneous& other, const char* name=0);
virtual TObject* clone(const char* newname) const { return new RooSimulta neous(*this,newname) ; } virtual TObject* clone(const char* newname) const { return new RooSimulta neous(*this,newname) ; }
virtual ~RooSimultaneous() ; virtual ~RooSimultaneous() ;
virtual Double_t evaluate() const ; virtual Double_t evaluate() const ;
virtual Bool_t selfNormalized() const { return kTRUE ; } virtual Bool_t selfNormalized() const { return kTRUE ; }
Bool_t addPdf(const RooAbsPdf& pdf, const char* catLabel) ; Bool_t addPdf(const RooAbsPdf& pdf, const char* catLabel) ;
virtual ExtendMode extendMode() const { virtual ExtendMode extendMode() const {
skipping to change at line 79 skipping to change at line 82
return RooAbsReal::plotOn(frame,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8 ,arg9,arg10) ; return RooAbsReal::plotOn(frame,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8 ,arg9,arg10) ;
} }
// Backward compatibility function // Backward compatibility function
virtual RooPlot *plotOn(RooPlot *frame, Option_t* drawOptions, Double_t s caleFactor=1.0, virtual RooPlot *plotOn(RooPlot *frame, Option_t* drawOptions, Double_t s caleFactor=1.0,
ScaleType stype=Relative, const RooAbsData* projDa ta=0, const RooArgSet* projSet=0, ScaleType stype=Relative, const RooAbsData* projDa ta=0, const RooArgSet* projSet=0,
Double_t precision=1e-3, Bool_t shiftToZero=kFALSE , const RooArgSet* projDataSet=0, Double_t precision=1e-3, Bool_t shiftToZero=kFALSE , const RooArgSet* projDataSet=0,
Double_t rangeLo=0, Double_t rangeHi=0, RooCurve:: WingMode wmode=RooCurve::Extended) const; Double_t rangeLo=0, Double_t rangeHi=0, RooCurve:: WingMode wmode=RooCurve::Extended) const;
RooAbsPdf* getPdf(const char* catName) const ; RooAbsPdf* getPdf(const char* catName) const ;
const RooAbsCategory& indexCat() const { return _indexCat.arg() ; } const RooAbsCategoryLValue& indexCat() const { return (RooAbsCategoryLVal ue&) _indexCat.arg() ; }
protected: protected:
void initialize(RooAbsCategoryLValue& inIndexCat, std::map<std::string,Ro oAbsPdf*> pdfMap) ;
virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ; virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;
virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ; virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;
virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ; virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;
mutable RooSetProxy _plotCoefNormSet ; mutable RooSetProxy _plotCoefNormSet ;
const TNamed* _plotCoefNormRange ; const TNamed* _plotCoefNormRange ;
class CacheElem : public RooAbsCacheElement { class CacheElem : public RooAbsCacheElement {
public: public:
virtual ~CacheElem() {} ; virtual ~CacheElem() {} ;
 End of changes. 4 change blocks. 
1 lines changed or deleted 5 lines changed or added


 RooStatsUtils.h   RooStatsUtils.h 
// @(#)root/roostats:$Id: RooStatsUtils.h 26981 2008-12-17 08:17:00Z moneta $ // @(#)root/roostats:$Id: RooStatsUtils.h 28306 2009-04-21 10:04:57Z moneta $
// Author: Kyle Cranmer 28/07/2008 // Author: Kyle Cranmer 28/07/2008
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 40 skipping to change at line 40
// return sqrt(2.)*TMath::ErfInverse(1 - 2.*pvalue); // return sqrt(2.)*TMath::ErfInverse(1 - 2.*pvalue);
return TMath::Abs(::ROOT::Math::normal_quantile(pvalue,1) ); return TMath::Abs(::ROOT::Math::normal_quantile(pvalue,1) );
} }
// returns p-value corresponding to a 1-sided significance // returns p-value corresponding to a 1-sided significance
inline Double_t SignificanceToPValue(Double_t Z){ inline Double_t SignificanceToPValue(Double_t Z){
// return .5*TMath::Erfc( Z /sqrt(2.)); // return .5*TMath::Erfc( Z /sqrt(2.));
return ::ROOT::Math::normal_cdf_c(Z); return ::ROOT::Math::normal_cdf_c(Z);
} }
inline void SetParameters(RooArgSet* desiredVals, RooArgSet* paramsToChan ge){ inline void SetParameters(const RooArgSet* desiredVals, RooArgSet* params ToChange){
TIter it = desiredVals->createIterator(); TIter it = desiredVals->createIterator();
RooRealVar *myarg; RooRealVar *myarg;
RooRealVar *mytarget; RooRealVar *mytarget;
while ((myarg = (RooRealVar *)it.Next())) { while ((myarg = (RooRealVar *)it.Next())) {
if(!myarg) continue; if(!myarg) continue;
mytarget = (RooRealVar*) paramsToChange->find(myarg->GetName()); mytarget = (RooRealVar*) paramsToChange->find(myarg->GetName());
if(!mytarget) continue; if(!mytarget) continue;
mytarget->setVal( myarg->getVal() ); mytarget->setVal( myarg->getVal() );
mytarget->setConstant(myarg->isConstant()); mytarget->setConstant(myarg->isConstant());
} }
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 RooTreeData.h   RooTreeData.h 
skipping to change at line 67 skipping to change at line 67
// Load a given row of data // Load a given row of data
virtual void fill() { Fill() ; } ; virtual void fill() { Fill() ; } ;
virtual const RooArgSet* get(Int_t index) const; virtual const RooArgSet* get(Int_t index) const;
virtual const RooArgSet* get() const { return &_vars ; } virtual const RooArgSet* get() const { return &_vars ; }
virtual Bool_t valid() const ; virtual Bool_t valid() const ;
virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ; virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ;
virtual RooArgSet* addColumns(const RooArgList& varList) ; virtual RooArgSet* addColumns(const RooArgList& varList) ;
virtual Int_t numEntries(Bool_t useWeights=kFALSE) const ; virtual Int_t numEntries() const ;
virtual void reset() { Reset() ; } virtual void reset() { Reset() ; }
using RooAbsData::table ; using RooAbsData::table ;
virtual Roo1DTable* table(const RooAbsCategory& cat, const char* cuts="", const char* opts="") const ; virtual Roo1DTable* table(const RooAbsCategory& cat, const char* cuts="", const char* opts="") const ;
virtual RooPlot* statOn(RooPlot* frame, virtual RooPlot* statOn(RooPlot* frame,
const RooCmdArg& arg1=RooCmdArg::none(), const Ro oCmdArg& arg2=RooCmdArg::none(), const RooCmdArg& arg1=RooCmdArg::none(), const Ro oCmdArg& arg2=RooCmdArg::none(),
const RooCmdArg& arg3=RooCmdArg::none(), const Ro oCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(), const Ro oCmdArg& arg4=RooCmdArg::none(),
const RooCmdArg& arg5=RooCmdArg::none(), const Ro oCmdArg& arg6=RooCmdArg::none(), const RooCmdArg& arg5=RooCmdArg::none(), const Ro oCmdArg& arg6=RooCmdArg::none(),
const RooCmdArg& arg7=RooCmdArg::none(), const Ro oCmdArg& arg8=RooCmdArg::none()) ; const RooCmdArg& arg7=RooCmdArg::none(), const Ro oCmdArg& arg8=RooCmdArg::none()) ;
skipping to change at line 92 skipping to change at line 92
Double_t xmax= 0.65,Double_t ymax=0.85, Double_t xmax= 0.65,Double_t ymax=0.85,
const char* cutSpec=0, const char* cutRange=0, const char* cutSpec=0, const char* cutRange=0,
const RooCmdArg* formatCmd=0); const RooCmdArg* formatCmd=0);
TH1 *fillHistogram(TH1 *hist, const RooArgList &plotVars, const char *cut s= "", const char* cutRange=0) const; TH1 *fillHistogram(TH1 *hist, const RooArgList &plotVars, const char *cut s= "", const char* cutRange=0) const;
Double_t moment(RooRealVar &var, Double_t order, const char* cutSpec=0, c onst char* cutRange=0) const ; Double_t moment(RooRealVar &var, Double_t order, const char* cutSpec=0, c onst char* cutRange=0) const ;
Double_t moment(RooRealVar &var, Double_t order, Double_t offset, const c har* cutSpec=0, const char* cutRange=0) const ; Double_t moment(RooRealVar &var, Double_t order, Double_t offset, const c har* cutSpec=0, const char* cutRange=0) const ;
Double_t standMoment(RooRealVar &var, Double_t order, const char* cutSpec =0, const char* cutRange=0) const ; Double_t standMoment(RooRealVar &var, Double_t order, const char* cutSpec =0, const char* cutRange=0) const ;
Double_t mean(RooRealVar& var, const char* cutSpec=0, const char* cutRang Double_t mean(RooRealVar& var, const char* cutSpec=0, const char* cutRang
e=0) const { return moment(var,0,0,cutSpec,cutRange) ; } e=0) const { return moment(var,1,0,cutSpec,cutRange) ; }
Double_t sigma(RooRealVar& var, const char* cutSpec=0, const char* cutRan Double_t sigma(RooRealVar& var, const char* cutSpec=0, const char* cutRan
ge=0) const { return moment(var,1,cutSpec,cutRange) ; } ge=0) const { return moment(var,2,cutSpec,cutRange) ; }
Double_t skewness(RooRealVar& var, const char* cutSpec=0, const char* cut Range=0) const { return standMoment(var,3,cutSpec,cutRange) ; } Double_t skewness(RooRealVar& var, const char* cutSpec=0, const char* cut Range=0) const { return standMoment(var,3,cutSpec,cutRange) ; }
Double_t kurtosis(RooRealVar& var, const char* cutSpec=0, const char* cut Range=0) const { return standMoment(var,4,cutSpec,cutRange) ; } Double_t kurtosis(RooRealVar& var, const char* cutSpec=0, const char* cut Range=0) const { return standMoment(var,4,cutSpec,cutRange) ; }
RooRealVar* meanVar(RooRealVar &var, const char* cutSpec=0, const char* c utRange=0) const ; RooRealVar* meanVar(RooRealVar &var, const char* cutSpec=0, const char* c utRange=0) const ;
RooRealVar* rmsVar(RooRealVar &var, const char* cutSpec=0, const char* cu tRange=0) const ; RooRealVar* rmsVar(RooRealVar &var, const char* cutSpec=0, const char* cu tRange=0) const ;
Bool_t getRange(RooRealVar& var, Double_t& lowest, Double_t& highest, Dou ble_t marginFrac=0, Bool_t symMode=kFALSE) const ; Bool_t getRange(RooRealVar& var, Double_t& lowest, Double_t& highest, Dou ble_t marginFrac=0, Bool_t symMode=kFALSE) const ;
virtual TList* split(const RooAbsCategory& splitCat) const ; virtual TList* split(const RooAbsCategory& splitCat) const ;
skipping to change at line 120 skipping to change at line 120
void dump() ; void dump() ;
virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ; virtual void printMultiline(ostream& os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ;
using RooAbsData::plotOn ; using RooAbsData::plotOn ;
virtual RooPlot* plotOn(RooPlot* frame, const RooLinkedList& cmdList) con st ; virtual RooPlot* plotOn(RooPlot* frame, const RooLinkedList& cmdList) con st ;
// WVE --- This needs to be public to avoid CINT problems // WVE --- This needs to be public to avoid CINT problems
struct PlotOpt { struct PlotOpt {
PlotOpt() : cuts(""), drawOptions("P"), bins(0), etype(RooAbsData::Poiss on), cutRange(0), histName(0), histInvisible(kFALSE), PlotOpt() : cuts(""), drawOptions("P"), bins(0), etype(RooAbsData::Poiss on), cutRange(0), histName(0), histInvisible(kFALSE),
addToHistName(0),addToWgtSelf(1.),addToWgtOther(1.),xErrorSiz addToHistName(0),addToWgtSelf(1.),addToWgtOther(1.),xErrorSiz
e(1),refreshFrameNorm(kFALSE),correctForBinWidth(kTRUE) {} ; e(1),refreshFrameNorm(kFALSE),correctForBinWidth(kTRUE),
scaleFactor(1.) {} ;
const char* cuts ; const char* cuts ;
Option_t* drawOptions ; Option_t* drawOptions ;
RooAbsBinning* bins ; RooAbsBinning* bins ;
RooAbsData::ErrorType etype ; RooAbsData::ErrorType etype ;
const char* cutRange ; const char* cutRange ;
const char* histName ; const char* histName ;
Bool_t histInvisible ; Bool_t histInvisible ;
const char* addToHistName ; const char* addToHistName ;
Double_t addToWgtSelf ; Double_t addToWgtSelf ;
Double_t addToWgtOther ; Double_t addToWgtOther ;
Double_t xErrorSize ; Double_t xErrorSize ;
Bool_t refreshFrameNorm ; Bool_t refreshFrameNorm ;
Bool_t correctForBinWidth ; Bool_t correctForBinWidth ;
Double_t scaleFactor ;
} ; } ;
// PlotOn implementation // PlotOn implementation
virtual RooPlot *plotOn(RooPlot *frame, PlotOpt o) const ; virtual RooPlot *plotOn(RooPlot *frame, PlotOpt o) const ;
virtual RooPlot *plotAsymOn(RooPlot* frame, const RooAbsCategoryLValue& a symCat, PlotOpt o) const ; virtual RooPlot *plotAsymOn(RooPlot* frame, const RooAbsCategoryLValue& a symCat, PlotOpt o) const ;
virtual RooPlot *plotEffOn(RooPlot* frame, const RooAbsCategoryLValue& ef fCat, PlotOpt o) const ; virtual RooPlot *plotEffOn(RooPlot* frame, const RooAbsCategoryLValue& ef fCat, PlotOpt o) const ;
// Draw implementation forwarded to underlying tree // Draw implementation forwarded to underlying tree
virtual void Draw(Option_t* opt) ; virtual void Draw(Option_t* opt) ;
virtual Long64_t Draw(const char* varexp, const char* selection, Option_t * option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0) ; virtual Long64_t Draw(const char* varexp, const char* selection, Option_t * option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0) ;
protected: protected:
friend class RooMCStudy ; friend class RooMCStudy ;
virtual void optimizeReadingWithCaching(RooAbsArg& arg, const RooArgSet& cacheList) ; virtual void optimizeReadingWithCaching(RooAbsArg& arg, const RooArgSet& cacheList, const RooArgSet& keepObsList) ;
Bool_t allClientsCached(RooAbsArg*, const RooArgSet&) ; Bool_t allClientsCached(RooAbsArg*, const RooArgSet&) ;
// Cache copy feature is not publicly accessible // Cache copy feature is not publicly accessible
RooTreeData(const char *name, const char *title, RooTreeData *ntuple, RooTreeData(const char *name, const char *title, RooTreeData *ntuple,
const RooArgSet& vars, const RooFormulaVar* cutVar, const char * cutRange, const RooArgSet& vars, const RooFormulaVar* cutVar, const char * cutRange,
Int_t nStart, Int_t nStop, Bool_t copyCache); Int_t nStart, Int_t nStop, Bool_t copyCache);
Int_t ScanCache(const char* varexp="", const char* selection="", Option_t * option="", Int_t ScanCache(const char* varexp="", const char* selection="", Option_t * option="",
Int_t nentries = 1000000000, Int_t firstentry = 0); Int_t nentries = 1000000000, Int_t firstentry = 0);
const TTree& cacheTree() const { return *_cacheTree ; } const TTree& cacheTree() const { return *_cacheTree ; }
skipping to change at line 179 skipping to change at line 181
virtual void cacheArgs(RooArgSet& varSet, const RooArgSet* nset=0) ; virtual void cacheArgs(RooArgSet& varSet, const RooArgSet* nset=0) ;
void setArgStatus(const RooArgSet& set, Bool_t active) ; void setArgStatus(const RooArgSet& set, Bool_t active) ;
virtual void resetCache() ; virtual void resetCache() ;
// TTree Branch buffer size contro // TTree Branch buffer size contro
void setBranchBufferSize(Int_t size) { _defTreeBufSize = size ; } void setBranchBufferSize(Int_t size) { _defTreeBufSize = size ; }
Int_t getBranchBufferSize() const { return _defTreeBufSize ; } Int_t getBranchBufferSize() const { return _defTreeBufSize ; }
void checkInit() const { void checkInit() const {
if (_defCtor) { if (_defCtor) {
((RooTreeData*)this)->initialize() ; const_cast<RooTreeData*>(this)->initialize() ;
_defCtor = kFALSE ; _defCtor = kFALSE ;
} }
} }
// Load data from another TTree // Load data from another TTree
void loadValues(const RooTreeData *t, RooFormulaVar* select=0, const char * rangeName=0, Int_t nStart=0, Int_t nStop=2000000000) ; void loadValues(const RooTreeData *t, RooFormulaVar* select=0, const char * rangeName=0, Int_t nStart=0, Int_t nStop=2000000000) ;
void loadValues(const TTree *t, RooFormulaVar* cutVar=0, const char* rang eName=0, Int_t nStart=0, Int_t nStop=2000000000) ; void loadValues(const TTree *t, RooFormulaVar* cutVar=0, const char* rang eName=0, Int_t nStart=0, Int_t nStop=2000000000) ;
void loadValues(const char *filename, const char *treename, RooFormulaVar *cutVar=0); void loadValues(const char *filename, const char *treename, RooFormulaVar *cutVar=0);
friend class RooDataSet ; friend class RooDataSet ;
 End of changes. 6 change blocks. 
9 lines changed or deleted 11 lines changed or added


 RooWorkspace.h   RooWorkspace.h 
skipping to change at line 24 skipping to change at line 24
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) * * listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROO_WORKSPACE #ifndef ROO_WORKSPACE
#define ROO_WORKSPACE #define ROO_WORKSPACE
#include "RooPrintable.h" #include "RooPrintable.h"
#include "RooArgSet.h" #include "RooArgSet.h"
#include "RooLinkedList.h" #include "RooLinkedList.h"
#include "RooCmdArg.h" #include "RooCmdArg.h"
#include "RooExpensiveObjectCache.h" #include "RooExpensiveObjectCache.h"
#include "TUUID.h"
#include <map> #include <map>
#include <list> #include <list>
#include <string> #include <string>
class TClass ; class TClass ;
class RooAbsPdf ; class RooAbsPdf ;
class RooAbsData ; class RooAbsData ;
class RooRealVar ; class RooRealVar ;
class RooCategory ; class RooCategory ;
class RooAbsReal ; class RooAbsReal ;
class RooAbsCategory ; class RooAbsCategory ;
class RooFactoryWSTool ;
//class RooModelView ; //class RooModelView ;
#include "TNamed.h" #include "TNamed.h"
#include "TDirectoryFile.h" #include "TDirectoryFile.h"
class RooWorkspace : public TNamed { class RooWorkspace : public TNamed {
public: public:
RooWorkspace() ; RooWorkspace() ;
RooWorkspace(const char* name, Bool_t doCINTExport) ;
RooWorkspace(const char* name, const char* title=0) ; RooWorkspace(const char* name, const char* title=0) ;
RooWorkspace(const RooWorkspace& other) ; RooWorkspace(const RooWorkspace& other) ;
~RooWorkspace() ; ~RooWorkspace() ;
void exportToCint(const char* namespaceName=0) ;
Bool_t importClassCode(const char* pat="*", Bool_t doReplace=kFALSE) ; Bool_t importClassCode(const char* pat="*", Bool_t doReplace=kFALSE) ;
Bool_t importClassCode(TClass* theClass, Bool_t doReplace=kFALSE) ; Bool_t importClassCode(TClass* theClass, Bool_t doReplace=kFALSE) ;
// Import functions for dataset, functions // Import functions for dataset, functions
Bool_t import(const RooAbsArg& arg, const RooCmdArg& arg1=RooCmdArg(),con st RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg3=RooCmdArg()) ; Bool_t import(const RooAbsArg& arg, const RooCmdArg& arg1=RooCmdArg(),con st RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg3=RooCmdArg()) ;
Bool_t import(const RooArgSet& args, const RooCmdArg& arg1=RooCmdArg(),co nst RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg3=RooCmdArg()) ; Bool_t import(const RooArgSet& args, const RooCmdArg& arg1=RooCmdArg(),co nst RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg3=RooCmdArg()) ;
Bool_t import(RooAbsData& data, const RooCmdArg& arg1=RooCmdArg(),const R ooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg3=RooCmdArg()) ; Bool_t import(RooAbsData& data, const RooCmdArg& arg1=RooCmdArg(),const R ooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg3=RooCmdArg()) ;
// Transaction management interface for multi-step import operations
Bool_t startTransaction() ;
Bool_t cancelTransaction() ;
Bool_t commitTransaction() ;
// Named set management
Bool_t defineSet(const char* name, const RooArgSet& aset, Bool_t importMi
ssing=kFALSE) ;
const RooArgSet* set(const char* name) ;
// Import, load and save parameter value snapshots // Import, load and save parameter value snapshots
Bool_t saveSnapshot(const char* name, const RooArgSet& params, Bool_t imp ortValues=kFALSE) ; Bool_t saveSnapshot(const char* name, const RooArgSet& params, Bool_t imp ortValues=kFALSE) ;
Bool_t loadSnapshot(const char* name) ; Bool_t loadSnapshot(const char* name) ;
// Import other workspaces // Import other workspaces
Bool_t merge(const RooWorkspace& other) ; Bool_t merge(const RooWorkspace& other) ;
Bool_t join(const RooWorkspace& other) ; Bool_t join(const RooWorkspace& other) ;
// Accessor functions // Accessor functions
RooAbsPdf* pdf(const char* name) ; RooAbsPdf* pdf(const char* name) ;
skipping to change at line 77 skipping to change at line 91
RooRealVar* var(const char* name) ; RooRealVar* var(const char* name) ;
RooCategory* cat(const char* name) ; RooCategory* cat(const char* name) ;
RooAbsCategory* catfunc(const char* name) ; RooAbsCategory* catfunc(const char* name) ;
RooAbsData* data(const char* name) ; RooAbsData* data(const char* name) ;
RooAbsArg* arg(const char* name) ; RooAbsArg* arg(const char* name) ;
RooAbsArg* fundArg(const char* name) ; RooAbsArg* fundArg(const char* name) ;
TIterator* componentIterator() { return _allOwnedNodes.createIterator() ; } TIterator* componentIterator() { return _allOwnedNodes.createIterator() ; }
const RooArgSet& components() const { return _allOwnedNodes ; } const RooArgSet& components() const { return _allOwnedNodes ; }
Bool_t makeDir() ; Bool_t makeDir() ;
Bool_t cd(const char* path = 0) ;
Bool_t writeToFile(const char* fileName, Bool_t recreate=kTRUE) ;
// Tools management
RooFactoryWSTool& factory() ;
RooAbsArg* factory(const char* expr) ;
// View management // View management
//RooModelView* addView(const char* name, const RooArgSet& observables) ; //RooModelView* addView(const char* name, const RooArgSet& observables) ;
//RooModelView* view(const char* name) ; //RooModelView* view(const char* name) ;
//void removeView(const char* name) ; //void removeView(const char* name) ;
// Print function // Print function
void Print(Option_t* opts=0) const ; void Print(Option_t* opts=0) const ;
static void autoImportClassCode(Bool_t flag) ; static void autoImportClassCode(Bool_t flag) ;
static void addClassDeclImportDir(const char* dir) ; static void addClassDeclImportDir(const char* dir) ;
static void addClassImplImportDir(const char* dir) ; static void addClassImplImportDir(const char* dir) ;
static void setClassFileExportDir(const char* dir=0) ; static void setClassFileExportDir(const char* dir=0) ;
const TUUID& uuid() const { return _uuid ; }
RooExpensiveObjectCache& expensiveObjectCache() { return _eocache ; }
class CodeRepo : public TObject { class CodeRepo : public TObject {
public: public:
CodeRepo(RooWorkspace* wspace=0) : _wspace(wspace), _compiledOK(kTRUE) {} ; CodeRepo(RooWorkspace* wspace=0) : _wspace(wspace), _compiledOK(kTRUE) {} ;
virtual ~CodeRepo() {} ; virtual ~CodeRepo() {} ;
Bool_t autoImportClass(TClass* tc, Bool_t doReplace=kFALSE) ; Bool_t autoImportClass(TClass* tc, Bool_t doReplace=kFALSE) ;
Bool_t compileClasses() ; Bool_t compileClasses() ;
Bool_t compiledOK() const { return _compiledOK ; } Bool_t compiledOK() const { return _compiledOK ; }
skipping to change at line 156 skipping to change at line 181
protected: protected:
friend class RooWorkspace ; friend class RooWorkspace ;
void InternalAppend(TObject* obj) ; void InternalAppend(TObject* obj) ;
RooWorkspace* _wspace ; //! do not persist RooWorkspace* _wspace ; //! do not persist
ClassDef(WSDir,1) ; // TDirectory representation of RooWorkspace ClassDef(WSDir,1) ; // TDirectory representation of RooWorkspace
} ; } ;
private: private:
Bool_t isValidCPPID(const char* name) ;
void exportObj(TObject* obj) ;
void unExport() ;
friend class CodeRepo ; friend class CodeRepo ;
static std::list<std::string> _classDeclDirList ; static std::list<std::string> _classDeclDirList ;
static std::list<std::string> _classImplDirList ; static std::list<std::string> _classImplDirList ;
static std::string _classFileExportDir ; static std::string _classFileExportDir ;
TUUID _uuid ; // Unique workspace ID
static Bool_t _autoClass ; // Automatic import of non-distribution class code static Bool_t _autoClass ; // Automatic import of non-distribution class code
CodeRepo _classes ; // Repository of embedded class code. This data membe r _must_ be first CodeRepo _classes ; // Repository of embedded class code. This data membe r _must_ be first
RooArgSet _allOwnedNodes ; // List of owned pdfs and components RooArgSet _allOwnedNodes ; // List of owned pdfs and components
RooLinkedList _dataList ; // List of owned datasets RooLinkedList _dataList ; // List of owned datasets
RooLinkedList _views ; // List of model views RooLinkedList _views ; // List of model views
RooLinkedList _snapshots ; // List of parameter snapshots RooLinkedList _snapshots ; // List of parameter snapshots
std::map<std::string,RooArgSet> _namedSets ; // Map of named RooArgSets
WSDir* _dir ; //! Transient ROOT directory representation of workspace WSDir* _dir ; //! Transient ROOT directory representation of workspace
RooExpensiveObjectCache _eocache ; // Cache for expensive objects RooExpensiveObjectCache _eocache ; // Cache for expensive objects
ClassDef(RooWorkspace,4) // Persistable project container for (composite RooFactoryWSTool* _factory ; //! Factory tool associated with workspace
) pdfs, functions, variables and datasets
Bool_t _doExport ; //! Export contents of workspace to CINT?
std::string _exportNSName ; //! Name of CINT namespace to which contents
are exported
Bool_t _openTrans ; //! Is there a transaction open?
RooArgSet _sandboxNodes ; //! Sandbox for incoming objects in a transac
tion
ClassDef(RooWorkspace,5) // Persistable project container for (composite
) pdfs, functions, variables and datasets
} ; } ;
#endif #endif
 End of changes. 11 change blocks. 
2 lines changed or deleted 45 lines changed or added


 Scope.h   Scope.h 
// @(#)root/reflex:$Id: Scope.h 27509 2009-02-19 03:32:22Z pcanal $ // @(#)root/reflex:$Id: Scope.h 28064 2009-04-02 13:31:29Z axel $
// Author: Stefan Roiser 2004 // Author: Stefan Roiser 2004
// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved. // Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
// //
// Permission to use, copy, modify, and distribute this software for any // Permission to use, copy, modify, and distribute this software for any
// purpose is hereby granted without fee, provided that this copyright and // purpose is hereby granted without fee, provided that this copyright and
// permissions notice appear in all copies and derivatives. // permissions notice appear in all copies and derivatives.
// //
// This software is provided "as is" without express or implied warranty. // This software is provided "as is" without express or implied warranty.
skipping to change at line 23 skipping to change at line 23
#define Reflex_Scope #define Reflex_Scope
// Include files // Include files
#include "Reflex/Kernel.h" #include "Reflex/Kernel.h"
#include <string> #include <string>
#include <typeinfo> #include <typeinfo>
namespace Reflex { namespace Reflex {
// forward declarations // forward declarations
class Class;
class Base; class Base;
class InstantiatedTemplateClass;
class Member; class Member;
class Namespace;
class PropertyList; class PropertyList;
class Type; class Type;
class ScopeBase; class ScopeBase;
class ScopeName; class ScopeName;
class TypeTemplate; class TypeTemplate;
class MemberTemplate; class MemberTemplate;
class DictionaryGenerator; class DictionaryGenerator;
/** /**
* @class Scope Scope.h Reflex/Scope.h * @class Scope Scope.h Reflex/Scope.h
skipping to change at line 141 skipping to change at line 138
* @param name fully qualified name of the scope * @param name fully qualified name of the scope
* @return reflection information of the scope * @return reflection information of the scope
*/ */
static Scope ByName( const std::string & name ); static Scope ByName( const std::string & name );
/** /**
* DataMemberAt will return the nth data member of the type * DataMemberAt will return the nth data member of the type
* @param nth the nth data member * @param nth the nth data member
* @return nth data member * @return nth data member
*/ */
Member DataMemberAt( size_t nth ) const; Member DataMemberAt( size_t nth, EMEMBERQUERY inh = INHERITEDMEMBERS_ DEFAULT ) const;
/** /**
* DataMemberByName will lookup a data member by name * DataMemberByName will lookup a data member by name
* @param name of data member * @param name of data member
* @return data member * @return data member
*/ */
Member DataMemberByName( const std::string & name ) const; Member DataMemberByName( const std::string & name, EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAULT ) const;
/** /**
* DataMemberSize will return the number of data members of this type * DataMemberSize will return the number of data members of this type
* @return number of data members * @return number of data members
*/ */
size_t DataMemberSize() const; size_t DataMemberSize(EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAULT) co nst;
/** /**
* Member_Begin returns the begin of the container of members * Member_Begin returns the begin of the container of members
* @return begin of container of members * @return begin of container of members
*/ */
Member_Iterator DataMember_Begin() const; Member_Iterator DataMember_Begin(EMEMBERQUERY inh = INHERITEDMEMBERS_ DEFAULT) const;
/** /**
* Member_End returns the end of the container of members * Member_End returns the end of the container of members
* @return end of container of members * @return end of container of members
*/ */
Member_Iterator DataMember_End() const; Member_Iterator DataMember_End(EMEMBERQUERY inh = INHERITEDMEMBERS_DE FAULT) const;
/** /**
* Member_RBegin returns the reverse begin of the container of members * Member_RBegin returns the reverse begin of the container of members
* @return reverse begin of container of members * @return reverse begin of container of members
*/ */
Reverse_Member_Iterator DataMember_RBegin() const; Reverse_Member_Iterator DataMember_RBegin(EMEMBERQUERY inh = INHERITE DMEMBERS_DEFAULT) const;
/** /**
* Member_REnd returns the reverse end of the container of members * Member_REnd returns the reverse end of the container of members
* @return reverse end of container of members * @return reverse end of container of members
*/ */
Reverse_Member_Iterator DataMember_REnd() const; Reverse_Member_Iterator DataMember_REnd(EMEMBERQUERY inh = INHERITEDM EMBERS_DEFAULT) const;
/** /**
* DeclaringScope will return the declaring socpe of this type * DeclaringScope will return the declaring socpe of this type
* @return declaring scope of this type * @return declaring scope of this type
*/ */
Scope DeclaringScope() const; Scope DeclaringScope() const;
/** /**
* FunctionMemberAt will return the nth function member of the type * FunctionMemberAt will return the nth function member of the type
* @param nth function member * @param nth function member
* @return reflection information of nth function member * @return reflection information of nth function member
*/ */
Member FunctionMemberAt( size_t nth ) const; Member FunctionMemberAt( size_t nth, EMEMBERQUERY inh = INHERITEDMEMB ERS_DEFAULT ) const;
/** /**
* FunctionMemberByName will return the member with the name, * FunctionMemberByName will return the member with the name,
* optionally the signature of the function may be given as a type * optionally the signature of the function may be given as a type
* @param name of function member * @param name of function member
* @return reflection information of the function member * @return reflection information of the function member
*/ */
Member FunctionMemberByName( const std::string & name ) const; Member FunctionMemberByName( const std::string & name, EMEMBERQUERY i nh = INHERITEDMEMBERS_DEFAULT ) const;
/** /**
* FunctionMemberByName will return the member with the name, * FunctionMemberByName will return the member with the name,
* optionally the signature of the function may be given as a type * optionally the signature of the function may be given as a type
* @param name of function member * @param name of function member
* @param signature of the member function * @param signature of the member function
* @modifiers_mask When matching, do not compare the listed modifiers * @modifiers_mask When matching, do not compare the listed modifiers
* @return reflection information of the function member * @return reflection information of the function member
*/ */
// this overloading is unfortunate but I can't include Type.h here // this overloading is unfortunate but I can't include Type.h here
Member FunctionMemberByName( const std::string & name, Member FunctionMemberByName( const std::string & name,
const Type & signature, const Type & signature,
unsigned int modifers_mask = 0) const; unsigned int modifers_mask = 0,
EMEMBERQUERY inh = INHERITEDMEMBERS_DEFA
ULT) const;
/** /**
* FunctionMemberByNameAndSignature will return the member with the na me, * FunctionMemberByNameAndSignature will return the member with the na me,
* optionally the signature of the function may be given as a type * optionally the signature of the function may be given as a type
* @param name of function member * @param name of function member
* @param signature of the member function * @param signature of the member function
* @modifiers_mask When matching, do not compare the listed modifiers * @modifiers_mask When matching, do not compare the listed modifiers
* @return reflection information of the function member * @return reflection information of the function member
*/ */
// this overloading is unfortunate but I can't include Type.h here // this overloading is unfortunate but I can't include Type.h here
Member FunctionMemberByNameAndSignature( const std::string & name, Member FunctionMemberByNameAndSignature( const std::string & name,
const Type & signature, const Type & signature,
unsigned int modifers_mask = 0) const; unsigned int modifers_mask =
0,
EMEMBERQUERY inh = INHERITED
MEMBERS_DEFAULT) const;
/** /**
* FunctionMemberSize will return the number of function members of * FunctionMemberSize will return the number of function members of
* this type * this type
* @return number of function members * @return number of function members
*/ */
size_t FunctionMemberSize() const; size_t FunctionMemberSize(EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAULT ) const;
/** /**
* FunctionMember_Begin returns the begin of the container of function members * FunctionMember_Begin returns the begin of the container of function members
* @return begin of container of function members * @return begin of container of function members
*/ */
Member_Iterator FunctionMember_Begin() const; Member_Iterator FunctionMember_Begin(EMEMBERQUERY inh = INHERITEDMEMB ERS_DEFAULT) const;
/** /**
* FunctionMember_End returns the end of the container of function mem bers * FunctionMember_End returns the end of the container of function mem bers
* @return end of container of function members * @return end of container of function members
*/ */
Member_Iterator FunctionMember_End() const; Member_Iterator FunctionMember_End(EMEMBERQUERY inh = INHERITEDMEMBER S_DEFAULT) const;
/** /**
* FunctionMember_RBegin returns the reverse begin of the container of function members * FunctionMember_RBegin returns the reverse begin of the container of function members
* @return reverse begin of container of function members * @return reverse begin of container of function members
*/ */
Reverse_Member_Iterator FunctionMember_RBegin() const; Reverse_Member_Iterator FunctionMember_RBegin(EMEMBERQUERY inh = INHE RITEDMEMBERS_DEFAULT) const;
/** /**
* FunctionMember_RBegin returns the reverse begin of the container of function members * FunctionMember_RBegin returns the reverse begin of the container of function members
* @return reverse begin of container of function members * @return reverse begin of container of function members
*/ */
Reverse_Member_Iterator FunctionMember_REnd() const; Reverse_Member_Iterator FunctionMember_REnd(EMEMBERQUERY inh = INHERI TEDMEMBERS_DEFAULT) const;
/** /**
* GenerateDict will produce the dictionary information of this type * GenerateDict will produce the dictionary information of this type
* @param generator a reference to the dictionary generator instance * @param generator a reference to the dictionary generator instance
*/ */
void GenerateDict(DictionaryGenerator & generator) const; void GenerateDict(DictionaryGenerator & generator) const;
/** /**
* GlobalScope will return the global scope representation\ * GlobalScope will return the global scope representation\
* @return global scope * @return global scope
*/ */
static Scope GlobalScope(); static Scope GlobalScope();
/** /**
* HasBase will check whether this class has a base class given
* as argument
* @param cl the base-class to check for
* @return the Base info if it is found, an empty base otherwise (can
be tested for bool)
*/
bool HasBase( const Type & cl ) const;
/**
* Id returns a unique identifier of the type in the system * Id returns a unique identifier of the type in the system
* @return unique identifier * @return unique identifier
*/ */
void * Id() const; void * Id() const;
/** /**
* IsClass returns true if the type represents a class * IsClass returns true if the type represents a class
* @return true if type represents a class * @return true if type represents a class
*/ */
bool IsClass() const; bool IsClass() const;
skipping to change at line 356 skipping to change at line 363
* @param nam the string representation of the scope to lookup * @param nam the string representation of the scope to lookup
* @return if a matching scope is found return it, otherwise return em pty scope * @return if a matching scope is found return it, otherwise return em pty scope
*/ */
Scope LookupScope( const std::string & nam ) const; Scope LookupScope( const std::string & nam ) const;
/** /**
* MemberAt will return the nth member of the type * MemberAt will return the nth member of the type
* @param nth member * @param nth member
* @return reflection information nth member * @return reflection information nth member
*/ */
Member MemberAt( size_t nth ) const; Member MemberAt( size_t nth, EMEMBERQUERY inh = INHERITEDMEMBERS_DEFA ULT ) const;
/** /**
* MemberByName will return the first member with a given Name * MemberByName will return the first member with a given Name
* @param member name * @param member name
* @return reflection information of the member * @return reflection information of the member
*/ */
Member MemberByName( const std::string & name ) const; Member MemberByName( const std::string & name, EMEMBERQUERY inh = INH ERITEDMEMBERS_DEFAULT ) const;
/** /**
* MemberByName will return the first member with a given Name * MemberByName will return the first member with a given Name
* @param member name * @param member name
* @param signature of the (function) member * @param signature of the (function) member
* @return reflection information of the member * @return reflection information of the member
*/ */
// this overloading is unfortunate but I can't include Type.h here // this overloading is unfortunate but I can't include Type.h here
Member MemberByName( const std::string & name, Member MemberByName( const std::string & name,
const Type & signature ) const; const Type & signature,
EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAULT) con
st;
/** /**
* MemberSize will return the number of members * MemberSize will return the number of members
* @return number of members * @return number of members
*/ */
size_t MemberSize() const; size_t MemberSize(EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAULT) const;
/** /**
* Member_Begin returns the begin of the container of members * Member_Begin returns the begin of the container of members
* @return begin of container of members * @return begin of container of members
*/ */
Member_Iterator Member_Begin() const; Member_Iterator Member_Begin(EMEMBERQUERY inh = INHERITEDMEMBERS_DEFA ULT) const;
/** /**
* Member_End returns the end of the container of members * Member_End returns the end of the container of members
* @return end of container of members * @return end of container of members
*/ */
Member_Iterator Member_End() const; Member_Iterator Member_End(EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAUL T) const;
/** /**
* Member_RBegin returns the reverse begin of the container of members * Member_RBegin returns the reverse begin of the container of members
* @return reverse begin of container of members * @return reverse begin of container of members
*/ */
Reverse_Member_Iterator Member_RBegin() const; Reverse_Member_Iterator Member_RBegin(EMEMBERQUERY inh = INHERITEDMEM BERS_DEFAULT) const;
/** /**
* Member_REnd returns the reverse end of the container of members * Member_REnd returns the reverse end of the container of members
* @return reverse end of container of members * @return reverse end of container of members
*/ */
Reverse_Member_Iterator Member_REnd() const; Reverse_Member_Iterator Member_REnd(EMEMBERQUERY inh = INHERITEDMEMBE RS_DEFAULT) const;
/** /**
* MemberTemplateAt will return the nth member template of this type * MemberTemplateAt will return the nth member template of this type
* @param nth member template * @param nth member template
* @return nth member template * @return nth member template
*/ */
MemberTemplate MemberTemplateAt( size_t nth ) const; MemberTemplate MemberTemplateAt( size_t nth ) const;
/** /**
* MemberTemplateSize will return the number of member templates in th is scope * MemberTemplateSize will return the number of member templates in th is scope
skipping to change at line 712 skipping to change at line 720
* @return corresponding TypeTemplate * @return corresponding TypeTemplate
*/ */
TypeTemplate TemplateFamily() const; TypeTemplate TemplateFamily() const;
/** /**
* Unload will unload the dictionary information of a scope * Unload will unload the dictionary information of a scope
*/ */
void Unload() const; void Unload() const;
/** /**
* UpdateMembers will update the list of Function/Data/Members with al
l
* members of base classes currently availabe in the system, switching
* INHERITEDMEMBERS_DEFAULT to INHERITEDMEMBERS_ALSO.
*/
void UpdateMembers() const;
/**
* UsingDirectiveAt will return the nth using directive * UsingDirectiveAt will return the nth using directive
* @param nth using directive * @param nth using directive
* @return nth using directive * @return nth using directive
*/ */
Scope UsingDirectiveAt( size_t nth ) const; Scope UsingDirectiveAt( size_t nth ) const;
/** /**
* UsingDirectiveSize will return the number of using directives of th is scope * UsingDirectiveSize will return the number of using directives of th is scope
* @return number of using directives declared in this scope * @return number of using directives declared in this scope
*/ */
skipping to change at line 983 skipping to change at line 998
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Base_Iterator Reflex::Scope::Base_REnd() const { inline Reflex::Reverse_Base_Iterator Reflex::Scope::Base_REnd() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->Base_REnd(); if ( * this ) return fScopeName->fScopeBase->Base_REnd();
return Dummy::BaseCont().rend(); return Dummy::BaseCont().rend();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::Scope::DataMember_Begin() const { inline Reflex::Member_Iterator Reflex::Scope::DataMember_Begin(EMEMBERQUERY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->DataMember_Begin(); if ( * this ) return fScopeName->fScopeBase->DataMember_Begin(inh);
return Dummy::MemberCont().begin(); return Dummy::MemberCont().begin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::Scope::DataMember_End() const { inline Reflex::Member_Iterator Reflex::Scope::DataMember_End(EMEMBERQUERY i nh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->DataMember_End(); if ( * this ) return fScopeName->fScopeBase->DataMember_End(inh);
return Dummy::MemberCont().end(); return Dummy::MemberCont().end();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::Scope::DataMember_RBegin() c onst { inline Reflex::Reverse_Member_Iterator Reflex::Scope::DataMember_RBegin(EME MBERQUERY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->DataMember_RBegin(); if ( * this ) return fScopeName->fScopeBase->DataMember_RBegin(inh);
return Dummy::MemberCont().rbegin(); return Dummy::MemberCont().rbegin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::Scope::DataMember_REnd() con st { inline Reflex::Reverse_Member_Iterator Reflex::Scope::DataMember_REnd(EMEMB ERQUERY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->DataMember_REnd(); if ( * this ) return fScopeName->fScopeBase->DataMember_REnd(inh);
return Dummy::MemberCont().rend(); return Dummy::MemberCont().rend();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Scope Reflex::Scope::DeclaringScope() const { inline Reflex::Scope Reflex::Scope::DeclaringScope() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->DeclaringScope(); if ( * this ) return fScopeName->fScopeBase->DeclaringScope();
return Dummy::Scope(); return Dummy::Scope();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::Scope::FunctionMember_Begin() const { inline Reflex::Member_Iterator Reflex::Scope::FunctionMember_Begin(EMEMBERQ UERY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->FunctionMember_Begin(); if ( * this ) return fScopeName->fScopeBase->FunctionMember_Begin(inh);
return Dummy::MemberCont().begin(); return Dummy::MemberCont().begin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::Scope::FunctionMember_End() const { inline Reflex::Member_Iterator Reflex::Scope::FunctionMember_End(EMEMBERQUE RY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->FunctionMember_End(); if ( * this ) return fScopeName->fScopeBase->FunctionMember_End(inh);
return Dummy::MemberCont().end(); return Dummy::MemberCont().end();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::Scope::FunctionMember_RBegin () const { inline Reflex::Reverse_Member_Iterator Reflex::Scope::FunctionMember_RBegin (EMEMBERQUERY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->FunctionMember_RBegin(); if ( * this ) return fScopeName->fScopeBase->FunctionMember_RBegin(inh);
return Dummy::MemberCont().rbegin(); return Dummy::MemberCont().rbegin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::Scope::FunctionMember_REnd() const { inline Reflex::Reverse_Member_Iterator Reflex::Scope::FunctionMember_REnd(E MEMBERQUERY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->FunctionMember_REnd(); if ( * this ) return fScopeName->fScopeBase->FunctionMember_REnd(inh);
return Dummy::MemberCont().rend(); return Dummy::MemberCont().rend();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Scope Reflex::Scope::GlobalScope() { inline Reflex::Scope Reflex::Scope::GlobalScope() {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ScopeBase::GlobalScope(); return ScopeBase::GlobalScope();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
skipping to change at line 1079 skipping to change at line 1094
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::Scope::IsNamespace() const { inline bool Reflex::Scope::IsNamespace() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->IsNamespace(); if ( * this ) return fScopeName->fScopeBase->IsNamespace();
return false; return false;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::Scope::IsPrivate() const {
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->IsPrivate();
return false;
}
//-------------------------------------------------------------------------
------
inline bool Reflex::Scope::IsProtected() const {
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->IsProtected();
return false;
}
//-------------------------------------------------------------------------
------
inline bool Reflex::Scope::IsPublic() const {
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->IsPublic();
return false;
}
//-------------------------------------------------------------------------
------
inline bool Reflex::Scope::IsTemplateInstance() const { inline bool Reflex::Scope::IsTemplateInstance() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->IsTemplateInstance(); if ( * this ) return fScopeName->fScopeBase->IsTemplateInstance();
return false; return false;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::Scope::IsTopScope() const { inline bool Reflex::Scope::IsTopScope() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->IsTopScope(); if ( * this ) return fScopeName->fScopeBase->IsTopScope();
skipping to change at line 1121 skipping to change at line 1115
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::Scope::IsUnion() const { inline bool Reflex::Scope::IsUnion() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->IsUnion(); if ( * this ) return fScopeName->fScopeBase->IsUnion();
return false; return false;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::Scope::MemberSize() const { inline size_t Reflex::Scope::MemberSize(EMEMBERQUERY inh) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->MemberSize(); if ( * this ) return fScopeName->fScopeBase->MemberSize(inh);
return 0; return 0;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::MemberTemplate_Iterator Reflex::Scope::MemberTemplate_Begin( ) const { inline Reflex::MemberTemplate_Iterator Reflex::Scope::MemberTemplate_Begin( ) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->MemberTemplate_Begin(); if ( * this ) return fScopeName->fScopeBase->MemberTemplate_Begin();
return Dummy::MemberTemplateCont().begin(); return Dummy::MemberTemplateCont().begin();
} }
skipping to change at line 1299 skipping to change at line 1293
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline const Reflex::ScopeBase * Reflex::Scope::ToScopeBase() const { inline const Reflex::ScopeBase * Reflex::Scope::ToScopeBase() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase; if ( * this ) return fScopeName->fScopeBase;
return 0; return 0;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::Scope::TemplateArgumentSize() const {
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->TemplateArgumentSize();
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::Type_Iterator Reflex::Scope::TemplateArgument_Begin() const
{
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->TemplateArgument_Begin();
return Dummy::TypeCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Type_Iterator Reflex::Scope::TemplateArgument_End() const {
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->TemplateArgument_End();
return Dummy::TypeCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Type_Iterator Reflex::Scope::TemplateArgument_RBegin
() const {
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->TemplateArgument_RBegin();
return Dummy::TypeCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Type_Iterator Reflex::Scope::TemplateArgument_REnd()
const {
//-------------------------------------------------------------------------
------
if ( * this ) return fScopeName->fScopeBase->TemplateArgument_REnd();
return Dummy::TypeCont().rend();
}
//-------------------------------------------------------------------------
------
inline Reflex::TypeTemplate_Iterator Reflex::Scope::SubTypeTemplate_Begin() const { inline Reflex::TypeTemplate_Iterator Reflex::Scope::SubTypeTemplate_Begin() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->SubTypeTemplate_Begin(); if ( * this ) return fScopeName->fScopeBase->SubTypeTemplate_Begin();
return Dummy::TypeTemplateCont().begin(); return Dummy::TypeTemplateCont().begin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::TypeTemplate_Iterator Reflex::Scope::SubTypeTemplate_End() c onst { inline Reflex::TypeTemplate_Iterator Reflex::Scope::SubTypeTemplate_End() c onst {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( * this ) return fScopeName->fScopeBase->SubTypeTemplate_End(); if ( * this ) return fScopeName->fScopeBase->SubTypeTemplate_End();
 End of changes. 50 change blocks. 
123 lines changed or deleted 69 lines changed or added


 ScopeBase.h   ScopeBase.h 
// @(#)root/reflex:$Id: ScopeBase.h 27509 2009-02-19 03:32:22Z pcanal $ // @(#)root/reflex:$Id: ScopeBase.h 28145 2009-04-07 17:00:06Z axel $
// Author: Stefan Roiser 2004 // Author: Stefan Roiser 2004
// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved. // Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
// //
// Permission to use, copy, modify, and distribute this software for any // Permission to use, copy, modify, and distribute this software for any
// purpose is hereby granted without fee, provided that this copyright and // purpose is hereby granted without fee, provided that this copyright and
// permissions notice appear in all copies and derivatives. // permissions notice appear in all copies and derivatives.
// //
// This software is provided "as is" without express or implied warranty. // This software is provided "as is" without express or implied warranty.
skipping to change at line 94 skipping to change at line 94
virtual Base_Iterator Base_Begin() const; virtual Base_Iterator Base_Begin() const;
virtual Base_Iterator Base_End() const; virtual Base_Iterator Base_End() const;
virtual Reverse_Base_Iterator Base_RBegin() const; virtual Reverse_Base_Iterator Base_RBegin() const;
virtual Reverse_Base_Iterator Base_REnd() const; virtual Reverse_Base_Iterator Base_REnd() const;
/** /**
* nthDataMember will return the nth data MemberAt of the At * nthDataMember will return the nth data MemberAt of the At
* @param nth data MemberAt * @param nth data MemberAt
* @return pointer to data MemberAt * @return pointer to data MemberAt
*/ */
Member DataMemberAt( size_t nth ) const; virtual Member DataMemberAt( size_t nth, EMEMBERQUERY inh = INHERITED MEMBERS_DEFAULT ) const;
/** /**
* DataMemberByName will return the MemberAt with Name * DataMemberByName will return the MemberAt with Name
* @param Name of data MemberAt * @param Name of data MemberAt
* @return data MemberAt * @return data MemberAt
*/ */
Member DataMemberByName( const std::string & nam ) const; virtual Member DataMemberByName( const std::string & nam, EMEMBERQUER Y inh = INHERITEDMEMBERS_DEFAULT ) const;
/** /**
* DataMemberSize will return the number of data members of this At * DataMemberSize will return the number of data members of this At
* @return number of data members * @return number of data members
*/ */
size_t DataMemberSize() const; virtual size_t DataMemberSize(EMEMBERQUERY inh = INHERITEDMEMBERS_DEF AULT) const;
Member_Iterator DataMember_Begin() const; virtual Member_Iterator DataMember_Begin(EMEMBERQUERY inh = INHERITED
Member_Iterator DataMember_End() const; MEMBERS_DEFAULT) const;
Reverse_Member_Iterator DataMember_RBegin() const; virtual Member_Iterator DataMember_End(EMEMBERQUERY inh = INHERITEDME
Reverse_Member_Iterator DataMember_REnd() const; MBERS_DEFAULT) const;
virtual Reverse_Member_Iterator DataMember_RBegin(EMEMBERQUERY inh =
INHERITEDMEMBERS_DEFAULT) const;
virtual Reverse_Member_Iterator DataMember_REnd(EMEMBERQUERY inh = IN
HERITEDMEMBERS_DEFAULT) const;
/** /**
* DeclaringScope will return a pointer to the At of this one * DeclaringScope will return a pointer to the At of this one
* @return pointer to declaring At * @return pointer to declaring At
*/ */
Scope DeclaringScope() const; virtual Scope DeclaringScope() const;
/** /**
* nthFunctionMember will return the nth function MemberAt of the At * nthFunctionMember will return the nth function MemberAt of the At
* @param nth function MemberAt * @param nth function MemberAt
* @return pointer to function MemberAt * @return pointer to function MemberAt
*/ */
Member FunctionMemberAt( size_t nth ) const; virtual Member FunctionMemberAt( size_t nth, EMEMBERQUERY inh = INHER ITEDMEMBERS_DEFAULT ) const;
/** /**
* FunctionMemberByName will return the MemberAt with the Name, * FunctionMemberByName will return the MemberAt with the Name,
* optionally the signature of the function may be given * optionally the signature of the function may be given
* @param Name of function MemberAt * @param Name of function MemberAt
* @param signature of the MemberAt function * @param signature of the MemberAt function
* @modifiers_mask When matching, do not compare the listed modifiers * @modifiers_mask When matching, do not compare the listed modifiers
* @return function MemberAt * @return function MemberAt
*/ */
Member FunctionMemberByName( const std::string & name, virtual Member FunctionMemberByName( const std::string & name,
const Type & signature, const Type & signature,
unsigned int modifiers_mask = 0) const; unsigned int modifiers_mask = 0,
EMEMBERQUERY inh = INHERITEDMEMBERS_DEFA
ULT) const;
/** /**
* FunctionMemberByNameAndSignature will return the MemberAt with the Name, * FunctionMemberByNameAndSignature will return the MemberAt with the Name,
* optionally the signature of the function may be given * optionally the signature of the function may be given
* @param Name of function MemberAt * @param Name of function MemberAt
* @param signature of the MemberAt function * @param signature of the MemberAt function
* @modifiers_mask When matching, do not compare the listed modifiers * @modifiers_mask When matching, do not compare the listed modifiers
* @return function MemberAt * @return function MemberAt
*/ */
Member FunctionMemberByNameAndSignature( const std::string & name, virtual Member FunctionMemberByNameAndSignature( const std::string &
const Type & signature, name,
unsigned int modifiers_mask = 0) const; const Type & signature,
unsigned int modifiers_mask
= 0,
EMEMBERQUERY inh = INHERITED
MEMBERS_DEFAULT) const;
/** /**
* FunctionMemberSize will return the number of function members of * FunctionMemberSize will return the number of function members of
* this type * this type
* @return number of function members * @return number of function members
*/ */
size_t FunctionMemberSize() const; virtual size_t FunctionMemberSize(EMEMBERQUERY inh = INHERITEDMEMBERS _DEFAULT) const;
Member_Iterator FunctionMember_Begin() const; virtual Member_Iterator FunctionMember_Begin(EMEMBERQUERY inh = INHER
Member_Iterator FunctionMember_End() const; ITEDMEMBERS_DEFAULT) const;
Reverse_Member_Iterator FunctionMember_RBegin() const; virtual Member_Iterator FunctionMember_End(EMEMBERQUERY inh = INHERIT
Reverse_Member_Iterator FunctionMember_REnd() const; EDMEMBERS_DEFAULT) const;
virtual Reverse_Member_Iterator FunctionMember_RBegin(EMEMBERQUERY in
h = INHERITEDMEMBERS_DEFAULT) const;
virtual Reverse_Member_Iterator FunctionMember_REnd(EMEMBERQUERY inh
= INHERITEDMEMBERS_DEFAULT) const;
/** /**
* GenerateDict will produce the dictionary information of this type * GenerateDict will produce the dictionary information of this type
* @param generator a reference to the dictionary generator instance * @param generator a reference to the dictionary generator instance
*/ */
virtual void GenerateDict(DictionaryGenerator &generator) const; virtual void GenerateDict(DictionaryGenerator &generator) const;
/** /**
* GlobalScope will return the global scope representation\ * GlobalScope will return the global scope representation\
* @return global scope * @return global scope
*/ */
static Scope GlobalScope(); static Scope GlobalScope();
/** /**
* HasBase will check whether this class has a base class given
* as argument
* @param cl the base-class to check for
* @return the Base info if it is found, an empty base otherwise (can
be tested for bool)
*/
virtual bool HasBase( const Type & cl ) const;
/**
* IsClass returns true if the At represents a Class * IsClass returns true if the At represents a Class
* @return true if At represents a Class * @return true if At represents a Class
*/ */
bool IsClass() const; bool IsClass() const;
/** /**
* IsEnum returns true if the At represents a Enum * IsEnum returns true if the At represents a Enum
* @return true if At represents a Enum * @return true if At represents a Enum
*/ */
bool IsEnum() const; bool IsEnum() const;
/** /**
* IsNamespace returns true if the At represents a Namespace * IsNamespace returns true if the At represents a Namespace
* @return true if At represents a Namespace * @return true if At represents a Namespace
*/ */
bool IsNamespace() const; bool IsNamespace() const;
/** /**
* IsPrivate will check if the scope access is private
* @return true if scope access is private
*/
virtual bool IsPrivate() const;
/**
* IsProtected will check if the scope access is protected
* @return true if scope access is protected
*/
virtual bool IsProtected() const;
/**
* IsPublic will check if the scope access is public
* @return true if scope access is public
*/
virtual bool IsPublic() const;
/**
* IsTemplateInstance returns true if the At represents a * IsTemplateInstance returns true if the At represents a
* ClassTemplateInstance * ClassTemplateInstance
* @return true if At represents a InstantiatedTemplateClass * @return true if At represents a InstantiatedTemplateClass
*/ */
bool IsTemplateInstance() const; bool IsTemplateInstance() const;
/** /**
* IsTopScope will return true if the current At is the top * IsTopScope will return true if the current At is the top
* (Empty) namespace * (Empty) namespace
* @return true if current sope is top namespace * @return true if current sope is top namespace
skipping to change at line 263 skipping to change at line 255
* @return if a matching scope is found return it, otherwise return em pty scope * @return if a matching scope is found return it, otherwise return em pty scope
*/ */
Scope LookupScope( const std::string & nam, Scope LookupScope( const std::string & nam,
const Scope & current ) const; const Scope & current ) const;
/** /**
* MemberByName will return the first MemberAt with a given Name * MemberByName will return the first MemberAt with a given Name
* @param Name MemberAt Name * @param Name MemberAt Name
* @return pointer to MemberAt * @return pointer to MemberAt
*/ */
Member MemberByName( const std::string & name, virtual Member MemberByName( const std::string & name,
const Type & signature ) const; const Type & signature,
EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAULT) con
st;
/** /**
* MemberAt will return the nth MemberAt of the At * MemberAt will return the nth MemberAt of the At
* @param nth MemberAt * @param nth MemberAt
* @return pointer to nth MemberAt * @return pointer to nth MemberAt
*/ */
Member MemberAt( size_t nth ) const; virtual Member MemberAt( size_t nth, EMEMBERQUERY inh = INHERITEDMEMB ERS_DEFAULT ) const;
Member_Iterator Member_Begin() const; virtual Member_Iterator Member_Begin(EMEMBERQUERY inh = INHERITEDMEMB
Member_Iterator Member_End() const; ERS_DEFAULT) const;
Reverse_Member_Iterator Member_RBegin() const; virtual Member_Iterator Member_End(EMEMBERQUERY inh = INHERITEDMEMBER
Reverse_Member_Iterator Member_REnd() const; S_DEFAULT) const;
virtual Reverse_Member_Iterator Member_RBegin(EMEMBERQUERY inh = INHE
RITEDMEMBERS_DEFAULT) const;
virtual Reverse_Member_Iterator Member_REnd(EMEMBERQUERY inh = INHERI
TEDMEMBERS_DEFAULT) const;
/** /**
* MemberSize will return the number of members * MemberSize will return the number of members
* @return number of members * @return number of members
*/ */
size_t MemberSize() const; virtual size_t MemberSize(EMEMBERQUERY inh = INHERITEDMEMBERS_DEFAULT ) const;
/** /**
* MemberTemplateAt will return the nth MemberAt template of this At * MemberTemplateAt will return the nth MemberAt template of this At
* @param nth MemberAt template * @param nth MemberAt template
* @return nth MemberAt template * @return nth MemberAt template
*/ */
MemberTemplate MemberTemplateAt( size_t nth ) const; MemberTemplate MemberTemplateAt( size_t nth ) const;
/** /**
* MemberTemplateSize will return the number of MemberAt templates in this socpe * MemberTemplateSize will return the number of MemberAt templates in this socpe
skipping to change at line 413 skipping to change at line 406
* @return Type representation of the sub type * @return Type representation of the sub type
*/ */
Type SubTypeByName( const std::string & nam ) const; Type SubTypeByName( const std::string & nam ) const;
Type_Iterator SubType_Begin() const; Type_Iterator SubType_Begin() const;
Type_Iterator SubType_End() const; Type_Iterator SubType_End() const;
Reverse_Type_Iterator SubType_RBegin() const; Reverse_Type_Iterator SubType_RBegin() const;
Reverse_Type_Iterator SubType_REnd() const; Reverse_Type_Iterator SubType_REnd() const;
/** /**
* TemplateArgumentAt will return a pointer to the nth template argume
nt
* @param nth nth template argument
* @return pointer to nth template argument
*/
virtual Type TemplateArgumentAt( size_t nth ) const;
/**
* templateArgSize will return the number of template arguments
* @return number of template arguments
*/
virtual size_t TemplateArgumentSize() const;
virtual Type_Iterator TemplateArgument_Begin() const;
virtual Type_Iterator TemplateArgument_End() const;
virtual Reverse_Type_Iterator TemplateArgument_RBegin() const;
virtual Reverse_Type_Iterator TemplateArgument_REnd() const;
/**
* SubTypeTemplateAt returns the corresponding TypeTemplate if any
* @return corresponding TypeTemplate
*/
virtual TypeTemplate TemplateFamily() const;
/**
* SubTypeTemplateAt will return the nth At template of this At * SubTypeTemplateAt will return the nth At template of this At
* @param nth sub type template * @param nth sub type template
* @return nth sub type template * @return nth sub type template
*/ */
TypeTemplate SubTypeTemplateAt( size_t nth ) const; TypeTemplate SubTypeTemplateAt( size_t nth ) const;
/** /**
* SubTypeTemplateSize will return the number of At templates in this socpe * SubTypeTemplateSize will return the number of At templates in this socpe
* @return number of defined sub type templates * @return number of defined sub type templates
*/ */
skipping to change at line 572 skipping to change at line 541
/** /**
* Hide this scope from any lookup by appending the string " @HIDDEN@ " to its name. * Hide this scope from any lookup by appending the string " @HIDDEN@ " to its name.
*/ */
virtual void HideName() const; virtual void HideName() const;
/** /**
* Un-Hide this scope from any lookup by removing the string " @HIDDE N@" to its name. * Un-Hide this scope from any lookup by removing the string " @HIDDE N@" to its name.
*/ */
virtual void UnhideName() const; virtual void UnhideName() const;
/** Initialize the vector of inherited members.
Returns false if one of the bases is not complete. */
virtual bool UpdateMembers() const;
protected:
/** The MemberByName work-horse: find a member called name in members
,
if signature also compare its signature, and if matchReturnType
also compare the signature's return types. */
Member MemberByName2( const std::vector<Member>& members,
const std::string & name,
const Type * signature = 0,
unsigned int modifiers_mask = 0,
bool matchReturnType = true) const;
private: private:
/* no copying */ /* no copying */
ScopeBase( const ScopeBase & ); ScopeBase( const ScopeBase & );
/* no assignment */ /* no assignment */
ScopeBase & operator = ( const ScopeBase & ); ScopeBase & operator = ( const ScopeBase & );
protected: protected:
skipping to change at line 696 skipping to change at line 680
* container for using directives of this scope * container for using directives of this scope
* @label using directives * @label using directives
* @linkScope aggregation * @linkScope aggregation
* @supplierCardinality 0..* * @supplierCardinality 0..*
* @clientCardinality 1 * @clientCardinality 1
*/ */
mutable mutable
std::vector < Scope > fUsingDirectives; std::vector < Scope > fUsingDirectives;
/** /**
* pointer to the property list
* @label propertylist
* @link aggregationByValue
* @clientCardinality 1
* @supplierCardinality 1
*/
OwnedPropertyList fPropertyList;
/**
* The position where the unscoped Name starts in the scopename * The position where the unscoped Name starts in the scopename
*/ */
size_t fBasePosition; size_t fBasePosition;
}; // class ScopeBase }; // class ScopeBase
} //namespace Reflex } //namespace Reflex
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::ScopeBase::BaseSize() const { inline size_t Reflex::ScopeBase::BaseSize() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
skipping to change at line 749 skipping to change at line 724
return Dummy::BaseCont().rend(); return Dummy::BaseCont().rend();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Scope Reflex::ScopeBase::DeclaringScope() const { inline Reflex::Scope Reflex::ScopeBase::DeclaringScope() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fDeclaringScope; return fDeclaringScope;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::ScopeBase::DataMember_Begin() const { inline Reflex::Member_Iterator Reflex::ScopeBase::DataMember_Begin(EMEMBERQ UERY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fDataMembers.begin(); return fDataMembers.begin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::ScopeBase::DataMember_End() const { inline Reflex::Member_Iterator Reflex::ScopeBase::DataMember_End(EMEMBERQUE RY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fDataMembers.end(); return fDataMembers.end();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::DataMember_RBegin () const { inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::DataMember_RBegin (EMEMBERQUERY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ((const std::vector<Member>&)fDataMembers).rbegin(); return ((const std::vector<Member>&)fDataMembers).rbegin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::DataMember_REnd() const { inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::DataMember_REnd(E MEMBERQUERY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ((const std::vector<Member>&)fDataMembers).rend(); return ((const std::vector<Member>&)fDataMembers).rend();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::ScopeBase::FunctionMember_Begin() co nst { inline Reflex::Member_Iterator Reflex::ScopeBase::FunctionMember_Begin(EMEM BERQUERY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fFunctionMembers.begin(); return fFunctionMembers.begin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Member_Iterator Reflex::ScopeBase::FunctionMember_End() cons t { inline Reflex::Member_Iterator Reflex::ScopeBase::FunctionMember_End(EMEMBE RQUERY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fFunctionMembers.end(); return fFunctionMembers.end();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::FunctionMember_RB egin() const { inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::FunctionMember_RB egin(EMEMBERQUERY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ((const std::vector<Member>&)fFunctionMembers).rbegin(); return ((const std::vector<Member>&)fFunctionMembers).rbegin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::FunctionMember_RE nd() const { inline Reflex::Reverse_Member_Iterator Reflex::ScopeBase::FunctionMember_RE nd(EMEMBERQUERY) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ((const std::vector<Member>&)fFunctionMembers).rend(); return ((const std::vector<Member>&)fFunctionMembers).rend();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Scope_Iterator Reflex::ScopeBase::SubScope_Begin() const { inline Reflex::Scope_Iterator Reflex::ScopeBase::SubScope_Begin() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fSubScopes.begin(); return fSubScopes.begin();
} }
skipping to change at line 869 skipping to change at line 844
return ((const std::vector<TypeTemplate>&)fTypeTemplates).rbegin(); return ((const std::vector<TypeTemplate>&)fTypeTemplates).rbegin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Reverse_TypeTemplate_Iterator Reflex::ScopeBase::SubTypeTemp late_REnd() const { inline Reflex::Reverse_TypeTemplate_Iterator Reflex::ScopeBase::SubTypeTemp late_REnd() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ((const std::vector<TypeTemplate>&)fTypeTemplates).rend(); return ((const std::vector<TypeTemplate>&)fTypeTemplates).rend();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::ScopeBase::IsClass() const { inline
bool
Reflex::ScopeBase::HasBase( const Type &) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ( fScopeType == CLASS || return false;
fScopeType == TYPETEMPLATEINSTANCE ||
fScopeType == STRUCT );
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::ScopeBase::IsEnum() const { inline bool Reflex::ScopeBase::UpdateMembers() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ( fScopeType == ENUM ); // Initialize the vector of inherited members.
} // Return false if one of the bases is not complete.
//------------------------------------------------------------------------- return true;
------
inline bool Reflex::ScopeBase::IsNamespace() const {
//-------------------------------------------------------------------------
------
return ( fScopeType == NAMESPACE );
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::ScopeBase::IsPrivate() const { inline bool Reflex::ScopeBase::IsClass() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return false; return ( fScopeType == CLASS ||
fScopeType == TYPETEMPLATEINSTANCE ||
fScopeType == STRUCT );
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::ScopeBase::IsProtected() const { inline bool Reflex::ScopeBase::IsEnum() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return false; return ( fScopeType == ENUM );
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::ScopeBase::IsPublic() const { inline bool Reflex::ScopeBase::IsNamespace() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return true; return ( fScopeType == NAMESPACE );
} }
inline bool ROOT::Reflex::ScopeBase::IsTemplateInstance() const { inline bool ROOT::Reflex::ScopeBase::IsTemplateInstance() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ( fScopeType == TYPETEMPLATEINSTANCE ); return ( fScopeType == TYPETEMPLATEINSTANCE );
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::ScopeBase::IsUnion() const { inline bool Reflex::ScopeBase::IsUnion() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
skipping to change at line 937 skipping to change at line 911
return Dummy::Scope(); return Dummy::Scope();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::ScopeBase::SubScopeSize() const { inline size_t Reflex::ScopeBase::SubScopeSize() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fSubScopes.size(); return fSubScopes.size();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::ScopeBase::TemplateArgumentSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::Type_Iterator Reflex::ScopeBase::TemplateArgument_Begin() co
nst {
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Type_Iterator Reflex::ScopeBase::TemplateArgument_End() cons
t {
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Type_Iterator Reflex::ScopeBase::TemplateArgument_RB
egin() const {
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Type_Iterator Reflex::ScopeBase::TemplateArgument_RE
nd() const {
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().rend();
}
//-------------------------------------------------------------------------
------
inline Reflex::Scope Reflex::ScopeBase::UsingDirectiveAt( size_t nth ) cons t { inline Reflex::Scope Reflex::ScopeBase::UsingDirectiveAt( size_t nth ) cons t {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if ( nth < fUsingDirectives.size() ) { return fUsingDirectives[ nth ]; } if ( nth < fUsingDirectives.size() ) { return fUsingDirectives[ nth ]; }
return Dummy::Scope(); return Dummy::Scope();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::ScopeBase::UsingDirectiveSize() const { inline size_t Reflex::ScopeBase::UsingDirectiveSize() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fUsingDirectives.size(); return fUsingDirectives.size();
 End of changes. 40 change blocks. 
152 lines changed or deleted 98 lines changed or added


 TAdvancedGraphicsDialog.h   TAdvancedGraphicsDialog.h 
skipping to change at line 42 skipping to change at line 42
TGVerticalFrame *fContourFrame; // Contour Frame TGVerticalFrame *fContourFrame; // Contour Frame
TGNumberEntry *fContourPoints; // Number of points for the graph TGNumberEntry *fContourPoints; // Number of points for the graph
TGComboBox *fContourPar1; // Parameter 1 for Contour TGComboBox *fContourPar1; // Parameter 1 for Contour
TGComboBox *fContourPar2; // Parameter 2 for Contour TGComboBox *fContourPar2; // Parameter 2 for Contour
TGNumberEntry *fContourError; // Error Level for Contour TGNumberEntry *fContourError; // Error Level for Contour
TGCheckButton *fContourOver; // Superimpose the graphics TGCheckButton *fContourOver; // Superimpose the graphics
TGColorSelect *fContourColor; // Color for the graph TGColorSelect *fContourColor; // Color for the graph
TGVerticalFrame *fScanFrame; // Scan Frame TGVerticalFrame *fScanFrame; // Scan Frame
TGNumberEntry *fScanPoints; // Number of points for the graph TGNumberEntry *fScanPoints; // Number of points for the graph
TGComboBox *fScanPar; // Parameter for Scan TGComboBox *fScanPar; // Parameter for Scan
TGNumberEntry *fScanMin; // Min Value for Contour TGNumberEntry *fScanMin; // Min Value for Contour
TGNumberEntry *fScanMax; // Max Value for Contour TGNumberEntry *fScanMax; // Max Value for Contour
TGVerticalFrame *fConfFrame; // Confidence Intervals Frame
TGNumberEntry *fConfLevel; // Confidence Level
TGColorSelect *fConfColor; // Color for the graph
TGTextButton *fDraw; // ok button TGTextButton *fDraw; // ok button
TGTextButton *fClose; // cancel button TGTextButton *fClose; // cancel button
TBackCompFitter *fFitter; // Fitter. TBackCompFitter *fFitter; // Fitter.
void CreateContourFrame(); void CreateContourFrame();
void CreateScanFrame(); void CreateScanFrame();
void CreateConfFrame();
void AddParameters(TGComboBox*); void AddParameters(TGComboBox*);
void DrawContour(); void DrawContour();
void DrawScan(); void DrawScan();
void DrawConfidenceLevels();
void ConnectSlots(); void ConnectSlots();
TAdvancedGraphicsDialog(const TAdvancedGraphicsDialog&); // Not impleme nted TAdvancedGraphicsDialog(const TAdvancedGraphicsDialog&); // Not impleme nted
TAdvancedGraphicsDialog &operator= (const TAdvancedGraphicsDialog&); // Not implemented TAdvancedGraphicsDialog &operator= (const TAdvancedGraphicsDialog&); // Not implemented
public: public:
TAdvancedGraphicsDialog(const TGWindow *p, const TGWindow *main); TAdvancedGraphicsDialog(const TGWindow *p, const TGWindow *main);
~TAdvancedGraphicsDialog(); ~TAdvancedGraphicsDialog();
 End of changes. 4 change blocks. 
1 lines changed or deleted 7 lines changed or added


 TAttAxis.h   TAttAxis.h 
// @(#)root/base:$Id: TAttAxis.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TAttAxis.h 27860 2009-03-18 08:36:17Z brun $
// Author: Rene Brun 12/12/94 // Author: Rene Brun 12/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 62 skipping to change at line 62
virtual Float_t GetLabelOffset() const {return fLabelOffset;} virtual Float_t GetLabelOffset() const {return fLabelOffset;}
virtual Float_t GetLabelSize() const {return fLabelSize;} virtual Float_t GetLabelSize() const {return fLabelSize;}
virtual Float_t GetTitleOffset() const {return fTitleOffset;} virtual Float_t GetTitleOffset() const {return fTitleOffset;}
virtual Float_t GetTitleSize() const {return fTitleSize;} virtual Float_t GetTitleSize() const {return fTitleSize;}
virtual Float_t GetTickLength() const {return fTickLength;} virtual Float_t GetTickLength() const {return fTickLength;}
virtual Color_t GetTitleColor() const {return fTitleColor;} virtual Color_t GetTitleColor() const {return fTitleColor;}
virtual Style_t GetTitleFont() const {return fTitleFont;} virtual Style_t GetTitleFont() const {return fTitleFont;}
virtual void ResetAttAxis(Option_t *option=""); virtual void ResetAttAxis(Option_t *option="");
virtual void SaveAttributes(ostream &out, const char *name, const ch ar *subname); virtual void SaveAttributes(ostream &out, const char *name, const ch ar *subname);
virtual void SetNdivisions(Int_t n=510, Bool_t optim=kTRUE); // *ME NU* virtual void SetNdivisions(Int_t n=510, Bool_t optim=kTRUE); // *ME NU*
virtual void SetNdivisions(Int_t n1, Int_t n2, Int_t n3, Bool_t opti m=kTRUE);
virtual void SetAxisColor(Color_t color=1); // *MENU* virtual void SetAxisColor(Color_t color=1); // *MENU*
virtual void SetLabelColor(Color_t color=1); // *MENU* virtual void SetLabelColor(Color_t color=1); // *MENU*
virtual void SetLabelFont(Style_t font=62); // *MENU* virtual void SetLabelFont(Style_t font=62); // *MENU*
virtual void SetLabelOffset(Float_t offset=0.005); // *MENU* virtual void SetLabelOffset(Float_t offset=0.005); // *MENU*
virtual void SetLabelSize(Float_t size=0.04); // *MENU* virtual void SetLabelSize(Float_t size=0.04); // *MENU*
virtual void SetTickLength(Float_t length=0.03); // *MENU* virtual void SetTickLength(Float_t length=0.03); // *MENU*
virtual void SetTitleOffset(Float_t offset=1); // *MENU* virtual void SetTitleOffset(Float_t offset=1); // *MENU*
virtual void SetTitleSize(Float_t size=0.04); // *MENU* virtual void SetTitleSize(Float_t size=0.04); // *MENU*
virtual void SetTitleColor(Color_t color=1); // *MENU* virtual void SetTitleColor(Color_t color=1); // *MENU*
virtual void SetTitleFont(Style_t font=62); // *MENU* virtual void SetTitleFont(Style_t font=62); // *MENU*
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TAttFill.h   TAttFill.h 
// @(#)root/base:$Id: TAttFill.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TAttFill.h 27860 2009-03-18 08:36:17Z brun $
// Author: Rene Brun 12/12/94 // Author: Rene Brun 12/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 TAttLine.h   TAttLine.h 
// @(#)root/base:$Id: TAttLine.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TAttLine.h 27860 2009-03-18 08:36:17Z brun $
// Author: Rene Brun 28/11/94 // Author: Rene Brun 28/11/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 TAttMarker.h   TAttMarker.h 
// @(#)root/base:$Id: TAttMarker.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TAttMarker.h 27860 2009-03-18 08:36:17Z brun $
// Author: Rene Brun 12/05/95 // Author: Rene Brun 12/05/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 TAttText.h   TAttText.h 
// @(#)root/base:$Id: TAttText.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TAttText.h 27861 2009-03-18 08:38:14Z brun $
// Author: Rene Brun 12/12/94 // Author: Rene Brun 12/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 TAxis.h   TAxis.h 
// @(#)root/hist:$Id: TAxis.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/hist:$Id: TAxis.h 27982 2009-03-28 19:05:50Z brun $
// Author: Rene Brun 12/12/94 // Author: Rene Brun 12/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 87 skipping to change at line 87
const char *ChooseTimeFormat(Double_t axislength=0); const char *ChooseTimeFormat(Double_t axislength=0);
virtual void Copy(TObject &axis) const; virtual void Copy(TObject &axis) const;
virtual void Delete(Option_t * /*option*/ ="") { } virtual void Delete(Option_t * /*option*/ ="") { }
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual TObject *DrawClone(Option_t * /*option*/ ="") const {return 0; } virtual TObject *DrawClone(Option_t * /*option*/ ="") const {return 0; }
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual Int_t FindBin(Double_t x); virtual Int_t FindBin(Double_t x);
virtual Int_t FindBin(const char *label); virtual Int_t FindBin(const char *label);
virtual Int_t FindFixBin(Double_t x) const; virtual Int_t FindFixBin(Double_t x) const;
virtual Double_t GetBinCenter(Int_t bin) const; virtual Double_t GetBinCenter(Int_t bin) const;
virtual Double_t GetBinCenterLog(Int_t bin) const;
const char *GetBinLabel(Int_t bin) const; const char *GetBinLabel(Int_t bin) const;
virtual Double_t GetBinLowEdge(Int_t bin) const; virtual Double_t GetBinLowEdge(Int_t bin) const;
virtual Double_t GetBinUpEdge(Int_t bin) const; virtual Double_t GetBinUpEdge(Int_t bin) const;
virtual Double_t GetBinWidth(Int_t bin) const; virtual Double_t GetBinWidth(Int_t bin) const;
virtual void GetCenter(Double_t *center) const; virtual void GetCenter(Double_t *center) const;
Bool_t GetCenterLabels() const; Bool_t GetCenterLabels() const;
Bool_t GetCenterTitle() const; Bool_t GetCenterTitle() const;
THashList *GetLabels() {return fLabels;} THashList *GetLabels() {return fLabels;}
virtual void GetLowEdge(Double_t *edge) const; virtual void GetLowEdge(Double_t *edge) const;
Bool_t GetMoreLogLabels() const; Bool_t GetMoreLogLabels() const;
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TBackCompFitter.h   TBackCompFitter.h 
// @(#)root/minuit2:$Id: TBackCompFitter.h 26866 2008-12-12 10:50:07Z monet a $ // @(#)root/minuit2:$Id: TBackCompFitter.h 28022 2009-04-01 14:41:58Z monet a $
// Author: L. Moneta 08/2008 // Author: L. Moneta 08/2008
/********************************************************************** /**********************************************************************
* * * *
* Copyright (c) 2008 ROOT Foundation, CERN/PH-SFT * * Copyright (c) 2008 ROOT Foundation, CERN/PH-SFT *
* * * *
**********************************************************************/ **********************************************************************/
#ifndef ROOT_TBackCompFitter_H_ #ifndef ROOT_TBackCompFitter_H_
#define ROOT_TBackCompFitter_H_ #define ROOT_TBackCompFitter_H_
skipping to change at line 101 skipping to change at line 101
virtual void SetMethodCall(TMethodCall * m) { fMethodCall = m; } virtual void SetMethodCall(TMethodCall * m) { fMethodCall = m; }
///!!!! new method (of this interface) ///!!!! new method (of this interface)
// get reference to Fit configuration (NOTE: it will be invalid when cla ss is deleted) // get reference to Fit configuration (NOTE: it will be invalid when cla ss is deleted)
ROOT::Fit::FitConfig & GetFitConfig() { return fFitter->Config(); } ROOT::Fit::FitConfig & GetFitConfig() { return fFitter->Config(); }
// get reference to Fit Result object (NOTE: it will be invalid when cla ss is deleted) // get reference to Fit Result object (NOTE: it will be invalid when cla ss is deleted)
const ROOT::Fit::FitResult & GetFitResult() const { return fFitter->Resu lt(); } const ROOT::Fit::FitResult & GetFitResult() const { return fFitter->Resu lt(); }
// get reference to Fit Data object (NOTE: it will be invalid when class
is deleted)
const ROOT::Fit::FitData & GetFitData() const { return *fFitData; }
// scan likelihood value of parameter and fill the given graph. // scan likelihood value of parameter and fill the given graph.
bool Scan(unsigned int ipar, TGraph * gr, double xmin = 0, double xmax = 0); bool Scan(unsigned int ipar, TGraph * gr, double xmin = 0, double xmax = 0);
// // scan likelihood value for two parameters and fill the given graph . // // scan likelihood value for two parameters and fill the given graph .
// bool Scan2D(unsigned int ipar, unsigned int jpar, TGraph2D * gr, // bool Scan2D(unsigned int ipar, unsigned int jpar, TGraph2D * gr,
// double xmin = 0, double xmax = 0, double ymin = 0, double ymax = 0); // double xmin = 0, double xmax = 0, double ymin = 0, double ymax = 0);
// create contour of two parameters around the minimum // create contour of two parameters around the minimum
// pass as option confidence level: default is a value of 0.683 // pass as option confidence level: default is a value of 0.683
bool Contour(unsigned int ipar, unsigned int jpar, TGraph * gr , double confLevel = 0.683); bool Contour(unsigned int ipar, unsigned int jpar, TGraph * gr , double confLevel = 0.683);
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 TBuffer.h   TBuffer.h 
// @(#)root/base:$Id: TBuffer.h 25450 2008-09-18 21:13:42Z pcanal $ // @(#)root/base:$Id: TBuffer.h 27845 2009-03-17 15:23:30Z pcanal $
// Author: Rene Brun, Philippe Canal, Fons Rademakers 04/05/96 // Author: Rene Brun, Philippe Canal, Fons Rademakers 04/05/96
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 38 skipping to change at line 38
class TStreamerElement; class TStreamerElement;
class TClass; class TClass;
class TString; class TString;
class TProcessID; class TProcessID;
class TClonesArray; class TClonesArray;
class TRefTable; class TRefTable;
class TBuffer : public TObject { class TBuffer : public TObject {
protected: protected:
Bool_t fMode; //Read or write mode Bool_t fMode; //Read or write mode
Int_t fVersion; //Buffer format version Int_t fVersion; //Buffer format version
Int_t fBufSize; //Size of buffer Int_t fBufSize; //Size of buffer
char *fBuffer; //Buffer used to store objects char *fBuffer; //Buffer used to store objects
char *fBufCur; //Current position in buffer char *fBufCur; //Current position in buffer
char *fBufMax; //End of buffer char *fBufMax; //End of buffer
TObject *fParent; //Pointer to parent object owning this b TObject *fParent; //Pointer to parent object owning this
uffer buffer
ReAllocCharFun_t fReAllocFunc; //! Realloc function to be used when ex
tending the buffer.
// Default ctor // Default ctor
TBuffer() : TObject(), fMode(0), fVersion(0), fBufSize(0), fBuffer(0), TBuffer() : TObject(), fMode(0), fVersion(0), fBufSize(0), fBuffer(0),
fBufCur(0), fBufMax(0), fParent(0) {} fBufCur(0), fBufMax(0), fParent(0), fReAllocFunc(0) {}
// TBuffer objects cannot be copied or assigned // TBuffer objects cannot be copied or assigned
TBuffer(const TBuffer &); // not implemented TBuffer(const TBuffer &); // not implemented
void operator=(const TBuffer &); // not implemented void operator=(const TBuffer &); // not implemented
void Expand(Int_t newsize); // expand buffer to newsize void Expand(Int_t newsize); // expand buffer to newsize
Int_t Read(const char *name) { return TObject::Read(name); } Int_t Read(const char *name) { return TObject::Read(name); }
Int_t Write(const char *name, Int_t opt, Int_t bufs) Int_t Write(const char *name, Int_t opt, Int_t bufs)
{ return TObject::Write(name, opt, bufs); } { return TObject::Write(name, opt, bufs); }
skipping to change at line 70 skipping to change at line 71
{ return TObject::Write(name, opt, bufs); } { return TObject::Write(name, opt, bufs); }
public: public:
enum EMode { kRead = 0, kWrite = 1 }; enum EMode { kRead = 0, kWrite = 1 };
enum { kIsOwner = BIT(16) }; //if set TBuffer own s fBuffer enum { kIsOwner = BIT(16) }; //if set TBuffer own s fBuffer
enum { kCannotHandleMemberWiseStreaming = BIT(17)}; //if set TClonesArra y should not use member wise streaming enum { kCannotHandleMemberWiseStreaming = BIT(17)}; //if set TClonesArra y should not use member wise streaming
enum { kInitialSize = 1024, kMinimalSize = 128 }; enum { kInitialSize = 1024, kMinimalSize = 128 };
TBuffer(EMode mode); TBuffer(EMode mode);
TBuffer(EMode mode, Int_t bufsiz); TBuffer(EMode mode, Int_t bufsiz);
TBuffer(EMode mode, Int_t bufsiz, void *buf, Bool_t adopt = kTRUE); TBuffer(EMode mode, Int_t bufsiz, void *buf, Bool_t adopt = kTRUE, ReAll ocCharFun_t reallocfunc = 0);
virtual ~TBuffer(); virtual ~TBuffer();
Int_t GetBufferVersion() const { return fVersion; } Int_t GetBufferVersion() const { return fVersion; }
Bool_t IsReading() const { return (fMode & kWrite) == 0; } Bool_t IsReading() const { return (fMode & kWrite) == 0; }
Bool_t IsWriting() const { return (fMode & kWrite) != 0; } Bool_t IsWriting() const { return (fMode & kWrite) != 0; }
void SetReadMode(); void SetReadMode();
void SetWriteMode(); void SetWriteMode();
void SetBuffer(void *buf, UInt_t bufsiz = 0, Bool_t adopt = kTRUE); void SetBuffer(void *buf, UInt_t bufsiz = 0, Bool_t adopt = kTRUE, R
eAllocCharFun_t reallocfunc = 0);
ReAllocCharFun_t GetReAllocFunc() const;
void SetReAllocFunc(ReAllocCharFun_t reallocfunc = 0);
void SetBufferOffset(Int_t offset = 0) { fBufCur = fBuffer+offset; } void SetBufferOffset(Int_t offset = 0) { fBufCur = fBuffer+offset; }
void SetParent(TObject *parent); void SetParent(TObject *parent);
TObject *GetParent() const; TObject *GetParent() const;
char *Buffer() const { return fBuffer; } char *Buffer() const { return fBuffer; }
Int_t BufferSize() const { return fBufSize; } Int_t BufferSize() const { return fBufSize; }
void DetachBuffer() { fBuffer = 0; } void DetachBuffer() { fBuffer = 0; }
Int_t Length() const { return (Int_t)(fBufCur - fBuffer); } Int_t Length() const { return (Int_t)(fBufCur - fBuffer); }
virtual Bool_t CheckObject(const TObject *obj) = 0; virtual Bool_t CheckObject(const TObject *obj) = 0;
virtual Bool_t CheckObject(const void *obj, const TClass *ptrClass) = 0; virtual Bool_t CheckObject(const void *obj, const TClass *ptrClass) = 0;
 End of changes. 5 change blocks. 
12 lines changed or deleted 17 lines changed or added


 TBufferFile.h   TBufferFile.h 
// @(#)root/io:$Id: TBufferFile.h 25863 2008-10-17 18:53:10Z brun $ // @(#)root/io:$Id: TBufferFile.h 27747 2009-03-10 12:30:50Z pcanal $
// Author: Rene Brun 17/01/2007 // Author: Rene Brun 17/01/2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 89 skipping to change at line 89
public: public:
enum { kMapSize = 503 }; enum { kMapSize = 503 };
enum { kStreamedMemberWise = BIT(14) }; //added to version number to kno w if a collection has been stored member-wise enum { kStreamedMemberWise = BIT(14) }; //added to version number to kno w if a collection has been stored member-wise
enum { kNotDecompressed = BIT(15) }; //indicates a weird buffer, used by TBasket enum { kNotDecompressed = BIT(15) }; //indicates a weird buffer, used by TBasket
enum { kTextBasedStreaming = BIT(18) }; //indicates if buffer used for X ML/SQL object streaming enum { kTextBasedStreaming = BIT(18) }; //indicates if buffer used for X ML/SQL object streaming
enum { kUser1 = BIT(21), kUser2 = BIT(22), kUser3 = BIT(23)}; //free for user enum { kUser1 = BIT(21), kUser2 = BIT(22), kUser3 = BIT(23)}; //free for user
TBufferFile(TBuffer::EMode mode); TBufferFile(TBuffer::EMode mode);
TBufferFile(TBuffer::EMode mode, Int_t bufsiz); TBufferFile(TBuffer::EMode mode, Int_t bufsiz);
TBufferFile(TBuffer::EMode mode, Int_t bufsiz, void *buf, Bool_t adopt = kTRUE); TBufferFile(TBuffer::EMode mode, Int_t bufsiz, void *buf, Bool_t adopt = kTRUE, ReAllocCharFun_t reallocfunc = 0);
virtual ~TBufferFile(); virtual ~TBufferFile();
Int_t GetMapCount() const { return fMapCount; } Int_t GetMapCount() const { return fMapCount; }
void GetMappedObject(UInt_t tag, void* &ptr, TClass* &ClassPtr) cons t; void GetMappedObject(UInt_t tag, void* &ptr, TClass* &ClassPtr) cons t;
void MapObject(const TObject *obj, UInt_t offset = 1); void MapObject(const TObject *obj, UInt_t offset = 1);
void MapObject(const void *obj, const TClass *cl, UInt_t offset = 1) ; void MapObject(const void *obj, const TClass *cl, UInt_t offset = 1) ;
void Reset() { SetBufferOffset(); ResetMap(); } void Reset() { SetBufferOffset(); ResetMap(); }
void InitMap(); void InitMap();
void ResetMap(); void ResetMap();
void SetReadParam(Int_t mapsize); void SetReadParam(Int_t mapsize);
void SetWriteParam(Int_t mapsize); void SetWriteParam(Int_t mapsize);
void SetBuffer(void *buf, UInt_t bufsiz = 0, Bool_t adopt = kTRUE);
Bool_t CheckObject(const TObject *obj); Bool_t CheckObject(const TObject *obj);
Bool_t CheckObject(const void *obj, const TClass *ptrClass); Bool_t CheckObject(const void *obj, const TClass *ptrClass);
virtual Int_t GetVersionOwner() const; virtual Int_t GetVersionOwner() const;
virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const TC lass *clss); virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const TC lass *clss);
virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const ch ar *classname); virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const ch ar *classname);
virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kF ALSE); virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kF ALSE);
virtual Version_t ReadVersion(UInt_t *start = 0, UInt_t *bcnt = 0, cons t TClass *cl = 0); virtual Version_t ReadVersion(UInt_t *start = 0, UInt_t *bcnt = 0, cons t TClass *cl = 0);
 End of changes. 3 change blocks. 
3 lines changed or deleted 2 lines changed or added


 TClassEdit.h   TClassEdit.h 
// @(#)root/base:$Id: TClassEdit.h 27409 2009-02-10 22:31:15Z pcanal $ // @(#)root/base:$Id: TClassEdit.h 28095 2009-04-03 19:52:28Z pcanal $
// Author: Victor Perev 10/04/2003 // Author: Victor Perev 10/04/2003
// Philippe Canal 05/2004 // Philippe Canal 05/2004
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2003, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2003, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 70 skipping to change at line 70
bool IsDefComp (const char *comp , const char *classname); bool IsDefComp (const char *comp , const char *classname);
int IsSTLCont (const char *type,int testAlloc=0); int IsSTLCont (const char *type,int testAlloc=0);
bool IsStdClass(const char *type); bool IsStdClass(const char *type);
bool IsVectorBool(const char *name); bool IsVectorBool(const char *name);
std::string GetLong64_Name(const std::string& original); std::string GetLong64_Name(const std::string& original);
int GetSplit (const char *type, std::vector<std::string> &outpu t, int &nestedLoc); int GetSplit (const char *type, std::vector<std::string> &outpu t, int &nestedLoc);
int STLKind (const char *type); //Kind of stl container int STLKind (const char *type); //Kind of stl container
int STLArgs (int kind); //Min number of arguments w ithout allocator int STLArgs (int kind); //Min number of arguments w ithout allocator
std::string ResolveTypedef(const char *tname, bool resolveAll = false); std::string ResolveTypedef(const char *tname, bool resolveAll = false);
std::string ShortType (const char *typeDesc, int mode); std::string ShortType (const char *typeDesc, int mode);
std::string InsertStd(const char *tname);
} }
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TCollectionProxyInfo.h   TCollectionProxyInfo.h 
// @(#)root/cont:$Id: TCollectionProxyInfo.h 27255 2009-01-27 10:59:53Z pca nal $ // @(#)root/cont:$Id: TCollectionProxyInfo.h 27661 2009-02-28 20:37:18Z pca nal $
// Author: Markus Frank 28/10/04. Philippe Canal 02/01/2007 // Author: Markus Frank 28/10/04. Philippe Canal 02/01/2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 390 skipping to change at line 390
T::construct, T::construct,
T::destruct, T::destruct,
T::feed, T::feed,
T::collect, T::collect,
T::Env_t::Create); T::Env_t::Create);
} }
}; };
template <> struct TCollectionProxyInfo::Type<std::vector<bool> > template <> struct TCollectionProxyInfo::Type<std::vector<bool> >
: public Address<std::vector<bool>::const_reference> : public TCollectionProxyInfo::Address<std::vector<bool>::const_referenc e>
{ {
typedef std::vector<bool> Cont_t; typedef std::vector<bool> Cont_t;
typedef std::vector<bool>::iterator Iter_t; typedef std::vector<bool>::iterator Iter_t;
typedef std::vector<bool>::value_type Value_t; typedef std::vector<bool>::value_type Value_t;
typedef Environ<Iter_t> Env_t; typedef Environ<Iter_t> Env_t;
typedef Env_t *PEnv_t; typedef Env_t *PEnv_t;
typedef Cont_t *PCont_t; typedef Cont_t *PCont_t;
typedef Value_t *PValue_t; typedef Value_t *PValue_t;
virtual ~Type() {} virtual ~Type() {}
skipping to change at line 450 skipping to change at line 450
for (Iter_t i=c->begin(); i != c->end(); ++i, ++m ) for (Iter_t i=c->begin(); i != c->end(); ++i, ++m )
::new(m) Value_t(*i); ::new(m) Value_t(*i);
return 0; return 0;
} }
static void* destruct(void*) { static void* destruct(void*) {
// Nothing to destruct. // Nothing to destruct.
return 0; return 0;
} }
}; };
template <> struct TCollectionProxyInfo::Pushback<std::vector<bool> > : public Type<std::vector<bool> > { template <> struct TCollectionProxyInfo::Pushback<std::vector<bool> > : public TCollectionProxyInfo::Type<std::vector<bool> > {
typedef std::vector<bool> Cont_t; typedef std::vector<bool> Cont_t;
typedef Cont_t::iterator Iter_t; typedef Cont_t::iterator Iter_t;
typedef Cont_t::value_type Value_t; typedef Cont_t::value_type Value_t;
typedef Environ<Iter_t> Env_t; typedef Environ<Iter_t> Env_t;
typedef Env_t *PEnv_t; typedef Env_t *PEnv_t;
typedef Cont_t *PCont_t; typedef Cont_t *PCont_t;
typedef Value_t *PValue_t; typedef Value_t *PValue_t;
static void* resize(void* env) { static void* resize(void* env) {
PEnv_t e = PEnv_t(env); PEnv_t e = PEnv_t(env);
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TDirectory.h   TDirectory.h 
// @(#)root/base:$Id: TDirectory.h 24013 2008-05-26 12:07:40Z brun $ // @(#)root/base:$Id: TDirectory.h 27658 2009-02-28 05:34:57Z pcanal $
// Author: Rene Brun 28/11/94 // Author: Rene Brun 28/11/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 181 skipping to change at line 181
virtual Int_t ReadKeys(Bool_t /*forceRead*/=kTRUE) {return 0;} virtual Int_t ReadKeys(Bool_t /*forceRead*/=kTRUE) {return 0;}
virtual Int_t ReadTObject(TObject * /*obj*/, const char * /*keynam e*/) {return 0;} virtual Int_t ReadTObject(TObject * /*obj*/, const char * /*keynam e*/) {return 0;}
virtual TObject *Remove(TObject*); virtual TObject *Remove(TObject*);
virtual void RecursiveRemove(TObject *obj); virtual void RecursiveRemove(TObject *obj);
virtual void rmdir(const char *name); virtual void rmdir(const char *name);
virtual void Save() {} virtual void Save() {}
virtual Int_t SaveObjectAs(const TObject * /*obj*/, const char * / *filename*/="", Option_t * /*option*/="") const; virtual Int_t SaveObjectAs(const TObject * /*obj*/, const char * / *filename*/="", Option_t * /*option*/="") const;
virtual void SaveSelf(Bool_t /*force*/ = kFALSE) {} virtual void SaveSelf(Bool_t /*force*/ = kFALSE) {}
virtual void SetBufferSize(Int_t /* bufsize */) {} virtual void SetBufferSize(Int_t /* bufsize */) {}
virtual void SetModified() {} virtual void SetModified() {}
virtual void SetMother(const TObject *mother) {fMother = (TObject *)mother;} virtual void SetMother(TObject *mother) {fMother = (TObject*)moth er;}
virtual void SetName(const char* newname); virtual void SetName(const char* newname);
virtual void SetTRefAction(TObject * /*ref*/, TObject * /*parent* /) {} virtual void SetTRefAction(TObject * /*ref*/, TObject * /*parent* /) {}
virtual void SetSeekDir(Long64_t) {} virtual void SetSeekDir(Long64_t) {}
virtual void SetWritable(Bool_t) {} virtual void SetWritable(Bool_t) {}
virtual Int_t Sizeof() const {return 0;} virtual Int_t Sizeof() const {return 0;}
virtual Int_t Write(const char * /*name*/=0, Int_t /*opt*/=0, Int_ t /*bufsize*/=0){return 0;} virtual Int_t Write(const char * /*name*/=0, Int_t /*opt*/=0, Int_ t /*bufsize*/=0){return 0;}
virtual Int_t Write(const char * /*name*/=0, Int_t /*opt*/=0, Int_ t /*bufsize*/=0) const {return 0;} virtual Int_t Write(const char * /*name*/=0, Int_t /*opt*/=0, Int_ t /*bufsize*/=0) const {return 0;}
virtual Int_t WriteTObject(const TObject *obj, const char *name =0 , Option_t * /*option*/="", Int_t /*bufsize*/ =0); virtual Int_t WriteTObject(const TObject *obj, const char *name =0 , Option_t * /*option*/="", Int_t /*bufsize*/ =0);
template <class T> inline Int_t WriteObject(const T* obj, const char* na me, Option_t *option="", Int_t bufsize=0) // see TDirectory::WriteTObject o r TDirectoryWriteObjectAny for explanation template <class T> inline Int_t WriteObject(const T* obj, const char* na me, Option_t *option="", Int_t bufsize=0) // see TDirectory::WriteTObject o r TDirectoryWriteObjectAny for explanation
{ {
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TDocParser.h   TDocParser.h 
// @(#)root/html:$Id: TDocParser.h 27531 2009-02-19 16:51:35Z axel $ // @(#)root/html:$Id: TDocParser.h 27897 2009-03-20 13:27:04Z axel $
// Author: Axel Naumann 2007-01-09 // Author: Axel Naumann 2007-01-09
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 30 skipping to change at line 30
// / / // / /
/////////////////////////////////////////////////////////////////////////// / /////////////////////////////////////////////////////////////////////////// /
#include <list> #include <list>
#include <set> #include <set>
#include <map> #include <map>
#ifndef ROOT_TObject #ifndef ROOT_TObject
#include "TObject.h" #include "TObject.h"
#endif #endif
#ifndef ROOT_TList #ifndef ROOT_THashList
#include "TList.h" #include "THashList.h"
#endif #endif
#ifndef ROOT_TString #ifndef ROOT_TString
#include "TString.h" #include "TString.h"
#endif #endif
#ifndef ROOT_Riosfwd #ifndef ROOT_Riosfwd
#include "Riosfwd.h" #include "Riosfwd.h"
#endif #endif
class TBaseClass; class TBaseClass;
class TClass; class TClass;
skipping to change at line 129 skipping to change at line 129
kClassDoc_Ignore, kClassDoc_Ignore,
kClassDoc_NumStates kClassDoc_NumStates
} fClassDocState; // whether we found the class description } fClassDocState; // whether we found the class description
Bool_t fCommentAtBOL; // at the beginning of the current line , fParseContext contained kComment Bool_t fCommentAtBOL; // at the beginning of the current line , fParseContext contained kComment
TString fClassDescrTag; // tag for finding the class descriptio n TString fClassDescrTag; // tag for finding the class descriptio n
TString fSourceInfoTags[kNumSourceInfos]; // tags for source info elements (copyright, last changed, author) TString fSourceInfoTags[kNumSourceInfos]; // tags for source info elements (copyright, last changed, author)
TList fDirectiveHandlers;// handler for doc directives (TDocDir ective objects) TList fDirectiveHandlers;// handler for doc directives (TDocDir ective objects)
Bool_t fAllowDirectives; // whether directives are to be interp reted Bool_t fAllowDirectives; // whether directives are to be interp reted
std::set<UInt_t> fExtraLinesWithAnchor; // lines that need an additional anchor std::set<UInt_t> fExtraLinesWithAnchor; // lines that need an additional anchor
TString fSourceInfo[kNumSourceInfos];// author, last changed, ... TString fSourceInfo[kNumSourceInfos];// author, last changed, ...
TList fMethods[3]; // methods as TMethodWrapper objects (b y access) THashList fMethods[3]; // methods as TMethodWrapper objects (b y access)
TList fDataMembers[6]; // data members (by access, plus enums) TList fDataMembers[6]; // data members (by access, plus enums)
static std::set<std::string> fgKeywords; // C++ keywords static std::set<std::string> fgKeywords; // C++ keywords
void AddClassMethodsRecursively(TBaseClass* bc); void AddClassMethodsRecursively(TBaseClass* bc);
void AddClassDataMembersRecursively(TBaseClass* bc); void AddClassDataMembersRecursively(TBaseClass* bc);
EParseContext Context() const { return fParseContext.empty() ? kComment : (EParseContext)(fParseContext.back() & kParseContextMask); } EParseContext Context() const { return fParseContext.empty() ? kComment : (EParseContext)(fParseContext.back() & kParseContextMask); }
virtual void ExpandCPPLine(TString& line, Ssiz_t& pos); virtual void ExpandCPPLine(TString& line, Ssiz_t& pos);
virtual Bool_t HandleDirective(TString& keyword, Ssiz_t& pos, virtual Bool_t HandleDirective(TString& keyword, Ssiz_t& pos,
TString& word, Ssiz_t& copiedToCommentUpTo); TString& word, Ssiz_t& copiedToCommentUpTo);
skipping to change at line 170 skipping to change at line 170
TString& codeOneLiner); TString& codeOneLiner);
void WriteSourceLine(std::ostream& out); void WriteSourceLine(std::ostream& out);
public: public:
TDocParser(TClassDocOutput& docOutput, TClass* cl); TDocParser(TClassDocOutput& docOutput, TClass* cl);
TDocParser(TDocOutput& docOutput); TDocParser(TDocOutput& docOutput);
virtual ~TDocParser(); virtual ~TDocParser();
static void AnchorFromLine(const TString& line, TString& anchor); static void AnchorFromLine(const TString& line, TString& anchor);
void Convert(std::ostream& out, std::istream& in, const char* r elpath, void Convert(std::ostream& out, std::istream& in, const char* r elpath,
Bool_t isCode); Bool_t isCode, Bool_t interpretDirectives);
void DecrementMethodCount(const char* name); void DecrementMethodCount(const char* name);
virtual void DecorateKeywords(std::ostream& out, const char* text); virtual void DecorateKeywords(std::ostream& out, const char* text);
virtual void DecorateKeywords(TString& text); virtual void DecorateKeywords(TString& text);
virtual void DeleteDirectiveOutput() const; virtual void DeleteDirectiveOutput() const;
const TList* GetMethods(EAccess access) const { return &fMethods[access ]; } const TList* GetMethods(EAccess access) const { return &fMethods[access ]; }
TClass* GetCurrentClass() const { return fCurrentClass; } TClass* GetCurrentClass() const { return fCurrentClass; }
void GetCurrentModule(TString& out_module) const; void GetCurrentModule(TString& out_module) const;
TDocOutput* GetDocOutput() const { return fDocOutput; } TDocOutput* GetDocOutput() const { return fDocOutput; }
Long_t GetLineNumber() const { return fLineNumber; } Long_t GetLineNumber() const { return fLineNumber; }
const TList* GetDataMembers(EAccess access) const { return &fDataMember s[access]; } const TList* GetDataMembers(EAccess access) const { return &fDataMember s[access]; }
 End of changes. 4 change blocks. 
5 lines changed or deleted 5 lines changed or added


 TDsKey.h   TDsKey.h 
// @(#)root/table:$Id: TDsKey.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/table:$Id: TDsKey.h 27656 2009-02-28 02:49:41Z pcanal $
// Author: Victor Perevoztchikov (perev@bnl.gov) 01/03/2001 // Author: Victor Perevoztchikov (perev@bnl.gov) 01/03/2001
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. *
* Copyright (C) 2001 [BNL] Brookhaven National Laboratory. * * Copyright (C) 2001 [BNL] Brookhaven National Laboratory. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 37 skipping to change at line 37
public: public:
TDsKey(const char *name=0,UInt_t *uk=0,int nk=1); TDsKey(const char *name=0,UInt_t *uk=0,int nk=1);
TDsKey(const char *name,UInt_t uk); TDsKey(const char *name,UInt_t uk);
TDsKey(UInt_t uRun,UInt_t uEvent=0); TDsKey(UInt_t uRun,UInt_t uEvent=0);
virtual ~TDsKey(){} virtual ~TDsKey(){}
virtual TDsKey &operator=( const TDsKey &from); virtual TDsKey &operator=( const TDsKey &from);
virtual TDsKey &operator=( UInt_t from); virtual TDsKey &operator=( UInt_t from);
virtual TDsKey &operator=( Int_t from){ *this=(UInt_t)from; return *thi s;} virtual TDsKey &operator=( Int_t from){ *this=(UInt_t)from; return *thi s;}
virtual TDsKey &operator=( const char *from); virtual TDsKey &operator=( const char *from);
virtual Bool_t operator==(const TDsKey &from) const; virtual Bool_t operator==(const TDsKey &from) const;
virtual UInt_t operator[](Int_t i) const { return (*(TArrayI *)(&fUrr) )[i]; } virtual UInt_t operator[](Int_t i) const { return fUrr[i]; }
virtual void Update(const TDsKey &from,const char *name=0); virtual void Update(const TDsKey &from,const char *name=0);
virtual void SetName(const char *name){fName=name;} virtual void SetName(const char *name){fName=name;}
virtual const char *GetName() const {return fName;} virtual const char *GetName() const {return fName;}
virtual TString GetKey() const; virtual TString GetKey() const;
virtual UInt_t EventNumber() const { return (*this)[1];} virtual UInt_t EventNumber() const { return (*this)[1];}
virtual UInt_t RunNumber() const { return (*this)[0];} virtual UInt_t RunNumber() const { return (*this)[0];}
virtual void SetKey(const char *key); virtual void SetKey(const char *key);
virtual void SetUrr(const UInt_t *key,int nk); virtual void SetUrr(const UInt_t *key,int nk);
virtual UInt_t GetSum() const; virtual UInt_t GetSum() const;
virtual Int_t EOK() const { return (UInt_t)(*(TArrayI *)(&fUrr))[0 virtual Int_t EOK() const { return (UInt_t)fUrr[0]==kUMAX;}
]==kUMAX;} virtual Int_t IsNull() const { return !fUrr[0];}
virtual Int_t IsNull() const { return !(*(TArrayI *)(&fUrr))[0];}
}; };
#endif #endif
 End of changes. 3 change blocks. 
5 lines changed or deleted 4 lines changed or added


 TEveCalo.h   TEveCalo.h 
// @(#)root/eve:$Id: TEveCalo.h 27157 2009-01-15 14:05:12Z brun $ // @(#)root/eve:$Id: TEveCalo.h 28197 2009-04-14 13:59:27Z matevz $
// Author: Matevz Tadel 2007 // Author: Matevz Tadel 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 164 skipping to change at line 164
Color_t fFrameColor; Color_t fFrameColor;
UChar_t fFrameTransparency; UChar_t fFrameTransparency;
virtual void BuildCellIdCache(); virtual void BuildCellIdCache();
public: public:
TEveCalo3D(TEveCaloData* d=0, const char* n="TEveCalo3D", const char* t= "xx"); TEveCalo3D(TEveCaloData* d=0, const char* n="TEveCalo3D", const char* t= "xx");
virtual ~TEveCalo3D() {} virtual ~TEveCalo3D() {}
virtual void ComputeBBox(); virtual void ComputeBBox();
virtual Bool_t CanEditMainColor() const { return kTRUE; } virtual Bool_t CanEditMainColor() const { return kTRUE; }
virtual Bool_t CanEditMainTransparency() const { return kTRUE; } virtual Bool_t CanEditMainTransparency() const { return kTRUE; }
void SetRnrFrame(Bool_t e, Bool_t b) { fRnrEndCapFrame = e; fRnr BarrelFrame = b; } void SetRnrFrame(Bool_t e, Bool_t b) { fRnrEndCapFrame = e; fRnr BarrelFrame = b; }
void GetRnrFrame(Bool_t &e, Bool_t &b) const { e = fRnrEndCapFrame; b = fRnrBarrelFrame; } void GetRnrFrame(Bool_t &e, Bool_t &b) const { e = fRnrEndCapFrame; b = fRnrBarrelFrame; }
virtual void SetFrameTransparency(UChar_t x) { fFrameTransparency = x; }
UChar_t GetFrameTransparency() const { return fFrameTransparency; }
ClassDef(TEveCalo3D, 0); // Class for 3D visualization of calorimeter ev ent data. ClassDef(TEveCalo3D, 0); // Class for 3D visualization of calorimeter ev ent data.
}; };
/************************************************************************** / /************************************************************************** /
/************************************************************************** / /************************************************************************** /
class TEveCalo2D : public TEveCaloViz, class TEveCalo2D : public TEveCaloViz,
public TEveProjected public TEveProjected
{ {
friend class TEveCalo2DGL; friend class TEveCalo2DGL;
skipping to change at line 194 skipping to change at line 197
TEveProjection::EPType_e fOldProjectionType; TEveProjection::EPType_e fOldProjectionType;
protected: protected:
std::vector<TEveCaloData::vCellId_t*> fCellLists; std::vector<TEveCaloData::vCellId_t*> fCellLists;
std::vector<Int_t> fBinIds; std::vector<Int_t> fBinIds;
virtual void BuildCellIdCache(); virtual void BuildCellIdCache();
public: public:
TEveCalo2D(const char* n="TEveCalo2D", const char* t=""); TEveCalo2D(const char* n="TEveCalo2D", const char* t="");
virtual ~TEveCalo2D(){} virtual ~TEveCalo2D();
virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model); virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);
virtual void UpdateProjection(); virtual void UpdateProjection();
virtual void SetDepth(Float_t x){fDepth = x;} virtual void SetDepth(Float_t x){fDepth = x;}
virtual void ComputeBBox(); virtual void ComputeBBox();
ClassDef(TEveCalo2D, 0); // Class for visualization of projected calorim eter event data. ClassDef(TEveCalo2D, 0); // Class for visualization of projected calorim eter event data.
}; };
/************************************************************************** / /************************************************************************** /
 End of changes. 4 change blocks. 
3 lines changed or deleted 6 lines changed or added


 TEveCaloLegoOverlay.h   TEveCaloLegoOverlay.h 
// @(#)root/eve:$Id: TEveCaloLegoOverlay.h 27370 2009-02-06 18:58:23Z matev z $ // @(#)root/eve:$Id: TEveCaloLegoOverlay.h 27643 2009-02-27 16:13:24Z matev z $
// Author: Alja Mrak-Tadel 2007 // Author: Alja Mrak-Tadel 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 36 skipping to change at line 36
void DrawSlider(TGLRnrCtx& rnrCtx); void DrawSlider(TGLRnrCtx& rnrCtx);
Bool_t SetSliderVal(Event_t* event,TGLRnrCtx& rnrCtx ); Bool_t SetSliderVal(Event_t* event,TGLRnrCtx& rnrCtx );
TString fHeaderTxt; TString fHeaderTxt;
Bool_t fHeaderSelected; Bool_t fHeaderSelected;
protected: protected:
TEveCaloLego* fCalo; TEveCaloLego* fCalo;
TAxis *fSliderAxis;
Color_t fMainColor; Color_t fMainColor;
Bool_t fShowCamera; Bool_t fShowCamera;
Bool_t fShowPlane; Bool_t fShowPlane;
// plane-value // plane-value
Float_t fMenuW; Float_t fMenuW;
Float_t fButtonW; Float_t fButtonW;
Float_t fSliderH; // slider height in % of viewport Float_t fSliderH; // slider height in % of viewport
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TEveCaloVizEditor.h   TEveCaloVizEditor.h 
// @(#)root/eve:$Id: TEveCaloVizEditor.h 25245 2008-08-25 21:44:09Z matevz $ // @(#)root/eve:$Id: TEveCaloVizEditor.h 27669 2009-03-02 20:13:53Z matevz $
// Author: Matevz Tadel 2007 // Author: Matevz Tadel 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TEveCaloVizEditor #ifndef ROOT_TEveCaloVizEditor
#define ROOT_TEveCaloVizEditor #define ROOT_TEveCaloVizEditor
#include "TGedFrame.h" #include "TGedFrame.h"
class TEveCaloViz; class TEveCaloViz;
class TEveCalo3D;
class TGDoubleHSlider; class TGDoubleHSlider;
class TEveGValuator; class TEveGValuator;
class TEveGDoubleValuator; class TEveGDoubleValuator;
class TGCheckButton; class TGCheckButton;
class TGRadioButton; class TGRadioButton;
class TGNumberEntry;
class TGVerticalFrame; class TGVerticalFrame;
class TEveCaloVizEditor : public TGedFrame class TEveCaloVizEditor : public TGedFrame
{ {
private: private:
TEveCaloVizEditor(const TEveCaloVizEditor&); // Not implement ed TEveCaloVizEditor(const TEveCaloVizEditor&); // Not implement ed
TEveCaloVizEditor& operator=(const TEveCaloVizEditor&); // Not implement ed TEveCaloVizEditor& operator=(const TEveCaloVizEditor&); // Not implement ed
void MakeSliceInfo(); void MakeSliceInfo();
protected: protected:
TEveCaloViz *fM; // Model object. TEveCaloViz *fM; // Model object.
TGNumberEntry *fFrameTransparency;
TGRadioButton *fPlotE; TGRadioButton *fPlotE;
TGRadioButton *fPlotEt; TGRadioButton *fPlotEt;
TGCheckButton *fScaleAbs; TGCheckButton *fScaleAbs;
TEveGValuator *fMaxValAbs; TEveGValuator *fMaxValAbs;
TEveGValuator *fMaxTowerH; TEveGValuator *fMaxTowerH;
TEveGDoubleValuator *fEtaRng; TEveGDoubleValuator *fEtaRng;
TEveGValuator *fPhi; TEveGValuator *fPhi;
TEveGValuator *fPhiOffset; TEveGValuator *fPhiOffset;
skipping to change at line 72 skipping to change at line 76
void DoEtaRange(); void DoEtaRange();
void DoPhi(); void DoPhi();
void DoSliceThreshold(); void DoSliceThreshold();
void DoSliceColor(Pixel_t color); void DoSliceColor(Pixel_t color);
ClassDef(TEveCaloVizEditor, 0); // GUI editor for TEveCaloVizEditor. ClassDef(TEveCaloVizEditor, 0); // GUI editor for TEveCaloVizEditor.
}; };
/**************************************************************************
/
class TEveCalo3DEditor : public TGedFrame
{
private:
TEveCalo3DEditor(const TEveCalo3DEditor&); // Not implemented
TEveCalo3DEditor& operator=(const TEveCalo3DEditor&); // Not implemented
protected:
TEveCalo3D *fM; // Model object.
TGNumberEntry *fFrameTransparency;
public:
TEveCalo3DEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30,
UInt_t options=kChildFrame, Pixel_t back=GetDefaultFra
meBackground());
virtual ~TEveCalo3DEditor() {}
virtual void SetModel(TObject* obj);
void DoFrameTransparency();
ClassDef(TEveCalo3DEditor, 0); // GUI editor for TEveCalo3DEditor.
};
#endif #endif
 End of changes. 5 change blocks. 
1 lines changed or deleted 30 lines changed or added


 TEveGeoNode.h   TEveGeoNode.h 
// @(#)root/eve:$Id: TEveGeoNode.h 27157 2009-01-15 14:05:12Z brun $ // @(#)root/eve:$Id: TEveGeoNode.h 28295 2009-04-20 20:26:34Z matevz $
// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 // Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 41 skipping to change at line 41
{ {
friend class TEveGeoNodeEditor; friend class TEveGeoNodeEditor;
TEveGeoNode(const TEveGeoNode&); // Not implemented TEveGeoNode(const TEveGeoNode&); // Not implemented
TEveGeoNode& operator=(const TEveGeoNode&); // Not implemented TEveGeoNode& operator=(const TEveGeoNode&); // Not implemented
protected: protected:
TGeoNode *fNode; TGeoNode *fNode;
TEveGeoShapeExtract* DumpShapeTree(TEveGeoNode* geon, TEveGeoShapeExtrac t* parent = 0, Int_t level = 0); TEveGeoShapeExtract* DumpShapeTree(TEveGeoNode* geon, TEveGeoShapeExtrac t* parent = 0, Int_t level = 0);
static Int_t fgCSGExportNSeg; //!
static std::list<TGeoShape*> fgTemporaryStore; //!
public: public:
TEveGeoNode(TGeoNode* node); TEveGeoNode(TGeoNode* node);
virtual const char* GetName() const; virtual const char* GetName() const;
virtual const char* GetTitle() const; virtual const char* GetTitle() const;
virtual const char* GetElementName() const; virtual const char* GetElementName() const;
virtual const char* GetElementTitle() const; virtual const char* GetElementTitle() const;
TGeoNode* GetNode() const { return fNode; } TGeoNode* GetNode() const { return fNode; }
virtual void ExpandIntoListTree(TGListTree* ltree, TGListTreeItem* par ent); virtual void ExpandIntoListTree(TGListTree* ltree, TGListTreeItem* par ent);
virtual void ExpandIntoListTrees();
virtual void ExpandIntoListTreesRecursively();
virtual Bool_t CanEditElement() const { return kFALSE; } virtual Bool_t CanEditElement() const { return kFALSE; }
virtual void AddStamp(UChar_t bits); virtual void AddStamp(UChar_t bits);
virtual Bool_t CanEditMainColor() const; virtual Bool_t CanEditMainColor() const;
virtual void SetMainColor(Color_t color); virtual void SetMainColor(Color_t color);
virtual Bool_t CanEditMainTransparency() const; virtual Bool_t CanEditMainTransparency() const;
virtual UChar_t GetMainTransparency() const; virtual UChar_t GetMainTransparency() const;
virtual void SetMainTransparency(UChar_t t); virtual void SetMainTransparency(UChar_t t);
void UpdateNode(TGeoNode* node); void UpdateNode(TGeoNode* node);
void UpdateVolume(TGeoVolume* volume); void UpdateVolume(TGeoVolume* volume);
void Save(const char* file, const char* name="Extract"); void Save(const char* file, const char* name="Extract");
virtual void Draw(Option_t* option=""); virtual void Draw(Option_t* option="");
static Int_t GetCSGExportNSeg();
static void SetCSGExportNSeg(Int_t nseg);
ClassDef(TEveGeoNode, 1); // Wrapper for TGeoNode that allows it to be s hown in GUI and controlled as a TEveElement. ClassDef(TEveGeoNode, 1); // Wrapper for TGeoNode that allows it to be s hown in GUI and controlled as a TEveElement.
}; };
//---------------------------------------------------------------- //----------------------------------------------------------------
class TEveGeoTopNode : public TEveGeoNode class TEveGeoTopNode : public TEveGeoNode
{ {
TEveGeoTopNode(const TEveGeoTopNode&); // Not implemented TEveGeoTopNode(const TEveGeoTopNode&); // Not implemented
TEveGeoTopNode& operator=(const TEveGeoTopNode&); // Not implemented TEveGeoTopNode& operator=(const TEveGeoTopNode&); // Not implemented
 End of changes. 4 change blocks. 
1 lines changed or deleted 10 lines changed or added


 TEveJetCone.h   TEveJetCone.h 
// @(#)root/eve:$Id: TEveJetCone.h 27299 2009-01-29 21:54:57Z matevz $ // @(#)root/eve:$Id: TEveJetCone.h 28214 2009-04-15 11:32:25Z matevz $
// Author: Matevz Tadel, Jochen Thaeder 2009 // Author: Matevz Tadel, Jochen Thaeder 2009
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 49 skipping to change at line 49
Float_t fThetaC; // Angle between axis and the edge o f top-side of cylinder Float_t fThetaC; // Angle between axis and the edge o f top-side of cylinder
public: public:
TEveJetCone(const Text_t* n="TEveJetCone", const Text_t* t=""); TEveJetCone(const Text_t* n="TEveJetCone", const Text_t* t="");
virtual ~TEveJetCone() {} virtual ~TEveJetCone() {}
void SetApex(const TEveVector& a) { fApex = a; } / / Sets apex of cone void SetApex(const TEveVector& a) { fApex = a; } / / Sets apex of cone
void SetCylinder( const Float_t& r, const Float_t& z ) { void SetCylinder( const Float_t& r, const Float_t& z ) {
fCylinderBorder.Set( r, 0.f, z ); fThetaC = fCylinderBorder.Theta(); } // Set border cylinder fCylinderBorder.Set( r, 0.f, z ); fThetaC = fCylinderBorder.Theta(); } // Set border cylinder
Int_t AddCone( const Float_t& eta, const Float_t& phi, const Float_t& co Int_t AddCone(Float_t eta, Float_t phi, Float_t coneRadius, Float_t heig
neRadius, const Float_t& height = -1. ); ht=-1);
Int_t AddEllipticCone(Float_t eta, Float_t phi, Float_t reta, Float_t rp
hi, Float_t height=-1);
virtual Bool_t CanEditMainTransparency() const { return kTRUE; } virtual Bool_t CanEditMainTransparency() const { return kTRUE; }
// For TAttBBox: // For TAttBBox:
virtual void ComputeBBox(); virtual void ComputeBBox();
// If painting is needed: // If painting is needed:
virtual void Paint(Option_t* option=""); virtual void Paint(Option_t* option="");
ClassDef(TEveJetCone, 0); // Short description. ClassDef(TEveJetCone, 0); // Short description.
}; };
 End of changes. 2 change blocks. 
3 lines changed or deleted 5 lines changed or added


 TEvePolygonSetProjectedGL.h   TEvePolygonSetProjectedGL.h 
// @(#)root/eve:$Id: TEvePolygonSetProjectedGL.h 21310 2007-12-10 19:05:45Z matevz $ // @(#)root/eve:$Id: TEvePolygonSetProjectedGL.h 28197 2009-04-14 13:59:27Z matevz $
// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 // Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 25 skipping to change at line 25
#include "TGLObject.h" #include "TGLObject.h"
class TEvePolygonSetProjectedGL : public TGLObject class TEvePolygonSetProjectedGL : public TGLObject
{ {
public: public:
TEvePolygonSetProjectedGL(); TEvePolygonSetProjectedGL();
virtual ~TEvePolygonSetProjectedGL() {} virtual ~TEvePolygonSetProjectedGL() {}
virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);
virtual void SetBBox(); virtual void SetBBox();
virtual void Draw(TGLRnrCtx& rnrCtx) const;
virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;
virtual Bool_t IgnoreSizeForOfInterest() const { return kTRUE; } virtual Bool_t IgnoreSizeForOfInterest() const { return kTRUE; }
ClassDef(TEvePolygonSetProjectedGL,0); // GL-renderer for TEvePolygonSe tProjected class. ClassDef(TEvePolygonSetProjectedGL,0); // GL-renderer for TEvePolygonSe tProjected class.
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TEveProjectionAxesGL.h   TEveProjectionAxesGL.h 
// @(#)root/eve:$Id: TEveProjectionAxesGL.h 27370 2009-02-06 18:58:23Z mate vz $ // @(#)root/eve:$Id: TEveProjectionAxesGL.h 28197 2009-04-14 13:59:27Z mate vz $
// Author: Alja Mrak-Tadel 2007 // Author: Alja Mrak-Tadel 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 43 skipping to change at line 43
TEveProjectionAxes *fM; // Model object. TEveProjectionAxes *fM; // Model object.
mutable TEveProjection *fProjection; // Cached model projection mutable TEveProjection *fProjection; // Cached model projection
mutable TGLAxisPainter fAxisPainter; mutable TGLAxisPainter fAxisPainter;
public: public:
TEveProjectionAxesGL(); TEveProjectionAxesGL();
virtual ~TEveProjectionAxesGL() {} virtual ~TEveProjectionAxesGL() {}
virtual Bool_t SetModel(TObject* obj, const Option_t* opt = 0); virtual Bool_t SetModel(TObject* obj, const Option_t* opt = 0);
virtual void SetBBox(); virtual void SetBBox();
virtual void Draw(TGLRnrCtx& rnrCtx) const;
virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;
Bool_t IgnoreSizeForOfInterest() const { Bool_t IgnoreSizeForOfInterest() const { return kTRUE; }
return kTRUE;
}
ClassDef(TEveProjectionAxesGL, 0); // GL renderer class for TEveProjecti onAxes. ClassDef(TEveProjectionAxesGL, 0); // GL renderer class for TEveProjecti onAxes.
}; };
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 3 lines changed or added


 TEveStraightLineSet.h   TEveStraightLineSet.h 
// @(#)root/eve:$Id: TEveStraightLineSet.h 27157 2009-01-15 14:05:12Z brun $ // @(#)root/eve:$Id: TEveStraightLineSet.h 28197 2009-04-14 13:59:27Z matev z $
// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 // Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 80 skipping to change at line 80
protected: protected:
TEveChunkManager fLinePlex; TEveChunkManager fLinePlex;
TEveChunkManager fMarkerPlex; TEveChunkManager fMarkerPlex;
Bool_t fOwnLinesIds; // Flag specifying if id-objects are owned by the TEveQuadSet Bool_t fOwnLinesIds; // Flag specifying if id-objects are owned by the TEveQuadSet
Bool_t fOwnMarkersIds; // Flag specifying if id-objects are owned by the TEveQuadSet Bool_t fOwnMarkersIds; // Flag specifying if id-objects are owned by the TEveQuadSet
Bool_t fRnrMarkers; Bool_t fRnrMarkers;
Bool_t fRnrLines; Bool_t fRnrLines;
Bool_t fDepthTest;
Line_t* fLastLine; //! Line_t* fLastLine; //!
public: public:
TEveStraightLineSet(const char* n="StraightLineSet", const char* t=""); TEveStraightLineSet(const char* n="StraightLineSet", const char* t="");
virtual ~TEveStraightLineSet() {} virtual ~TEveStraightLineSet() {}
virtual void SetLineColor(Color_t col) { SetMainColor(col); } virtual void SetLineColor(Color_t col) { SetMainColor(col); }
void AddLine(Float_t x1, Float_t y1, Float_t z1, Float_t x2, Float_t y2, Float_t z2); void AddLine(Float_t x1, Float_t y1, Float_t z1, Float_t x2, Float_t y2, Float_t z2);
void AddMarker(Int_t lineID, Float_t pos); void AddMarker(Int_t lineID, Float_t pos);
TEveChunkManager& GetLinePlex() { return fLinePlex; } TEveChunkManager& GetLinePlex() { return fLinePlex; }
TEveChunkManager& GetMarkerPlex() { return fMarkerPlex; } TEveChunkManager& GetMarkerPlex() { return fMarkerPlex; }
virtual Bool_t GetRnrMarkers() { return fRnrMarkers; } virtual Bool_t GetRnrMarkers() { return fRnrMarkers; }
virtual Bool_t GetRnrLines() { return fRnrLines; } virtual Bool_t GetRnrLines() { return fRnrLines; }
virtual Bool_t GetDepthTest() { return fDepthTest; }
virtual void SetRnrMarkers(Bool_t x) { fRnrMarkers = x; } virtual void SetRnrMarkers(Bool_t x) { fRnrMarkers = x; }
virtual void SetRnrLines(Bool_t x) { fRnrLines = x; } virtual void SetRnrLines(Bool_t x) { fRnrLines = x; }
virtual void SetDepthTest(Bool_t x) { fDepthTest = x; }
virtual void CopyVizParams(const TEveElement* el); virtual void CopyVizParams(const TEveElement* el);
virtual void WriteVizParams(ostream& out, const TString& var); virtual void WriteVizParams(ostream& out, const TString& var);
virtual TClass* ProjectedClass() const; virtual TClass* ProjectedClass() const;
virtual void ComputeBBox(); virtual void ComputeBBox();
virtual void Paint(Option_t* option=""); virtual void Paint(Option_t* option="");
ClassDef(TEveStraightLineSet, 1); // Set of straight lines with optional markers along the lines. ClassDef(TEveStraightLineSet, 1); // Set of straight lines with optional markers along the lines.
 End of changes. 4 change blocks. 
1 lines changed or deleted 5 lines changed or added


 TEveStraightLineSetGL.h   TEveStraightLineSetGL.h 
// @(#)root/eve:$Id: TEveStraightLineSetGL.h 21653 2008-01-11 20:23:15Z mat evz $ // @(#)root/eve:$Id: TEveStraightLineSetGL.h 28197 2009-04-14 13:59:27Z mat evz $
// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 // Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 37 skipping to change at line 37
protected: protected:
TEveStraightLineSet* fM; // fModel dynamic-casted to TEveStraightLineSet GL TEveStraightLineSet* fM; // fModel dynamic-casted to TEveStraightLineSet GL
public: public:
TEveStraightLineSetGL(); TEveStraightLineSetGL();
virtual ~TEveStraightLineSetGL() {} virtual ~TEveStraightLineSetGL() {}
virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);
virtual void SetBBox(); virtual void SetBBox();
virtual void Draw(TGLRnrCtx& rnrCtx) const;
virtual void DirectDraw(TGLRnrCtx& rnrCtx) const; virtual void DirectDraw(TGLRnrCtx& rnrCtx) const;
// To support two-level selectionvirtual // To support two-level selectionvirtual
Bool_t IgnoreSizeForOfInterest() const { return kTRUE; } Bool_t IgnoreSizeForOfInterest() const { return kTRUE; }
virtual Bool_t ShouldDLCache(const TGLRnrCtx& rnrCtx) const; virtual Bool_t ShouldDLCache(const TGLRnrCtx& rnrCtx) const;
virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }
virtual void ProcessSelection(TGLRnrCtx& rnrCtx, TGLSelectRecord& rec); virtual void ProcessSelection(TGLRnrCtx& rnrCtx, TGLSelectRecord& rec);
ClassDef(TEveStraightLineSetGL, 0); // GL-renderer for TEveStraightLineS et class. ClassDef(TEveStraightLineSetGL, 0); // GL-renderer for TEveStraightLineS et class.
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TEveViewer.h   TEveViewer.h 
// @(#)root/eve:$Id: TEveViewer.h 27577 2009-02-23 14:34:36Z matevz $ // @(#)root/eve:$Id: TEveViewer.h 28197 2009-04-14 13:59:27Z matevz $
// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 // Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TEveViewer #ifndef ROOT_TEveViewer
#define ROOT_TEveViewer #define ROOT_TEveViewer
#include "TEveElement.h" #include "TEveElement.h"
#include "TEveWindow.h" #include "TEveWindow.h"
class TGWindow; class TGWindow;
class TGedEditor; class TGedEditor;
class TGLViewer; class TGLViewer;
class TGLSAViewer;
class TGLEmbeddedViewer;
class TGLPhysicalShape; class TGLPhysicalShape;
class TEveScene; class TEveScene;
/************************************************************************** ****/ /************************************************************************** ****/
// TEveViewer // TEveViewer
/************************************************************************** ****/ /************************************************************************** ****/
class TEveViewer : public TEveWindowFrame class TEveViewer : public TEveWindowFrame
{ {
skipping to change at line 48 skipping to change at line 50
public: public:
TEveViewer(const char* n="TEveViewer", const char* t=""); TEveViewer(const char* n="TEveViewer", const char* t="");
virtual ~TEveViewer(); virtual ~TEveViewer();
virtual void PreUndock(); virtual void PreUndock();
virtual void PostDock(); virtual void PostDock();
TGLViewer* GetGLViewer() const { return fGLViewer; } TGLViewer* GetGLViewer() const { return fGLViewer; }
void SetGLViewer(TGLViewer* viewer, TGFrame* frame); void SetGLViewer(TGLViewer* viewer, TGFrame* frame);
void SpawnGLViewer(TGedEditor* ged);
void SpawnGLEmbeddedViewer(Int_t border=0); TGLSAViewer* SpawnGLViewer(TGedEditor* ged);
TGLEmbeddedViewer* SpawnGLEmbeddedViewer(Int_t border=0);
void Redraw(Bool_t resetCameras=kFALSE); void Redraw(Bool_t resetCameras=kFALSE);
virtual void AddScene(TEveScene* scene); virtual void AddScene(TEveScene* scene);
virtual void RemoveElementLocal(TEveElement* el); virtual void RemoveElementLocal(TEveElement* el);
virtual void RemoveElementsLocal(); virtual void RemoveElementsLocal();
virtual TObject* GetEditorObject(const TEveException& eh="TEveViewer::Ge tEditorObject ") const; virtual TObject* GetEditorObject(const TEveException& eh="TEveViewer::Ge tEditorObject ") const;
virtual Bool_t HandleElementPaste(TEveElement* el); virtual Bool_t HandleElementPaste(TEveElement* el);
 End of changes. 3 change blocks. 
3 lines changed or deleted 7 lines changed or added


 TEveWindow.h   TEveWindow.h 
// @(#)root/eve:$Id: TEveWindow.h 27157 2009-01-15 14:05:12Z brun $ // @(#)root/eve:$Id: TEveWindow.h 28197 2009-04-14 13:59:27Z matevz $
// Author: Matevz Tadel 2007 // Author: Matevz Tadel 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 44 skipping to change at line 44
//========================================================================= ===== //========================================================================= =====
// TEveCompositeFrame // TEveCompositeFrame
//========================================================================= ===== //========================================================================= =====
class TEveCompositeFrame : public TGCompositeFrame class TEveCompositeFrame : public TGCompositeFrame
{ {
friend class TEveWindow; friend class TEveWindow;
friend class TEveWindowManager; friend class TEveWindowManager;
public:
typedef TGFrame* (*IconBarCreator_foo)(TEveCompositeFrame*, TGCompositeF
rame*, Int_t);
private: private:
TEveCompositeFrame(const TEveCompositeFrame&); // Not impleme nted TEveCompositeFrame(const TEveCompositeFrame&); // Not impleme nted
TEveCompositeFrame& operator=(const TEveCompositeFrame&); // Not impleme nted TEveCompositeFrame& operator=(const TEveCompositeFrame&); // Not impleme nted
static IconBarCreator_foo fgIconBarCreator;
static UInt_t fgTopFrameHeight;
static UInt_t fgMiniBarHeight;
static Bool_t fgAllowTopFrameCollapse;
protected: protected:
TGCompositeFrame *fTopFrame; TGCompositeFrame *fTopFrame;
TGTextButton *fToggleBar; TGTextButton *fToggleBar;
TGTextButton *fTitleBar; TGTextButton *fTitleBar;
TGTextButton *fIconBar; TGFrame *fIconBar;
TGLayoutHints *fEveWindowLH; TGLayoutHints *fEveWindowLH;
TGButton *fMiniBar; TGFrame *fMiniBar;
TEveElement *fEveParent; TEveElement *fEveParent;
TEveWindow *fEveWindow; TEveWindow *fEveWindow;
Bool_t fShowInSync; Bool_t fShowInSync;
static TContextMenu *fgCtxMenu; static TContextMenu *fgCtxMenu;
static const TString fgkEmptyFrameName; static const TString fgkEmptyFrameName;
static TList *fgFrameList; static TList *fgFrameList;
skipping to change at line 86 skipping to change at line 94
virtual TEveWindow* RelinquishEveWindow(Bool_t reparent=kTRUE); virtual TEveWindow* RelinquishEveWindow(Bool_t reparent=kTRUE);
TEveWindow* GetEveWindow() const { return fEveWindow; } TEveWindow* GetEveWindow() const { return fEveWindow; }
TEveWindow* GetEveParentAsWindow() const; TEveWindow* GetEveParentAsWindow() const;
virtual void SetCurrent(Bool_t curr); virtual void SetCurrent(Bool_t curr);
virtual void SetShowTitleBar(Bool_t show); virtual void SetShowTitleBar(Bool_t show);
virtual void HideAllDecorations(); virtual void HideAllDecorations();
virtual void ShowNormalDecorations(); virtual void ShowNormalDecorations();
void ReplaceIconBox(TGFrame* icon_box);
void ActionPressed(); void ActionPressed();
void FlipTitleBarState(); void FlipTitleBarState();
void TitleBarClicked(); void TitleBarClicked();
static void SetupFrameMarkup(IconBarCreator_foo creator,
UInt_t top_frame_height = 14,
UInt_t mini_bar_height = 4,
Bool_t allow_top_collapse = kTRUE);
ClassDef(TEveCompositeFrame, 0); // Composite frame containing eve-windo w-controls and eve-windows. ClassDef(TEveCompositeFrame, 0); // Composite frame containing eve-windo w-controls and eve-windows.
}; };
//========================================================================= ===== //========================================================================= =====
// TEveCompositeFrameInMainFrame // TEveCompositeFrameInMainFrame
//========================================================================= ===== //========================================================================= =====
class TEveCompositeFrameInMainFrame : public TEveCompositeFrame class TEveCompositeFrameInMainFrame : public TEveCompositeFrame
{ {
private: private:
 End of changes. 7 change blocks. 
5 lines changed or deleted 17 lines changed or added


 TF2.h   TF2.h 
// @(#)root/hist:$Id: TF2.h 26166 2008-11-12 16:25:31Z brun $ // @(#)root/hist:$Id: TF2.h 28299 2009-04-21 07:35:58Z moneta $
// Author: Rene Brun 23/08/95 // Author: Rene Brun 23/08/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
// ---------------------------------- F2.h // ---------------------------------- F2.h
skipping to change at line 64 skipping to change at line 64
TF2(const char *name, const PtrObj& p, MemFn memFn, Double_t xmin, Doub le_t xmax, Double_t ymin, Double_t ymax, Int_t npar, const char * c1, const char * c2) : TF2(const char *name, const PtrObj& p, MemFn memFn, Double_t xmin, Doub le_t xmax, Double_t ymin, Double_t ymax, Int_t npar, const char * c1, const char * c2) :
TF1(name,p,memFn,xmin,xmax,npar,c1,c2), TF1(name,p,memFn,xmin,xmax,npar,c1,c2),
fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0) fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0)
{ {
fNpx = 30; fNpx = 30;
fNdim = 2; fNdim = 2;
} }
// Template constructors from any C++ callable object, defining the o perator() (double * , double *) // Template constructors from any C++ callable object, defining the o perator() (double * , double *)
// and returning a double. // and returning a double.
template <typename Func> template <typename Func>
TF2(const char *name, Func f, Double_t xmin, Double_t xmax, Double_t ymi n, Double_t ymax, Int_t npar, char * tmp ) : TF2(const char *name, Func f, Double_t xmin, Double_t xmax, Double_t ymi n, Double_t ymax, Int_t npar, const char * tmp ) :
TF1(name,f,xmin,xmax,npar,tmp), TF1(name,f,xmin,xmax,npar,tmp),
fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0) fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0)
{ {
fNpx = 30; fNpx = 30;
fNdim = 2; fNdim = 2;
} }
// constructor used by CINT // constructor used by CINT
TF2(const char *name, void *ptr, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Int_t npar, char *className ); TF2(const char *name, void *ptr, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Int_t npar, const char *className );
TF2(const char *name, void *ptr, void *,Double_t xmin, Double_t xmax, Do uble_t ymin, Double_t ymax, Int_t npar, const char *className, const char * methodName = 0); TF2(const char *name, void *ptr, void *,Double_t xmin, Double_t xmax, Do uble_t ymin, Double_t ymax, Int_t npar, const char *className, const char * methodName = 0);
TF2(const TF2 &f2); TF2(const TF2 &f2);
TF2 &operator=(const TF2& rhs); TF2 &operator=(const TF2& rhs);
virtual ~TF2(); virtual ~TF2();
virtual void Copy(TObject &f2) const; virtual void Copy(TObject &f2) const;
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void Draw(Option_t *option=""); virtual void Draw(Option_t *option="");
virtual TF1 *DrawCopy(Option_t *option="") const; virtual TF1 *DrawCopy(Option_t *option="") const;
virtual void DrawDerivative(Option_t * ="al") {;} virtual void DrawDerivative(Option_t * ="al") {;}
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TFileCollection.h   TFileCollection.h 
// @(#)root/base:$Id: TFileCollection.h 25412 2008-09-16 10:08:04Z brun $ // @(#)root/base:$Id: TFileCollection.h 27854 2009-03-17 21:33:41Z rdm $
// Author: Jan Fiete Grosse-Oetringhaus 01/06/07 // Author: Jan Fiete Grosse-Oetringhaus 01/06/07
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 30 skipping to change at line 30
// data information about its entries. This class is used to describe // // data information about its entries. This class is used to describe //
// file sets as stored by Grid file catalogs, by PROOF or any other // // file sets as stored by Grid file catalogs, by PROOF or any other //
// collection of TFile names. // // collection of TFile names. //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifndef ROOT_TNamed #ifndef ROOT_TNamed
#include "TNamed.h" #include "TNamed.h"
#endif #endif
#ifndef ROOT_TString
#include "TString.h"
#endif
class THashList; class THashList;
class TList; class TList;
class TFileInfo; class TFileInfo;
class TFileInfoMeta; class TFileInfoMeta;
class TObjString; class TObjString;
class TFileCollection : public TNamed { class TFileCollection : public TNamed {
private: private:
THashList *fList; //-> list of TFileInfos THashList *fList; //-> list of TFileInfos
TList *fMetaDataList; //-> generic list of file meta data obj ect(s) TList *fMetaDataList; //-> generic list of file meta data obj ect(s)
// (summed over entries of fList) // (summed over entries of fList)
TString fDefaultTree; // name of default tree
Long64_t fTotalSize; // total size of files in the list Long64_t fTotalSize; // total size of files in the list
Long64_t fNFiles; // number of files ( == fList->GetEntri es(), needed Long64_t fNFiles; // number of files ( == fList->GetEntri es(), needed
// because TFileCollection might be rea d without fList) // because TFileCollection might be rea d without fList)
Long64_t fNStagedFiles; // number of staged files Long64_t fNStagedFiles; // number of staged files
Long64_t fNCorruptFiles; // number of corrupt files Long64_t fNCorruptFiles; // number of corrupt files
TFileCollection(const TFileCollection&); // not implemented TFileCollection(const TFileCollection&); // not implemented
TFileCollection& operator=(const TFileCollection&); // not implemented TFileCollection& operator=(const TFileCollection&); // not implemented
public: public:
skipping to change at line 86 skipping to change at line 91
Long64_t GetTotalSize() const { return fTotalSize; } Long64_t GetTotalSize() const { return fTotalSize; }
Long64_t GetNFiles() const { return fNFiles; } Long64_t GetNFiles() const { return fNFiles; }
Long64_t GetNStagedFiles() const { return fNStagedFiles; } Long64_t GetNStagedFiles() const { return fNStagedFiles; }
Long64_t GetNCorruptFiles() const { return fNCorruptFiles; } Long64_t GetNCorruptFiles() const { return fNCorruptFiles; }
Float_t GetStagedPercentage() const Float_t GetStagedPercentage() const
{ return (fNFiles > 0) ? 100. * fNStagedFiles / fNFiles : 0; } { return (fNFiles > 0) ? 100. * fNStagedFiles / fNFiles : 0; }
Float_t GetCorruptedPercentage() const Float_t GetCorruptedPercentage() const
{ return (fNFiles > 0) ? 100. * fNCorruptFiles / fNFiles : 0; } { return (fNFiles > 0) ? 100. * fNCorruptFiles / fNFiles : 0; }
const char *GetDefaultTreeName() const; const char *GetDefaultTreeName() const;
void SetDefaultTreeName(const char* treeName) { fDefaultTree = treeName; }
Long64_t GetTotalEntries(const char *tree) const; Long64_t GetTotalEntries(const char *tree) const;
TFileInfoMeta *GetMetaData(const char *meta = 0) const; TFileInfoMeta *GetMetaData(const char *meta = 0) const;
void SetDefaultMetaData(const char *meta); void SetDefaultMetaData(const char *meta);
void RemoveMetaData(const char *meta = 0); void RemoveMetaData(const char *meta = 0);
TFileCollection *GetStagedSubset(); TFileCollection *GetStagedSubset();
ClassDef(TFileCollection, 2) // Collection of TFileInfo objects ClassDef(TFileCollection, 3) // Collection of TFileInfo objects
}; };
#endif #endif
 End of changes. 5 change blocks. 
2 lines changed or deleted 8 lines changed or added


 TGFSContainer.h   TGFSContainer.h 
// @(#)root/gui:$Id: TGFSContainer.h 23115 2008-04-10 13:35:37Z rdm $ // @(#)root/gui:$Id: TGFSContainer.h 27658 2009-02-28 05:34:57Z pcanal $
// Author: Fons Rademakers 19/01/98 // Author: Fons Rademakers 19/01/98
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 109 skipping to change at line 109
virtual Bool_t HandleDNDLeave() { virtual Bool_t HandleDNDLeave() {
return kTRUE; return kTRUE;
} }
virtual Atom_t HandleDNDPosition(int, int, Atom_t action, int, int) { virtual Atom_t HandleDNDPosition(int, int, Atom_t action, int, int) {
if (action == TGDNDManager::GetDNDActionCopy()) return action; if (action == TGDNDManager::GetDNDActionCopy()) return action;
return kNone; return kNone;
} }
virtual Bool_t HandleDNDFinished() { virtual Bool_t HandleDNDFinished() {
return ((TGFrame *)GetParent())->HandleDNDFinished(); return ((TGFrame *)(const_cast<TGWindow*>(GetParent())))->HandleDNDFi nished();
} }
void SetDNDData(TDNDData *data) { void SetDNDData(TDNDData *data) {
if (fDNDData.fDataLength > 0) if (fDNDData.fDataLength > 0)
free(fDNDData.fData); free(fDNDData.fData);
fDNDData.fData = calloc(sizeof(unsigned char), data->fDataLength); fDNDData.fData = calloc(sizeof(unsigned char), data->fDataLength);
memcpy(fDNDData.fData, data->fData, data->fDataLength); memcpy(fDNDData.fData, data->fData, data->fDataLength);
fDNDData.fDataLength = data->fDataLength; fDNDData.fDataLength = data->fDataLength;
fDNDData.fDataType = data->fDataType; fDNDData.fDataType = data->fDataType;
} }
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TGHtmlBrowser.h   TGHtmlBrowser.h 
// @(#)root/guihtml:$Id: TGHtmlBrowser.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/guihtml:$Id: TGHtmlBrowser.h 27987 2009-03-30 12:35:36Z belleno t $
// Author: Bertrand Bellenot 26/09/2007 // Author: Bertrand Bellenot 26/09/2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 62 skipping to change at line 62
TGTextBuffer *fURLBuf; // text buffer for current URL te xt entry TGTextBuffer *fURLBuf; // text buffer for current URL te xt entry
TGTextEntry *fURL; // current URL text entry TGTextEntry *fURL; // current URL text entry
TGHtml *fHtml; // main TGHtml widget TGHtml *fHtml; // main TGHtml widget
Int_t fNbFavorites; // number of favorites in the men u Int_t fNbFavorites; // number of favorites in the men u
public: public:
TGHtmlBrowser(const char *filename = 0, const TGWindow *p = 0, TGHtmlBrowser(const char *filename = 0, const TGWindow *p = 0,
UInt_t w = 900, UInt_t h = 600); UInt_t w = 900, UInt_t h = 600);
virtual ~TGHtmlBrowser() { ; } virtual ~TGHtmlBrowser() { ; }
virtual void CloseWindow();
virtual Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t); virtual Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t);
void Selected(const char *txt); void Selected(const char *txt);
void URLChanged(); void URLChanged();
void Back(); void Back();
Bool_t CheckAnchors(const char *);
void Forward(); void Forward();
void Reload(); void Reload();
void Stop(); void Stop();
void MouseOver(const char *); void MouseOver(const char *);
void MouseDown(const char *); void MouseDown(const char *);
void Clicked(char *uri) { Emit("Clicked(char *)",uri); } // *SIGNAL* void Clicked(char *uri) { Emit("Clicked(char *)",uri); } // *SIGNAL*
ClassDef(TGHtmlBrowser, 0) // very simple html browser ClassDef(TGHtmlBrowser, 0) // very simple html browser
}; };
 End of changes. 3 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TGLAxisPainter.h   TGLAxisPainter.h 
// @(#)root/eve:$Id: TGLAxisPainter.h 27342 2009-02-03 20:25:20Z matevz $ // @(#)root/eve:$Id: TGLAxisPainter.h 28197 2009-04-14 13:59:27Z matevz $
// Author: Alja Mrak-Tadel 2009 // Author: Alja Mrak-Tadel 2009
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 46 skipping to change at line 46
Int_t fMaxDigits; Int_t fMaxDigits;
Int_t fDecimals; Int_t fDecimals;
char fFormat[8]; char fFormat[8];
// Font derived from axis attributes. // Font derived from axis attributes.
TGLFont fLabelFont; TGLFont fLabelFont;
TGLFont fTitleFont; TGLFont fTitleFont;
// Print format. // Print format.
void LabelsLimits(const char *label, Int_t &first, Int_t &last) const; void LabelsLimits(const char *label, Int_t &first, Int_t &last) const;
void FormAxisValue(Float_t x, char* lab) const; void FormAxisValue(Double_t x, TString &s) const;
protected: protected:
TAttAxis *fAttAxis; // Model. TAttAxis *fAttAxis; // Model.
LabVec_t fLabVec; // List of Labels position-value pairs TGLFont::EMode fFontMode; // Later in AttAxis
TMVec_t fTMVec; // List of tick-mark position-value pairs LabVec_t fLabVec; // List of Labels position-value pairs
TMVec_t fTMVec; // List of tick-mark position-value pairs
// //
// Additional axis attributes required for GL rendering: // Additional axis attributes required for GL rendering:
// Orientation // Orientation
TGLVector3 fDir; TGLVector3 fDir;
TGLVector3 fTMOff[3]; TGLVector3 fTMOff[3];
Int_t fTMNDim; Int_t fTMNDim;
// Font. // Font.
Bool_t fUseRelativeFontSize; Int_t fLabelPixelFontSize;
Int_t fAbsoluteLabelFontSize; Double_t fLabel3DFontSize;
Int_t fAbsoluteTitleFontSize; Int_t fTitlePixelFontSize;
Double_t fTitle3DFontSize;
// Labels options. Allready exist in TAttAxis, but can't be set. // Labels options. Allready exist in TAttAxis, but can't be set.
TGLFont::ETextAlign_e fLabelAlign; TGLFont::ETextAlign_e fLabelAlign;
TGLVector3 fTitlePos;
public: public:
TGLAxisPainter(); TGLAxisPainter();
virtual ~TGLAxisPainter(); virtual ~TGLAxisPainter();
// GetSets. // GetSets.
Int_t GetTMNDim() const { return fTMNDim; } Int_t GetTMNDim() const { return fTMNDim; }
void SetTMNDim(Int_t x) { fTMNDim = x; } void SetTMNDim(Int_t x) { fTMNDim = x; }
TGLVector3& RefDir() { return fDir; } TGLVector3& RefDir() { return fDir; }
TGLVector3& RefTMOff(Int_t i) { return fTMOff[i]; } TGLVector3& RefTMOff(Int_t i) { return fTMOff[i]; }
Bool_t GetUseRelativeFontSize() const { return fUseRelativeFontSiz TGLFont::EMode GetFontMode() const { return fFontMode; }
e; } void SetFontMode(TGLFont::EMode m) { fFontMode=m; }
void SetUseRelativeFontSize( Bool_t x ) { fUseRelativeFontSize =
x; }
void SetAbsoluteLabelFontSize(Int_t fs) { fAbsoluteLabelFontSize // this setter not necessary
=fs; } void SetLabelPixelFontSize(Int_t fs) { fLabelPixelFontSize=fs; }
Int_t GetAbsoluteLabelFontSize() const { return fAbsoluteLabelFon Int_t GetLabelPixelFontSize() const { return fLabelPixelFontSize;
tSize; } }
void SetTitlePixelFontSize(Int_t fs) { fTitlePixelFontSize=fs; }
Int_t GetTitlePixelFontSize() const { return fTitlePixelFontSize;
}
void SetAbsoluteTitleFontSize(Int_t fs) { fAbsoluteTitleFontSize TGLVector3& RefTitlePos() { return fTitlePos; }
=fs; }
Int_t GetAbsoluteTitleFontSize() const { return fAbsoluteTitleFon
tSize; }
TGLFont::ETextAlign_e GetLabelAlign() const { return fLabelAlign; } TGLFont::ETextAlign_e GetLabelAlign() const { return fLabelAlign; }
void SetLabelAlign(TGLFont::ETextAlign_e x) { fLabelAlign = x; } void SetLabelAlign(TGLFont::ETextAlign_e x) { fLabelAlign = x; }
LabVec_t& RefLabVec() { return fLabVec; } LabVec_t& RefLabVec() { return fLabVec; }
TMVec_t& RefTMVec() { return fTMVec; } TMVec_t& RefTMVec() { return fTMVec; }
void SetAttAxis(TAttAxis* a) { fAttAxis = a; } void SetAttAxis(TAttAxis* a) { fAttAxis = a; }
TAttAxis* GetAttAxis() { return fAttAxis; } TAttAxis* GetAttAxis() { return fAttAxis; }
// Utility. // Utility.
void SetLabelFont(TGLRnrCtx &rnrCtx, Double_t refLength = -1); void SetLabelFont(TGLRnrCtx &rnrCtx, const char* fontName, Int_t pixelSi
void SetTitleFont(TGLRnrCtx &rnrCtx, Double_t refLength = -1); ze = 64, Double_t font3DSize = -1);
void SetTitleFont(TGLRnrCtx &rnrCtx, const char* fontName, Int_t pixelSi
ze = 64, Double_t font3DSize = -1);
void SetTextFormat(Double_t min, Double_t max, Double_t binWidth); void SetTextFormat(Double_t min, Double_t max, Double_t binWidth);
// Renderers. // Renderers.
void RnrTitle(const char* title, Float_t pos, TGLFont::ETextAlign_e alig void RnrText( const char* txt, const TGLVector3 &pos, const TGLFont::ETe
n) const; xtAlign_e align, const TGLFont &font) const;
void RnrTitle(const char* title, TGLVector3 &pos, TGLFont::ETextAlign_e
align) const;
void RnrLabels() const; void RnrLabels() const;
void RnrLines() const; void RnrLines() const;
void PaintAxis(TGLRnrCtx& ctx, TAxis* ax); void PaintAxis(TGLRnrCtx& ctx, TAxis* ax);
ClassDef(TGLAxisPainter, 0); // GL axis painter. ClassDef(TGLAxisPainter, 0); // GL axis painter.
}; };
#endif #endif
 End of changes. 10 change blocks. 
24 lines changed or deleted 30 lines changed or added


 TGLBoxPainter.h   TGLBoxPainter.h 
skipping to change at line 17 skipping to change at line 17
#ifndef ROOT_TGLQuadric #ifndef ROOT_TGLQuadric
#include "TGLQuadric.h" #include "TGLQuadric.h"
#endif #endif
#ifndef ROOT_TString #ifndef ROOT_TString
#include "TString.h" #include "TString.h"
#endif #endif
#ifndef ROOT_TGLUtil #ifndef ROOT_TGLUtil
#include "TGLUtil.h" #include "TGLUtil.h"
#endif #endif
class TGLOrthoCamera; class TGLPlotCamera;
class TAxis; class TAxis;
class TH1; class TH1;
class TGLBoxPainter : public TGLPlotPainter { class TGLBoxPainter : public TGLPlotPainter {
private: private:
TGLTH3Slice fXOZSlice; TGLTH3Slice fXOZSlice;
TGLTH3Slice fYOZSlice; TGLTH3Slice fYOZSlice;
TGLTH3Slice fXOYSlice; TGLTH3Slice fXOYSlice;
enum EBoxType { enum EBoxType {
skipping to change at line 43 skipping to change at line 43
TString fPlotInfo; TString fPlotInfo;
Rgl::Range_t fMinMaxVal; Rgl::Range_t fMinMaxVal;
mutable TGLQuadric fQuadric; mutable TGLQuadric fQuadric;
TGLBoxPainter(const TGLBoxPainter &); TGLBoxPainter(const TGLBoxPainter &);
TGLBoxPainter &operator = (const TGLBoxPainter &); TGLBoxPainter &operator = (const TGLBoxPainter &);
public: public:
TGLBoxPainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates *coo rd, TGLPaintDevice *dev = 0); TGLBoxPainter(TH1 *hist, TGLPlotCamera *camera, TGLPlotCoordinates *coor d, TGLPaintDevice *dev = 0);
char *GetPlotInfo(Int_t px, Int_t py); char *GetPlotInfo(Int_t px, Int_t py);
Bool_t InitGeometry(); Bool_t InitGeometry();
void StartPan(Int_t px, Int_t py); void StartPan(Int_t px, Int_t py);
void Pan(Int_t px, Int_t py); void Pan(Int_t px, Int_t py);
void AddOption(const TString &stringOption); void AddOption(const TString &stringOption);
void ProcessEvent(Int_t event, Int_t px, Int_t py); void ProcessEvent(Int_t event, Int_t px, Int_t py);
private: private:
//Overriders //Overriders
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TGLCamera.h   TGLCamera.h 
// @(#)root/gl:$Id: TGLCamera.h 27369 2009-02-06 17:35:54Z matevz $ // @(#)root/gl:$Id: TGLCamera.h 28201 2009-04-14 16:04:20Z matevz $
// Author: Richard Maunder 25/05/2005 // Author: Richard Maunder 25/05/2005
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TGLCamera #ifndef ROOT_TGLCamera
#define ROOT_TGLCamera #define ROOT_TGLCamera
#ifndef ROOT_TGLUtil
#include "TGLUtil.h" #include "TGLUtil.h"
#endif
#ifndef ROOT_TGLBoundingBox
#include "TGLBoundingBox.h" #include "TGLBoundingBox.h"
#endif
#ifndef ROOT_TPoint
#include "TPoint.h" #include "TPoint.h"
#endif
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// // // //
// TGLCamera // // TGLCamera //
// // // //
// Abstract base camera class - concrete classes for orthographic and // // Abstract base camera class - concrete classes for orthographic and //
// persepctive cameras derive from it. This class maintains values for // // persepctive cameras derive from it. This class maintains values for //
 End of changes. 5 change blocks. 
7 lines changed or deleted 1 lines changed or added


 TGLCameraOverlay.h   TGLCameraOverlay.h 
// @(#)root/eve:$Id: TGLCameraOverlay.h 27370 2009-02-06 18:58:23Z matevz $ // @(#)root/eve:$Id: TGLCameraOverlay.h 27643 2009-02-27 16:13:24Z matevz $
// Author: Alja Mrak-Tadel 2007 // Author: Alja Mrak-Tadel 2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 26 skipping to change at line 26
#include "TGLOverlay.h" #include "TGLOverlay.h"
#include "TGLUtil.h" #include "TGLUtil.h"
class TGLAxisPainter; class TGLAxisPainter;
class TGLFont; class TGLFont;
class TAttAxis; class TAttAxis;
class TAxis; class TAxis;
class TGLCameraOverlay : public TGLOverlayElement class TGLCameraOverlay : public TGLOverlayElement
{ {
public: public:
enum EMode { kPlaneIntersect, kBar, kAxis }; enum EMode { kPlaneIntersect, kBar, kAxis };
private: private:
TGLCameraOverlay(const TGLCameraOverlay&); // Not implemented TGLCameraOverlay(const TGLCameraOverlay&); // Not implemented
TGLCameraOverlay& operator=(const TGLCameraOverlay&); // Not implemented TGLCameraOverlay& operator=(const TGLCameraOverlay&); // Not implemented
Double_t fFrustum[4]; Double_t fFrustum[4];
skipping to change at line 51 skipping to change at line 50
EMode fOrthographicMode; EMode fOrthographicMode;
EMode fPerspectiveMode; EMode fPerspectiveMode;
TGLAxisPainter *fAxisPainter; TGLAxisPainter *fAxisPainter;
TAxis *fAxis; TAxis *fAxis;
Float_t fAxisExtend; Float_t fAxisExtend;
TGLPlane fExternalRefPlane; TGLPlane fExternalRefPlane;
Bool_t fUseExternalRefPlane; Bool_t fUseExternalRefPlane;
void RenderPlaneIntersect(TGLRnrCtx& rnrCtx, const TGLFont &font); void RenderPlaneIntersect(TGLRnrCtx& rnrCtx);
void RenderAxis(TGLRnrCtx& rnrCtx); void RenderAxis(TGLRnrCtx& rnrCtx);
void RenderBar(TGLRnrCtx& rnrCtx, const TGLFont &font); void RenderBar(TGLRnrCtx& rnrCtx);
public: public:
TGLCameraOverlay(Bool_t showOrtho=kTRUE, Bool_t showPersp=kFALSE); TGLCameraOverlay(Bool_t showOrtho=kTRUE, Bool_t showPersp=kFALSE);
virtual ~TGLCameraOverlay(); virtual ~TGLCameraOverlay();
virtual void Render(TGLRnrCtx& rnrCtx); virtual void Render(TGLRnrCtx& rnrCtx);
TGLPlane& RefExternalRefPlane() { return fExternalRefPlane; } TGLPlane& RefExternalRefPlane() { return fExternalRefPlane; }
void UseExternalRefPlane(Bool_t x) { fUseExternalRefPlane=x; } void UseExternalRefPlane(Bool_t x) { fUseExternalRefPlane=x; }
Bool_t GetUseExternalRefPlane() const { return fUseExternalRefPlane; } Bool_t GetUseExternalRefPlane() const { return fUseExternalRefPlane; }
 End of changes. 4 change blocks. 
4 lines changed or deleted 3 lines changed or added


 TGLFaceSet.h   TGLFaceSet.h 
// @(#)root/gl:$Id: TGLFaceSet.h 21252 2007-12-07 01:39:32Z matevz $ // @(#)root/gl:$Id: TGLFaceSet.h 28295 2009-04-20 20:26:34Z matevz $
// Author: Timur Pocheptsov 03/08/2004 // Author: Timur Pocheptsov 03/08/2004
// NOTE: This code moved from obsoleted TGLSceneObject.h / .cxx - see these // NOTE: This code moved from obsoleted TGLSceneObject.h / .cxx - see these
// attic files for previous CVS history // attic files for previous CVS history
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
skipping to change at line 40 skipping to change at line 40
std::vector<Int_t> fPolyDesc; std::vector<Int_t> fPolyDesc;
UInt_t fNbPols; UInt_t fNbPols;
public: public:
TGLFaceSet(const TBuffer3D & buffer); TGLFaceSet(const TBuffer3D & buffer);
virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;
void SetFromMesh(const RootCsg::TBaseMesh *m); void SetFromMesh(const RootCsg::TBaseMesh *m);
std::vector<Double_t>& GetVertices() { return fVertices; }
std::vector<Double_t>& GetNormals() { return fNormals; }
std::vector<Int_t>& GetPolyDesc() { return fPolyDesc; }
UInt_t GetNbPols() { return fNbPols; }
private: private:
void GLDrawPolys()const; void GLDrawPolys()const;
Int_t CheckPoints(const Int_t *source, Int_t *dest)const; Int_t CheckPoints(const Int_t *source, Int_t *dest)const;
static Bool_t Eq(const Double_t *p1, const Double_t *p2); static Bool_t Eq(const Double_t *p1, const Double_t *p2);
void CalculateNormals(); void CalculateNormals();
ClassDef(TGLFaceSet,0) // a faceset logical shape ClassDef(TGLFaceSet,0) // a faceset logical shape
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 6 lines changed or added


 TGLHistPainter.h   TGLHistPainter.h 
skipping to change at line 12 skipping to change at line 12
#define ROOT_TGLHistPainter #define ROOT_TGLHistPainter
#include <memory> #include <memory>
#ifndef ROOT_TVirtualHistPainter #ifndef ROOT_TVirtualHistPainter
#include "TVirtualHistPainter.h" #include "TVirtualHistPainter.h"
#endif #endif
#ifndef ROOT_TGLPlotPainter #ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h" #include "TGLPlotPainter.h"
#endif #endif
#ifndef ROOT_TGLOrthoCamera #ifndef ROOT_TGLPlotCamera
#include "TGLOrthoCamera.h" #include "TGLPlotCamera.h"
#endif #endif
#ifndef ROOT_TGLAdapter #ifndef ROOT_TGLAdapter
#include "TGLAdapter.h" #include "TGLAdapter.h"
#endif #endif
/* /*
TGLHistPainter is a proxy class. It inherits TVirtualHistPainter and TGLHistPainter is a proxy class. It inherits TVirtualHistPainter and
overrides its virtual functions, but all actual work is done by : overrides its virtual functions, but all actual work is done by :
THistPainter - I name it "default" painter, it's the member of type THistPainter - I name it "default" painter, it's the member of type
TVirtualHistPainter * and loaded via plugin-manager; TVirtualHistPainter * and loaded via plugin-manager;
skipping to change at line 49 skipping to change at line 49
//TGLHistPainter delegates unsupported options/calls to this object //TGLHistPainter delegates unsupported options/calls to this object
std::auto_ptr<TVirtualHistPainter> fDefaultPainter; std::auto_ptr<TVirtualHistPainter> fDefaultPainter;
//This member can have different dynamic types: TGLLegoPainter, etc. //This member can have different dynamic types: TGLLegoPainter, etc.
std::auto_ptr<TGLPlotPainter> fGLPainter; std::auto_ptr<TGLPlotPainter> fGLPainter;
TGLParametricEquation *fEq; TGLParametricEquation *fEq;
TH1 *fHist; TH1 *fHist;
TF3 *fF3; TF3 *fF3;
TList *fStack; TList *fStack;
EGLPlotType fPlotType; EGLPlotType fPlotType;
TGLOrthoCamera fCamera; TGLPlotCamera fCamera;
TGLPlotCoordinates fCoord; TGLPlotCoordinates fCoord;
TGLAdapter fGLDevice; TGLAdapter fGLDevice;
public: public:
TGLHistPainter(TH1 *hist); TGLHistPainter(TH1 *hist);
TGLHistPainter(TGLParametricEquation *equation); TGLHistPainter(TGLParametricEquation *equation);
//TVirtualHistPainter final overriders //TVirtualHistPainter final overriders
Int_t DistancetoPrimitive(Int_t px, Int_t py); Int_t DistancetoPrimitive(Int_t px, Int_t py);
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TGLLegoPainter.h   TGLLegoPainter.h 
// @(#)root/gl:$Id: TGLLegoPainter.h 22595 2008-03-11 16:15:27Z brun $ // @(#)root/gl:$Id: TGLLegoPainter.h 28201 2009-04-14 16:04:20Z matevz $
// Author: Timur Pocheptsov 14/06/2006 // Author: Timur Pocheptsov 14/06/2006
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 28 skipping to change at line 28
#ifndef ROOT_TGLQuadric #ifndef ROOT_TGLQuadric
#include "TGLQuadric.h" #include "TGLQuadric.h"
#endif #endif
#ifndef ROOT_TGLUtil #ifndef ROOT_TGLUtil
#include "TGLUtil.h" #include "TGLUtil.h"
#endif #endif
#ifndef ROOT_TString #ifndef ROOT_TString
#include "TString.h" #include "TString.h"
#endif #endif
class TGLOrthoCamera; class TGLPlotCamera;
class TAxis; class TAxis;
class TH1; class TH1;
/* /*
TGLLegoPainter. The concrete implementation of abstract TGLPlotPainter. TGLLegoPainter. The concrete implementation of abstract TGLPlotPainter.
*/ */
class TGLLegoPainter : public TGLPlotPainter { class TGLLegoPainter : public TGLPlotPainter {
private: private:
skipping to change at line 66 skipping to change at line 66
mutable TGLQuadric fQuadric; mutable TGLQuadric fQuadric;
Bool_t fDrawErrors; Bool_t fDrawErrors;
mutable TGLLevelPalette fPalette; mutable TGLLevelPalette fPalette;
mutable std::vector<Double_t> fColorLevels; mutable std::vector<Double_t> fColorLevels;
TGLLegoPainter(const TGLLegoPainter &); TGLLegoPainter(const TGLLegoPainter &);
TGLLegoPainter &operator = (const TGLLegoPainter &); TGLLegoPainter &operator = (const TGLLegoPainter &);
public: public:
TGLLegoPainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates *co ord, TGLPaintDevice *dev = 0); TGLLegoPainter(TH1 *hist, TGLPlotCamera *camera, TGLPlotCoordinates *coo rd, TGLPaintDevice *dev = 0);
//TGLPlotPainter's final-overriders //TGLPlotPainter's final-overriders
char *GetPlotInfo(Int_t px, Int_t py); char *GetPlotInfo(Int_t px, Int_t py);
Bool_t InitGeometry(); Bool_t InitGeometry();
void StartPan(Int_t px, Int_t py); void StartPan(Int_t px, Int_t py);
void Pan(Int_t px, Int_t py); void Pan(Int_t px, Int_t py);
void AddOption(const TString &stringOption); void AddOption(const TString &stringOption);
void ProcessEvent(Int_t event, Int_t px, Int_t py); void ProcessEvent(Int_t event, Int_t px, Int_t py);
private: private:
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TGLLightSet.h   TGLLightSet.h 
// @(#)root/gl:$Id: TGLLightSet.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/gl:$Id: TGLLightSet.h 28197 2009-04-14 13:59:27Z matevz $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TGLLightSet_H #ifndef ROOT_TGLLightSet_H
#define ROOT_TGLLightSet_H #define ROOT_TGLLightSet_H
skipping to change at line 36 skipping to change at line 36
kLightMask = 0x001f, kLightMask = 0x001f,
kLightSpecular = 0x0100 }; kLightSpecular = 0x0100 };
private: private:
TGLLightSet(const TGLLightSet&); // Not implemented TGLLightSet(const TGLLightSet&); // Not implemented
TGLLightSet& operator=(const TGLLightSet&); // Not implemented TGLLightSet& operator=(const TGLLightSet&); // Not implemented
protected: protected:
UInt_t fLightState; //! light states (on/off) mask UInt_t fLightState; //! light states (on/off) mask
Bool_t fUseSpecular; //! Bool_t fUseSpecular; //!
Float_t fFrontPower; //! power of the front lamp
Float_t fSidePower; //! power of the side lamps
Float_t fSpecularPower; //! power of specular lamp
public: public:
TGLLightSet(); TGLLightSet();
virtual ~TGLLightSet() {} virtual ~TGLLightSet() {}
void ToggleLight(ELight light); void ToggleLight(ELight light);
void SetLight(ELight light, Bool_t on); void SetLight(ELight light, Bool_t on);
UInt_t GetLightState() { return fLightState; } UInt_t GetLightState() { return fLightState; }
Bool_t GetUseSpecular() const { return fUseSpecular; } Bool_t GetUseSpecular() const { return fUseSpecular; }
void SetUseSpecular(Bool_t s) { fUseSpecular = s; } void SetUseSpecular(Bool_t s) { fUseSpecular = s; }
Float_t GetFrontPower() const { return fFrontPower; }
Float_t GetSidePower() const { return fSidePower; }
Float_t GetSpecularPower() const { return fSpecularPower; }
void SetFrontPower(Float_t p) { fFrontPower = p; }
void SetSidePower(Float_t p) { fSidePower = p; }
void SetSpecularPower(Float_t p) { fSpecularPower = p; }
void StdSetupLights(const TGLBoundingBox& bbox, const TGLCamera& camera, void StdSetupLights(const TGLBoundingBox& bbox, const TGLCamera& camera,
Bool_t debug=kFALSE); Bool_t debug=kFALSE);
ClassDef(TGLLightSet, 0) // A set of OpenGL lights. ClassDef(TGLLightSet, 0) // A set of OpenGL lights.
}; // endclass TGLLightSet }; // endclass TGLLightSet
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 12 lines changed or added


 TGLOrthoCamera.h   TGLOrthoCamera.h 
// @(#)root/gl:$Id: TGLOrthoCamera.h 27369 2009-02-06 17:35:54Z matevz $ // @(#)root/gl:$Id: TGLOrthoCamera.h 28212 2009-04-15 11:05:29Z matevz $
// Author: Richard Maunder 25/05/2005 // Author: Richard Maunder 25/05/2005
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TGLOrthoCamera #ifndef ROOT_TGLOrthoCamera
#define ROOT_TGLOrthoCamera #define ROOT_TGLOrthoCamera
#ifndef ROOT_TGLCamera
#include "TGLCamera.h" #include "TGLCamera.h"
#endif
#ifndef ROOT_TArcBall
#include "TArcBall.h"
#endif
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// // // //
// TGLOrthoCamera // // TGLOrthoCamera //
// // // //
// Orthographic projection camera. Currently limited to three types // // Orthographic projection camera. Currently limited to three types //
// defined at construction time - kXOY, kXOZ, kZOY - where this refers // // defined at construction time - kXOY, kXOZ, kZOY - where this refers //
// to the viewport plane axis - e.g. kXOY has X axis horizontal, Y // // to the viewport plane axis - e.g. kXOY has X axis horizontal, Y //
// vertical - i.e. looking down Z axis with Y vertical. // // vertical - i.e. looking down Z axis with Y vertical. //
// //
// The plane types restriction could easily be removed to supported // // The plane types restriction could easily be removed to supported //
// arbitary ortho projections along any axis/orientation with free // // arbitary ortho projections along any axis/orientation with free //
// rotations about them. // // rotations about them. //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
class TGLPaintDevice; class TGLPaintDevice;
class TGLOrthoCamera : public TGLCamera { class TGLOrthoCamera : public TGLCamera
{
public: public:
enum EType { kZOY, kXOZ, kXOY, // Pair of world axes aligned to h/v screen. enum EType { kZOY, kXOZ, kXOY, // Pair of world axes aligned to h/v screen.
kZnOY, kXnOZ, kXnOY }; // 'n' means preceeding axis is nega ted. kZnOY, kXnOZ, kXnOY }; // 'n' means preceeding axis is nega ted.
private: private:
// Fields // Fields
EType fType; //! camera type EType fType; //! camera type
Bool_t fEnableRotate; //! enable rotation Bool_t fEnableRotate; //! enable rotation
Bool_t fDollyToZoom; //! zoom when dolly is requested Bool_t fDollyToZoom; //! zoom when dolly is requested
// Limits - set in Setup() // Limits - set in Setup()
Double_t fZoomMin; //! minimum zoom factor Double_t fZoomMin; //! minimum zoom factor
Double_t fZoomDefault; //! default zoom factor Double_t fZoomDefault; //! default zoom factor
Double_t fZoomMax; //! maximum zoom factor Double_t fZoomMax; //! maximum zoom factor
TGLBoundingBox fVolume; //! scene volume TGLBoundingBox fVolume; //! scene volume
// Current interaction // Current interaction
Double_t fDefXSize, fDefYSize; //! x, y size of scene from camera view Double_t fDefXSize, fDefYSize; //! x, y size of scene from camera view
Double_t fZoom; //! current zoom Double_t fZoom; //! current zoom
//Stuff for TGLPlotPainter. MT: This *must* go to a special subclass. static UInt_t fgZoomDeltaSens;
Double_t fShift;
Double_t fOrthoBox[4];
TGLVertex3 fCenter;
TGLVector3 fTruck;
TArcBall fArcBall;
TPoint fMousePos;
Bool_t fVpChanged;
// Methods
void Init();
static UInt_t fgZoomDeltaSens;
public: public:
TGLOrthoCamera();
TGLOrthoCamera(EType type, const TGLVector3 & hAxis, const TGLVector3 & vAxis); TGLOrthoCamera(EType type, const TGLVector3 & hAxis, const TGLVector3 & vAxis);
virtual ~TGLOrthoCamera(); virtual ~TGLOrthoCamera();
virtual Bool_t IsOrthographic() const { return kTRUE; } virtual Bool_t IsOrthographic() const { return kTRUE; }
virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE); virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE);
virtual void Reset(); virtual void Reset();
virtual Bool_t Dolly(Int_t delta, Bool_t mod1, Bool_t mod2); virtual Bool_t Dolly(Int_t delta, Bool_t mod1, Bool_t mod2);
virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2); virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2);
skipping to change at line 107 skipping to change at line 90
Double_t GetZoomMin() const { return fZoomMin; } Double_t GetZoomMin() const { return fZoomMin; }
Double_t GetZoomMax() const { return fZoomMax; } Double_t GetZoomMax() const { return fZoomMax; }
void SetZoomMin(Double_t z); void SetZoomMin(Double_t z);
void SetZoomMax(Double_t z); void SetZoomMax(Double_t z);
void SetZoomMinMax(Double_t min, Double_t max) { SetZoomMin(min); Se tZoomMax(max); } void SetZoomMinMax(Double_t min, Double_t max) { SetZoomMin(min); Se tZoomMax(max); }
void SetDollyToZoom(Bool_t x) { fDollyToZoom = x; } void SetDollyToZoom(Bool_t x) { fDollyToZoom = x; }
Bool_t GetDollyToZoom() const { return fDollyToZoom; } Bool_t GetDollyToZoom() const { return fDollyToZoom; }
// Stuff for TGLPlotPainter.
void SetViewport(TGLPaintDevice *dev);
void SetViewVolume(const TGLVertex3 *box);
void StartRotation(Int_t px, Int_t py);
void RotateCamera(Int_t px, Int_t py);
void StartPan(Int_t px, Int_t py);
void Pan(Int_t px, Int_t py);
void ZoomIn();
void ZoomOut();
void SetCamera()const;
void Apply(Double_t phi, Double_t theta)const;
Bool_t ViewportChanged()const{return fVpChanged;}
Int_t GetX()const;
Int_t GetY()const;
Int_t GetWidth()const;
Int_t GetHeight()const;
ClassDef(TGLOrthoCamera,0) // Camera for orthographic view. ClassDef(TGLOrthoCamera,0) // Camera for orthographic view.
}; };
#endif // ROOT_TGLOrthoCamera #endif // ROOT_TGLOrthoCamera
 End of changes. 8 change blocks. 
38 lines changed or deleted 4 lines changed or added


 TGLPShapeObjEditor.h   TGLPShapeObjEditor.h 
// @(#)root/gl:$Id: TGLPShapeObjEditor.h 24204 2008-06-10 18:24:40Z matevz $ // @(#)root/gl:$Id: TGLPShapeObjEditor.h 28197 2009-04-14 13:59:27Z matevz $
// Author: Matevz Tadel 25/09/2006 // Author: Matevz Tadel 25/09/2006
#ifndef ROOT_TGLPShapeObjEditor #ifndef ROOT_TGLPShapeObjEditor
#define ROOT_TGLPShapeObjEditor #define ROOT_TGLPShapeObjEditor
#include <memory> #include <memory>
#ifndef ROOT_TGedFrame #ifndef ROOT_TGedFrame
#include "TGedFrame.h" #include "TGedFrame.h"
#endif #endif
skipping to change at line 39 skipping to change at line 39
class TGLViewer; class TGLViewer;
class TGTab; class TGTab;
class TGLWidget; class TGLWidget;
class TGLPShapeObjEditor : public TGedFrame, class TGLPShapeObjEditor : public TGedFrame,
public TGLPShapeRef public TGLPShapeRef
{ {
private: private:
enum ELightMode { kDiffuse, kAmbient, kSpecular, kEmission, kLTot }; enum ELightMode { kDiffuse, kAmbient, kSpecular, kEmission };
ELightMode fLMode; ELightMode fLMode;
TGLayoutHints fLb; //button layout TGLayoutHints fLb; //button layout
TGLayoutHints fLe; //num entry layout TGLayoutHints fLe; //num entry layout
TGLayoutHints fLl; //label layout TGLayoutHints fLl; //label layout
TGLayoutHints fLs; //slider layout TGLayoutHints fLs; //slider layout
TGCompositeFrame *fGeoFrame; //orientation, clipping TGCompositeFrame *fGeoFrame; //orientation, clipping
// "Geometry" tab's controls // "Geometry" tab's controls
skipping to change at line 67 skipping to change at line 67
TGButton *fLightTypes[4]; //light type TGButton *fLightTypes[4]; //light type
TGHSlider *fRedSlider; //red component of selected materi al TGHSlider *fRedSlider; //red component of selected materi al
TGHSlider *fGreenSlider; //green component of selected mate rial TGHSlider *fGreenSlider; //green component of selected mate rial
TGHSlider *fBlueSlider; //blue component of selected mater ial TGHSlider *fBlueSlider; //blue component of selected mater ial
TGHSlider *fAlphaSlider; //alpha component of selected mate rial lider; TGHSlider *fAlphaSlider; //alpha component of selected mate rial lider;
TGHSlider *fShineSlider; //specular refelction of selected material TGHSlider *fShineSlider; //specular refelction of selected material
TGButton *fColorApplyButton; //apply to selected TGButton *fColorApplyButton; //apply to selected
TGButton *fColorApplyFamily; //apply to selected and family TGButton *fColorApplyFamily; //apply to selected and family
Bool_t fIsLight; //does object emit light
Float_t fRGBA[17]; //color multiplet Float_t fRGBA[17]; //color multiplet
Window_t fGLWin; //GL window with sphere Window_t fGLWin; //GL window with sphere
ULong_t fCtx; //GL context ULong_t fCtx; //GL context
TGLPShapeObj *fPShapeObj; //model TGLPShapeObj *fPShapeObj; //model
void CreateGeoControls(); void CreateGeoControls();
void CreateColorControls(); void CreateColorControls();
skipping to change at line 112 skipping to change at line 111
void SetColorSlidersPos(); void SetColorSlidersPos();
void DrawSphere()const; void DrawSphere()const;
void SetRGBA(const Float_t *rgba); void SetRGBA(const Float_t *rgba);
const Float_t *GetRGBA()const{return fRGBA;} const Float_t *GetRGBA()const{return fRGBA;}
//color slots //color slots
void DoColorSlider(Int_t val); void DoColorSlider(Int_t val);
void DoColorButton(); void DoColorButton();
ClassDef(TGLPShapeObjEditor, 0) //GUI for editing TGLViewer attributes ClassDef(TGLPShapeObjEditor, 0); //GUI for editing attributes of a physi cal-shape.
}; };
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 3 lines changed or added


 TGLParametric.h   TGLParametric.h 
// @(#)root/gl:$Id: TGLParametric.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/gl:$Id: TGLParametric.h 28201 2009-04-14 16:04:20Z matevz $
// Author: Timur Pocheptsov 26/01/2007 // Author: Timur Pocheptsov 26/01/2007
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 111 skipping to change at line 111
Int_t fMeshSize; Int_t fMeshSize;
TGL2DArray<Vertex_t> fMesh; TGL2DArray<Vertex_t> fMesh;
Bool_t fShowMesh; Bool_t fShowMesh;
Int_t fColorScheme; Int_t fColorScheme;
TGLParametricEquation *fEquation; TGLParametricEquation *fEquation;
public: public:
TGLParametricPlot(TGLParametricEquation *equation, TGLOrthoCamera *camer a, TGLPaintDevice *dev = 0); TGLParametricPlot(TGLParametricEquation *equation, TGLPlotCamera *camera , TGLPaintDevice *dev = 0);
Bool_t InitGeometry(); Bool_t InitGeometry();
void StartPan(Int_t px, Int_t py); void StartPan(Int_t px, Int_t py);
void Pan(Int_t px, Int_t py); void Pan(Int_t px, Int_t py);
char *GetPlotInfo(Int_t px, Int_t py); char *GetPlotInfo(Int_t px, Int_t py);
void AddOption(const TString &option); void AddOption(const TString &option);
void ProcessEvent(Int_t event, Int_t px, Int_t py); void ProcessEvent(Int_t event, Int_t px, Int_t py);
private: private:
void InitGL()const; void InitGL()const;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TGLPerspectiveCamera.h   TGLPerspectiveCamera.h 
// @(#)root/gl:$Id: TGLPerspectiveCamera.h 27369 2009-02-06 17:35:54Z matev z $ // @(#)root/gl:$Id: TGLPerspectiveCamera.h 28201 2009-04-14 16:04:20Z matev z $
// Author: Richard Maunder 25/05/2005 // Author: Richard Maunder 25/05/2005
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TGLPerspectiveCamera #ifndef ROOT_TGLPerspectiveCamera
#define ROOT_TGLPerspectiveCamera #define ROOT_TGLPerspectiveCamera
#ifndef ROOT_TGLCamera
#include "TGLCamera.h" #include "TGLCamera.h"
#endif
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// // // //
// TGLPerspectiveCamera // // TGLPerspectiveCamera //
// // // //
// Perspective projection camera - with characteristic foreshortening. // // Perspective projection camera - with characteristic foreshortening. //
// // // //
// TODO: Currently constrains YOZ plane to be floor - this is never // // TODO: Currently constrains YOZ plane to be floor - this is never //
// 'tipped'. While useful we really need to extend so can: // // 'tipped'. While useful we really need to extend so can: //
// i) Pick any one of the three natural planes of the world to be floor.// // i) Pick any one of the three natural planes of the world to be floor.//
 End of changes. 3 change blocks. 
3 lines changed or deleted 1 lines changed or added


 TGLPlotPainter.h   TGLPlotPainter.h 
// @(#)root/gl:$Id: TGLPlotPainter.h 27090 2009-01-06 10:09:43Z brun $ // @(#)root/gl:$Id: TGLPlotPainter.h 28201 2009-04-14 16:04:20Z matevz $
// Author: Timur Pocheptsov 14/06/2006 // Author: Timur Pocheptsov 14/06/2006
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 34 skipping to change at line 34
#include "TPoint.h" #include "TPoint.h"
#endif #endif
#ifndef ROOT_TGLUtil #ifndef ROOT_TGLUtil
#include "TGLUtil.h" #include "TGLUtil.h"
#endif #endif
#ifndef ROOT_TNamed #ifndef ROOT_TNamed
#include "TNamed.h" #include "TNamed.h"
#endif #endif
class TGLPlotCoordinates; class TGLPlotCoordinates;
class TGLOrthoCamera; class TGLPlotCamera;
class TString; class TString;
class TColor; class TColor;
class TAxis; class TAxis;
class TH1; class TH1;
class TH3; class TH3;
class TF3; class TF3;
/* /*
Box cut. When attached to a plot, cuts away a part of it. Box cut. When attached to a plot, cuts away a part of it.
Can be moved in a plot's own area in X/Y/Z directions. Can be moved in a plot's own area in X/Y/Z directions.
skipping to change at line 174 skipping to change at line 174
protected: protected:
Double_t fPadPhi; Double_t fPadPhi;
Double_t fPadTheta; Double_t fPadTheta;
TH1 *fHist; TH1 *fHist;
TAxis *fXAxis; TAxis *fXAxis;
TAxis *fYAxis; TAxis *fYAxis;
TAxis *fZAxis; TAxis *fZAxis;
TGLPlotCoordinates *fCoord; TGLPlotCoordinates *fCoord;
TGLOrthoCamera *fCamera; TGLPlotCamera *fCamera;
TGLSelectionBuffer fSelection; TGLSelectionBuffer fSelection;
Bool_t fUpdateSelection; Bool_t fUpdateSelection;
Bool_t fSelectionPass; Bool_t fSelectionPass;
Int_t fSelectedPart; Int_t fSelectedPart;
TPoint fMousePosition; TPoint fMousePosition;
mutable Double_t fXOZSectionPos; mutable Double_t fXOZSectionPos;
mutable Double_t fYOZSectionPos; mutable Double_t fYOZSectionPos;
mutable Double_t fXOYSectionPos; mutable Double_t fXOYSectionPos;
TGLPlotBox fBackBox; TGLPlotBox fBackBox;
TGLBoxCut fBoxCut; TGLBoxCut fBoxCut;
skipping to change at line 198 skipping to change at line 198
enum ESelectionBase{ enum ESelectionBase{
kHighColorSelectionBase = 7, kHighColorSelectionBase = 7,
kTrueColorSelectionBase = 10 kTrueColorSelectionBase = 10
}; };
ESelectionBase fSelectionBase; ESelectionBase fSelectionBase;
mutable Bool_t fDrawPalette; mutable Bool_t fDrawPalette;
public: public:
/* TGLPlotPainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates * coord, Int_t context, /* TGLPlotPainter(TH1 *hist, TGLPlotCamera *camera, TGLPlotCoordinates *c oord, Int_t context,
Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable); Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable);
TGLPlotPainter(TGLOrthoCamera *camera, Int_t context);*/ TGLPlotPainter(TGLPlotCamera *camera, Int_t context);*/
TGLPlotPainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates *co TGLPlotPainter(TH1 *hist, TGLPlotCamera *camera, TGLPlotCoordinates *coo
ord, TGLPaintDevice *dev, rd, TGLPaintDevice *dev,
Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable); Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable);
TGLPlotPainter(TGLOrthoCamera *camera, TGLPaintDevice *dev); TGLPlotPainter(TGLPlotCamera *camera, TGLPaintDevice *dev);
const TGLPlotBox& RefBackBox() const { return fBackBox; } const TGLPlotBox& RefBackBox() const { return fBackBox; }
virtual void InitGL()const = 0; virtual void InitGL()const = 0;
virtual void DrawPlot()const = 0; virtual void DrawPlot()const = 0;
virtual void Paint(); virtual void Paint();
//Checks, if mouse cursor is above plot. //Checks, if mouse cursor is above plot.
virtual Bool_t PlotSelected(Int_t px, Int_t py); virtual Bool_t PlotSelected(Int_t px, Int_t py);
//Init geometry does plot's specific initialization. //Init geometry does plot's specific initialization.
skipping to change at line 362 skipping to change at line 362
TGLPlotCoordinates(const TGLPlotCoordinates &); TGLPlotCoordinates(const TGLPlotCoordinates &);
TGLPlotCoordinates &operator = (const TGLPlotCoordinates &); TGLPlotCoordinates &operator = (const TGLPlotCoordinates &);
ClassDef(TGLPlotCoordinates, 0)//Auxilary class, holds plot dimensions. ClassDef(TGLPlotCoordinates, 0)//Auxilary class, holds plot dimensions.
}; };
class TGLLevelPalette; class TGLLevelPalette;
namespace Rgl { namespace Rgl {
void DrawPalette(const TGLOrthoCamera * camera, const TGLLevelPalette & void DrawPalette(const TGLPlotCamera * camera, const TGLLevelPalette & p
palette); alette);
void DrawPaletteAxis(const TGLOrthoCamera * camera, const Range_t & minM void DrawPaletteAxis(const TGLPlotCamera * camera, const Range_t & minMa
ax, Bool_t logZ); x, Bool_t logZ);
} }
#endif #endif
 End of changes. 7 change blocks. 
12 lines changed or deleted 12 lines changed or added


 TGLRnrCtx.h   TGLRnrCtx.h 
// @(#)root/gl:$Id: TGLRnrCtx.h 27157 2009-01-15 14:05:12Z brun $ // @(#)root/gl:$Id: TGLRnrCtx.h 28197 2009-04-14 13:59:27Z matevz $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TGLRnrCtx #ifndef ROOT_TGLRnrCtx
#define ROOT_TGLRnrCtx #define ROOT_TGLRnrCtx
#include <Rtypes.h> #include "Rtypes.h"
#include "TGLStopwatch.h" #include "TGLStopwatch.h"
class TGLViewerBase; class TGLViewerBase;
class TGLCamera; class TGLCamera;
class TGLSceneBase; class TGLSceneBase;
class TGLSceneInfo; class TGLSceneInfo;
class TGLColorSet;
class TGLFont; class TGLFont;
class TGLContextIdentity; class TGLContextIdentity;
class TGLClip; class TGLClip;
class TGLSelectBuffer; class TGLSelectBuffer;
class TGLRect; class TGLRect;
class GLUquadric; class GLUquadric;
skipping to change at line 112 skipping to change at line 113
// Highlight / Selection stuff // Highlight / Selection stuff
Bool_t fHighlight; // True when in highlight. Bool_t fHighlight; // True when in highlight.
Bool_t fHighlightOutline; // True when in highlight-outline. Bool_t fHighlightOutline; // True when in highlight-outline.
Bool_t fSelection; Bool_t fSelection;
Bool_t fSecSelection; Bool_t fSecSelection;
Int_t fPickRadius; Int_t fPickRadius;
TGLRect *fPickRectangle; TGLRect *fPickRectangle;
TGLSelectBuffer*fSelectBuffer; TGLSelectBuffer*fSelectBuffer;
UChar_t fSSLColor[5][4]; // Colors for shape-selection-levels void *fColorSetStack;
UInt_t fEventKeySym; UInt_t fEventKeySym;
// GL state // GL state
Bool_t fDLCaptureOpen; //! DL-capture currently open Bool_t fDLCaptureOpen; //! DL-capture currently open
TGLContextIdentity *fGLCtxIdentity; //! Current GL context identity TGLContextIdentity *fGLCtxIdentity; //! Current GL context identity
GLUquadric *fQuadric; GLUquadric *fQuadric;
// Picture grabbing // Picture grabbing
skipping to change at line 201 skipping to change at line 202
Bool_t SecSelection() const { return fSecSelection; } Bool_t SecSelection() const { return fSecSelection; }
void SetSecSelection(Bool_t secSel) { fSecSelection = secSel; } void SetSecSelection(Bool_t secSel) { fSecSelection = secSel; }
// Low-level getters // Low-level getters
TGLRect * GetPickRectangle(); TGLRect * GetPickRectangle();
Int_t GetPickRadius(); Int_t GetPickRadius();
TGLSelectBuffer * GetSelectBuffer() const { return fSelectBuffer; } TGLSelectBuffer * GetSelectBuffer() const { return fSelectBuffer; }
// Composed operations // Composed operations
void BeginSelection(Int_t x, Int_t y, Int_t r=3); void BeginSelection(Int_t x, Int_t y, Int_t r=3);
void EndSelection (Int_t glResult); void EndSelection (Int_t glResult);
UChar_t* GetSSLColor(Int_t level) { return fSSLColor[level]; } void PushColorSet();
void SetSSLColor(Int_t level, UChar_t r, UChar_t g, UChar_t b, UChar_t a TGLColorSet& ColorSet();
=1); void PopColorSet();
void SetSSLColor(Int_t level, UChar_t rgba[4]); TGLColorSet* ChangeBaseColorSet(TGLColorSet* set);
TGLColorSet* GetBaseColorSet();
UInt_t GetEventKeySym() const { return fEventKeySym; } UInt_t GetEventKeySym() const { return fEventKeySym; }
void SetEventKeySym(UInt_t k) { fEventKeySym = k; } void SetEventKeySym(UInt_t k) { fEventKeySym = k; }
Bool_t IsDLCaptureOpen() const { return fDLCaptureOpen; } Bool_t IsDLCaptureOpen() const { return fDLCaptureOpen; }
void OpenDLCapture(); void OpenDLCapture();
void CloseDLCapture(); void CloseDLCapture();
TGLContextIdentity* GetGLCtxIdentity() const { return fGLCtxIdentity; } TGLContextIdentity* GetGLCtxIdentity() const { return fGLCtxIdentity; }
void SetGLCtxIdentity(TGLContextIdentity* cid) { fGLCtxIdentity = cid; } void SetGLCtxIdentity(TGLContextIdentity* cid) { fGLCtxIdentity = cid; }
 End of changes. 5 change blocks. 
7 lines changed or deleted 9 lines changed or added


 TGLSurfacePainter.h   TGLSurfacePainter.h 
skipping to change at line 57 skipping to change at line 57
mutable std::list<Projection_t> fXOYProj; mutable std::list<Projection_t> fXOYProj;
mutable TGLLevelPalette fPalette; mutable TGLLevelPalette fPalette;
mutable std::vector<Double_t> fColorLevels; mutable std::vector<Double_t> fColorLevels;
Rgl::Range_t fMinMaxVal; Rgl::Range_t fMinMaxVal;
Bool_t fSectionPass; Bool_t fSectionPass;
mutable Bool_t fUpdateTexMap; mutable Bool_t fUpdateTexMap;
public: public:
TGLSurfacePainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates *coord, TGLSurfacePainter(TH1 *hist, TGLPlotCamera *camera, TGLPlotCoordinates * coord,
TGLPaintDevice *dev = 0); TGLPaintDevice *dev = 0);
//TGLPlotPainter's final-overriders. //TGLPlotPainter's final-overriders.
char *GetPlotInfo(Int_t px, Int_t py); char *GetPlotInfo(Int_t px, Int_t py);
Bool_t InitGeometry(); Bool_t InitGeometry();
void StartPan(Int_t px, Int_t py); void StartPan(Int_t px, Int_t py);
void Pan(Int_t px, Int_t py); void Pan(Int_t px, Int_t py);
void AddOption(const TString &stringOption); void AddOption(const TString &stringOption);
void ProcessEvent(Int_t event, Int_t px, Int_t py); void ProcessEvent(Int_t event, Int_t px, Int_t py);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 TGLTF3Painter.h   TGLTF3Painter.h 
skipping to change at line 17 skipping to change at line 17
#ifndef ROOT_TGLPlotPainter #ifndef ROOT_TGLPlotPainter
#include "TGLPlotPainter.h" #include "TGLPlotPainter.h"
#endif #endif
#ifndef ROOT_TGLIsoMesh #ifndef ROOT_TGLIsoMesh
#include "TGLIsoMesh.h" #include "TGLIsoMesh.h"
#endif #endif
#ifndef ROOT_TGLUtil #ifndef ROOT_TGLUtil
#include "TGLUtil.h" #include "TGLUtil.h"
#endif #endif
class TGLOrthoCamera; class TGLPlotCamera;
class TF3; class TF3;
/* /*
Draw TF3 using marching cubes. Draw TF3 using marching cubes.
*/ */
class TGLTF3Painter : public TGLPlotPainter { class TGLTF3Painter : public TGLPlotPainter {
private: private:
enum ETF3Style { enum ETF3Style {
kDefault, kDefault,
skipping to change at line 43 skipping to change at line 43
ETF3Style fStyle; ETF3Style fStyle;
Rgl::Mc::TIsoMesh<Double_t> fMesh; Rgl::Mc::TIsoMesh<Double_t> fMesh;
TF3 *fF3; TF3 *fF3;
TGLTH3Slice fXOZSlice; TGLTH3Slice fXOZSlice;
TGLTH3Slice fYOZSlice; TGLTH3Slice fYOZSlice;
TGLTH3Slice fXOYSlice; TGLTH3Slice fXOYSlice;
public: public:
TGLTF3Painter(TF3 *fun, TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordi nates *coord, TGLTF3Painter(TF3 *fun, TH1 *hist, TGLPlotCamera *camera, TGLPlotCoordin ates *coord,
TGLPaintDevice *dev = 0); TGLPaintDevice *dev = 0);
char *GetPlotInfo(Int_t px, Int_t py); char *GetPlotInfo(Int_t px, Int_t py);
Bool_t InitGeometry(); Bool_t InitGeometry();
void StartPan(Int_t px, Int_t py); void StartPan(Int_t px, Int_t py);
void Pan(Int_t px, Int_t py); void Pan(Int_t px, Int_t py);
void AddOption(const TString &stringOption); void AddOption(const TString &stringOption);
void ProcessEvent(Int_t event, Int_t px, Int_t py); void ProcessEvent(Int_t event, Int_t px, Int_t py);
private: private:
skipping to change at line 107 skipping to change at line 107
Rgl::Range_t fMinMax; Rgl::Range_t fMinMax;
//Palette. One color per iso-surface. //Palette. One color per iso-surface.
TGLLevelPalette fPalette; TGLLevelPalette fPalette;
//Iso levels. Equidistant or user-defined. //Iso levels. Equidistant or user-defined.
std::vector<Double_t> fColorLevels; std::vector<Double_t> fColorLevels;
//Now meshes are initialized only once. //Now meshes are initialized only once.
//To be changed in future. //To be changed in future.
Bool_t fInit; Bool_t fInit;
public: public:
TGLIsoPainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates *coo rd, TGLIsoPainter(TH1 *hist, TGLPlotCamera *camera, TGLPlotCoordinates *coor d,
TGLPaintDevice *dev = 0); TGLPaintDevice *dev = 0);
//TGLPlotPainter final-overriders. //TGLPlotPainter final-overriders.
char *GetPlotInfo(Int_t px, Int_t py); char *GetPlotInfo(Int_t px, Int_t py);
Bool_t InitGeometry(); Bool_t InitGeometry();
void StartPan(Int_t px, Int_t py); void StartPan(Int_t px, Int_t py);
void Pan(Int_t px, Int_t py); void Pan(Int_t px, Int_t py);
void AddOption(const TString &option); void AddOption(const TString &option);
void ProcessEvent(Int_t event, Int_t px, Int_t py); void ProcessEvent(Int_t event, Int_t px, Int_t py);
private: private:
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TGLUtil.h   TGLUtil.h 
// @(#)root/gl:$Id: TGLUtil.h 27173 2009-01-16 18:48:33Z matevz $ // @(#)root/gl:$Id: TGLUtil.h 28210 2009-04-15 08:03:19Z matevz $
// Author: Richard Maunder 25/05/2005 // Author: Richard Maunder 25/05/2005
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TGLUtil #ifndef ROOT_TGLUtil
#define ROOT_TGLUtil #define ROOT_TGLUtil
#ifndef ROOT_Rtypes
#include "Rtypes.h" #include "Rtypes.h"
#endif
#ifndef ROOT_TError
#include "TError.h" #include "TError.h"
#endif
class TString; class TString;
class TGLBoundingBox; class TGLBoundingBox;
class TGLCamera; class TGLCamera;
class TAttMarker; class TAttMarker;
class TAttLine; class TAttLine;
class GLUtesselator; class GLUtesselator;
#include <cmath>
#include <vector> #include <vector>
#include <cmath>
#include <cassert> #include <cassert>
// TODO:Find a better place for these enums - TGLEnum.h? // TODO:Find a better place for these enums - TGLEnum.h?
// Whole GL viewer should be moved into own namespace // Whole GL viewer should be moved into own namespace
// probably // probably
enum EPosition enum EPosition
{ {
kInFront = 0, kInFront = 0,
kBehind kBehind
}; };
skipping to change at line 897 skipping to change at line 893
} }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TGLMatrix::GetBaseVec(Int_t b, Double_t* x) const inline void TGLMatrix::GetBaseVec(Int_t b, Double_t* x) const
{ {
const Double_t* C = fVals + 4*--b; const Double_t* C = fVals + 4*--b;
x[0] = C[0], x[1] = C[1], x[2] = C[2]; x[0] = C[0], x[1] = C[1], x[2] = C[2];
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//
// TGLColor
//
// Encapsulate color in preferred GL format - UChar_t RGBA array.
//
//////////////////////////////////////////////////////////////////////////
class TGLColor
{
protected:
UChar_t fRGBA[4];
public:
TGLColor();
TGLColor(Int_t r, Int_t g, Int_t b, Int_t a=255);
TGLColor(Float_t r, Float_t g, Float_t b, Float_t a=1);
TGLColor(Color_t color_index, Char_t transparency=0);
virtual ~TGLColor();
TGLColor& operator=(const TGLColor& c);
UChar_t* Arr() { return fRGBA; }
const UChar_t* CArr() const { return fRGBA; }
UChar_t GetRed() const { return fRGBA[0]; }
UChar_t GetGreen() const { return fRGBA[1]; }
UChar_t GetBlue() const { return fRGBA[2]; }
UChar_t GetAlpha() const { return fRGBA[3]; }
Color_t GetColorIndex() const;
Char_t GetTransparency() const;
void SetRed(Int_t v) { fRGBA[0] = v; }
void SetGreen(Int_t v) { fRGBA[1] = v; }
void SetBlue(Int_t v) { fRGBA[2] = v; }
void SetAlpha(Int_t v) { fRGBA[3] = v; }
void SetColor(Int_t r, Int_t g, Int_t b, Int_t a=255);
void SetColor(Float_t r, Float_t g, Float_t b, Float_t a=1);
void SetColor(Color_t color_index);
void SetColor(Color_t color_index, Char_t transparency);
void SetTransparency(Char_t transparency);
TString AsString() const;
ClassDef(TGLColor, 0); // Color in preferred GL format - RGBA.
};
//////////////////////////////////////////////////////////////////////////
//
// TGLColorSet
//
// A collection of colors used for OpenGL rendering.
//
//////////////////////////////////////////////////////////////////////////
class TGLColorSet
{
protected:
TGLColor fBackground;
TGLColor fForeground;
TGLColor fOutline;
TGLColor fMarkup;
TGLColor fSelection[5]; // Colors for shape-selection-levels
public:
TGLColorSet();
virtual ~TGLColorSet();
TGLColorSet& operator=(const TGLColorSet& s);
TGLColor& Background() { return fBackground; }
TGLColor& Foreground() { return fForeground; }
TGLColor& Outline() { return fOutline; }
TGLColor& Markup() { return fMarkup; }
TGLColor& Selection(Int_t i) { return fSelection[i]; }
const TGLColor& Background() const { return fBackground; }
const TGLColor& Foreground() const { return fForeground; }
const TGLColor& Outline() const { return fOutline; }
const TGLColor& Markup() const { return fMarkup; }
const TGLColor& Selection(Int_t i) const { return fSelection[i]; }
void StdDarkBackground();
void StdLightBackground();
ClassDef(TGLColorSet, 0); // Collection of colors used for GL rendering.
};
//////////////////////////////////////////////////////////////////////////
// // // //
// TGLUtil // // TGLUtil //
// // // //
// Wrapper class for various misc static functions - error checking, // // Wrapper class for various misc static functions - error checking, //
// draw helpers etc. // // draw helpers etc. //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
class TGLUtil class TGLUtil
{ {
skipping to change at line 978 skipping to change at line 1064
static UInt_t GetDrawQuality(); static UInt_t GetDrawQuality();
static void SetDrawQuality(UInt_t dq); static void SetDrawQuality(UInt_t dq);
static void ResetDrawQuality(); static void ResetDrawQuality();
static UInt_t GetDefaultDrawQuality(); static UInt_t GetDefaultDrawQuality();
static void SetDefaultDrawQuality(UInt_t dq); static void SetDefaultDrawQuality(UInt_t dq);
static UInt_t LockColor(); static UInt_t LockColor();
static UInt_t UnlockColor(); static UInt_t UnlockColor();
static Bool_t IsColorLocked(); static Bool_t IsColorLocked();
static void Color(const TGLColor& color);
static void Color(const TGLColor& color, UChar_t alpha);
static void Color(const TGLColor& color, Float_t alpha);
static void Color(Color_t color_index, Float_t alpha=1); static void Color(Color_t color_index, Float_t alpha=1);
static void ColorTransparency(Color_t color_index, UChar_t transparency= 0); static void ColorTransparency(Color_t color_index, Char_t transparency=0 );
static void Color3ub(UChar_t r, UChar_t g, UChar_t b); static void Color3ub(UChar_t r, UChar_t g, UChar_t b);
static void Color4ub(UChar_t r, UChar_t g, UChar_t b, UChar_t a); static void Color4ub(UChar_t r, UChar_t g, UChar_t b, UChar_t a);
static void Color3ubv(const UChar_t* rgb); static void Color3ubv(const UChar_t* rgb);
static void Color4ubv(const UChar_t* rgba); static void Color4ubv(const UChar_t* rgba);
static void Color3f(Float_t r, Float_t g, Float_t b); static void Color3f(Float_t r, Float_t g, Float_t b);
static void Color4f(Float_t r, Float_t g, Float_t b, Float_t a); static void Color4f(Float_t r, Float_t g, Float_t b, Float_t a);
static void Color3fv(const Float_t* rgb); static void Color3fv(const Float_t* rgb);
static void Color4fv(const Float_t* rgba); static void Color4fv(const Float_t* rgba);
static void BeginExtendPickRegion(Float_t scale); static void BeginExtendPickRegion(Float_t scale);
 End of changes. 9 change blocks. 
7 lines changed or deleted 96 lines changed or added


 TGLViewer.h   TGLViewer.h 
// @(#)root/gl:$Id: TGLViewer.h 27577 2009-02-23 14:34:36Z matevz $ // @(#)root/gl:$Id: TGLViewer.h 28197 2009-04-14 13:59:27Z matevz $
// Author: Richard Maunder 25/05/2005 // Author: Richard Maunder 25/05/2005
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 119 skipping to change at line 119
protected: protected:
EPushAction fPushAction; EPushAction fPushAction;
EDragAction fDragAction; EDragAction fDragAction;
// Redraw timer // Redraw timer
TGLRedrawTimer *fRedrawTimer; //! timer for triggering redra ws TGLRedrawTimer *fRedrawTimer; //! timer for triggering redra ws
Float_t fMaxSceneDrawTimeHQ; //! max time for scene renderi ng at high LOD (in ms) Float_t fMaxSceneDrawTimeHQ; //! max time for scene renderi ng at high LOD (in ms)
Float_t fMaxSceneDrawTimeLQ; //! max time for scene renderi ng at high LOD (in ms) Float_t fMaxSceneDrawTimeLQ; //! max time for scene renderi ng at high LOD (in ms)
TGLRect fViewport; //! viewport - drawn area TGLRect fViewport; //! viewport - drawn area
Color_t fClearColor; //! clear-color TGLColorSet fDarkColorSet; //! color-set with dark background
Float_t fClearColorRGB[3]; //! clear-color cache TGLColorSet fLightColorSet; //! color-set with dark background
Int_t fAxesType; //! axes type Int_t fAxesType; //! axes type
Bool_t fAxesDepthTest; //! remove guides hidden-lines Bool_t fAxesDepthTest; //! remove guides hidden-lines
Bool_t fReferenceOn; //! reference marker on? Bool_t fReferenceOn; //! reference marker on?
TGLVertex3 fReferencePos; //! reference position TGLVertex3 fReferencePos; //! reference position
Bool_t fDrawCameraCenter; //! reference marker on? Bool_t fDrawCameraCenter; //! reference marker on?
TGLCameraOverlay *fCameraOverlay; //! markup size of viewport in scene units TGLCameraOverlay *fCameraOverlay; //! markup size of viewport in scene units
Bool_t fInitGL; //! has GL been initialised? Bool_t fInitGL; //! has GL been initialised?
Bool_t fSmartRefresh; //! cache logicals during scene rebuilds , use TAtt3D time-stamp to determine if they are still valid Bool_t fSmartRefresh; //! cache logicals during scene rebuilds , use TAtt3D time-stamp to determine if they are still valid
// Debug tracing (for scene rebuilds) // Debug tracing (for scene rebuilds)
Bool_t fDebugMode; //! debug mode (forced rebuild + d raw scene/frustum/interest boxes) Bool_t fDebugMode; //! debug mode (forced rebuild + d raw scene/frustum/interest boxes)
Bool_t fIsPrinting; //! Bool_t fIsPrinting; //!
TString fPictureFileName; //! default file-name for SavePict ure() TString fPictureFileName; //! default file-name for SavePict ure()
Float_t fFader; //! fade the view (0 - no fade/def ault, 1 - full fade/no rendering done) Float_t fFader; //! fade the view (0 - no fade/def ault, 1 - full fade/no rendering done)
static TGLColorSet fgDefaultColorSet; //! a shared, defa
ult color-set
static Bool_t fgUseDefaultColorSetForNewViewers; //! name says it a
ll
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// Methods // Methods
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// Drawing - can tidy up/remove lots when TGLManager added // Drawing - can tidy up/remove lots when TGLManager added
void InitGL(); void InitGL();
void PreDraw(); void PreDraw();
void PostDraw(); void PostDraw();
void FadeView(Float_t alpha); void FadeView(Float_t alpha);
void MakeCurrent() const; void MakeCurrent() const;
void SwapBuffers() const; void SwapBuffers() const;
skipping to change at line 168 skipping to change at line 171
Bool_t fIgnoreSizesOnUpdate; // ignore sizes of bounding- boxes on update Bool_t fIgnoreSizesOnUpdate; // ignore sizes of bounding- boxes on update
Bool_t fResetCamerasOnUpdate; // reposition camera on each update Bool_t fResetCamerasOnUpdate; // reposition camera on each update
Bool_t fResetCamerasOnNextUpdate; // reposition camera on next update Bool_t fResetCamerasOnNextUpdate; // reposition camera on next update
Bool_t fResetCameraOnDoubleClick; // reposition camera on doub le-click Bool_t fResetCameraOnDoubleClick; // reposition camera on doub le-click
public: public:
TGLViewer(TVirtualPad* pad, Int_t x, Int_t y, Int_t width, Int_t height) ; TGLViewer(TVirtualPad* pad, Int_t x, Int_t y, Int_t width, Int_t height) ;
TGLViewer(TVirtualPad* pad); TGLViewer(TVirtualPad* pad);
virtual ~TGLViewer(); virtual ~TGLViewer();
void ResetInitGL();
// TVirtualViewer3D interface ... mostly a facade // TVirtualViewer3D interface ... mostly a facade
// Forward to TGLScenePad // Forward to TGLScenePad
virtual Bool_t CanLoopOnPrimitives() const { return kTRUE; } virtual Bool_t CanLoopOnPrimitives() const { return kTRUE; }
virtual void PadPaint(TVirtualPad* pad); virtual void PadPaint(TVirtualPad* pad);
// Actually used by GL-in-pad // Actually used by GL-in-pad
virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
// Only implemented because they're abstract ... should throw an // Only implemented because they're abstract ... should throw an
// exception or assert they are not called. // exception or assert they are not called.
skipping to change at line 200 skipping to change at line 205
virtual void ResetCamerasAfterNextUpdate() { fResetCamerasOnNextUpdate = kTRUE; } virtual void ResetCamerasAfterNextUpdate() { fResetCamerasOnNextUpdate = kTRUE; }
virtual void RefreshPadEditor(TObject* = 0) {} virtual void RefreshPadEditor(TObject* = 0) {}
TGLWidget* GetGLWidget() { return fGLWidget; } TGLWidget* GetGLWidget() { return fGLWidget; }
virtual void CreateGLWidget() {} virtual void CreateGLWidget() {}
virtual void DestroyGLWidget() {} virtual void DestroyGLWidget() {}
Int_t GetDev() const { return fGLDevice; } Int_t GetDev() const { return fGLDevice; }
Color_t GetClearColor() const { return fClearColor; }
void SetClearColor(Color_t col) { fClearColor = col; }
Bool_t GetSmartRefresh() const { return fSmartRefresh; } Bool_t GetSmartRefresh() const { return fSmartRefresh; }
void SetSmartRefresh(Bool_t smart_ref) { fSmartRefresh = smart_ref; } void SetSmartRefresh(Bool_t smart_ref) { fSmartRefresh = smart_ref; }
TGLColorSet& RefDarkColorSet() { return fDarkColorSet; }
TGLColorSet& RefLightColorSet() { return fLightColorSet; }
TGLColorSet& ColorSet() { return * fRnrCtx->GetBaseColorSet(); }
void UseDarkColorSet();
void UseLightColorSet();
void SwitchColorSet();
void UseDefaultColorSet(Bool_t x);
Bool_t IsUsingDefaultColorSet() const;
void SetClearColor(Color_t col);
static TGLColorSet& GetDefaultColorSet();
static void UseDefaultColorSetForNewViewers(Bool_t x);
static Bool_t IsUsingDefaultColorSetForNewViewers();
TGLLightSet* GetLightSet() const { return fLightSet; } TGLLightSet* GetLightSet() const { return fLightSet; }
TGLClipSet * GetClipSet() const { return fClipSet; } TGLClipSet * GetClipSet() const { return fClipSet; }
// External GUI component interface // External GUI component interface
TGLCamera & CurrentCamera() const { return *fCurrentCamera; } TGLCamera & CurrentCamera() const { return *fCurrentCamera; }
TGLCamera & RefCamera(ECameraType camera); TGLCamera & RefCamera(ECameraType camera);
void SetCurrentCamera(ECameraType camera); void SetCurrentCamera(ECameraType camera);
void SetOrthoCamera(ECameraType camera, Double_t zoom, Double_t dolly, void SetOrthoCamera(ECameraType camera, Double_t zoom, Double_t dolly,
Double_t center[3], Double_t hRotate, Double_t vRotate); Double_t center[3], Double_t hRotate, Double_t vRotate);
void SetPerspectiveCamera(ECameraType camera, Double_t fov, Double_t dol ly, void SetPerspectiveCamera(ECameraType camera, Double_t fov, Double_t dol ly,
 End of changes. 6 change blocks. 
5 lines changed or deleted 26 lines changed or added


 TGLViewerBase.h   TGLViewerBase.h 
// @(#)root/gl:$Id: TGLViewerBase.h 27577 2009-02-23 14:34:36Z matevz $ // @(#)root/gl:$Id: TGLViewerBase.h 28197 2009-04-14 13:59:27Z matevz $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TGLViewerBase #ifndef ROOT_TGLViewerBase
#define ROOT_TGLViewerBase #define ROOT_TGLViewerBase
skipping to change at line 137 skipping to change at line 137
// Demangle select buffer // Demangle select buffer
Bool_t ResolveSelectRecord(TGLSelectRecord& rec, Int_t recIdx); Bool_t ResolveSelectRecord(TGLSelectRecord& rec, Int_t recIdx);
// Slightly higher-level search in select-buffer // Slightly higher-level search in select-buffer
Bool_t FindClosestRecord (TGLSelectRecord& rec, Int_t& recIdx); Bool_t FindClosestRecord (TGLSelectRecord& rec, Int_t& recIdx);
Bool_t FindClosestOpaqueRecord(TGLSelectRecord& rec, Int_t& recIdx); Bool_t FindClosestOpaqueRecord(TGLSelectRecord& rec, Int_t& recIdx);
// Demangle overlay select buffer // Demangle overlay select buffer
Bool_t FindClosestOverlayRecord(TGLOvlSelectRecord& rec, Int_t& recIdx); Bool_t FindClosestOverlayRecord(TGLOvlSelectRecord& rec, Int_t& recIdx);
TGLRnrCtx* GetRnrCtx() const { return fRnrCtx;} TGLRnrCtx* GetRnrCtx() const { return fRnrCtx; }
TGLRnrCtx& RnrCtx() const { return *fRnrCtx; }
ClassDef(TGLViewerBase, 0); // GL Viewer base-class. ClassDef(TGLViewerBase, 0); // GL Viewer base-class.
}; };
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 TGMenu.h   TGMenu.h 
// @(#)root/gui:$Id: TGMenu.h 26554 2008-12-01 16:35:47Z bellenot $ // @(#)root/gui:$Id: TGMenu.h 28252 2009-04-16 10:25:18Z bellenot $
// Author: Fons Rademakers 09/01/98 // Author: Fons Rademakers 09/01/98
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 88 skipping to change at line 88
friend class TGMenuBar; friend class TGMenuBar;
protected: protected:
Int_t fEntryId; // the entry id (used for event processing ) Int_t fEntryId; // the entry id (used for event processing )
void *fUserData; // pointer to user data structure void *fUserData; // pointer to user data structure
EMenuEntryType fType; // type of entry EMenuEntryType fType; // type of entry
Int_t fStatus; // entry status (OR of EMenuEntryState) Int_t fStatus; // entry status (OR of EMenuEntryState)
Int_t fEx, fEy; // position of entry Int_t fEx, fEy; // position of entry
UInt_t fEw, fEh; // width and height of entry UInt_t fEw, fEh; // width and height of entry
TGHotString *fLabel; // menu entry label TGHotString *fLabel; // menu entry label
TGString *fShortcut; // menu entry shortcut
const TGPicture *fPic; // menu entry icon const TGPicture *fPic; // menu entry icon
TGPopupMenu *fPopup; // pointer to popup menu (in case of casca ding menus) TGPopupMenu *fPopup; // pointer to popup menu (in case of casca ding menus)
private: private:
TGMenuEntry(const TGMenuEntry&); // not implemented TGMenuEntry(const TGMenuEntry&); // not implemented
TGMenuEntry& operator=(const TGMenuEntry&); // not implemented TGMenuEntry& operator=(const TGMenuEntry&); // not implemented
public: public:
TGMenuEntry(): fEntryId(0), fUserData(0), fType(), fStatus(0), TGMenuEntry(): fEntryId(0), fUserData(0), fType(), fStatus(0),
fEx(0), fEy(0), fEw(0), fEh(0), fLabel(0), fPic(0), fPopup(0) { } fEx(0), fEy(0), fEw(0), fEh(0), fLabel(0), fShortcut(0), fPic(0), fPo
virtual ~TGMenuEntry() { if (fLabel) delete fLabel; } pup(0) { }
virtual ~TGMenuEntry() { if (fLabel) delete fLabel; if (fShortcut) delet
e fShortcut; }
Int_t GetEntryId() const { return fEntryId; } Int_t GetEntryId() const { return fEntryId; }
const char *GetName() const { return fLabel ? fLabel->GetString() : 0 ; } const char *GetName() const { return fLabel ? fLabel->GetString() : 0 ; }
const char *GetShortcutText() const { return fShortcut ? fShortcut->G etString() : 0; }
virtual Int_t GetStatus() const { return fStatus; } virtual Int_t GetStatus() const { return fStatus; }
EMenuEntryType GetType() const { return fType; } EMenuEntryType GetType() const { return fType; }
TGPopupMenu *GetPopup() const { return fPopup; } TGPopupMenu *GetPopup() const { return fPopup; }
TGHotString *GetLabel() const { return fLabel; } TGHotString *GetLabel() const { return fLabel; }
TGString *GetShortcut() const { return fShortcut; }
Int_t GetEx() const { return fEx; } Int_t GetEx() const { return fEx; }
Int_t GetEy() const { return fEy; } Int_t GetEy() const { return fEy; }
UInt_t GetEw() const { return fEw; } UInt_t GetEw() const { return fEw; }
UInt_t GetEh() const { return fEh; } UInt_t GetEh() const { return fEh; }
const TGPicture *GetPic() const { return fPic; } const TGPicture *GetPic() const { return fPic; }
void *GetUserData() const { return fUserData; } void *GetUserData() const { return fUserData; }
ClassDef(TGMenuEntry,0); // Menu entry class ClassDef(TGMenuEntry,0); // Menu entry class
}; };
 End of changes. 5 change blocks. 
3 lines changed or deleted 8 lines changed or added


 TGObject.h   TGObject.h 
// @(#)root/gui:$Id: TGObject.h 23115 2008-04-10 13:35:37Z rdm $ // @(#)root/gui:$Id: TGObject.h 27658 2009-02-28 05:34:57Z pcanal $
// Author: Fons Rademakers 27/12/97 // Author: Fons Rademakers 27/12/97
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 52 skipping to change at line 52
fClient=tgo.fClient; } return *this; } fClient=tgo.fClient; } return *this; }
public: public:
TGObject(): fId(0), fClient(0) { } TGObject(): fId(0), fClient(0) { }
TGObject(const TGObject& tgo): TObject(tgo), fId(tgo.fId), fClient(tgo.f Client) { } TGObject(const TGObject& tgo): TObject(tgo), fId(tgo.fId), fClient(tgo.f Client) { }
virtual ~TGObject() { } virtual ~TGObject() { }
Handle_t GetId() const { return fId; } Handle_t GetId() const { return fId; }
TGClient *GetClient() const { return fClient; } TGClient *GetClient() const { return fClient; }
ULong_t Hash() const { return (ULong_t) fId >> 0; } ULong_t Hash() const { return (ULong_t) fId >> 0; }
Bool_t IsEqual(const TObject *obj) const { return fId == ((TGObject * ) obj)->fId; } Bool_t IsEqual(const TObject *obj) const { return fId == ((const TGOb ject *) obj)->fId; }
virtual void SaveAs(const char* filename = "", Option_t* option = "") co nst; virtual void SaveAs(const char* filename = "", Option_t* option = "") co nst;
ClassDef(TGObject,0) //ROOT GUI base class ClassDef(TGObject,0) //ROOT GUI base class
}; };
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TGQt.h   TGQt.h 
// @(#)root/qt:$Id: TGQt.h 27157 2009-01-15 14:05:12Z brun $ // @(#)root/qt:$Id: TGQt.h 28205 2009-04-14 19:38:00Z brun $
// Author: Valeri Fine 21/01/2002 // Author: Valeri Fine 21/01/2002
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2002 by Valeri Fine. * * Copyright (C) 2002 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 100 skipping to change at line 100
friend class TQtWindowsObject; friend class TQtWindowsObject;
friend class TQtPixmapObject; friend class TQtPixmapObject;
friend class TPadOpenGLView; friend class TPadOpenGLView;
friend class TQtWidget; friend class TQtWidget;
friend class TQtClientWidget; friend class TQtClientWidget;
friend class TQtImage; friend class TQtImage;
friend class TQtClientGuard; friend class TQtClientGuard;
friend class TQtClientFilter; friend class TQtClientFilter;
friend class TQtSynchPainting; friend class TQtSynchPainting;
friend class TQtToggleFeedBack; friend class TQtToggleFeedBack;
friend class TQtColorSelect;
friend class TQt16ColorSelector;
friend class TQtPen;
protected: protected:
enum DEFWINDOWID { kDefault=1 }; enum DEFWINDOWID { kDefault=1 };
QPaintDevice *fSelectedWindow; // Pointer to the current "paintdevi ce: PixMap, Widget etc" QPaintDevice *fSelectedWindow; // Pointer to the current "paintdevi ce: PixMap, Widget etc"
// QPaintDevice *fSelectedBuffer; // Pointer to the current "paintde vice buffer" // QPaintDevice *fSelectedBuffer; // Pointer to the current "paintde vice buffer"
QPaintDevice *fPrevWindow; // Pointer to the previous "Window" QPaintDevice *fPrevWindow; // Pointer to the previous "Window"
Int_t fDisplayOpened; Int_t fDisplayOpened;
TQtPainter *fQPainter; TQtPainter *fQPainter;
TQtEmitter fEmitter; // object to emit Qt signals on beha lf of TVirtualX TQtEmitter fEmitter; // object to emit Qt signals on beha lf of TVirtualX
static TVirtualX *fgTQt; // The hiden poiner to fullish ROOT TPluginManager static TVirtualX *fgTQt; // The hiden poiner to fullish ROOT TPluginManager
skipping to change at line 164 skipping to change at line 167
TQtPixmapGuard fQPixmapGuard; // guard TQtClientWibdget against of dead pointers TQtPixmapGuard fQPixmapGuard; // guard TQtClientWibdget against of dead pointers
typedef std::map<ULong_t, QColor * > COLORMAP; typedef std::map<ULong_t, QColor * > COLORMAP;
COLORMAP fColorMap; // to back the TG widgets COLORMAP fColorMap; // to back the TG widgets
TQtClientWidget *fPointerGrabber; TQtClientWidget *fPointerGrabber;
QTextCodec *fCodec; // The Current text decoder QTextCodec *fCodec; // The Current text decoder
QString fFontTextCode; // The default code text code page (from the Gui.DefaultFont) QString fFontTextCode; // The default code text code page (from the Gui.DefaultFont)
const char *fSymbolFontFamily; // the name of the font to su bstiute the non-standard "Symbol" const char *fSymbolFontFamily; // the name of the font to su bstiute the non-standard "Symbol"
Int_t fQtEventHasBeenProcessed; // Flag whether the eve nts were processed Int_t fQtEventHasBeenProcessed; // Flag whether the eve nts were processed
Bool_t fFeedBackMode; // TCanvas feedback mode Bool_t fFeedBackMode; // TCanvas feedback mode
TQtFeedBackWidget *fFeedBackWidget; // The dedicated widget for TC anvas feebback mode TQtFeedBackWidget *fFeedBackWidget; // The dedicated widget for TC anvas feebback mode
Bool_t fBlockRGB; // Protect agaist color doubel setting
// //
// Text management // Text management
// //
//Qt::AlignmentFlags fTextAlign; //Qt::AlignmentFlags fTextAlign;
// void SetTextFont(const char *fontname, Int_t italic, Int_t bold); // void SetTextFont(const char *fontname, Int_t italic, Int_t bold);
Int_t CreatROOTThread(); Int_t CreatROOTThread();
void DeleteSelectedObj(); void DeleteSelectedObj();
// Qt methods // Qt methods
static QRect GetQRect(QPaintDevice &dev); static QRect GetQRect(QPaintDevice &dev);
void Begin(); void Begin();
void End(); void End();
void UpdateFont(); void UpdateFont();
void UpdatePen(); void UpdatePen();
void UpdateBrush(); void UpdateBrush();
void UpdateClipRectangle(); void UpdateClipRectangle();
int UpdateColor(int cindex);
virtual const QColor& ColorIndex(Color_t indx) const;
QPaintDevice *GetDoubleBuffer(QPaintDevice *dev); QPaintDevice *GetDoubleBuffer(QPaintDevice *dev);
#endif #endif
static Int_t RegisterWid(QPaintDevice *wid); // register QWidget for the embedded TCanvas static Int_t RegisterWid(QPaintDevice *wid); // register QWidget for the embedded TCanvas
static Int_t UnRegisterWid(QPaintDevice *wid); // unregister QWidget o f the TCanvas static Int_t UnRegisterWid(QPaintDevice *wid); // unregister QWidget o f the TCanvas
static Bool_t IsRegistered(QPaintDevice *wid); // Check whether the ob ject has been registered static Bool_t IsRegistered(QPaintDevice *wid); // Check whether the ob ject has been registered
private: private:
TGQt& operator=(const TGQt&); TGQt& operator=(const TGQt&);
public: public:
TGQt(); TGQt();
TGQt(const TGQt &vx): TVirtualX(vx) { MayNotUse("TGQt(const TGQt &)"); } // without dict does not compile? (rdm) TGQt(const TGQt &vx): TVirtualX(vx) { MayNotUse("TGQt(const TGQt &)"); } // without dict does not compile? (rdm)
TGQt(const char *name, const char *title); TGQt(const char *name, const char *title);
virtual ~TGQt(); virtual ~TGQt();
// Include the base TVirtualX class interface // Include the base TVirtualX class interface
#include "TVirtualX.interface.h" #include "TVirtualX.interface.h"
#ifndef __CINT__ #ifndef __CINT__
// extracted methods // extracted methods
virtual const QColor& ColorIndex(Color_t indx) const;
virtual QPaintDevice *GetSelectedWindow(){ return fSelectedWindow; } virtual QPaintDevice *GetSelectedWindow(){ return fSelectedWindow; }
virtual void SetFillStyleIndex( Int_t style, Int_t fasi); virtual void SetFillStyleIndex( Int_t style, Int_t fasi);
virtual void SetMarkerType( Int_t type, Int_t n, TPoint *xy ); virtual void SetMarkerType( Int_t type, Int_t n, TPoint *xy );
virtual void SetTitle(const char *title); virtual void SetTitle(const char *title);
virtual void CopyPixmap(const QPixmap &p, Int_t px1, Int_t py1); virtual void CopyPixmap(const QPixmap &p, Int_t px1, Int_t py1);
virtual void SetTextDecoder(const char * /*textDeocerName*/){;} / / for the future virtual void SetTextDecoder(const char * /*textDeocerName*/){;} / / for the future
virtual const QTextCodec *GetTextDecoder(); virtual const QTextCodec *GetTextDecoder();
#endif #endif
// obsolete methods // obsolete methods
virtual void PutByte(Byte_t b); virtual void PutByte(Byte_t b);
skipping to change at line 236 skipping to change at line 241
static QWidget *winid(Window_t id); static QWidget *winid(Window_t id);
static QWidget *wid(Window_t id); static QWidget *wid(Window_t id);
static Window_t wid(TQtClientWidget *widget); static Window_t wid(TQtClientWidget *widget);
static Window_t rootwid(QPaintDevice *dev); static Window_t rootwid(QPaintDevice *dev);
static void PrintEvent(Event_t &); static void PrintEvent(Event_t &);
static QString SetFileName(const QString &fileName); static QString SetFileName(const QString &fileName);
static QString GetNewFileName(const QString &fileNamePrototype); static QString GetNewFileName(const QString &fileNamePrototype);
void SetQClientFilter(TQtClientFilter *filter) {fQClientFilter = filter; } void SetQClientFilter(TQtClientFilter *filter) {fQClientFilter = filter; }
TQtClientFilter *QClientFilter() const {return fQClientFilter;} TQtClientFilter *QClientFilter() const {return fQClientFilter;}
QColor &QtColor(ULong_t pixel); QColor QtColor(ULong_t pixel);
void SendDestroyEvent(TQtClientWidget *) const; void SendDestroyEvent(TQtClientWidget *) const;
TQtEmitter *Emitter(){ return &fEmitter;} TQtEmitter *Emitter(){ return &fEmitter;}
#endif #endif
// Future interface : // Future interface :
virtual void SetRGB(Int_t cindex, Float_t r, Float_t g, Float_t b, Float_t a); virtual void SetRGB(Int_t cindex, Float_t r, Float_t g, Float_t b, Float_t a);
virtual void SetAlpha(Int_t cindex, Float_t a); virtual void SetAlpha(Int_t cindex, Float_t a);
virtual void GetRGBA(Int_t cindex, Float_t &r, Float_t &g, Float_t &b, Float_t &a); virtual void GetRGBA(Int_t cindex, Float_t &r, Float_t &g, Float_t &b, Float_t &a);
virtual Float_t GetAlpha(Int_t cindex); virtual Float_t GetAlpha(Int_t cindex);
virtual Int_t LoadQt(const char *shareLibFileName); virtual Int_t LoadQt(const char *shareLibFileName);
 End of changes. 6 change blocks. 
3 lines changed or deleted 8 lines changed or added


 TGSlider.h   TGSlider.h 
// @(#)root/gui:$Id: TGSlider.h 25396 2008-09-14 12:51:04Z bellenot $ // @(#)root/gui:$Id: TGSlider.h 27642 2009-02-27 16:11:02Z bellenot $
// Author: Fons Rademakers 14/01/98 // Author: Fons Rademakers 14/01/98
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 93 skipping to change at line 93
public: public:
TGSlider(const TGWindow *p = 0, UInt_t w = 1, UInt_t h = 1, TGSlider(const TGWindow *p = 0, UInt_t w = 1, UInt_t h = 1,
UInt_t type = kSlider1 | kScaleBoth, Int_t id = -1, UInt_t type = kSlider1 | kScaleBoth, Int_t id = -1,
UInt_t options = kChildFrame, UInt_t options = kChildFrame,
Pixel_t back = GetDefaultFrameBackground()); Pixel_t back = GetDefaultFrameBackground());
virtual ~TGSlider() { } virtual ~TGSlider() { }
virtual Bool_t HandleButton(Event_t *event) = 0; virtual Bool_t HandleButton(Event_t *event) = 0;
virtual Bool_t HandleConfigureNotify(Event_t* event) = 0;
virtual Bool_t HandleMotion(Event_t *event) = 0; virtual Bool_t HandleMotion(Event_t *event) = 0;
virtual void SetScale(Int_t scale) { fScale = scale; } //*MENU* virtual void SetScale(Int_t scale) { fScale = scale; } //*MENU*
virtual void SetRange(Int_t min, Int_t max) { fVmin = min; fVmax = max; } //*MENU* virtual void SetRange(Int_t min, Int_t max) { fVmin = min; fVmax = max; } //*MENU*
virtual void SetPosition(Int_t pos) { fPos = pos; fClient->NeedRedraw(t his); } //*MENU* virtual void SetPosition(Int_t pos) { fPos = pos; fClient->NeedRedraw(t his); } //*MENU*
virtual Int_t GetPosition() const { return fPos; } virtual Int_t GetPosition() const { return fPos; }
virtual Int_t GetMinPosition() const { return fVmin; } virtual Int_t GetMinPosition() const { return fVmin; }
virtual Int_t GetMaxPosition() const { return fVmax; } virtual Int_t GetMaxPosition() const { return fVmax; }
virtual Int_t GetScale() const { return fScale; } virtual Int_t GetScale() const { return fScale; }
virtual void MapSubwindows() { TGWindow::MapSubwindows(); } virtual void MapSubwindows() { TGWindow::MapSubwindows(); }
skipping to change at line 130 skipping to change at line 131
virtual void DoRedraw(); virtual void DoRedraw();
public: public:
TGVSlider(const TGWindow *p = 0, UInt_t h = 40, TGVSlider(const TGWindow *p = 0, UInt_t h = 40,
UInt_t type = kSlider1 | kScaleBoth, Int_t id = -1, UInt_t type = kSlider1 | kScaleBoth, Int_t id = -1,
UInt_t options = kVerticalFrame, UInt_t options = kVerticalFrame,
Pixel_t back = GetDefaultFrameBackground()); Pixel_t back = GetDefaultFrameBackground());
virtual ~TGVSlider(); virtual ~TGVSlider();
virtual Bool_t HandleButton(Event_t *event); virtual Bool_t HandleButton(Event_t *event);
virtual Bool_t HandleConfigureNotify(Event_t* event);
virtual Bool_t HandleMotion(Event_t *event); virtual Bool_t HandleMotion(Event_t *event);
virtual TGDimension GetDefaultSize() const virtual TGDimension GetDefaultSize() const
{ return TGDimension(kSliderWidth, fHeight); } { return TGDimension(kSliderWidth, fHeight); }
virtual void Resize(UInt_t w, UInt_t h) { TGFrame::Resize(w, h ? h+16 : fHeight + 16); } virtual void Resize(UInt_t w, UInt_t h) { TGFrame::Resize(w, h ? h+16 : fHeight + 16); }
virtual void Resize(TGDimension size) { Resize(size.fWidth, size.fHeig ht); } virtual void Resize(TGDimension size) { Resize(size.fWidth, size.fHeig ht); }
virtual void SavePrimitive(ostream &out, Option_t *option = ""); virtual void SavePrimitive(ostream &out, Option_t *option = "");
ClassDef(TGVSlider,0) // Vertical slider widget ClassDef(TGVSlider,0) // Vertical slider widget
}; };
skipping to change at line 155 skipping to change at line 157
virtual void DoRedraw(); virtual void DoRedraw();
public: public:
TGHSlider(const TGWindow *p = 0, UInt_t w = 40, TGHSlider(const TGWindow *p = 0, UInt_t w = 40,
UInt_t type = kSlider1 | kScaleBoth, Int_t id = -1, UInt_t type = kSlider1 | kScaleBoth, Int_t id = -1,
UInt_t options = kHorizontalFrame, UInt_t options = kHorizontalFrame,
Pixel_t back = GetDefaultFrameBackground()); Pixel_t back = GetDefaultFrameBackground());
virtual ~TGHSlider(); virtual ~TGHSlider();
virtual Bool_t HandleButton(Event_t *event); virtual Bool_t HandleButton(Event_t *event);
virtual Bool_t HandleConfigureNotify(Event_t* event);
virtual Bool_t HandleMotion(Event_t *event); virtual Bool_t HandleMotion(Event_t *event);
virtual TGDimension GetDefaultSize() const virtual TGDimension GetDefaultSize() const
{ return TGDimension(fWidth, kSliderHeight); } { return TGDimension(fWidth, kSliderHeight); }
virtual void Resize(UInt_t w, UInt_t h) { TGFrame::Resize(w ? w+16 : f Width + 16, h); } virtual void Resize(UInt_t w, UInt_t h) { TGFrame::Resize(w ? w+16 : f Width + 16, h); }
virtual void Resize(TGDimension size) { Resize(size.fWidth, size.fHeig ht); } virtual void Resize(TGDimension size) { Resize(size.fWidth, size.fHeig ht); }
virtual void SavePrimitive(ostream &out, Option_t *option = ""); virtual void SavePrimitive(ostream &out, Option_t *option = "");
ClassDef(TGHSlider,0) // Horizontal slider widget ClassDef(TGHSlider,0) // Horizontal slider widget
}; };
 End of changes. 4 change blocks. 
1 lines changed or deleted 4 lines changed or added


 TGeoArb8.h   TGeoArb8.h 
// @(#)root/geom:$Id: TGeoArb8.h 24419 2008-06-20 13:40:38Z brun $ // @(#)root/geom:$Id: TGeoArb8.h 27731 2009-03-09 17:40:56Z brun $
// Author: Andrei Gheata 24/10/01 // Author: Andrei Gheata 24/10/01
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 91 skipping to change at line 91
virtual void GetBoundingCylinder(Double_t *param) const; virtual void GetBoundingCylinder(Double_t *param) const;
virtual Int_t GetByteCount() const {return 100;} virtual Int_t GetByteCount() const {return 100;}
virtual Bool_t GetPointsOnFacet(Int_t /*index*/, Int_t /*npoints* /, Double_t * /*array*/) const; virtual Bool_t GetPointsOnFacet(Int_t /*index*/, Int_t /*npoints* /, Double_t * /*array*/) const;
Double_t GetDz() const {return fDz;} Double_t GetDz() const {return fDz;}
virtual Int_t GetFittingBox(const TGeoBBox *parambox, TGeoMatrix *mat, Double_t &dx, Double_t &dy, Double_t &dz) const; virtual Int_t GetFittingBox(const TGeoBBox *parambox, TGeoMatrix *mat, Double_t &dx, Double_t &dy, Double_t &dz) const;
virtual TGeoShape *GetMakeRuntimeShape(TGeoShape * /*mother*/, TGeoMa trix * /*mat*/) const {return 0;} virtual TGeoShape *GetMakeRuntimeShape(TGeoShape * /*mother*/, TGeoMa trix * /*mat*/) const {return 0;}
static void GetPlaneNormal(Double_t *p1, Double_t *p2, Double_ t *p3, Double_t *norm); static void GetPlaneNormal(Double_t *p1, Double_t *p2, Double_ t *p3, Double_t *norm);
Double_t *GetVertices() {return &fXY[0][0];} Double_t *GetVertices() {return &fXY[0][0];}
Double_t GetTwist(Int_t iseg) const; Double_t GetTwist(Int_t iseg) const;
virtual Bool_t IsCylType() const {return kFALSE;} virtual Bool_t IsCylType() const {return kFALSE;}
static Bool_t IsSamePoint(Double_t *p1, Double_t *p2) {return (( p1[0]==p2[0]) && (p1[1]==p2[1]))?kTRUE:kFALSE;} static Bool_t IsSamePoint(Double_t *p1, Double_t *p2) {return (T Math::Abs(p1[0]-p2[0])<1.E-16 && TMath::Abs(p1[1]-p2[1])<1.E-16)?kTRUE:kFAL SE;}
static Bool_t InsidePolygon(Double_t x, Double_t y, Double_t *pt s); static Bool_t InsidePolygon(Double_t x, Double_t y, Double_t *pt s);
virtual void InspectShape() const; virtual void InspectShape() const;
Bool_t IsTwisted() const {return (fTwist==0)?kFALSE:kTRUE ;} Bool_t IsTwisted() const {return (fTwist==0)?kFALSE:kTRUE ;}
Double_t SafetyToFace(Double_t *point, Int_t iseg, Bool_t i n) const; Double_t SafetyToFace(Double_t *point, Int_t iseg, Bool_t i n) const;
virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const; virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;
virtual void SavePrimitive(ostream &out, Option_t *option = "") ; virtual void SavePrimitive(ostream &out, Option_t *option = "") ;
void SetPlaneVertices(Double_t zpl, Double_t *vertices) const; void SetPlaneVertices(Double_t zpl, Double_t *vertices) const;
virtual void SetVertex(Int_t vnum, Double_t x, Double_t y); virtual void SetVertex(Int_t vnum, Double_t x, Double_t y);
virtual void SetDimensions(Double_t *param); virtual void SetDimensions(Double_t *param);
void SetDz(Double_t dz) {fDz = dz;} void SetDz(Double_t dz) {fDz = dz;}
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TGeoBBox.h   TGeoBBox.h 
// @(#)root/geom:$Id: TGeoBBox.h 24870 2008-07-17 16:30:58Z brun $ // @(#)root/geom:$Id: TGeoBBox.h 27731 2009-03-09 17:40:56Z brun $
// Author: Andrei Gheata 24/10/01 // Author: Andrei Gheata 24/10/01
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 85 skipping to change at line 85
virtual TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const; virtual TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const;
virtual void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t & npols) const; virtual void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t & npols) const;
virtual Int_t GetNmeshVertices() const {return 8;} virtual Int_t GetNmeshVertices() const {return 8;}
virtual Double_t GetDX() const {return fDX;} virtual Double_t GetDX() const {return fDX;}
virtual Double_t GetDY() const {return fDY;} virtual Double_t GetDY() const {return fDY;}
virtual Double_t GetDZ() const {return fDZ;} virtual Double_t GetDZ() const {return fDZ;}
virtual const Double_t *GetOrigin() const {return fOrigin;} virtual const Double_t *GetOrigin() const {return fOrigin;}
virtual void InspectShape() const; virtual void InspectShape() const;
virtual Bool_t IsCylType() const {return kFALSE;} virtual Bool_t IsCylType() const {return kFALSE;}
virtual Bool_t IsValidBox() const {return ((fDX<0)||(fDY<0)||(fDZ <0))?kFALSE:kTRUE;} virtual Bool_t IsValidBox() const {return ((fDX<0)||(fDY<0)||(fDZ <0))?kFALSE:kTRUE;}
virtual Bool_t IsNullBox() const {return ((fDX==0)&&(fDY==0)&&(fD Z==0))?kTRUE:kFALSE;} virtual Bool_t IsNullBox() const {return ((fDX<1.E-16)&&(fDY<1.E- 16)&&(fDZ<1.E-16))?kTRUE:kFALSE;}
virtual TBuffer3D *MakeBuffer3D() const; virtual TBuffer3D *MakeBuffer3D() const;
virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const; virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;
virtual void SavePrimitive(ostream &out, Option_t *option = "") ; virtual void SavePrimitive(ostream &out, Option_t *option = "") ;
void SetBoxDimensions(Double_t dx, Double_t dy, Double_ t dz, Double_t *origin=0); void SetBoxDimensions(Double_t dx, Double_t dy, Double_ t dz, Double_t *origin=0);
virtual void SetDimensions(Double_t *param); virtual void SetDimensions(Double_t *param);
void SetBoxPoints(Double_t *points) const; void SetBoxPoints(Double_t *points) const;
virtual void SetPoints(Double_t *points) const; virtual void SetPoints(Double_t *points) const;
virtual void SetPoints(Float_t *points) const; virtual void SetPoints(Float_t *points) const;
virtual void SetSegsAndPols(TBuffer3D &buffer) const; virtual void SetSegsAndPols(TBuffer3D &buffer) const;
virtual void Sizeof3D() const; virtual void Sizeof3D() const;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TGeoBuilder.h   TGeoBuilder.h 
// @(#)root/geom:$Id: TGeoBuilder.h 21567 2007-12-28 16:36:06Z brun $ // @(#)root/geom:$Id: TGeoBuilder.h 27731 2009-03-09 17:40:56Z brun $
// Author: Mihaela Gheata 30/05/07 // Author: Mihaela Gheata 30/05/07
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 60 skipping to change at line 60
public : public :
virtual ~TGeoBuilder(); virtual ~TGeoBuilder();
static TGeoBuilder *Instance(TGeoManager *geom); static TGeoBuilder *Instance(TGeoManager *geom);
Int_t AddMaterial(TGeoMaterial *material); Int_t AddMaterial(TGeoMaterial *material);
Int_t AddTransformation(TGeoMatrix *matrix); Int_t AddTransformation(TGeoMatrix *matrix);
Int_t AddShape(TGeoShape *shape); Int_t AddShape(TGeoShape *shape);
void RegisterMatrix(TGeoMatrix *matrix); void RegisterMatrix(TGeoMatrix *matrix);
TGeoVolume *MakeArb8(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeArb8(const char *name, TGeoMedium *medium,
Double_t dz, Double_t *vertices=0); Double_t dz, Double_t *vertices=0);
TGeoVolume *MakeBox(const char *name, const TGeoMedium *mediu m, TGeoVolume *MakeBox(const char *name, TGeoMedium *medium,
Double_t dx, Double_t dy, Double_t dz) ; Double_t dx, Double_t dy, Double_t dz) ;
TGeoVolume *MakeCone(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeCone(const char *name, TGeoMedium *medium,
Double_t dz, Double_t rmin1, Double_t rmax1, Double_t dz, Double_t rmin1, Double_t rmax1,
Double_t rmin2, Double_t rmax2); Double_t rmin2, Double_t rmax2);
TGeoVolume *MakeCons(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeCons(const char *name, TGeoMedium *medium,
Double_t dz, Double_t rmin1, Double_t rmax1, Double_t dz, Double_t rmin1, Double_t rmax1,
Double_t rmin2, Double_t rmax2, Double_t rmin2, Double_t rmax2,
Double_t phi1, Double_t phi2); Double_t phi1, Double_t phi2);
TGeoVolume *MakeCtub(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeCtub(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_ t dz, Double_t phi1, Double_t phi2, Double_t rmin, Double_t rmax, Double_ t dz, Double_t phi1, Double_t phi2,
Double_t lx, Double_t ly, Double_t lz , Double_t tx, Double_t ty, Double_t tz); Double_t lx, Double_t ly, Double_t lz , Double_t tx, Double_t ty, Double_t tz);
TGeoVolume *MakeEltu(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeEltu(const char *name, TGeoMedium *medium,
Double_t a, Double_t b, Double_t dz); Double_t a, Double_t b, Double_t dz);
TGeoVolume *MakeGtra(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeGtra(const char *name, TGeoMedium *medium,
Double_t dz, Double_t theta, Double_t ph i, Double_t twist, Double_t h1, Double_t dz, Double_t theta, Double_t ph i, Double_t twist, Double_t h1,
Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2, Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2,
Double_t tl2, Double_t alpha2); Double_t tl2, Double_t alpha2);
TGeoVolume *MakePara(const char *name, const TGeoMedium *medi um, TGeoVolume *MakePara(const char *name, TGeoMedium *medium,
Double_t dx, Double_t dy, Double_t dz, Double_t dx, Double_t dy, Double_t dz,
Double_t alpha, Double_t theta, Double _t phi); Double_t alpha, Double_t theta, Double _t phi);
TGeoVolume *MakePcon(const char *name, const TGeoMedium *medi um, TGeoVolume *MakePcon(const char *name, TGeoMedium *medium,
Double_t phi, Double_t dphi, Int_t nz ); Double_t phi, Double_t dphi, Int_t nz );
TGeoVolume *MakeParaboloid(const char *name, const TGeoMedium *medium, TGeoVolume *MakeParaboloid(const char *name, TGeoMedium *medi um,
Double_t rlo, Double_t rhi, Double_t dz); Double_t rlo, Double_t rhi, Double_t dz);
TGeoVolume *MakeHype(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeHype(const char *name, TGeoMedium *medium,
Double_t rin, Double_t stin, Double_t rout, Double_t stout, Double_t dz); Double_t rin, Double_t stin, Double_t rout, Double_t stout, Double_t dz);
TGeoVolume *MakePgon(const char *name, const TGeoMedium *medi um, TGeoVolume *MakePgon(const char *name, TGeoMedium *medium,
Double_t phi, Double_t dphi, Int_t ne dges, Int_t nz); Double_t phi, Double_t dphi, Int_t ne dges, Int_t nz);
TGeoVolume *MakeSphere(const char *name, const TGeoMedium *me dium, TGeoVolume *MakeSphere(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_t rmin, Double_t rmax,
Double_t themin=0, Double_t themax=180 , Double_t themin=0, Double_t themax=180 ,
Double_t phimin=0, Double_t phimax=360 ); Double_t phimin=0, Double_t phimax=360 );
TGeoVolume *MakeTorus(const char *name, const TGeoMedium *med ium, Double_t r, TGeoVolume *MakeTorus(const char *name, TGeoMedium *medium, D ouble_t r,
Double_t rmin, Double_t rmax, Double_t phi1=0, Double_t dphi=360); Double_t rmin, Double_t rmax, Double_t phi1=0, Double_t dphi=360);
TGeoVolume *MakeTrap(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTrap(const char *name, TGeoMedium *medium,
Double_t dz, Double_t theta, Double_t ph i, Double_t h1, Double_t dz, Double_t theta, Double_t ph i, Double_t h1,
Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2, Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2,
Double_t tl2, Double_t alpha2); Double_t tl2, Double_t alpha2);
TGeoVolume *MakeTrd1(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTrd1(const char *name, TGeoMedium *medium,
Double_t dx1, Double_t dx2, Double_t dy, Double_t dz); Double_t dx1, Double_t dx2, Double_t dy, Double_t dz);
TGeoVolume *MakeTrd2(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTrd2(const char *name, TGeoMedium *medium,
Double_t dx1, Double_t dx2, Double_t dy1, Double_t dy2, Double_t dx1, Double_t dx2, Double_t dy1, Double_t dy2,
Double_t dz); Double_t dz);
TGeoVolume *MakeTube(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTube(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_ t dz); Double_t rmin, Double_t rmax, Double_ t dz);
TGeoVolume *MakeTubs(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTubs(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_ t dz, Double_t rmin, Double_t rmax, Double_ t dz,
Double_t phi1, Double_t phi2); Double_t phi1, Double_t phi2);
TGeoVolume *MakeXtru(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeXtru(const char *name, TGeoMedium *medium,
Int_t nz); Int_t nz);
TGeoVolumeAssembly *MakeVolumeAssembly(const char *name); TGeoVolumeAssembly *MakeVolumeAssembly(const char *name);
TGeoVolumeMulti *MakeVolumeMulti(const char *name, const TGeoMediu m *medium); TGeoVolumeMulti *MakeVolumeMulti(const char *name, TGeoMedium *med ium);
//--- GEANT3-like geometry creation //--- GEANT3-like geometry creation
TGeoVolume *Division(const char *name, const char *mother, In t_t iaxis, Int_t ndiv, TGeoVolume *Division(const char *name, const char *mother, In t_t iaxis, Int_t ndiv,
Double_t start, Double_t step, Int _t numed=0, Option_t *option=""); Double_t start, Double_t step, Int _t numed=0, Option_t *option="");
void Matrix(Int_t index, Double_t theta1, Double_t phi 1, void Matrix(Int_t index, Double_t theta1, Double_t phi 1,
Double_t theta2, Double_t phi2, Double_t theta2, Double_t phi2,
Double_t theta3, Double_t phi3); Double_t theta3, Double_t phi3);
TGeoMaterial *Material(const char *name, Double_t a, Double_t z , Double_t dens, Int_t uid, Double_t radlen=0, Double_t intlen=0); TGeoMaterial *Material(const char *name, Double_t a, Double_t z , Double_t dens, Int_t uid, Double_t radlen=0, Double_t intlen=0);
TGeoMaterial *Mixture(const char *name, Float_t *a, Float_t *z, Double_t dens, TGeoMaterial *Mixture(const char *name, Float_t *a, Float_t *z, Double_t dens,
Int_t nelem, Float_t *wmat, Int_t u id); Int_t nelem, Float_t *wmat, Int_t u id);
 End of changes. 22 change blocks. 
22 lines changed or deleted 22 lines changed or added


 TGeoChecker.h   TGeoChecker.h 
// @(#)root/geom:$Id: TGeoChecker.h 25123 2008-08-12 09:59:46Z brun $ // @(#)root/geom:$Id: TGeoChecker.h 27749 2009-03-10 15:23:52Z brun $
// Author: Andrei Gheata 01/11/01 // Author: Andrei Gheata 01/11/01
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 67 skipping to change at line 67
Int_t PropagateInGeom(Double_t *, Double_t *); Int_t PropagateInGeom(Double_t *, Double_t *);
void Score(TGeoVolume *, Int_t, Double_t); void Score(TGeoVolume *, Int_t, Double_t);
Double_t TimingPerVolume(TGeoVolume *); Double_t TimingPerVolume(TGeoVolume *);
public: public:
// constructors // constructors
TGeoChecker(); TGeoChecker();
TGeoChecker(TGeoManager *geom); TGeoChecker(TGeoManager *geom);
// destructor // destructor
virtual ~TGeoChecker(); virtual ~TGeoChecker();
// methods // methods
virtual void CheckBoundaryErrors(Int_t ntracks=1000000, Double_t rad
ius=-1.);
virtual void CheckBoundaryReference(Int_t icheck=-1);
void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t ch eckcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL); void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t ch eckcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL);
void CheckGeometry(Int_t nrays, Double_t startx, Double_t st arty, Double_t startz) const; void CheckGeometry(Int_t nrays, Double_t startx, Double_t st arty, Double_t startz) const;
void CheckOverlaps(const TGeoVolume *vol, Double_t ovlp=0.1, Option_t *option=""); void CheckOverlaps(const TGeoVolume *vol, Double_t ovlp=0.1, Option_t *option="");
void CheckOverlapsBySampling(TGeoVolume *vol, Double_t ovlp= 0.1, Int_t npoints=1000000) const; void CheckOverlapsBySampling(TGeoVolume *vol, Double_t ovlp= 0.1, Int_t npoints=1000000) const;
void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Op tion_t *option=""); void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Op tion_t *option="");
Double_t CheckVoxels(TGeoVolume *vol, TGeoVoxelFinder *voxels, D ouble_t *xyz, Int_t npoints); Double_t CheckVoxels(TGeoVolume *vol, TGeoVoxelFinder *voxels, D ouble_t *xyz, Int_t npoints);
TH2F *LegoPlot(Int_t ntheta=60, Double_t themin=0., Double_t themax=180., TH2F *LegoPlot(Int_t ntheta=60, Double_t themin=0., Double_t themax=180.,
Int_t nphi=90, Double_t phimin=0., Double_t phi max=360., Int_t nphi=90, Double_t phimin=0., Double_t phi max=360.,
Double_t rmin=0., Double_t rmax=9999999, Option _t *option=""); Double_t rmin=0., Double_t rmax=9999999, Option _t *option="");
void PrintOverlaps() const; void PrintOverlaps() const;
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 TGeoManager.h   TGeoManager.h 
// @(#)root/geom:$Id: TGeoManager.h 26991 2008-12-17 15:16:28Z brun $ // @(#)root/geom:$Id: TGeoManager.h 27749 2009-03-10 15:23:52Z brun $
// Author: Andrei Gheata 25/10/01 // Author: Andrei Gheata 25/10/01
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 214 skipping to change at line 214
void SetNodeSelectable(Bool_t flag=kTRUE) {fIsNodeSele ctable=flag;} void SetNodeSelectable(Bool_t flag=kTRUE) {fIsNodeSele ctable=flag;}
void SetVisDensity(Double_t dens=0.01); // *MENU* void SetVisDensity(Double_t dens=0.01); // *MENU*
void SetVisLevel(Int_t level=3); // *MENU* void SetVisLevel(Int_t level=3); // *MENU*
void SetVisOption(Int_t option=0); void SetVisOption(Int_t option=0);
void ViewLeaves(Bool_t flag=kTRUE); // *TOGGLE* *GETTE R=IsVisLeaves void ViewLeaves(Bool_t flag=kTRUE); // *TOGGLE* *GETTE R=IsVisLeaves
void SaveAttributes(const char *filename="tgeoatt.C"); // *MENU* void SaveAttributes(const char *filename="tgeoatt.C"); // *MENU*
void RestoreMasterVolume(); // *MENU* void RestoreMasterVolume(); // *MENU*
void SetMaxVisNodes(Int_t maxnodes=10000); // *MENU* void SetMaxVisNodes(Int_t maxnodes=10000); // *MENU*
//--- geometry checking //--- geometry checking
void AnimateTracks(Double_t tmin=0, Double_t tmax=5E-8 , Int_t nframes=200, Option_t *option="/*"); // *MENU* void AnimateTracks(Double_t tmin=0, Double_t tmax=5E-8 , Int_t nframes=200, Option_t *option="/*"); // *MENU*
void CheckBoundaryErrors(Int_t ntracks=1000000, Double
_t radius=-1.); // *MENU*
void CheckBoundaryReference(Int_t icheck=-1);
void CheckGeometryFull(Int_t ntracks=1000000, Double_t vx=0., Double_t vy=0., Double_t vz=0., Option_t *option="ob"); // *MENU* void CheckGeometryFull(Int_t ntracks=1000000, Double_t vx=0., Double_t vy=0., Double_t vz=0., Option_t *option="ob"); // *MENU*
void CheckGeometry(Option_t *option=""); void CheckGeometry(Option_t *option="");
void CheckOverlaps(Double_t ovlp=0.1, Option_t *option =""); // *MENU* void CheckOverlaps(Double_t ovlp=0.1, Option_t *option =""); // *MENU*
void CheckPoint(Double_t x=0,Double_t y=0, Double_t z= 0, Option_t *option=""); // *MENU* void CheckPoint(Double_t x=0,Double_t y=0, Double_t z= 0, Option_t *option=""); // *MENU*
void ConvertReflections(); void ConvertReflections();
void DrawCurrentPoint(Int_t color=2); // *MENU* void DrawCurrentPoint(Int_t color=2); // *MENU*
void DrawTracks(Option_t *option=""); // *MENU* void DrawTracks(Option_t *option=""); // *MENU*
void SetParticleName(const char *pname) {fParticleName =pname;} void SetParticleName(const char *pname) {fParticleName =pname;}
const char *GetParticleName() const {return fParticleName.Dat a();} const char *GetParticleName() const {return fParticleName.Dat a();}
void DrawPath(const char *path); void DrawPath(const char *path);
skipping to change at line 265 skipping to change at line 267
Bool_t isOnly, Double_t *upar, Int_t n par=0); Bool_t isOnly, Double_t *upar, Int_t n par=0);
TGeoVolume *Volume(const char *name, const char *shape, Int_t nmed, TGeoVolume *Volume(const char *name, const char *shape, Int_t nmed,
Float_t *upar, Int_t npar=0); Float_t *upar, Int_t npar=0);
TGeoVolume *Volume(const char *name, const char *shape, Int_t nmed, TGeoVolume *Volume(const char *name, const char *shape, Int_t nmed,
Double_t *upar, Int_t npar=0); Double_t *upar, Int_t npar=0);
void SetVolumeAttribute(const char *name, const char * att, Int_t val); void SetVolumeAttribute(const char *name, const char * att, Int_t val);
//--- geometry building //--- geometry building
void BuildDefaultMaterials(); void BuildDefaultMaterials();
void CloseGeometry(Option_t *option="d"); void CloseGeometry(Option_t *option="d");
Bool_t IsClosed() const {return fClosed;} Bool_t IsClosed() const {return fClosed;}
TGeoVolume *MakeArb8(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeArb8(const char *name, TGeoMedium *medium,
Double_t dz, Double_t *vertices=0); Double_t dz, Double_t *vertices=0);
TGeoVolume *MakeBox(const char *name, const TGeoMedium *mediu m, TGeoVolume *MakeBox(const char *name, TGeoMedium *medium,
Double_t dx, Double_t dy, Double_t dz) ; Double_t dx, Double_t dy, Double_t dz) ;
TGeoVolume *MakeCone(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeCone(const char *name, TGeoMedium *medium,
Double_t dz, Double_t rmin1, Double_t rmax1, Double_t dz, Double_t rmin1, Double_t rmax1,
Double_t rmin2, Double_t rmax2); Double_t rmin2, Double_t rmax2);
TGeoVolume *MakeCons(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeCons(const char *name, TGeoMedium *medium,
Double_t dz, Double_t rmin1, Double_t rmax1, Double_t dz, Double_t rmin1, Double_t rmax1,
Double_t rmin2, Double_t rmax2, Double_t rmin2, Double_t rmax2,
Double_t phi1, Double_t phi2); Double_t phi1, Double_t phi2);
TGeoVolume *MakeCtub(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeCtub(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_ t dz, Double_t phi1, Double_t phi2, Double_t rmin, Double_t rmax, Double_ t dz, Double_t phi1, Double_t phi2,
Double_t lx, Double_t ly, Double_t lz , Double_t tx, Double_t ty, Double_t tz); Double_t lx, Double_t ly, Double_t lz , Double_t tx, Double_t ty, Double_t tz);
TGeoVolume *MakeEltu(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeEltu(const char *name, TGeoMedium *medium,
Double_t a, Double_t b, Double_t dz); Double_t a, Double_t b, Double_t dz);
TGeoVolume *MakeGtra(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeGtra(const char *name, TGeoMedium *medium,
Double_t dz, Double_t theta, Double_t ph i, Double_t twist, Double_t h1, Double_t dz, Double_t theta, Double_t ph i, Double_t twist, Double_t h1,
Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2, Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2,
Double_t tl2, Double_t alpha2); Double_t tl2, Double_t alpha2);
TGeoVolume *MakePara(const char *name, const TGeoMedium *medi um, TGeoVolume *MakePara(const char *name, TGeoMedium *medium,
Double_t dx, Double_t dy, Double_t dz, Double_t dx, Double_t dy, Double_t dz,
Double_t alpha, Double_t theta, Double _t phi); Double_t alpha, Double_t theta, Double _t phi);
TGeoVolume *MakePcon(const char *name, const TGeoMedium *medi um, TGeoVolume *MakePcon(const char *name, TGeoMedium *medium,
Double_t phi, Double_t dphi, Int_t nz ); Double_t phi, Double_t dphi, Int_t nz );
TGeoVolume *MakeParaboloid(const char *name, const TGeoMedium *medium, TGeoVolume *MakeParaboloid(const char *name, TGeoMedium *medi um,
Double_t rlo, Double_t rhi, Double_t dz); Double_t rlo, Double_t rhi, Double_t dz);
TGeoVolume *MakeHype(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeHype(const char *name, TGeoMedium *medium,
Double_t rin, Double_t stin, Double_t rout, Double_t stout, Double_t dz); Double_t rin, Double_t stin, Double_t rout, Double_t stout, Double_t dz);
TGeoVolume *MakePgon(const char *name, const TGeoMedium *medi um, TGeoVolume *MakePgon(const char *name, TGeoMedium *medium,
Double_t phi, Double_t dphi, Int_t ne dges, Int_t nz); Double_t phi, Double_t dphi, Int_t ne dges, Int_t nz);
TGeoVolume *MakeSphere(const char *name, const TGeoMedium *me dium, TGeoVolume *MakeSphere(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_t rmin, Double_t rmax,
Double_t themin=0, Double_t themax=180 , Double_t themin=0, Double_t themax=180 ,
Double_t phimin=0, Double_t phimax=360 ); Double_t phimin=0, Double_t phimax=360 );
TGeoVolume *MakeTorus(const char *name, const TGeoMedium *med ium, Double_t r, TGeoVolume *MakeTorus(const char *name, TGeoMedium *medium, D ouble_t r,
Double_t rmin, Double_t rmax, Double_t phi1=0, Double_t dphi=360); Double_t rmin, Double_t rmax, Double_t phi1=0, Double_t dphi=360);
TGeoVolume *MakeTrap(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTrap(const char *name, TGeoMedium *medium,
Double_t dz, Double_t theta, Double_t ph i, Double_t h1, Double_t dz, Double_t theta, Double_t ph i, Double_t h1,
Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2, Double_t bl1, Double_t tl1, Double_t alp ha1, Double_t h2, Double_t bl2,
Double_t tl2, Double_t alpha2); Double_t tl2, Double_t alpha2);
TGeoVolume *MakeTrd1(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTrd1(const char *name, TGeoMedium *medium,
Double_t dx1, Double_t dx2, Double_t dy, Double_t dz); Double_t dx1, Double_t dx2, Double_t dy, Double_t dz);
TGeoVolume *MakeTrd2(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTrd2(const char *name, TGeoMedium *medium,
Double_t dx1, Double_t dx2, Double_t dy1, Double_t dy2, Double_t dx1, Double_t dx2, Double_t dy1, Double_t dy2,
Double_t dz); Double_t dz);
TGeoVolume *MakeTube(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTube(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_ t dz); Double_t rmin, Double_t rmax, Double_ t dz);
TGeoVolume *MakeTubs(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeTubs(const char *name, TGeoMedium *medium,
Double_t rmin, Double_t rmax, Double_ t dz, Double_t rmin, Double_t rmax, Double_ t dz,
Double_t phi1, Double_t phi2); Double_t phi1, Double_t phi2);
TGeoVolume *MakeXtru(const char *name, const TGeoMedium *medi um, TGeoVolume *MakeXtru(const char *name, TGeoMedium *medium,
Int_t nz); Int_t nz);
TGeoPNEntry *SetAlignableEntry(const char *unique_name, const char *path, Int_t uid=-1); TGeoPNEntry *SetAlignableEntry(const char *unique_name, const char *path, Int_t uid=-1);
TGeoPNEntry *GetAlignableEntry(const char *name) const; TGeoPNEntry *GetAlignableEntry(const char *name) const;
TGeoPNEntry *GetAlignableEntry(Int_t index) const; TGeoPNEntry *GetAlignableEntry(Int_t index) const;
TGeoPNEntry *GetAlignableEntryByUID(Int_t uid) const; TGeoPNEntry *GetAlignableEntryByUID(Int_t uid) const;
Int_t GetNAlignable(Bool_t with_uid=kFALSE) const; Int_t GetNAlignable(Bool_t with_uid=kFALSE) const;
TGeoPhysicalNode *MakeAlignablePN(const char *name); TGeoPhysicalNode *MakeAlignablePN(const char *name);
TGeoPhysicalNode *MakeAlignablePN(TGeoPNEntry *entry); TGeoPhysicalNode *MakeAlignablePN(TGeoPNEntry *entry);
TGeoPhysicalNode *MakePhysicalNode(const char *path=0); TGeoPhysicalNode *MakePhysicalNode(const char *path=0);
void ClearPhysicalNodes(Bool_t mustdelete=kFALSE); void ClearPhysicalNodes(Bool_t mustdelete=kFALSE);
void RefreshPhysicalNodes(Bool_t lock=kTRUE); void RefreshPhysicalNodes(Bool_t lock=kTRUE);
TVirtualGeoTrack *MakeTrack(Int_t id, Int_t pdgcode, TObject *parti cle); TVirtualGeoTrack *MakeTrack(Int_t id, Int_t pdgcode, TObject *parti cle);
TGeoVolumeAssembly *MakeVolumeAssembly(const char *name); TGeoVolumeAssembly *MakeVolumeAssembly(const char *name);
TGeoVolumeMulti *MakeVolumeMulti(const char *name, const TGeoMediu m *medium); TGeoVolumeMulti *MakeVolumeMulti(const char *name, TGeoMedium *med ium);
void SetTopVolume(TGeoVolume *vol); void SetTopVolume(TGeoVolume *vol);
//--- geometry queries //--- geometry queries
TGeoNode *CrossBoundaryAndLocate(Bool_t downwards, TGeoNode *skipnode); TGeoNode *CrossBoundaryAndLocate(Bool_t downwards, TGeoNode *skipnode);
TGeoNode *FindNextBoundary(Double_t stepmax=TGeoShape::Big( ),const char *path="", Bool_t frombdr=kFALSE); TGeoNode *FindNextBoundary(Double_t stepmax=TGeoShape::Big( ),const char *path="", Bool_t frombdr=kFALSE);
TGeoNode *FindNextDaughterBoundary(Double_t *point, Double_ t *dir, Int_t &idaughter, Bool_t compmatrix=kFALSE); TGeoNode *FindNextDaughterBoundary(Double_t *point, Double_ t *dir, Int_t &idaughter, Bool_t compmatrix=kFALSE);
TGeoNode *FindNextBoundaryAndStep(Double_t stepmax=TGeoShap e::Big(), Bool_t compsafe=kFALSE); TGeoNode *FindNextBoundaryAndStep(Double_t stepmax=TGeoShap e::Big(), Bool_t compsafe=kFALSE);
TGeoNode *FindNode(Bool_t safe_start=kTRUE); TGeoNode *FindNode(Bool_t safe_start=kTRUE);
TGeoNode *FindNode(Double_t x, Double_t y, Double_t z); TGeoNode *FindNode(Double_t x, Double_t y, Double_t z);
Double_t *FindNormal(Bool_t forward=kTRUE); Double_t *FindNormal(Bool_t forward=kTRUE);
 End of changes. 23 change blocks. 
22 lines changed or deleted 25 lines changed or added


 TGeoNode.h   TGeoNode.h 
// @(#)root/geom:$Id: TGeoNode.h 21494 2007-12-19 15:50:40Z brun $ // @(#)root/geom:$Id: TGeoNode.h 27731 2009-03-09 17:40:56Z brun $
// Author: Andrei Gheata 24/10/01 // Author: Andrei Gheata 24/10/01
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 119 skipping to change at line 119
Bool_t IsOverlapping() const {return TObject::TestBit(kGeoNod eOverlap);} Bool_t IsOverlapping() const {return TObject::TestBit(kGeoNod eOverlap);}
Bool_t IsVirtual() const {return TObject::TestBit(kGeoNodeVC) ;} Bool_t IsVirtual() const {return TObject::TestBit(kGeoNodeVC) ;}
Bool_t IsVisible() const {return (TGeoAtt::IsVisible() && fVo lume->IsVisible());} Bool_t IsVisible() const {return (TGeoAtt::IsVisible() && fVo lume->IsVisible());}
Bool_t IsVisDaughters() const {return (TGeoAtt::IsVisDaughter s() && fVolume->IsVisDaughters());} Bool_t IsVisDaughters() const {return (TGeoAtt::IsVisDaughter s() && fVolume->IsVisDaughters());}
Bool_t MayOverlap(Int_t iother) const; Bool_t MayOverlap(Int_t iother) const;
virtual TGeoNode *MakeCopyNode() const {return 0;} virtual TGeoNode *MakeCopyNode() const {return 0;}
Double_t Safety(Double_t *point, Bool_t in=kTRUE) const; Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;
void SaveAttributes(ostream &out); void SaveAttributes(ostream &out);
void SetCurrentPoint(Double_t x, Double_t y, Double_t z) {f Volume->SetCurrentPoint(x,y,z);}// *MENU* void SetCurrentPoint(Double_t x, Double_t y, Double_t z) {f Volume->SetCurrentPoint(x,y,z);}// *MENU*
void SetVolume(const TGeoVolume *volume) {fVolume = (TGeoVo lume*)volume;} void SetVolume(TGeoVolume *volume) {fVolume = volume; }
void SetNumber(Int_t number) {fNumber=number;} void SetNumber(Int_t number) {fNumber=number;}
void SetOverlapping(Bool_t flag=kTRUE) {TObject::SetBit(k GeoNodeOverlap, flag);} void SetOverlapping(Bool_t flag=kTRUE) {TObject::SetBit(k GeoNodeOverlap, flag);}
void SetVirtual() {TObject::SetBit(k GeoNodeVC, kTRUE);} void SetVirtual() {TObject::SetBit(k GeoNodeVC, kTRUE);}
void SetVisibility(Bool_t vis=kTRUE); // *MENU* void SetVisibility(Bool_t vis=kTRUE); // *MENU*
void SetInvisible() {SetVisibility(kFA LSE);} // *MENU* void SetInvisible() {SetVisibility(kFA LSE);} // *MENU*
void SetAllInvisible() {VisibleDaughters( kFALSE);} // *MENU* void SetAllInvisible() {VisibleDaughters( kFALSE);} // *MENU*
void SetMotherVolume(const TGeoVolume *mother) {fMother = ( TGeoVolume*)mother;} void SetMotherVolume(TGeoVolume *mother) {fMother = mother; }
void SetOverlaps(Int_t *ovlp, Int_t novlp); void SetOverlaps(Int_t *ovlp, Int_t novlp);
virtual void MasterToLocal(const Double_t *master, Double_t *local) const; virtual void MasterToLocal(const Double_t *master, Double_t *local) const;
virtual void MasterToLocalVect(const Double_t *master, Double_t *lo cal) const; virtual void MasterToLocalVect(const Double_t *master, Double_t *lo cal) const;
virtual void LocalToMaster(const Double_t *local, Double_t *master) const; virtual void LocalToMaster(const Double_t *local, Double_t *master) const;
virtual void LocalToMasterVect(const Double_t *local, Double_t *mas ter) const; virtual void LocalToMasterVect(const Double_t *local, Double_t *mas ter) const;
virtual void ls(Option_t *option = "") const; virtual void ls(Option_t *option = "") const;
virtual void Paint(Option_t *option = ""); virtual void Paint(Option_t *option = "");
void PrintCandidates() const; // *MENU* void PrintCandidates() const; // *MENU*
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TGeoPainter.h   TGeoPainter.h 
skipping to change at line 87 skipping to change at line 87
protected: protected:
virtual void ClearVisibleVolumes(); virtual void ClearVisibleVolumes();
public: public:
TGeoPainter(TGeoManager *manager); TGeoPainter(TGeoManager *manager);
virtual ~TGeoPainter(); virtual ~TGeoPainter();
virtual void AddSize3D(Int_t numpoints, Int_t numsegs, Int_t numpo lys); virtual void AddSize3D(Int_t numpoints, Int_t numsegs, Int_t numpo lys);
virtual TVirtualGeoTrack *AddTrack(Int_t id, Int_t pdgcode, TObject *par t); virtual TVirtualGeoTrack *AddTrack(Int_t id, Int_t pdgcode, TObject *par t);
virtual void AddTrackPoint(Double_t *point, Double_t *box, Bool_t reset=kFALSE); virtual void AddTrackPoint(Double_t *point, Double_t *box, Bool_t reset=kFALSE);
virtual void BombTranslation(const Double_t *tr, Double_t *bombtr) ; virtual void BombTranslation(const Double_t *tr, Double_t *bombtr) ;
virtual void CheckBoundaryErrors(Int_t ntracks=1000000, Double_t r
adius=-1.);
virtual void CheckBoundaryReference(Int_t icheck=-1);
virtual void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t checkcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL); virtual void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t checkcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL);
virtual void CheckGeometry(Int_t nrays, Double_t startx, Double_t starty, Double_t startz) const; virtual void CheckGeometry(Int_t nrays, Double_t startx, Double_t starty, Double_t startz) const;
void CheckEdit(); void CheckEdit();
virtual void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Option_t *option=""); virtual void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Option_t *option="");
virtual void CheckOverlaps(const TGeoVolume *vol, Double_t ovlp=0. 1, Option_t *option="") const; virtual void CheckOverlaps(const TGeoVolume *vol, Double_t ovlp=0. 1, Option_t *option="") const;
Int_t CountNodes(TGeoVolume *vol, Int_t level) const; Int_t CountNodes(TGeoVolume *vol, Int_t level) const;
virtual Int_t CountVisibleNodes(); virtual Int_t CountVisibleNodes();
virtual void DefaultAngles(); virtual void DefaultAngles();
virtual void DefaultColors(); virtual void DefaultColors();
virtual Int_t DistanceToPrimitiveVol(TGeoVolume *vol, Int_t px, Int _t py); virtual Int_t DistanceToPrimitiveVol(TGeoVolume *vol, Int_t px, Int _t py);
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 TGeoShape.h   TGeoShape.h 
// @(#)root/geom:$Id: TGeoShape.h 27466 2009-02-17 12:53:37Z brun $ // @(#)root/geom:$Id: TGeoShape.h 27731 2009-03-09 17:40:56Z brun $
// Author: Andrei Gheata 31/01/02 // Author: Andrei Gheata 31/01/02
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 135 skipping to change at line 135
Int_t GetId() const {return fShapeId;} Int_t GetId() const {return fShapeId;}
virtual TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const = 0; virtual TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const = 0;
virtual void GetMeshNumbers(Int_t &/*nvert*/, Int_t &/*nsegs*/, Int_t &/*npols*/) const {;} virtual void GetMeshNumbers(Int_t &/*nvert*/, Int_t &/*nsegs*/, Int_t &/*npols*/) const {;}
virtual const char *GetName() const; virtual const char *GetName() const;
virtual Int_t GetNmeshVertices() const {return 0;} virtual Int_t GetNmeshVertices() const {return 0;}
char *GetPointerName() const; char *GetPointerName() const;
virtual Bool_t IsComposite() const {return kFALSE;} virtual Bool_t IsComposite() const {return kFALSE;}
virtual Bool_t IsCylType() const = 0; virtual Bool_t IsCylType() const = 0;
static Bool_t IsCloseToPhi(Double_t epsil, Double_t *point, Doub le_t c1, Double_t s1, Double_t c2, Double_t s2); static Bool_t IsCloseToPhi(Double_t epsil, Double_t *point, Doub le_t c1, Double_t s1, Double_t c2, Double_t s2);
static Bool_t IsCrossingSemiplane(Double_t *point, Double_t *dir , Double_t cphi, Double_t sphi, Double_t &snext, Double_t &rxy); static Bool_t IsCrossingSemiplane(Double_t *point, Double_t *dir , Double_t cphi, Double_t sphi, Double_t &snext, Double_t &rxy);
static Bool_t IsSameWithinTolerance(Double_t a, Double_t b);
static Bool_t IsSegCrossing(Double_t x1, Double_t y1, Double_t x 2, Double_t y2,Double_t x3, Double_t y3,Double_t x4, Double_t y4); static Bool_t IsSegCrossing(Double_t x1, Double_t y1, Double_t x 2, Double_t y2,Double_t x3, Double_t y3,Double_t x4, Double_t y4);
static Bool_t IsInPhiRange(Double_t *point, Double_t phi1, Doubl e_t phi2); static Bool_t IsInPhiRange(Double_t *point, Double_t phi1, Doubl e_t phi2);
virtual Bool_t IsReflected() const {return kFALSE;} virtual Bool_t IsReflected() const {return kFALSE;}
Bool_t IsRunTimeShape() const {return TestShapeBit(kGeoRu nTimeShape);} Bool_t IsRunTimeShape() const {return TestShapeBit(kGeoRu nTimeShape);}
Bool_t IsValid() const {return !TestShapeBit(kGeoInvalidS hape);} Bool_t IsValid() const {return !TestShapeBit(kGeoInvalidS hape);}
virtual Bool_t IsValidBox() const = 0; virtual Bool_t IsValidBox() const = 0;
virtual void InspectShape() const = 0; virtual void InspectShape() const = 0;
virtual TBuffer3D *MakeBuffer3D() const {return 0;} virtual TBuffer3D *MakeBuffer3D() const {return 0;}
static void NormalPhi(Double_t *point, Double_t *dir, Double_t *norm, Double_t c1, Double_t s1, Double_t c2, Double_t s2); static void NormalPhi(Double_t *point, Double_t *dir, Double_t *norm, Double_t c1, Double_t s1, Double_t c2, Double_t s2);
virtual void Paint(Option_t *option=""); virtual void Paint(Option_t *option="");
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TGeoVolume.h   TGeoVolume.h 
// @(#)root/geom:$Id: TGeoVolume.h 21494 2007-12-19 15:50:40Z brun $ // @(#)root/geom:$Id: TGeoVolume.h 27731 2009-03-09 17:40:56Z brun $
// Author: Andrei Gheata 30/05/02 // Author: Andrei Gheata 30/05/02
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
// Author : date : Wed 24 Oct 2001 01:39:36 PM CEST // Author : date : Wed 24 Oct 2001 01:39:36 PM CEST
skipping to change at line 207 skipping to change at line 207
void SetActivity(Bool_t flag=kTRUE) {TGeoAtt::SetActivity(fla g);} void SetActivity(Bool_t flag=kTRUE) {TGeoAtt::SetActivity(fla g);}
void SetActiveDaughters(Bool_t flag=kTRUE) {TGeoAtt::SetActiv eDaughters(flag);} void SetActiveDaughters(Bool_t flag=kTRUE) {TGeoAtt::SetActiv eDaughters(flag);}
void SetAsTopVolume(); // *TOGGLE* *GETTER=IsTopVolume void SetAsTopVolume(); // *TOGGLE* *GETTER=IsTopVolume
void SetAdded() {TObject::SetBit(kVolumeAdded);} void SetAdded() {TObject::SetBit(kVolumeAdded);}
void SetReplicated() {TObject::SetBit(kVolumeReplicated);} void SetReplicated() {TObject::SetBit(kVolumeReplicated);}
void SetCurrentPoint(Double_t x, Double_t y, Double_t z); void SetCurrentPoint(Double_t x, Double_t y, Double_t z);
void SetCylVoxels(Bool_t flag=kTRUE) {TObject::SetBit(kVoxels Cyl, flag); TObject::SetBit(kVoxelsXYZ, !flag);} void SetCylVoxels(Bool_t flag=kTRUE) {TObject::SetBit(kVoxels Cyl, flag); TObject::SetBit(kVoxelsXYZ, !flag);}
void SetNodes(TObjArray *nodes) {fNodes = nodes; TObject::Set Bit(kVolumeImportNodes);} void SetNodes(TObjArray *nodes) {fNodes = nodes; TObject::Set Bit(kVolumeImportNodes);}
void SetShape(const TGeoShape *shape); void SetShape(const TGeoShape *shape);
void SetTransparency(Char_t transparency=0) {if (fMedium) fMe dium->GetMaterial()->SetTransparency(transparency);} // *MENU* void SetTransparency(Char_t transparency=0) {if (fMedium) fMe dium->GetMaterial()->SetTransparency(transparency);} // *MENU*
void SetField(const TObject *field) {fField = (TObje ct*)field;} void SetField(TObject *field) {fField = field;}
void SetOption(const char *option); void SetOption(const char *option);
void SetAttVisibility(Bool_t vis) {TGeoAtt::SetVisibility(vis );} void SetAttVisibility(Bool_t vis) {TGeoAtt::SetVisibility(vis );}
virtual void SetVisibility(Bool_t vis=kTRUE); // *TOGGLE* *GETTER=IsV isible virtual void SetVisibility(Bool_t vis=kTRUE); // *TOGGLE* *GETTER=IsV isible
virtual void SetVisContainers(Bool_t flag=kTRUE); // *TOGGLE* *GETTER =IsVisContainers virtual void SetVisContainers(Bool_t flag=kTRUE); // *TOGGLE* *GETTER =IsVisContainers
virtual void SetVisLeaves(Bool_t flag=kTRUE); // *TOGGLE* *GETTER=IsV isLeaves virtual void SetVisLeaves(Bool_t flag=kTRUE); // *TOGGLE* *GETTER=IsV isLeaves
virtual void SetVisOnly(Bool_t flag=kTRUE); // *TOGGLE* *GETTER=IsVis Only virtual void SetVisOnly(Bool_t flag=kTRUE); // *TOGGLE* *GETTER=IsVis Only
virtual void SetLineColor(Color_t lcolor); virtual void SetLineColor(Color_t lcolor);
virtual void SetLineStyle(Style_t lstyle); virtual void SetLineStyle(Style_t lstyle);
virtual void SetLineWidth(Width_t lwidth); virtual void SetLineWidth(Width_t lwidth);
void SetInvisible() {SetVisibility(kFALSE);} void SetInvisible() {SetVisibility(kFALSE);}
virtual void SetMedium(const TGeoMedium *medium) {fMedium = (TGeoMedi virtual void SetMedium(TGeoMedium *medium) {fMedium = medium;}
um*)medium;} void SetVoxelFinder(TGeoVoxelFinder *finder) {fVoxels = finde
void SetVoxelFinder(const TGeoVoxelFinder *finder) {fVoxels=( r;}
TGeoVoxelFinder*)finder;} void SetFinder(TGeoPatternFinder *finder) {fFinder = finder;}
void SetFinder(const TGeoPatternFinder *finder) {fFinder=(TGe
oPatternFinder*)finder;}
void SetNumber(Int_t number) {fNumber = number;} void SetNumber(Int_t number) {fNumber = number;}
void SetNtotal(Int_t ntotal) {fNtotal = ntotal;} void SetNtotal(Int_t ntotal) {fNtotal = ntotal;}
void SortNodes(); void SortNodes();
void UnmarkSaved(); void UnmarkSaved();
Bool_t Valid() const; Bool_t Valid() const;
void VisibleDaughters(Bool_t vis=kTRUE); // *TOGGLE* *GETTER= IsVisibleDaughters void VisibleDaughters(Bool_t vis=kTRUE); // *TOGGLE* *GETTER= IsVisibleDaughters
void InvisibleAll(Bool_t flag=kTRUE); // *TOGGLE* *GETTER=IsA llInvisible void InvisibleAll(Bool_t flag=kTRUE); // *TOGGLE* *GETTER=IsA llInvisible
void Voxelize(Option_t *option); void Voxelize(Option_t *option);
Double_t Weight(Double_t precision=0.01, Option_t *option="va"); // *MENU* Double_t Weight(Double_t precision=0.01, Option_t *option="va"); // *MENU*
Double_t WeightA() const; Double_t WeightA() const;
skipping to change at line 260 skipping to change at line 260
Double_t fStart; // division start offset Double_t fStart; // division start offset
Double_t fStep; // division step Double_t fStep; // division step
Bool_t fAttSet; // flag attributes set Bool_t fAttSet; // flag attributes set
protected: protected:
TGeoVolumeMulti(const TGeoVolumeMulti&); TGeoVolumeMulti(const TGeoVolumeMulti&);
TGeoVolumeMulti& operator=(const TGeoVolumeMulti&); TGeoVolumeMulti& operator=(const TGeoVolumeMulti&);
public: public:
TGeoVolumeMulti(); TGeoVolumeMulti();
TGeoVolumeMulti(const char* name, const TGeoMedium *med=0); TGeoVolumeMulti(const char* name, TGeoMedium *med=0);
virtual ~TGeoVolumeMulti(); virtual ~TGeoVolumeMulti();
void AddVolume(TGeoVolume *vol); void AddVolume(TGeoVolume *vol);
TGeoVolume *GetVolume(Int_t id) const {return (TGeoVolume*)fVolumes- >At(id);} TGeoVolume *GetVolume(Int_t id) const {return (TGeoVolume*)fVolumes- >At(id);}
virtual void AddNode(const TGeoVolume *vol, Int_t copy_no, TGeoMatrix *mat, Option_t *option=""); // most general case virtual void AddNode(const TGeoVolume *vol, Int_t copy_no, TGeoMatrix *mat, Option_t *option=""); // most general case
virtual void AddNodeOverlap(const TGeoVolume *vol, Int_t copy_no, TGe oMatrix *mat, Option_t *option=""); virtual void AddNodeOverlap(const TGeoVolume *vol, Int_t copy_no, TGe oMatrix *mat, Option_t *option="");
virtual TGeoVolume *Divide(const char *divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step, Int_t numed=0, Option_t *option=""); virtual TGeoVolume *Divide(const char *divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step, Int_t numed=0, Option_t *option="");
TGeoShape *GetLastShape() const {return GetVolume(fVolumes->GetEntr iesFast()-1)->GetShape();} TGeoShape *GetLastShape() const {return GetVolume(fVolumes->GetEntr iesFast()-1)->GetShape();}
Int_t GetNvolumes() const {return fVolumes->GetEntriesFast();} Int_t GetNvolumes() const {return fVolumes->GetEntriesFast();}
Int_t GetAxis() const {return fNdiv;} Int_t GetAxis() const {return fNdiv;}
Int_t GetNdiv() const {return fNdiv;} Int_t GetNdiv() const {return fNdiv;}
Double_t GetStart() const {return fStart;} Double_t GetStart() const {return fStart;}
Double_t GetStep() const {return fStep;} Double_t GetStep() const {return fStep;}
virtual Bool_t IsVolumeMulti() const {return kTRUE;} virtual Bool_t IsVolumeMulti() const {return kTRUE;}
virtual TGeoVolume *MakeCopyVolume(TGeoShape *newshape); virtual TGeoVolume *MakeCopyVolume(TGeoShape *newshape);
virtual void SetLineColor(Color_t lcolor); virtual void SetLineColor(Color_t lcolor);
virtual void SetLineStyle(Style_t lstyle); virtual void SetLineStyle(Style_t lstyle);
virtual void SetLineWidth(Width_t lwidth); virtual void SetLineWidth(Width_t lwidth);
virtual void SetMedium(const TGeoMedium *medium); virtual void SetMedium(TGeoMedium *medium);
virtual void SetVisibility(Bool_t vis=kTRUE); virtual void SetVisibility(Bool_t vis=kTRUE);
ClassDef(TGeoVolumeMulti, 3) // class to handle multiple volumes in one step ClassDef(TGeoVolumeMulti, 3) // class to handle multiple volumes in one step
}; };
/////////////////////////////////////////////////////////////////////////// / /////////////////////////////////////////////////////////////////////////// /
// / / // / /
// TGeoVolumeAssembly - special assembly of volumes. The assembly has no / / // TGeoVolumeAssembly - special assembly of volumes. The assembly has no / /
// medium and its shape is the union of all component shapes / / // medium and its shape is the union of all component shapes / /
// / / // / /
 End of changes. 5 change blocks. 
10 lines changed or deleted 8 lines changed or added


 TGraph2D.h   TGraph2D.h 
skipping to change at line 147 skipping to change at line 147
virtual void SetHistogram(TH2 *h); virtual void SetHistogram(TH2 *h);
void SetMargin(Double_t m=0.1); // *MENU* void SetMargin(Double_t m=0.1); // *MENU*
void SetMarginBinsContent(Double_t z=0.); // *MENU* void SetMarginBinsContent(Double_t z=0.); // *MENU*
void SetMaximum(Double_t maximum=-1111); // *MENU* void SetMaximum(Double_t maximum=-1111); // *MENU*
void SetMinimum(Double_t minimum=-1111); // *MENU* void SetMinimum(Double_t minimum=-1111); // *MENU*
void SetMaxIter(Int_t n=100000) {fMaxIter = n;} // *MENU* void SetMaxIter(Int_t n=100000) {fMaxIter = n;} // *MENU*
virtual void SetName(const char *name); // *MENU* virtual void SetName(const char *name); // *MENU*
virtual void SetNameTitle(const char *name, const char *title); virtual void SetNameTitle(const char *name, const char *title);
void SetNpx(Int_t npx=40); // *MENU* void SetNpx(Int_t npx=40); // *MENU*
void SetNpy(Int_t npx=40); // *MENU* void SetNpy(Int_t npx=40); // *MENU*
void SetPoint(Int_t point, Double_t x, Double_t y, Double_t z); // *MENU* virtual void SetPoint(Int_t point, Double_t x, Double_t y, Double_t z); // *MENU*
virtual void SetTitle(const char *title=""); // *MENU* virtual void SetTitle(const char *title=""); // *MENU*
ClassDef(TGraph2D,1) //Set of n x[i],y[i],z[i] points with 3-d graphics including Delaunay triangulation ClassDef(TGraph2D,1) //Set of n x[i],y[i],z[i] points with 3-d graphics including Delaunay triangulation
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 TH1.h   TH1.h 
// @(#)root/hist:$Id: TH1.h 26511 2008-11-28 15:35:51Z moneta $ // @(#)root/hist:$Id: TH1.h 28080 2009-04-03 07:30:43Z brun $
// Author: Rene Brun 26/12/94 // Author: Rene Brun 26/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 185 skipping to change at line 185
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual TH1 *FFT(TH1* h_output, Option_t *option); virtual TH1 *FFT(TH1* h_output, Option_t *option);
virtual Int_t Fill(Double_t x); virtual Int_t Fill(Double_t x);
virtual Int_t Fill(Double_t x, Double_t w); virtual Int_t Fill(Double_t x, Double_t w);
virtual Int_t Fill(const char *name, Double_t w); virtual Int_t Fill(const char *name, Double_t w);
virtual void FillN(Int_t ntimes, const Double_t *x, const Double_t * w, Int_t stride=1); virtual void FillN(Int_t ntimes, const Double_t *x, const Double_t * w, Int_t stride=1);
virtual void FillN(Int_t, const Double_t *, const Double_t *, const Double_t *, Int_t) {;} virtual void FillN(Int_t, const Double_t *, const Double_t *, const Double_t *, Int_t) {;}
virtual void FillRandom(const char *fname, Int_t ntimes=5000); virtual void FillRandom(const char *fname, Int_t ntimes=5000);
virtual void FillRandom(TH1 *h, Int_t ntimes=5000); virtual void FillRandom(TH1 *h, Int_t ntimes=5000);
virtual Int_t FindBin(Double_t x, Double_t y=0, Double_t z=0); virtual Int_t FindBin(Double_t x, Double_t y=0, Double_t z=0);
virtual Int_t FindFirstBinAbove(Double_t threshold=0, Int_t axis=1) c
onst;
virtual Int_t FindLastBinAbove (Double_t threshold=0, Int_t axis=1) c
onst;
virtual TObject *FindObject(const char *name) const; virtual TObject *FindObject(const char *name) const;
virtual TObject *FindObject(const TObject *obj) const; virtual TObject *FindObject(const TObject *obj) const;
virtual Int_t Fit(const char *formula ,Option_t *option="" ,Option_t *goption="", Double_t xmin=0, Double_t xmax=0); // *MENU* virtual Int_t Fit(const char *formula ,Option_t *option="" ,Option_t *goption="", Double_t xmin=0, Double_t xmax=0); // *MENU*
virtual Int_t Fit(TF1 *f1 ,Option_t *option="" ,Option_t *goption="", Double_t xmin=0, Double_t xmax=0); virtual Int_t Fit(TF1 *f1 ,Option_t *option="" ,Option_t *goption="", Double_t xmin=0, Double_t xmax=0);
virtual void FitPanel(); // *MENU* virtual void FitPanel(); // *MENU*
TH1 *GetAsymmetry(TH1* h2, Double_t c2=1, Double_t dc2=0); TH1 *GetAsymmetry(TH1* h2, Double_t c2=1, Double_t dc2=0);
Int_t GetBufferLength() const {return fBuffer ? (Int_t)fBuffe r[0] : 0;} Int_t GetBufferLength() const {return fBuffer ? (Int_t)fBuffe r[0] : 0;}
Int_t GetBufferSize () const {return fBufferSize;} Int_t GetBufferSize () const {return fBufferSize;}
const Double_t *GetBuffer() const {return fBuffer;} const Double_t *GetBuffer() const {return fBuffer;}
static Int_t GetDefaultBufferSize(); static Int_t GetDefaultBufferSize();
skipping to change at line 277 skipping to change at line 279
TAxis *GetXaxis() const; TAxis *GetXaxis() const;
TAxis *GetYaxis() const; TAxis *GetYaxis() const;
TAxis *GetZaxis() const; TAxis *GetZaxis() const;
virtual Double_t Integral(Option_t *option="") const; virtual Double_t Integral(Option_t *option="") const;
virtual Double_t Integral(Int_t binx1, Int_t binx2, Option_t *option="") const; virtual Double_t Integral(Int_t binx1, Int_t binx2, Option_t *option="") const;
virtual Double_t Integral(Int_t, Int_t, Int_t, Int_t, Option_t * /*optio n*/ ="") const {return 0;} virtual Double_t Integral(Int_t, Int_t, Int_t, Int_t, Option_t * /*optio n*/ ="") const {return 0;}
virtual Double_t Integral(Int_t, Int_t, Int_t, Int_t, Int_t, Int_t, Opti on_t * /*option*/ ="" ) const {return 0;} virtual Double_t Integral(Int_t, Int_t, Int_t, Int_t, Int_t, Int_t, Opti on_t * /*option*/ ="" ) const {return 0;}
virtual Double_t Interpolate(Double_t x); virtual Double_t Interpolate(Double_t x);
virtual Double_t Interpolate(Double_t x, Double_t y); virtual Double_t Interpolate(Double_t x, Double_t y);
virtual Double_t Interpolate(Double_t x, Double_t y, Double_t z); virtual Double_t Interpolate(Double_t x, Double_t y, Double_t z);
Bool_t IsBinOverflow(Int_t bin) const;
Bool_t IsBinUnderflow(Int_t bin) const;
virtual Double_t KolmogorovTest(const TH1 *h2, Option_t *option="") cons t; virtual Double_t KolmogorovTest(const TH1 *h2, Option_t *option="") cons t;
virtual void LabelsDeflate(Option_t *axis="X"); virtual void LabelsDeflate(Option_t *axis="X");
virtual void LabelsInflate(Option_t *axis="X"); virtual void LabelsInflate(Option_t *axis="X");
virtual void LabelsOption(Option_t *option="h", Option_t *axis="X"); virtual void LabelsOption(Option_t *option="h", Option_t *axis="X");
virtual Long64_t Merge(TCollection *list); virtual Long64_t Merge(TCollection *list);
virtual void Multiply(TF1 *h1, Double_t c1=1); virtual void Multiply(TF1 *h1, Double_t c1=1);
virtual void Multiply(const TH1 *h1); virtual void Multiply(const TH1 *h1);
virtual void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, D ouble_t c2=1, Option_t *option=""); // *MENU* virtual void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, D ouble_t c2=1, Option_t *option=""); // *MENU*
virtual void Paint(Option_t *option=""); virtual void Paint(Option_t *option="");
virtual void Print(Option_t *option="") const; virtual void Print(Option_t *option="") const;
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added


 TH2.h   TH2.h 
// @(#)root/hist:$Id: TH2.h 27184 2009-01-19 16:14:21Z moneta $ // @(#)root/hist:$Id: TH2.h 28080 2009-04-03 07:30:43Z brun $
// Author: Rene Brun 26/12/94 // Author: Rene Brun 26/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 77 skipping to change at line 77
Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse
virtual Int_t Fill(Double_t x, Double_t y); virtual Int_t Fill(Double_t x, Double_t y);
virtual Int_t Fill(Double_t x, Double_t y, Double_t w); virtual Int_t Fill(Double_t x, Double_t y, Double_t w);
virtual Int_t Fill(Double_t x, const char *namey, Double_t w); virtual Int_t Fill(Double_t x, const char *namey, Double_t w);
virtual Int_t Fill(const char *namex, Double_t y, Double_t w); virtual Int_t Fill(const char *namex, Double_t y, Double_t w);
virtual Int_t Fill(const char *namex, const char *namey, Double_t w); virtual Int_t Fill(const char *namex, const char *namey, Double_t w);
virtual void FillN(Int_t, const Double_t *, const Double_t *, Int_t) {;} //MayNotUse virtual void FillN(Int_t, const Double_t *, const Double_t *, Int_t) {;} //MayNotUse
virtual void FillN(Int_t ntimes, const Double_t *x, const Double_t * y, const Double_t *w, Int_t stride=1); virtual void FillN(Int_t ntimes, const Double_t *x, const Double_t * y, const Double_t *w, Int_t stride=1);
virtual void FillRandom(const char *fname, Int_t ntimes=5000); virtual void FillRandom(const char *fname, Int_t ntimes=5000);
virtual void FillRandom(TH1 *h, Int_t ntimes=5000); virtual void FillRandom(TH1 *h, Int_t ntimes=5000);
virtual Int_t FindFirstBinAbove(Double_t threshold=0, Int_t axis=1) c
onst;
virtual Int_t FindLastBinAbove (Double_t threshold=0, Int_t axis=1) c
onst;
virtual void FitSlicesX(TF1 *f1=0,Int_t firstybin=0, Int_t lastybin= -1, Int_t cut=0, Option_t *option="QNR", TObjArray* arr = 0); // *MENU* virtual void FitSlicesX(TF1 *f1=0,Int_t firstybin=0, Int_t lastybin= -1, Int_t cut=0, Option_t *option="QNR", TObjArray* arr = 0); // *MENU*
virtual void FitSlicesY(TF1 *f1=0,Int_t firstxbin=0, Int_t lastxbin= -1, Int_t cut=0, Option_t *option="QNR", TObjArray* arr = 0); // *MENU* virtual void FitSlicesY(TF1 *f1=0,Int_t firstxbin=0, Int_t lastxbin= -1, Int_t cut=0, Option_t *option="QNR", TObjArray* arr = 0); // *MENU*
virtual Double_t GetBinWithContent2(Double_t c, Int_t &binx, Int_t &biny , Int_t firstxbin=1, Int_t lastxbin=-1,Int_t firstybin=1, Int_t lastybin=-1 , Double_t maxdiff=0) const; virtual Double_t GetBinWithContent2(Double_t c, Int_t &binx, Int_t &biny , Int_t firstxbin=1, Int_t lastxbin=-1,Int_t firstybin=1, Int_t lastybin=-1 , Double_t maxdiff=0) const;
virtual Double_t GetCorrelationFactor(Int_t axis1=1,Int_t axis2=2) const ; virtual Double_t GetCorrelationFactor(Int_t axis1=1,Int_t axis2=2) const ;
virtual Double_t GetCovariance(Int_t axis1=1,Int_t axis2=2) const; virtual Double_t GetCovariance(Int_t axis1=1,Int_t axis2=2) const;
virtual void GetRandom2(Double_t &x, Double_t &y); virtual void GetRandom2(Double_t &x, Double_t &y);
virtual void GetStats(Double_t *stats) const; virtual void GetStats(Double_t *stats) const;
virtual Double_t Integral(Option_t *option="") const; virtual Double_t Integral(Option_t *option="") const;
virtual Double_t Integral(Int_t, Int_t, Option_t * ="") const {return 0; } virtual Double_t Integral(Int_t, Int_t, Option_t * ="") const {return 0; }
virtual Double_t Integral(Int_t firstxbin, Int_t lastxbin, Int_t firstyb in, Int_t lastybin, Option_t *option="") const; virtual Double_t Integral(Int_t firstxbin, Int_t lastxbin, Int_t firstyb in, Int_t lastybin, Option_t *option="") const;
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 TH3.h   TH3.h 
// @(#)root/hist:$Id: TH3.h 27184 2009-01-19 16:14:21Z moneta $ // @(#)root/hist:$Id: TH3.h 28080 2009-04-03 07:30:43Z brun $
// Author: Rene Brun 27/10/95 // Author: Rene Brun 27/10/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 58 skipping to change at line 58
TH3(const char *name,const char *title,Int_t nbinsx,const Float_t *xbins TH3(const char *name,const char *title,Int_t nbinsx,const Float_t *xbins
,Int_t nbinsy,const Float_t *ybins ,Int_t nbinsy,const Float_t *ybins
,Int_t nbinsz,const Float_t *zbins ); ,Int_t nbinsz,const Float_t *zbins );
TH3(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s TH3(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s
,Int_t nbinsy,const Double_t *ybin s ,Int_t nbinsy,const Double_t *ybin s
,Int_t nbinsz,const Double_t *zbin s); ,Int_t nbinsz,const Double_t *zbin s);
virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se
virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} / /may not use virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} / /may not use
virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t w); virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t w);
void DoFillProfileProjection(TProfile2D * p2, const TAxis & a1, const TA
xis & a2, const TAxis & a3, Int_t bin1, Int_t bin2, Int_t bin3, Int_t inBin
, Bool_t useWeights) const;
public: public:
TH3(const TH3&); TH3(const TH3&);
virtual ~TH3(); virtual ~TH3();
virtual Int_t BufferEmpty(Int_t action=0); virtual Int_t BufferEmpty(Int_t action=0);
virtual void Copy(TObject &hnew) const; virtual void Copy(TObject &hnew) const;
Int_t Fill(Double_t) {return -1;} //MayNotUse Int_t Fill(Double_t) {return -1;} //MayNotUse
Int_t Fill(Double_t,Double_t) {return -1;} //MayNotUse Int_t Fill(Double_t,Double_t) {return -1;} //MayNotUse
Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse
Int_t Fill(Double_t,const char*,Double_t) {return -1;} //MayN otUse Int_t Fill(Double_t,const char*,Double_t) {return -1;} //MayN otUse
Int_t Fill(const char*,Double_t,Double_t) {return -1;} //MayN otUse Int_t Fill(const char*,Double_t,Double_t) {return -1;} //MayN otUse
skipping to change at line 81 skipping to change at line 83
virtual Int_t Fill(const char *namex, const char *namey, const char * namez, Double_t w); virtual Int_t Fill(const char *namex, const char *namey, const char * namez, Double_t w);
virtual Int_t Fill(const char *namex, Double_t y, const char *namez, Double_t w); virtual Int_t Fill(const char *namex, Double_t y, const char *namez, Double_t w);
virtual Int_t Fill(const char *namex, const char *namey, Double_t z, Double_t w); virtual Int_t Fill(const char *namex, const char *namey, Double_t z, Double_t w);
virtual Int_t Fill(Double_t x, const char *namey, const char *namez, Double_t w); virtual Int_t Fill(Double_t x, const char *namey, const char *namez, Double_t w);
virtual Int_t Fill(Double_t x, const char *namey, Double_t z, Double_ t w); virtual Int_t Fill(Double_t x, const char *namey, Double_t z, Double_ t w);
virtual Int_t Fill(Double_t x, Double_t y, const char *namez, Double_ t w); virtual Int_t Fill(Double_t x, Double_t y, const char *namez, Double_ t w);
virtual void FillRandom(const char *fname, Int_t ntimes=5000); virtual void FillRandom(const char *fname, Int_t ntimes=5000);
virtual void FillRandom(TH1 *h, Int_t ntimes=5000); virtual void FillRandom(TH1 *h, Int_t ntimes=5000);
virtual Int_t FindFirstBinAbove(Double_t threshold=0, Int_t axis=1) c
onst;
virtual Int_t FindLastBinAbove (Double_t threshold=0, Int_t axis=1) c
onst;
virtual void FitSlicesZ(TF1 *f1=0,Int_t binminx=1, Int_t binmaxx=0,I nt_t binminy=1, Int_t binmaxy=0, virtual void FitSlicesZ(TF1 *f1=0,Int_t binminx=1, Int_t binmaxx=0,I nt_t binminy=1, Int_t binmaxy=0,
Int_t cut=0 ,Option_t *option="QNR" ); // *MENU* Int_t cut=0 ,Option_t *option="QNR" ); // *MENU*
virtual Double_t GetBinWithContent3(Double_t c, Int_t &binx, Int_t &biny , Int_t &binz, Int_t firstx=0, Int_t lastx=0,Int_t firsty=0, Int_t lasty=0, Int_t firstz=0, Int_t lastz=0, Double_t maxdiff=0) const; virtual Double_t GetBinWithContent3(Double_t c, Int_t &binx, Int_t &biny , Int_t &binz, Int_t firstx=0, Int_t lastx=0,Int_t firsty=0, Int_t lasty=0, Int_t firstz=0, Int_t lastz=0, Double_t maxdiff=0) const;
virtual Double_t GetCorrelationFactor(Int_t axis1=1,Int_t axis2=2) const ; virtual Double_t GetCorrelationFactor(Int_t axis1=1,Int_t axis2=2) const ;
virtual Double_t GetCovariance(Int_t axis1=1,Int_t axis2=2) const; virtual Double_t GetCovariance(Int_t axis1=1,Int_t axis2=2) const;
virtual void GetRandom3(Double_t &x, Double_t &y, Double_t &z); virtual void GetRandom3(Double_t &x, Double_t &y, Double_t &z);
virtual void GetStats(Double_t *stats) const; virtual void GetStats(Double_t *stats) const;
virtual Double_t Integral(Option_t *option="") const; virtual Double_t Integral(Option_t *option="") const;
virtual Double_t Integral(Int_t, Int_t, Option_t * ="") const {return 0; } virtual Double_t Integral(Int_t, Int_t, Option_t * ="") const {return 0; }
virtual Double_t Integral(Int_t, Int_t, Int_t, Int_t, Option_t * ="") co nst {return 0;} virtual Double_t Integral(Int_t, Int_t, Int_t, Int_t, Option_t * ="") co nst {return 0;}
 End of changes. 3 change blocks. 
1 lines changed or deleted 9 lines changed or added


 THashList.h   THashList.h 
// @(#)root/cont:$Id: THashList.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/cont:$Id: THashList.h 27904 2009-03-20 19:44:39Z pcanal $
// Author: Fons Rademakers 10/08/95 // Author: Fons Rademakers 10/08/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 54 skipping to change at line 54
THashList(Int_t capacity=TCollection::kInitHashTableCapacity, Int_t reha sh=0); THashList(Int_t capacity=TCollection::kInitHashTableCapacity, Int_t reha sh=0);
THashList(TObject *parent, Int_t capacity=TCollection::kInitHashTableCap acity, Int_t rehash=0); THashList(TObject *parent, Int_t capacity=TCollection::kInitHashTableCap acity, Int_t rehash=0);
virtual ~THashList(); virtual ~THashList();
Float_t AverageCollisions() const; Float_t AverageCollisions() const;
void Clear(Option_t *option=""); void Clear(Option_t *option="");
void Delete(Option_t *option=""); void Delete(Option_t *option="");
TObject *FindObject(const char *name) const; TObject *FindObject(const char *name) const;
TObject *FindObject(const TObject *obj) const; TObject *FindObject(const TObject *obj) const;
TList *GetListForObject(const char *name) const;
TList *GetListForObject(const TObject *obj) const;
void AddFirst(TObject *obj); void AddFirst(TObject *obj);
void AddFirst(TObject *obj, Option_t *opt); void AddFirst(TObject *obj, Option_t *opt);
void AddLast(TObject *obj); void AddLast(TObject *obj);
void AddLast(TObject *obj, Option_t *opt); void AddLast(TObject *obj, Option_t *opt);
void AddAt(TObject *obj, Int_t idx); void AddAt(TObject *obj, Int_t idx);
void AddAfter(const TObject *after, TObject *obj); void AddAfter(const TObject *after, TObject *obj);
void AddAfter(TObjLink *after, TObject *obj); void AddAfter(TObjLink *after, TObject *obj);
void AddBefore(const TObject *before, TObject *obj); void AddBefore(const TObject *before, TObject *obj);
void AddBefore(TObjLink *before, TObject *obj); void AddBefore(TObjLink *before, TObject *obj);
void RecursiveRemove(TObject *obj); void RecursiveRemove(TObject *obj);
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 THnSparse.h   THnSparse.h 
// @(#)root/hist:$Id: THnSparse.h 27184 2009-01-19 16:14:21Z moneta $ // @(#)root/hist:$Id: THnSparse.h 28292 2009-04-20 15:27:12Z moneta $
// Author: Axel Naumann (2007-09-11) // Author: Axel Naumann (2007-09-11)
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 153 skipping to change at line 153
if (GetCalculateErrors()) { if (GetCalculateErrors()) {
fTsumw += w; fTsumw += w;
fTsumw2 += w*w; fTsumw2 += w*w;
} }
fIntegralStatus = kInvalidInt; fIntegralStatus = kInvalidInt;
THnSparseArrayChunk* chunk = GetChunk(bin / fChunkSize); THnSparseArrayChunk* chunk = GetChunk(bin / fChunkSize);
chunk->AddBinContent(bin % fChunkSize, w); chunk->AddBinContent(bin % fChunkSize, w);
return bin; return bin;
} }
THnSparse* CloneEmpty(const char* name, const char* title, THnSparse* CloneEmpty(const char* name, const char* title,
const TObjArray* axes, Int_t chunksize) const; const TObjArray* axes, Int_t chunksize,
Bool_t keepTargetAxis) const;
Bool_t CheckConsistency(const THnSparse *h, const char *tag) const; Bool_t CheckConsistency(const THnSparse *h, const char *tag) const;
Bool_t IsInRange(Int_t *coord) const; Bool_t IsInRange(Int_t *coord) const;
TH1* CreateHist(const char* name, const char* title, TH1* CreateHist(const char* name, const char* title,
const TObjArray* axes) const; const TObjArray* axes, Bool_t keepTargetAxis) const;
TObject* ProjectionAny(Int_t ndim, const Int_t* dim, TObject* ProjectionAny(Int_t ndim, const Int_t* dim,
Bool_t wantSparse, Option_t* option = "") const; Bool_t wantSparse, Option_t* option = "") const;
public: public:
virtual ~THnSparse(); virtual ~THnSparse();
Int_t GetNChunks() const { return fBinContent.GetEntriesFast(); } Int_t GetNChunks() const { return fBinContent.GetEntriesFast(); }
TObjArray* GetListOfAxes() { return &fAxes; } TObjArray* GetListOfAxes() { return &fAxes; }
TAxis* GetAxis(Int_t dim) const { return (TAxis*)fAxes[dim]; } TAxis* GetAxis(Int_t dim) const { return (TAxis*)fAxes[dim]; }
 End of changes. 3 change blocks. 
3 lines changed or deleted 4 lines changed or added


 THtml.h   THtml.h 
// @(#)root/html:$Id: THtml.h 27453 2009-02-15 11:38:11Z axel $ // @(#)root/html:$Id: THtml.h 27910 2009-03-21 17:26:55Z axel $
// Author: Nenad Buncic 18/10/95 // Author: Nenad Buncic 18/10/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 58 skipping to change at line 58
public: public:
THelperBase(): fHtml(0) {} THelperBase(): fHtml(0) {}
virtual ~THelperBase(); virtual ~THelperBase();
void SetOwner(THtml* html); void SetOwner(THtml* html);
THtml* GetOwner() const { return fHtml; } THtml* GetOwner() const { return fHtml; }
private: private:
THtml* fHtml; // object owning the helper THtml* fHtml; // object owning the helper
ClassDef(THelperBase, 0); // a helper object's base class ClassDef(THelperBase, 0); // a helper object's base class
}; };
class TFileSysEntry;
//______________________________________________________________ //______________________________________________________________
// Helper class to translate between classes and their // Helper class to translate between classes and their
// modules. Can be derived from and thus replaced by // modules. Can be derived from and thus replaced by
// the user; see THtml::SetModuleDefinition(). // the user; see THtml::SetModuleDefinition().
class TModuleDefinition: public THelperBase { class TModuleDefinition: public THelperBase {
public: public:
virtual bool GetModule(TClass* cl, TString& out_modulename) const; virtual bool GetModule(TClass* cl, TFileSysEntry* fse, TString& out_m odulename) const;
ClassDef(TModuleDefinition, 0); // helper class to determine a class' s module ClassDef(TModuleDefinition, 0); // helper class to determine a class' s module
}; };
//______________________________________________________________ //______________________________________________________________
// Helper class to translate between classes and their // Helper class to translate between classes and their
// filenames. Can be derived from and thus replaced by // filenames. Can be derived from and thus replaced by
// the user; see THtml::SetFileDefinition(). // the user; see THtml::SetFileDefinition().
class TFileDefinition: public THelperBase { class TFileDefinition: public THelperBase {
public: public:
virtual bool GetDeclFileName(const TClass* cl, TString& out_filename, virtual bool GetDeclFileName(const TClass* cl, TString& out_filename,
TString& out_fsys) const; TString& out_fsys,
virtual bool GetImplFileName(const TClass* cl, TString& out_filename, TFileSysEntry** fse = 0) const;
TString& out_fsys) const; virtual bool GetImplFileName(const TClass* cl, TString& out_filename,
TString& out_fsys,
TFileSysEntry** fse = 0) const;
protected: protected:
virtual bool GetFileName(const TClass* cl, bool decl, TString& out_fi virtual bool GetFileName(const TClass* cl, bool decl, TString& out_fi
lename, TString& out_fsys) const; lename, TString& out_fsys,
TFileSysEntry** fse = 0) const;
TString MatchFileSysName(TString& filename, TFileSysEntry** fse = 0)
const;
void SplitClassIntoDirFile(const TString& clname, TString& dir, TStri ng& filename) const; void SplitClassIntoDirFile(const TString& clname, TString& dir, TStri ng& filename) const;
void NormalizePath(TString& path) const;
void ExpandSearchPath(TString& path) const; void ExpandSearchPath(TString& path) const;
ClassDef(TFileDefinition, 0); // helper class to determine a class's source files ClassDef(TFileDefinition, 0); // helper class to determine a class's source files
}; };
//______________________________________________________________ //______________________________________________________________
// Helper class to translate between file names and their // Helper class to translate between file names and their
// version used for documentation. Can be derived from and thus // version used for documentation. Can be derived from and thus
// replaced by the user; see THtml::SetPathDefinition(). // replaced by the user; see THtml::SetPathDefinition().
class TPathDefinition: public THelperBase { class TPathDefinition: public THelperBase {
public: public:
skipping to change at line 111 skipping to change at line 118
// Utility class representing a directory entry // Utility class representing a directory entry
class TFileSysEntry: public TObject { class TFileSysEntry: public TObject {
public: public:
TFileSysEntry(const char* name, TFileSysDir* parent): TFileSysEntry(const char* name, TFileSysDir* parent):
fName(name), fParent(parent), fLevel(parent ? parent->GetLevel() + 1 : 0) {} fName(name), fParent(parent), fLevel(parent ? parent->GetLevel() + 1 : 0) {}
const char* GetName() const { return fName; } const char* GetName() const { return fName; }
virtual ULong_t Hash() const { return fName.Hash(); } virtual ULong_t Hash() const { return fName.Hash(); }
virtual void GetFullName(TString& fullname, Bool_t asIncluded) const { virtual void GetFullName(TString& fullname, Bool_t asIncluded) const {
if (fParent) { if (fParent) {
fParent->GetFullName(fullname, asIncluded); fParent->GetFullName(fullname, asIncluded);
fullname += "/"; if (fullname[0])
fullname += "/";
} else } else
fullname = ""; fullname = "";
fullname += fName; fullname += fName;
} }
TFileSysDir* GetParent() const { return fParent; } TFileSysDir* GetParent() const { return fParent; }
Int_t GetLevel() const { return fLevel; } Int_t GetLevel() const { return fLevel; }
protected: protected:
TString fName; // name of the element TString fName; // name of the element
TFileSysDir* fParent; // parent directory TFileSysDir* fParent; // parent directory
skipping to change at line 167 skipping to change at line 175
} }
ClassDef(TFileSysRoot, 0); // an root directory of the local file sys tem ClassDef(TFileSysRoot, 0); // an root directory of the local file sys tem
}; };
//______________________________________________________________ //______________________________________________________________
// Utility class representing a directory // Utility class representing a directory
class TFileSysDB: public TFileSysDir { class TFileSysDB: public TFileSysDir {
public: public:
TFileSysDB(const char* path, const char* ignore, Int_t maxdirlevel): TFileSysDB(const char* path, const char* ignore, Int_t maxdirlevel):
TFileSysDir(path, 0), fIgnorePath(ignore), fMaxLevel(maxdirlevel) TFileSysDir(path, 0), fEntries(1009, 5), fIgnorePath(ignore), fMax Level(maxdirlevel)
{ Fill(); } { Fill(); }
TExMap& GetMapIno() { return fMapIno; } TExMap& GetMapIno() { return fMapIno; }
THashTable& GetEntries() { return fEntries; } THashTable& GetEntries() { return fEntries; }
const TString& GetIgnore() const { return fIgnorePath; } const TString& GetIgnore() const { return fIgnorePath; }
Int_t GetMaxLevel() const { return fMaxLevel; } Int_t GetMaxLevel() const { return fMaxLevel; }
protected: protected:
void Fill(); void Fill();
skipping to change at line 254 skipping to change at line 262
void MakeTree(const char *className, Bool_t force=kFALSE); void MakeTree(const char *className, Bool_t force=kFALSE);
// Configuration setters // Configuration setters
void SetModuleDefinition(const TModuleDefinition& md); void SetModuleDefinition(const TModuleDefinition& md);
void SetFileDefinition(const TFileDefinition& fd); void SetFileDefinition(const TFileDefinition& fd);
void SetPathDefinition(const TPathDefinition& pd); void SetPathDefinition(const TPathDefinition& pd);
void SetProductName(const char* product) { fProductName = produ ct; } void SetProductName(const char* product) { fProductName = produ ct; }
void SetOutputDir(const char *dir); void SetOutputDir(const char *dir);
void SetInputDir(const char *dir); void SetInputDir(const char *dir);
void SetSourceDir(const char *dir) { SetInputDir(dir); } void SetSourceDir(const char *dir) { SetInputDir(dir); }
void SetIncludePath(const char* dir) { fPathInfo.fIncludePath = dir; }
void SetEtcDir(const char* dir) { fPathInfo.fEtcDir = dir; } void SetEtcDir(const char* dir) { fPathInfo.fEtcDir = dir; }
void SetDocPath(const char* path) { fPathInfo.fDocPath = path; } void SetDocPath(const char* path) { fPathInfo.fDocPath = path; }
void SetDotDir(const char* dir) { fPathInfo.fDotDir = dir; fPat hInfo.fFoundDot = PathInfo_t::kDotUnknown; } void SetDotDir(const char* dir) { fPathInfo.fDotDir = dir; fPat hInfo.fFoundDot = PathInfo_t::kDotUnknown; }
void SetRootURL(const char* url) { fLinkInfo.fROOTURL = url; } void SetRootURL(const char* url) { fLinkInfo.fROOTURL = url; }
void SetLibURL(const char* lib, const char* url) { fLinkInfo.fL ibURLs[lib] = url; } void SetLibURL(const char* lib, const char* url) { fLinkInfo.fL ibURLs[lib] = url; }
void SetXwho(const char *xwho) { fLinkInfo.fXwho = xwho; } void SetXwho(const char *xwho) { fLinkInfo.fXwho = xwho; }
void SetMacroPath(const char* path) {fPathInfo.fMacroPath = pat h;} void SetMacroPath(const char* path) {fPathInfo.fMacroPath = pat h;}
void AddMacroPath(const char* path); void AddMacroPath(const char* path);
void SetCounterFormat(const char* format) { fCounterFormat = fo rmat; } void SetCounterFormat(const char* format) { fCounterFormat = fo rmat; }
void SetClassDocTag(const char* tag) { fDocSyntax.fClassDocTag = tag; } void SetClassDocTag(const char* tag) { fDocSyntax.fClassDocTag = tag; }
skipping to change at line 309 skipping to change at line 318
const TString& GetSearchEngine() const { return fLinkInfo.fSearchEn gine; } const TString& GetSearchEngine() const { return fLinkInfo.fSearchEn gine; }
const TString& GetViewCVS() const { return fLinkInfo.fViewCVS; } const TString& GetViewCVS() const { return fLinkInfo.fViewCVS; }
const TString& GetWikiURL() const { return fLinkInfo.fWikiURL; } const TString& GetWikiURL() const { return fLinkInfo.fWikiURL; }
const TString& GetCharset() const { return fOutputStyle.fCharset; } const TString& GetCharset() const { return fOutputStyle.fCharset; }
const TString& GetDocStyle() const { return fDocSyntax.fDocStyle; } const TString& GetDocStyle() const { return fDocSyntax.fDocStyle; }
// Functions that should only be used by TDocOutput etc. // Functions that should only be used by TDocOutput etc.
Bool_t CopyFileFromEtcDir(const char* filename) const; Bool_t CopyFileFromEtcDir(const char* filename) const;
virtual void CreateAuxiliaryFiles() const; virtual void CreateAuxiliaryFiles() const;
virtual TClass* GetClass(const char *name) const; virtual TClass* GetClass(const char *name) const;
const char* ShortType(const char *name) const;
const char* GetCounter() const { return fCounter; } const char* GetCounter() const { return fCounter; }
void GetModuleMacroPath(const TString& module, TString& o ut_path) const { GetPathDefinition().GetMacroPath(module, out_path); } void GetModuleMacroPath(const TString& module, TString& o ut_path) const { GetPathDefinition().GetMacroPath(module, out_path); }
virtual bool GetDeclFileName(TClass* cl, Bool_t filesys, TString& out_name) const; virtual bool GetDeclFileName(TClass* cl, Bool_t filesys, TString& out_name) const;
void GetDerivedClasses(TClass* cl, std::map<TClass*, Int_ t>& derived) const; void GetDerivedClasses(TClass* cl, std::map<TClass*, Int_ t>& derived) const;
static const char* GetDirDelimiter() { static const char* GetDirDelimiter() {
// ";" on windows, ":" everywhere else // ";" on windows, ":" everywhere else
#ifdef R__WIN32 #ifdef R__WIN32
return ";"; return ";";
#else #else
return ":"; return ":";
skipping to change at line 373 skipping to change at line 383
TString fWikiURL; // URL stem of class's wiki page, %c replaced by mangled class name (no %c: appended) TString fWikiURL; // URL stem of class's wiki page, %c replaced by mangled class name (no %c: appended)
}; };
struct OutputStyle_t { struct OutputStyle_t {
TString fHeader; // header file name TString fHeader; // header file name
TString fFooter; // footerer file name TString fFooter; // footerer file name
TString fCharset; // Charset for doc pages TString fCharset; // Charset for doc pages
}; };
struct DocEntityInfo_t { struct DocEntityInfo_t {
DocEntityInfo_t(): fClasses(503, 3) {}
TString fClassFilter; // filter used for buidling known cl asses TString fClassFilter; // filter used for buidling known cl asses
THashList fClasses; // known classes THashList fClasses; // known classes
mutable THashList fShortClassNames; // class names with default templ ate args replaced
THashList fModules; // known modules THashList fModules; // known modules
THashList fLibDeps; // Library dependencies THashList fLibDeps; // Library dependencies
}; };
protected: protected:
virtual void CreateJavascript() const; virtual void CreateJavascript() const;
virtual void CreateStyleSheet() const; virtual void CreateStyleSheet() const;
void CreateListOfTypes(); void CreateListOfTypes();
void CreateListOfClasses(const char* filter); void CreateListOfClasses(const char* filter);
virtual bool GetDeclImplFileName(TClass* cl, bool filesys, bool decl, TString& out_name) const; virtual bool GetDeclImplFileName(TClass* cl, bool filesys, bool decl, TString& out_name) const;
 End of changes. 12 change blocks. 
10 lines changed or deleted 23 lines changed or added


 TIndexTable.h   TIndexTable.h 
// @(#)root/table:$Id: TIndexTable.h 27157 2009-01-15 14:05:12Z brun $ // @(#)root/table:$Id: TIndexTable.h 27656 2009-02-28 02:49:41Z pcanal $
// Author: Valery Fine(fine@bnl.gov) 01/03/2001 // Author: Valery Fine(fine@bnl.gov) 01/03/2001
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2001 [BNL] Brookhaven National Laboratory. * * Copyright (C) 2001 [BNL] Brookhaven National Laboratory. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 34 skipping to change at line 34
// //
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
class TIndexTable : public TTable { class TIndexTable : public TTable {
protected: protected:
const TTable *fRefTable; const TTable *fRefTable;
public: public:
class iterator { class iterator {
protected: protected:
const TTable *fTable; const TTable *fTable;
int *fCurrentRow; const int *fCurrentRow;
iterator(): fTable(0), fCurrentRow(0) {} iterator(): fTable(0), fCurrentRow(0) {}
public: public:
iterator(const TTable &t, int &rowPtr): fTable(&t), fCurrentRow(&rowP tr){} iterator(const TTable &t, const int &rowPtr): fTable(&t), fCurrentRow (&rowPtr){}
iterator(const TTable &t): fTable(&t),fCurrentRow(0){} iterator(const TTable &t): fTable(&t),fCurrentRow(0){}
iterator(const iterator& iter) : fTable(iter.fTable), fCurrentRow(ite r.fCurrentRow){} iterator(const iterator& iter) : fTable(iter.fTable), fCurrentRow(ite r.fCurrentRow){}
iterator &operator=(const iterator& iter) {fTable = iter.fTable; fCur rentRow = iter.fCurrentRow; return *this;} iterator &operator=(const iterator& iter) {fTable = iter.fTable; fCur rentRow = iter.fCurrentRow; return *this;}
iterator &operator++() { if (fCurrentRow) ++fCurrentRow; return *t his;} iterator &operator++() { if (fCurrentRow) ++fCurrentRow; return *t his;}
void operator++(int) { if (fCurrentRow) fCurrentRow++;} void operator++(int) { if (fCurrentRow) fCurrentRow++;}
iterator &operator--() { if (fCurrentRow) --fCurrentRow; return *t his;} iterator &operator--() { if (fCurrentRow) --fCurrentRow; return *t his;}
void operator--(int) { if (fCurrentRow) fCurrentRow--;} void operator--(int) { if (fCurrentRow) fCurrentRow--;}
iterator &operator+(Int_t idx) { if (fCurrentRow) fCurrentRow+=idx; r eturn *this;} iterator &operator+(Int_t idx) { if (fCurrentRow) fCurrentRow+=idx; r eturn *this;}
iterator &operator-(Int_t idx) { if (fCurrentRow) fCurrentRow-=idx; r eturn *this;} iterator &operator-(Int_t idx) { if (fCurrentRow) fCurrentRow-=idx; r eturn *this;}
Int_t operator-(const iterator &it) const { return (fCurrentRow-it.fC urrentRow)/sizeof(int); } Int_t operator-(const iterator &it) const { return (fCurrentRow-it.fC urrentRow)/sizeof(int); }
skipping to change at line 61 skipping to change at line 61
Bool_t operator!=(const iterator &t) const { return !operator==(t); } Bool_t operator!=(const iterator &t) const { return !operator==(t); }
}; };
TIndexTable(const TTable *table); TIndexTable(const TTable *table);
TIndexTable(const TIndexTable &indx): TTable(indx){} TIndexTable(const TIndexTable &indx): TTable(indx){}
int *GetTable(Int_t i=0); int *GetTable(Int_t i=0);
Bool_t IsValid() const; Bool_t IsValid() const;
void push_back(Long_t next); void push_back(Long_t next);
const TTable *Table() const; const TTable *Table() const;
iterator begin() { return ((const TIndexTable *)this)->begin();} iterator begin() { return ((const TIndexTable *)this)->begin();}
iterator begin() const { return GetNRows() ? iterator(*Table(),*(int *) GetTable(0)):end();} iterator begin() const { return GetNRows() ? iterator(*Table(),*GetTabl e(0)):end();}
iterator end() { return ((const TIndexTable *)this)->end(); } iterator end() { return ((const TIndexTable *)this)->end(); }
iterator end() const {Long_t i = GetNRows(); return i? iterator(*Tabl e(), *(int *)GetTable(i)):iterator(*this);} iterator end() const {Long_t i = GetNRows(); return i? iterator(*Tabl e(), *GetTable(i)):iterator(*this);}
protected: protected:
static TTableDescriptor *CreateDescriptor(); static TTableDescriptor *CreateDescriptor();
// define ClassDefTable(TIndexTable,int) // define ClassDefTable(TIndexTable,int)
protected: protected:
static TTableDescriptor *fgColDescriptors; static TTableDescriptor *fgColDescriptors;
virtual TTableDescriptor *GetDescriptorPointer() const; virtual TTableDescriptor *GetDescriptorPointer() const;
virtual void SetDescriptorPointer(TTableDescriptor *list); virtual void SetDescriptorPointer(TTableDescriptor *list);
public: public:
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 TMD5.h   TMD5.h 
// @(#)root/base:$Id: TMD5.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TMD5.h 27658 2009-02-28 05:34:57Z pcanal $
// Author: Fons Rademakers 29/9/2001 // Author: Fons Rademakers 29/9/2001
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 86 skipping to change at line 86
static TMD5 *FileChecksum(const char *file); static TMD5 *FileChecksum(const char *file);
static Int_t FileChecksum(const char *file, UChar_t digest[16]); static Int_t FileChecksum(const char *file, UChar_t digest[16]);
ClassDef(TMD5,1) // MD5 cryptographic hash functions with a 128 bit out put ClassDef(TMD5,1) // MD5 cryptographic hash functions with a 128 bit out put
}; };
inline TBuffer &operator>>(TBuffer &buf, TMD5 &md5) inline TBuffer &operator>>(TBuffer &buf, TMD5 &md5)
{ md5.Streamer(buf); return buf; } { md5.Streamer(buf); return buf; }
inline TBuffer &operator<<(TBuffer &buf, const TMD5 &md5) // Not inlined in order to avoid const casted away warning in user code.
{ ((TMD5&)md5).Streamer(buf); return buf; } TBuffer &operator<<(TBuffer &buf, const TMD5 &md5);
inline Bool_t operator!=(const TMD5 &m1, const TMD5 &m2) inline Bool_t operator!=(const TMD5 &m1, const TMD5 &m2)
{ return !(m1 == m2); } { return !(m1 == m2); }
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TMath.h   TMath.h 
// @(#)root/mathcore:$Id: TMath.h 26030 2008-10-31 10:57:57Z moneta $ // @(#)root/mathcore:$Id: TMath.h 28094 2009-04-03 14:10:51Z moneta $
// Authors: Rene Brun, Anna Kreshuk, Eddy Offermann, Fons Rademakers 29/0 7/95 // Authors: Rene Brun, Anna Kreshuk, Eddy Offermann, Fons Rademakers 29/0 7/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 548 skipping to change at line 548
// If more than one element is maximum returns first found. // If more than one element is maximum returns first found.
return std::max_element(first, last); return std::max_element(first, last);
} }
template<typename T> template<typename T>
struct CompareDesc { struct CompareDesc {
CompareDesc(T d) : fData(d) {} CompareDesc(T d) : fData(d) {}
bool operator()(int i1, int i2) { template<typename Index>
bool operator()(Index i1, Index i2) {
return *(fData + i1) > *(fData + i2); return *(fData + i1) > *(fData + i2);
} }
T fData; T fData;
}; };
template<typename T> template<typename T>
struct CompareAsc { struct CompareAsc {
CompareAsc(T d) : fData(d) {} CompareAsc(T d) : fData(d) {}
bool operator()(int i1, int i2) { template<typename Index>
bool operator()(Index i1, Index i2) {
return *(fData + i1) < *(fData + i2); return *(fData + i1) < *(fData + i2);
} }
T fData; T fData;
}; };
template <typename Iterator> template <typename Iterator>
Double_t TMath::Mean(Iterator first, Iterator last) Double_t TMath::Mean(Iterator first, Iterator last)
{ {
// Return the weighted mean of an array defined by the iterators. // Return the weighted mean of an array defined by the iterators.
 End of changes. 3 change blocks. 
3 lines changed or deleted 5 lines changed or added


 TMatrixT.h   TMatrixT.h 
// @(#)root/matrix:$Id: TMatrixT.h 25863 2008-10-17 18:53:10Z brun $ // @(#)root/matrix:$Id: TMatrixT.h 27658 2009-02-28 05:34:57Z pcanal $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TMatrixT #ifndef ROOT_TMatrixT
#define ROOT_TMatrixT #define ROOT_TMatrixT
skipping to change at line 122 skipping to change at line 122
virtual TMatrixTBase<Element> &SetRowIndexArray(Int_t * /*data*/) { MayNotUse("SetRowIndexArray(Int_t *)"); return *this; } virtual TMatrixTBase<Element> &SetRowIndexArray(Int_t * /*data*/) { MayNotUse("SetRowIndexArray(Int_t *)"); return *this; }
virtual TMatrixTBase<Element> &SetColIndexArray(Int_t * /*data*/) { MayNotUse("SetColIndexArray(Int_t *)"); return *this; } virtual TMatrixTBase<Element> &SetColIndexArray(Int_t * /*data*/) { MayNotUse("SetColIndexArray(Int_t *)"); return *this; }
virtual void Clear(Option_t * /*option*/ ="") { if (this->fIsOwner) Dele te_m(this->fNelems,fElements); virtual void Clear(Option_t * /*option*/ ="") { if (this->fIsOwner) Dele te_m(this->fNelems,fElements);
else fElements = 0; thi s->fNelems = 0; } else fElements = 0; thi s->fNelems = 0; }
TMatrixT <Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Element *data); TMatrixT <Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Element *data);
const TMatrixT <Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,const Element *data) const const TMatrixT <Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,const Element *data) const
{ return (const TMatrixT<Elemen t>&) { return (const TMatrixT<Elemen t>&)
(((TMatrixT<Element> * )this)->Use(row_lwb,row_upb,col_lwb,col_upb,(Element *)data)); } ((const_cast<TMatrixT< Element> *>(this))->Use(row_lwb,row_upb,col_lwb,col_upb, const_cast<Element *>(data))); }
TMatrixT <Element> &Use (Int_t nrows,Int_t ncols,Element *data); TMatrixT <Element> &Use (Int_t nrows,Int_t ncols,Element *data);
const TMatrixT <Element> &Use (Int_t nrows,Int_t ncols,const El ement *data) const; const TMatrixT <Element> &Use (Int_t nrows,Int_t ncols,const El ement *data) const;
TMatrixT <Element> &Use (TMatrixT<Element> &a); TMatrixT <Element> &Use (TMatrixT<Element> &a);
const TMatrixT <Element> &Use (const TMatrixT<Element> &a) cons t; const TMatrixT <Element> &Use (const TMatrixT<Element> &a) cons t;
virtual TMatrixTBase<Element> &GetSub (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb, virtual TMatrixTBase<Element> &GetSub (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,
TMatrixTBase<Element> &target,Op tion_t *option="S") const; TMatrixTBase<Element> &target,Op tion_t *option="S") const;
TMatrixT <Element> GetSub (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Option_t *option="S") const; TMatrixT <Element> GetSub (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Option_t *option="S") const;
virtual TMatrixTBase<Element> &SetSub (Int_t row_lwb,Int_t col_lwb,cons t TMatrixTBase<Element> &source); virtual TMatrixTBase<Element> &SetSub (Int_t row_lwb,Int_t col_lwb,cons t TMatrixTBase<Element> &source);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TMatrixTSparse.h   TMatrixTSparse.h 
// @(#)root/matrix:$Id: TMatrixTSparse.h 25272 2008-08-27 06:28:00Z brun $ // @(#)root/matrix:$Id: TMatrixTSparse.h 27658 2009-02-28 05:34:57Z pcanal $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TMatrixTSparse #ifndef ROOT_TMatrixTSparse
#define ROOT_TMatrixTSparse #define ROOT_TMatrixTSparse
skipping to change at line 125 skipping to change at line 125
} }
this->fNelems = 0; this->fNelems = 0;
this->fNrowIndex = 0; this->fNrowIndex = 0;
} }
TMatrixTSparse<Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Int_t nr_nonzeros, TMatrixTSparse<Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Int_t nr_nonzeros,
Int_t *pRowIndex,Int_t *pColInde x,Element *pData); Int_t *pRowIndex,Int_t *pColInde x,Element *pData);
const TMatrixTSparse<Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Int_t nr_nonzeros, const TMatrixTSparse<Element> &Use (Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Int_t nr_nonzeros,
const Int_t *pRowIndex,const Int _t *pColIndex,const Element *pData) const const Int_t *pRowIndex,const Int _t *pColIndex,const Element *pData) const
{ return (const TMatrixTSparse< Element>&) { return (const TMatrixTSparse< Element>&)
(((TMatrixTSparse<Elem ((const_cast<TMatrixTS
ent> *)this)->Use(row_lwb,row_upb,col_lwb,col_upb,nr_nonzeros, parse<Element> *>(this))->Use(row_lwb,row_upb,col_lwb,col_upb,nr_nonzeros,
(Int_t *)pRowIndex,(Int_t *)pColIndex,(Element *)pData)); const_cast<Int_t *>(pRowIndex),
}
const_cast<Int_t *>(pColIndex),
const_cast<Element *>(pData))); }
TMatrixTSparse<Element> &Use (Int_t nrows,Int_t ncols,Int_t nr _nonzeros, TMatrixTSparse<Element> &Use (Int_t nrows,Int_t ncols,Int_t nr _nonzeros,
Int_t *pRowIndex,Int_t *pColInde x,Element *pData); Int_t *pRowIndex,Int_t *pColInde x,Element *pData);
const TMatrixTSparse<Element> &Use (Int_t nrows,Int_t ncols,Int_t nr _nonzeros, const TMatrixTSparse<Element> &Use (Int_t nrows,Int_t ncols,Int_t nr _nonzeros,
const Int_t *pRowIndex,const Int _t *pColIndex,const Element *pData) const; const Int_t *pRowIndex,const Int _t *pColIndex,const Element *pData) const;
TMatrixTSparse<Element> &Use (TMatrixTSparse<Element> &a); TMatrixTSparse<Element> &Use (TMatrixTSparse<Element> &a);
const TMatrixTSparse<Element> &Use (const TMatrixTSparse<Element> &a ) const; const TMatrixTSparse<Element> &Use (const TMatrixTSparse<Element> &a ) const;
virtual TMatrixTBase<Element> &GetSub(Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb, virtual TMatrixTBase<Element> &GetSub(Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,
TMatrixTBase<Element> &target,O ption_t *option="S") const; TMatrixTBase<Element> &target,O ption_t *option="S") const;
TMatrixTSparse<Element> GetSub(Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Option_t *option="S") const; TMatrixTSparse<Element> GetSub(Int_t row_lwb,Int_t row_upb,Int_ t col_lwb,Int_t col_upb,Option_t *option="S") const;
 End of changes. 2 change blocks. 
6 lines changed or deleted 9 lines changed or added


 TMatrixTSym.h   TMatrixTSym.h 
// @(#)root/matrix:$Id: TMatrixTSym.h 22039 2008-02-07 05:48:31Z brun $ // @(#)root/matrix:$Id: TMatrixTSym.h 27658 2009-02-28 05:34:57Z pcanal $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TMatrixTSym #ifndef ROOT_TMatrixTSym
#define ROOT_TMatrixTSym #define ROOT_TMatrixTSym
skipping to change at line 101 skipping to change at line 101
virtual TMatrixTBase<Element> &SetRowIndexArray(Int_t * /*data*/) { MayNotUse("SetRowIndexArray(Int_t *)"); return *this; } virtual TMatrixTBase<Element> &SetRowIndexArray(Int_t * /*data*/) { MayNotUse("SetRowIndexArray(Int_t *)"); return *this; }
virtual TMatrixTBase<Element> &SetColIndexArray(Int_t * /*data*/) { MayNotUse("SetColIndexArray(Int_t *)"); return *this; } virtual TMatrixTBase<Element> &SetColIndexArray(Int_t * /*data*/) { MayNotUse("SetColIndexArray(Int_t *)"); return *this; }
virtual void Clear (Option_t * /*option*/ ="") { if (this->fIsOwn er) Delete_m(this->fNelems,fElements); virtual void Clear (Option_t * /*option*/ ="") { if (this->fIsOwn er) Delete_m(this->fNelems,fElements);
else fElements = 0; this->fNelems = 0; } else fElements = 0; this->fNelems = 0; }
virtual Bool_t IsSymmetric() const { return kTRUE; } virtual Bool_t IsSymmetric() const { return kTRUE; }
TMatrixTSym <Element> &Use (Int_t row_lwb,Int_t row_up b,Element *data); TMatrixTSym <Element> &Use (Int_t row_lwb,Int_t row_up b,Element *data);
const TMatrixTSym <Element> &Use (Int_t row_lwb,Int_t row_up b,const Element *data) const const TMatrixTSym <Element> &Use (Int_t row_lwb,Int_t row_up b,const Element *data) const
{ return (const TMatrixTS ym<Element>&) { return (const TMatrixTS ym<Element>&)
(((TMatrixTSym<E lement> *)this)->Use(row_lwb,row_upb,(Element *)data)); } ((const_cast<TMa trixTSym<Element> *>(this))->Use(row_lwb,row_upb,const_cast<Element *>(data ))); }
TMatrixTSym <Element> &Use (Int_t nrows,Element *data) ; TMatrixTSym <Element> &Use (Int_t nrows,Element *data) ;
const TMatrixTSym <Element> &Use (Int_t nrows,const Element *data) const; const TMatrixTSym <Element> &Use (Int_t nrows,const Element *data) const;
TMatrixTSym <Element> &Use (TMatrixTSym<Element> &a); TMatrixTSym <Element> &Use (TMatrixTSym<Element> &a);
const TMatrixTSym <Element> &Use (const TMatrixTSym<Element> &a) const; const TMatrixTSym <Element> &Use (const TMatrixTSym<Element> &a) const;
TMatrixTSym <Element> &GetSub (Int_t row_lwb,Int_t row_up b,TMatrixTSym<Element> &target,Option_t *option="S") const; TMatrixTSym <Element> &GetSub (Int_t row_lwb,Int_t row_up b,TMatrixTSym<Element> &target,Option_t *option="S") const;
virtual TMatrixTBase<Element> &GetSub (Int_t row_lwb,Int_t row_up b,Int_t col_lwb,Int_t col_upb, virtual TMatrixTBase<Element> &GetSub (Int_t row_lwb,Int_t row_up b,Int_t col_lwb,Int_t col_upb,
TMatrixTBase<Element> &targ et,Option_t *option="S") const; TMatrixTBase<Element> &targ et,Option_t *option="S") const;
TMatrixTSym <Element> GetSub (Int_t row_lwb,Int_t row_up b,Int_t col_lwb,Int_t col_upb,Option_t *option="S") const; TMatrixTSym <Element> GetSub (Int_t row_lwb,Int_t row_up b,Int_t col_lwb,Int_t col_upb,Option_t *option="S") const;
TMatrixTSym <Element> &SetSub (Int_t row_lwb,const TMatri xTBase<Element> &source); TMatrixTSym <Element> &SetSub (Int_t row_lwb,const TMatri xTBase<Element> &source);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TMessage.h   TMessage.h 
// @(#)root/net:$Id: TMessage.h 24432 2008-06-20 15:43:30Z rdm $ // @(#)root/net:$Id: TMessage.h 27689 2009-03-04 17:09:18Z rdm $
// Author: Fons Rademakers 19/12/96 // Author: Fons Rademakers 19/12/96
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 61 skipping to change at line 61
char *fBufCompCur; //Current position in compressed buffer char *fBufCompCur; //Current position in compressed buffer
char *fCompPos; //Position of fBufCur when message was compressed char *fCompPos; //Position of fBufCur when message was compressed
Bool_t fEvolution; //True if support for schema evolution required Bool_t fEvolution; //True if support for schema evolution required
static Bool_t fgEvolution; //True if global support for schema evolutio n required static Bool_t fgEvolution; //True if global support for schema evolutio n required
// TMessage objects cannot be copied or assigned // TMessage objects cannot be copied or assigned
TMessage(const TMessage &); // not implemented TMessage(const TMessage &); // not implemented
void operator=(const TMessage &); // not implemented void operator=(const TMessage &); // not implemented
// used by friend TSocket
Bool_t TestBitNumber(UInt_t bitnumber) const { return fBitsPIDs.TestBitN
umber(bitnumber); }
protected: protected:
TMessage(void *buf, Int_t bufsize); // only called by T(P)Socket::Recv () TMessage(void *buf, Int_t bufsize); // only called by T(P)Socket::Recv ()
void SetLength() const; // only called by T(P)Socket::Send () void SetLength() const; // only called by T(P)Socket::Send ()
public: public:
TMessage(UInt_t what = kMESS_ANY); TMessage(UInt_t what = kMESS_ANY);
virtual ~TMessage(); virtual ~TMessage();
void ForceWriteInfo(TVirtualStreamerInfo *info, Bool_t force); void ForceWriteInfo(TVirtualStreamerInfo *info, Bool_t force);
void Forward(); void Forward();
skipping to change at line 86 skipping to change at line 89
void SetWhat(UInt_t what); void SetWhat(UInt_t what);
void EnableSchemaEvolution(Bool_t enable = kTRUE) { fEvolution = ena ble; } void EnableSchemaEvolution(Bool_t enable = kTRUE) { fEvolution = ena ble; }
Bool_t UsesSchemaEvolution() const { return fEvolution; } Bool_t UsesSchemaEvolution() const { return fEvolution; }
void SetCompressionLevel(Int_t level = 1); void SetCompressionLevel(Int_t level = 1);
Int_t GetCompressionLevel() const { return fCompress; } Int_t GetCompressionLevel() const { return fCompress; }
Int_t Compress(); Int_t Compress();
Int_t Uncompress(); Int_t Uncompress();
char *CompBuffer() const { return fBufComp; } char *CompBuffer() const { return fBufComp; }
Int_t CompLength() const { return (Int_t)(fBufCompCur - fBufComp); } Int_t CompLength() const { return (Int_t)(fBufCompCur - fBufComp); }
Bool_t TestBitNumber(UInt_t bitnumber) const {return fBitsPIDs.TestBit Number(bitnumber);}
void WriteObject(const TObject *obj); void WriteObject(const TObject *obj);
UShort_t WriteProcessID(TProcessID *pid); UShort_t WriteProcessID(TProcessID *pid);
static void EnableSchemaEvolutionForAll(Bool_t enable = kTRUE); static void EnableSchemaEvolutionForAll(Bool_t enable = kTRUE);
static Bool_t UsesSchemaEvolutionForAll(); static Bool_t UsesSchemaEvolutionForAll();
ClassDef(TMessage,0) // Message buffer class ClassDef(TMessage,0) // Message buffer class
}; };
#endif #endif
 End of changes. 3 change blocks. 
2 lines changed or deleted 5 lines changed or added


 TOracleStatement.h   TOracleStatement.h 
// @(#)root/oracle:$Id: TOracleStatement.h 23102 2008-04-09 22:18:41Z pcana l $ // @(#)root/oracle:$Id: TOracleStatement.h 27990 2009-03-30 14:33:07Z brun $
// Author: Sergey Linev 6/02/2006 // Author: Sergey Linev 6/02/2006
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 84 skipping to change at line 84
virtual Bool_t SetLong64(Int_t npar, Long64_t value); virtual Bool_t SetLong64(Int_t npar, Long64_t value);
virtual Bool_t SetULong64(Int_t npar, ULong64_t value); virtual Bool_t SetULong64(Int_t npar, ULong64_t value);
virtual Bool_t SetDouble(Int_t npar, Double_t value); virtual Bool_t SetDouble(Int_t npar, Double_t value);
virtual Bool_t SetString(Int_t npar, const char* value, Int_t maxsi ze = 256); virtual Bool_t SetString(Int_t npar, const char* value, Int_t maxsi ze = 256);
virtual Bool_t SetBinary(Int_t npar, void* mem, Long_t size, Long_t maxsize = 0x1000); virtual Bool_t SetBinary(Int_t npar, void* mem, Long_t size, Long_t maxsize = 0x1000);
virtual Bool_t SetDate(Int_t npar, Int_t year, Int_t month, Int_t d ay); virtual Bool_t SetDate(Int_t npar, Int_t year, Int_t month, Int_t d ay);
virtual Bool_t SetTime(Int_t npar, Int_t hour, Int_t min, Int_t sec ); virtual Bool_t SetTime(Int_t npar, Int_t hour, Int_t min, Int_t sec );
virtual Bool_t SetDatime(Int_t npar, Int_t year, Int_t month, Int_t day, Int_t hour, Int_t min, Int_t sec); virtual Bool_t SetDatime(Int_t npar, Int_t year, Int_t month, Int_t day, Int_t hour, Int_t min, Int_t sec);
virtual Bool_t SetTimestamp(Int_t npar, Int_t year, Int_t month, In t_t day, Int_t hour, Int_t min, Int_t sec, Int_t frac = 0); virtual Bool_t SetTimestamp(Int_t npar, Int_t year, Int_t month, In t_t day, Int_t hour, Int_t min, Int_t sec, Int_t frac = 0);
virtual void SetTimeFormating(const char* fmt) { fTimeFmt = fmt; } virtual void SetTimeFormating(const char* fmt) { fTimeFmt = fmt; }
virtual Bool_t SetVInt(Int_t npar, const std::vector<Int_t> value,
const char* schemaName, const char* typeName);
virtual Bool_t SetVUInt(Int_t npar, const std::vector<UInt_t> value
, const char* schemaName, const char* typeName);
virtual Bool_t SetVLong(Int_t npar, const std::vector<Long_t> value
, const char* schemaName, const char* typeName);
virtual Bool_t SetVLong64(Int_t npar, const std::vector<Long64_t> v
alue, const char* schemaName, const char* typeName);
virtual Bool_t SetVULong64(Int_t npar, const std::vector<ULong64_t>
value, const char* schemaName, const char* typeName);
virtual Bool_t SetVDouble(Int_t npar, const std::vector<Double_t> v
alue, const char* schemaName, const char* typeName);
virtual Bool_t NextIteration(); virtual Bool_t NextIteration();
virtual Bool_t Process(); virtual Bool_t Process();
virtual Int_t GetNumAffectedRows(); virtual Int_t GetNumAffectedRows();
virtual Bool_t StoreResult(); virtual Bool_t StoreResult();
virtual Int_t GetNumFields(); virtual Int_t GetNumFields();
virtual const char *GetFieldName(Int_t nfield); virtual const char *GetFieldName(Int_t nfield);
virtual Bool_t SetMaxFieldSize(Int_t nfield, Long_t maxsize); virtual Bool_t SetMaxFieldSize(Int_t nfield, Long_t maxsize);
skipping to change at line 109 skipping to change at line 115
virtual Long_t GetLong(Int_t npar); virtual Long_t GetLong(Int_t npar);
virtual Long64_t GetLong64(Int_t npar); virtual Long64_t GetLong64(Int_t npar);
virtual ULong64_t GetULong64(Int_t npar); virtual ULong64_t GetULong64(Int_t npar);
virtual Double_t GetDouble(Int_t npar); virtual Double_t GetDouble(Int_t npar);
virtual const char *GetString(Int_t npar); virtual const char *GetString(Int_t npar);
virtual Bool_t GetBinary(Int_t npar, void* &mem, Long_t& size); virtual Bool_t GetBinary(Int_t npar, void* &mem, Long_t& size);
virtual Bool_t GetDate(Int_t npar, Int_t& year, Int_t& month, Int_t & day); virtual Bool_t GetDate(Int_t npar, Int_t& year, Int_t& month, Int_t & day);
virtual Bool_t GetTime(Int_t npar, Int_t& hour, Int_t& min, Int_t& sec); virtual Bool_t GetTime(Int_t npar, Int_t& hour, Int_t& min, Int_t& sec);
virtual Bool_t GetDatime(Int_t npar, Int_t& year, Int_t& month, Int _t& day, Int_t& hour, Int_t& min, Int_t& sec); virtual Bool_t GetDatime(Int_t npar, Int_t& year, Int_t& month, Int _t& day, Int_t& hour, Int_t& min, Int_t& sec);
virtual Bool_t GetTimestamp(Int_t npar, Int_t& year, Int_t& month, Int_t& day, Int_t& hour, Int_t& min, Int_t& sec, Int_t& frac); virtual Bool_t GetTimestamp(Int_t npar, Int_t& year, Int_t& month, Int_t& day, Int_t& hour, Int_t& min, Int_t& sec, Int_t& frac);
virtual Bool_t GetVInt(Int_t npar, std::vector<Int_t> &value);
virtual Bool_t GetVUInt(Int_t npar, std::vector<UInt_t> &value);
virtual Bool_t GetVLong(Int_t npar, std::vector<Long_t> &value);
virtual Bool_t GetVLong64(Int_t npar, std::vector<Long64_t> &value)
;
virtual Bool_t GetVULong64(Int_t npar, std::vector<ULong64_t> &valu
e);
virtual Bool_t GetVDouble(Int_t npar, std::vector<Double_t> &value)
;
ClassDef(TOracleStatement, 0); // SQL statement class for Oracle ClassDef(TOracleStatement, 0); // SQL statement class for Oracle
}; };
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 22 lines changed or added


 TProfile.h   TProfile.h 
// @(#)root/hist:$Id: TProfile.h 22216 2008-02-19 08:24:45Z brun $ // @(#)root/hist:$Id: TProfile.h 28022 2009-04-01 14:41:58Z moneta $
// Author: Rene Brun 29/09/95 // Author: Rene Brun 29/09/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 27 skipping to change at line 27
// TProfile // // TProfile //
// // // //
// Profile histogram class. // // Profile histogram class. //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifndef ROOT_TH1 #ifndef ROOT_TH1
#include "TH1.h" #include "TH1.h"
#endif #endif
class TProfileHelper;
enum EErrorType { kERRORMEAN = 0, kERRORSPREAD, kERRORSPREADI, kERRORSPREAD G }; enum EErrorType { kERRORMEAN = 0, kERRORSPREAD, kERRORSPREADI, kERRORSPREAD G };
class TF1; class TF1;
class TProfile : public TH1D { class TProfile : public TH1D {
public:
friend class TProfileHelper;
protected: protected:
TArrayD fBinEntries; //number of entries per bin TArrayD fBinEntries; //number of entries per bin
EErrorType fErrorMode; //Option to compute errors EErrorType fErrorMode; //Option to compute errors
Double_t fYmin; //Lower limit in Y (if set) Double_t fYmin; //Lower limit in Y (if set)
Double_t fYmax; //Upper limit in Y (if set) Double_t fYmax; //Upper limit in Y (if set)
Bool_t fScaling; //!True when TProfile::Scale is called Bool_t fScaling; //!True when TProfile::Scale is called
Double_t fTsumwy; //Total Sum of weight*Y Double_t fTsumwy; //Total Sum of weight*Y
Double_t fTsumwy2; //Total Sum of weight*Y*Y Double_t fTsumwy2; //Total Sum of weight*Y*Y
TArrayD fBinSumw2; //Array of sum of squares of weights per
bin
static Bool_t fgApproximate; //bin error approximation option static Bool_t fgApproximate; //bin error approximation option
virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se
virtual Int_t BufferFill(Double_t x, Double_t y, Double_t w); virtual Int_t BufferFill(Double_t x, Double_t y, Double_t w);
// helper methods for the Merge unification in TProfileHelper
void SetBins(const Int_t* nbins, const Double_t* range) { SetBins(nbins[
0], range[0], range[1]); };
Int_t Fill(const Double_t* v) { return Fill(v[0], v[1], v[2]); };
private: private:
Int_t Fill(Double_t) { MayNotUse("Fill(Double_t)"); return -1;} Int_t Fill(Double_t) { MayNotUse("Fill(Double_t)"); return -1;}
void FillN(Int_t, const Double_t *, const Double_t *, Int_t) { MayNotUse ("FillN(Int_t, Double_t*, Double_t*, Int_t)"); } void FillN(Int_t, const Double_t *, const Double_t *, Int_t) { MayNotUse ("FillN(Int_t, Double_t*, Double_t*, Int_t)"); }
void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Double_t) void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Double_t)
{ MayNotUse("SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Doub le_t"); } { MayNotUse("SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Doub le_t"); }
void SetBins(Int_t, const Double_t*, Int_t, const Double_t*) void SetBins(Int_t, const Double_t*, Int_t, const Double_t*)
{ MayNotUse("SetBins(Int_t, const Double_t*, Int_t, const Double_t*") ; } { MayNotUse("SetBins(Int_t, const Double_t*, Int_t, const Double_t*") ; }
void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Double_t, Int_t , Double_t, Double_t) void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Double_t, Int_t , Double_t, Double_t)
{ MayNotUse("SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Doub le_t, Int_t, Double_t, Double_t"); } { MayNotUse("SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Doub le_t, Int_t, Double_t, Double_t"); }
Double_t *GetB() {return &fBinEntries.fArray[0];} Double_t *GetB() {return &fBinEntries.fArray[0];}
Double_t *GetB2() {return (fBinSumw2.fN ? &fBinSumw2.fArray[0] : 0 ); }
Double_t *GetW() {return &fArray[0];} Double_t *GetW() {return &fArray[0];}
Double_t *GetW2() {return &fSumw2.fArray[0];} Double_t *GetW2() {return &fSumw2.fArray[0];}
public: public:
TProfile(); TProfile();
TProfile(const char *name,const char *title,Int_t nbinsx,Double_t xlow,D ouble_t xup, Option_t *option=""); TProfile(const char *name,const char *title,Int_t nbinsx,Double_t xlow,D ouble_t xup, Option_t *option="");
TProfile(const char *name,const char *title,Int_t nbinsx,Double_t xlow,D ouble_t xup,Double_t ylow,Double_t yup,Option_t *option=""); TProfile(const char *name,const char *title,Int_t nbinsx,Double_t xlow,D ouble_t xup,Double_t ylow,Double_t yup,Option_t *option="");
TProfile(const char *name,const char *title,Int_t nbinsx,const Float_t *xbins, Option_t *option=""); TProfile(const char *name,const char *title,Int_t nbinsx,const Float_t *xbins, Option_t *option="");
TProfile(const char *name,const char *title,Int_t nbinsx,const Double_t *xbins, Option_t *option=""); TProfile(const char *name,const char *title,Int_t nbinsx,const Double_t *xbins, Option_t *option="");
TProfile(const char *name,const char *title,Int_t nbinsx,const Double_t *xbins, Double_t ylow,Double_t yup, Option_t *option=""); TProfile(const char *name,const char *title,Int_t nbinsx,const Double_t *xbins, Double_t ylow,Double_t yup, Option_t *option="");
skipping to change at line 91 skipping to change at line 104
virtual Int_t Fill(Double_t x, Double_t y, Double_t w); virtual Int_t Fill(Double_t x, Double_t y, Double_t w);
virtual Int_t Fill(const char *namex, Double_t y, Double_t w); virtual Int_t Fill(const char *namex, Double_t y, Double_t w);
virtual void FillN(Int_t ntimes, const Double_t *x, const Double_t * y, const Double_t *w, Int_t stride=1); virtual void FillN(Int_t ntimes, const Double_t *x, const Double_t * y, const Double_t *w, Int_t stride=1);
virtual Double_t GetBinContent(Int_t bin) const; virtual Double_t GetBinContent(Int_t bin) const;
virtual Double_t GetBinContent(Int_t bin, Int_t) const {return GetBinCon tent(bin);} virtual Double_t GetBinContent(Int_t bin, Int_t) const {return GetBinCon tent(bin);}
virtual Double_t GetBinContent(Int_t bin, Int_t, Int_t) const {return Ge tBinContent(bin);} virtual Double_t GetBinContent(Int_t bin, Int_t, Int_t) const {return Ge tBinContent(bin);}
virtual Double_t GetBinError(Int_t bin) const; virtual Double_t GetBinError(Int_t bin) const;
virtual Double_t GetBinError(Int_t bin, Int_t) const {return GetBinError (bin);} virtual Double_t GetBinError(Int_t bin, Int_t) const {return GetBinError (bin);}
virtual Double_t GetBinError(Int_t bin, Int_t, Int_t) const {return GetB inError(bin);} virtual Double_t GetBinError(Int_t bin, Int_t, Int_t) const {return GetB inError(bin);}
virtual Double_t GetBinEntries(Int_t bin) const; virtual Double_t GetBinEntries(Int_t bin) const;
virtual Double_t GetBinEffectiveEntries(Int_t bin) const;
virtual TArrayD *GetBinSumw2() {return &fBinSumw2;}
virtual const TArrayD *GetBinSumw2() const {return &fBinSumw2;}
Option_t *GetErrorOption() const; Option_t *GetErrorOption() const;
virtual char *GetObjectInfo(Int_t px, Int_t py) const; virtual char *GetObjectInfo(Int_t px, Int_t py) const;
virtual void GetStats(Double_t *stats) const; virtual void GetStats(Double_t *stats) const;
virtual Double_t GetYmin() const {return fYmin;} virtual Double_t GetYmin() const {return fYmin;}
virtual Double_t GetYmax() const {return fYmax;} virtual Double_t GetYmax() const {return fYmax;}
virtual void LabelsDeflate(Option_t *axis="X"); virtual void LabelsDeflate(Option_t *axis="X");
virtual void LabelsInflate(Option_t *axis="X"); virtual void LabelsInflate(Option_t *axis="X");
virtual void LabelsOption(Option_t *option="h", Option_t *axis="X"); virtual void LabelsOption(Option_t *option="h", Option_t *axis="X");
virtual Long64_t Merge(TCollection *list); virtual Long64_t Merge(TCollection *list);
virtual void Multiply(TF1 *h1, Double_t c1=1); virtual void Multiply(TF1 *h1, Double_t c1=1);
skipping to change at line 115 skipping to change at line 131
TH1 *Rebin(Int_t ngroup=2, const char*newname="", const Doub le_t *xbins=0); TH1 *Rebin(Int_t ngroup=2, const char*newname="", const Doub le_t *xbins=0);
virtual void RebinAxis(Double_t x, TAxis *axis); virtual void RebinAxis(Double_t x, TAxis *axis);
virtual void Reset(Option_t *option=""); virtual void Reset(Option_t *option="");
virtual void SavePrimitive(ostream &out, Option_t *option = ""); virtual void SavePrimitive(ostream &out, Option_t *option = "");
virtual void Scale(Double_t c1=1, Option_t *option=""); virtual void Scale(Double_t c1=1, Option_t *option="");
virtual void SetBinEntries(Int_t bin, Double_t w); virtual void SetBinEntries(Int_t bin, Double_t w);
virtual void SetBins(Int_t nbins, Double_t xmin, Double_t xmax); virtual void SetBins(Int_t nbins, Double_t xmin, Double_t xmax);
virtual void SetBins(Int_t nx, const Double_t *xbins); virtual void SetBins(Int_t nx, const Double_t *xbins);
virtual void SetBuffer(Int_t buffersize, Option_t *option=""); virtual void SetBuffer(Int_t buffersize, Option_t *option="");
virtual void SetErrorOption(Option_t *option=""); // *MENU* virtual void SetErrorOption(Option_t *option=""); // *MENU*
virtual void Sumw2();
ClassDef(TProfile,5) //Profile histogram class ClassDef(TProfile,6) //Profile histogram class
}; };
#endif #endif
 End of changes. 10 change blocks. 
2 lines changed or deleted 21 lines changed or added


 TProfile2D.h   TProfile2D.h 
// @(#)root/hist:$Id: TProfile2D.h 22216 2008-02-19 08:24:45Z brun $ // @(#)root/hist:$Id: TProfile2D.h 28022 2009-04-01 14:41:58Z moneta $
// Author: Rene Brun 16/04/2000 // Author: Rene Brun 16/04/2000
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 32 skipping to change at line 32
#ifndef ROOT_TH2 #ifndef ROOT_TH2
#include "TH2.h" #include "TH2.h"
#endif #endif
#ifndef ROOT_TProfile #ifndef ROOT_TProfile
#include "TProfile.h" #include "TProfile.h"
#endif #endif
class TProfile2D : public TH2D { class TProfile2D : public TH2D {
public:
friend class TProfileHelper;
protected: protected:
TArrayD fBinEntries; //number of entries per bin TArrayD fBinEntries; //number of entries per bin
EErrorType fErrorMode; //Option to compute errors EErrorType fErrorMode; //Option to compute errors
Double_t fZmin; //Lower limit in Z (if set) Double_t fZmin; //Lower limit in Z (if set)
Double_t fZmax; //Upper limit in Z (if set) Double_t fZmax; //Upper limit in Z (if set)
Bool_t fScaling; //!True when TProfile2D::Scale is called Bool_t fScaling; //!True when TProfile2D::Scale is called
Double_t fTsumwz; //Total Sum of weight*Z Double_t fTsumwz; //Total Sum of weight*Z
Double_t fTsumwz2; //Total Sum of weight*Z*Z Double_t fTsumwz2; //Total Sum of weight*Z*Z
static Bool_t fgApproximate; //bin error approximation option TArrayD fBinSumw2; //Array of sum of squares of weights per
bin
static Bool_t fgApproximate; //bin error approximation option
virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se
virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} / /may not use virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} / /may not use
virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t w); virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t w);
// helper methods for the Merge unification in TProfileHelper
void SetBins(const Int_t* nbins, const Double_t* range) { SetBins(nbins[
0], range[0], range[1],
nbins[
1], range[2], range[3]); };
Int_t Fill(const Double_t* v) { return Fill(v[0], v[1], v[2], v[3]); };
private: private:
Double_t *GetB() {return &fBinEntries.fArray[0];} Double_t *GetB() {return &fBinEntries.fArray[0];}
Double_t *GetB2() {return (fBinSumw2.fN ? &fBinSumw2.fArray[0] : 0 ); }
Double_t *GetW() {return &fArray[0];} Double_t *GetW() {return &fArray[0];}
Double_t *GetW2() {return &fSumw2.fArray[0];} Double_t *GetW2() {return &fSumw2.fArray[0];}
public: public:
TProfile2D(); TProfile2D();
TProfile2D(const char *name,const char *title,Int_t nbinsx,Double_t xlow ,Double_t xup TProfile2D(const char *name,const char *title,Int_t nbinsx,Double_t xlow ,Double_t xup
,Int_t nbinsy,Double_t ylow,Double_t yup ,Int_t nbinsy,Double_t ylow,Double_t yup
,Double_t zlow, Double_t zup,Option_t *optio n=""); ,Double_t zlow, Double_t zup,Option_t *optio n="");
TProfile2D(const char *name,const char *title,Int_t nbinsx,Double_t xlow ,Double_t xup TProfile2D(const char *name,const char *title,Int_t nbinsx,Double_t xlow ,Double_t xup
,Int_t nbinsy,Double_t ylow,Double_t yup,Opt ion_t *option=""); ,Int_t nbinsy,Double_t ylow,Double_t yup,Opt ion_t *option="");
skipping to change at line 92 skipping to change at line 102
virtual Int_t Fill(const char *namex, Double_t y, Double_t z); virtual Int_t Fill(const char *namex, Double_t y, Double_t z);
virtual Int_t Fill(const char *namex, const char *namey, Double_t z) ; virtual Int_t Fill(const char *namex, const char *namey, Double_t z) ;
virtual Int_t Fill(Double_t x, Double_t y, Double_t z, Double_t w); virtual Int_t Fill(Double_t x, Double_t y, Double_t z, Double_t w);
virtual Double_t GetBinContent(Int_t bin) const; virtual Double_t GetBinContent(Int_t bin) const;
virtual Double_t GetBinContent(Int_t binx, Int_t biny) const {return Ge tBinContent(GetBin(binx,biny));} virtual Double_t GetBinContent(Int_t binx, Int_t biny) const {return Ge tBinContent(GetBin(binx,biny));}
virtual Double_t GetBinContent(Int_t binx, Int_t biny, Int_t) const {re turn GetBinContent(GetBin(binx,biny));} virtual Double_t GetBinContent(Int_t binx, Int_t biny, Int_t) const {re turn GetBinContent(GetBin(binx,biny));}
virtual Double_t GetBinError(Int_t bin) const; virtual Double_t GetBinError(Int_t bin) const;
virtual Double_t GetBinError(Int_t binx, Int_t biny) const {return GetB inError(GetBin(binx,biny));} virtual Double_t GetBinError(Int_t binx, Int_t biny) const {return GetB inError(GetBin(binx,biny));}
virtual Double_t GetBinError(Int_t binx, Int_t biny, Int_t) const {retu rn GetBinError(GetBin(binx,biny));} virtual Double_t GetBinError(Int_t binx, Int_t biny, Int_t) const {retu rn GetBinError(GetBin(binx,biny));}
virtual Double_t GetBinEntries(Int_t bin) const; virtual Double_t GetBinEntries(Int_t bin) const;
virtual Double_t GetBinEffectiveEntries(Int_t bin);
virtual TArrayD *GetBinSumw2() {return &fBinSumw2;}
virtual const TArrayD *GetBinSumw2() const {return &fBinSumw2;}
Option_t *GetErrorOption() const; Option_t *GetErrorOption() const;
virtual void GetStats(Double_t *stats) const; virtual void GetStats(Double_t *stats) const;
virtual Double_t GetZmin() const {return fZmin;} virtual Double_t GetZmin() const {return fZmin;}
virtual Double_t GetZmax() const {return fZmax;} virtual Double_t GetZmax() const {return fZmax;}
virtual void LabelsDeflate(Option_t *axis="X"); virtual void LabelsDeflate(Option_t *axis="X");
virtual void LabelsInflate(Option_t *axis="X"); virtual void LabelsInflate(Option_t *axis="X");
virtual void LabelsOption(Option_t *option="h", Option_t *axis="X") ; virtual void LabelsOption(Option_t *option="h", Option_t *axis="X") ;
virtual Long64_t Merge(TCollection *list); virtual Long64_t Merge(TCollection *list);
virtual void Multiply(TF1 *h1, Double_t c1=1); virtual void Multiply(TF1 *h1, Double_t c1=1);
virtual void Multiply(const TH1 *h1); virtual void Multiply(const TH1 *h1);
skipping to change at line 122 skipping to change at line 135
{ MayNotUse("SetBins(Int_t, Double_t, Double_t"); } { MayNotUse("SetBins(Int_t, Double_t, Double_t"); }
void SetBins(Int_t, const Double_t*) void SetBins(Int_t, const Double_t*)
{ MayNotUse("SetBins(Int_t, const Double_t*"); } { MayNotUse("SetBins(Int_t, const Double_t*"); }
virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax, In t_t nbinsy, Double_t ymin, Double_t ymax); virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax, In t_t nbinsy, Double_t ymin, Double_t ymax);
void SetBins(Int_t, const Double_t*, Int_t, const Double_t* ) void SetBins(Int_t, const Double_t*, Int_t, const Double_t* )
{ MayNotUse("SetBins(Int_t, const Double_t*, Int_t, c onst Double_t*"); } { MayNotUse("SetBins(Int_t, const Double_t*, Int_t, c onst Double_t*"); }
void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Do uble_t, Int_t, Double_t, Double_t) void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Do uble_t, Int_t, Double_t, Double_t)
{ MayNotUse("SetBins(Int_t, Double_t, Double_t, Int_t , Double_t, Double_t, Int_t, Double_t, Double_t"); } { MayNotUse("SetBins(Int_t, Double_t, Double_t, Int_t , Double_t, Double_t, Int_t, Double_t, Double_t"); }
virtual void SetBuffer(Int_t buffersize, Option_t *option=""); virtual void SetBuffer(Int_t buffersize, Option_t *option="");
virtual void SetErrorOption(Option_t *option=""); // *MENU* virtual void SetErrorOption(Option_t *option=""); // *MENU*
virtual void Sumw2();
ClassDef(TProfile2D,6) //Profile2D histogram class ClassDef(TProfile2D,7) //Profile2D histogram class
}; };
#endif #endif
 End of changes. 8 change blocks. 
10 lines changed or deleted 27 lines changed or added


 TProfile3D.h   TProfile3D.h 
// @(#)root/hist:$Id: TProfile3D.h 22216 2008-02-19 08:24:45Z brun $ // @(#)root/hist:$Id: TProfile3D.h 28022 2009-04-01 14:41:58Z moneta $
// Author: Rene Brun 17/05/2006 // Author: Rene Brun 17/05/2006
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 32 skipping to change at line 32
#ifndef ROOT_TH3 #ifndef ROOT_TH3
#include "TH3.h" #include "TH3.h"
#endif #endif
#ifndef ROOT_TProfile #ifndef ROOT_TProfile
#include "TProfile.h" #include "TProfile.h"
#endif #endif
class TProfile3D : public TH3D { class TProfile3D : public TH3D {
public:
friend class TProfileHelper;
protected: protected:
TArrayD fBinEntries; //number of entries per bin TArrayD fBinEntries; //number of entries per bin
EErrorType fErrorMode; //Option to compute errors EErrorType fErrorMode; //Option to compute errors
Double_t fTmin; //Lower limit in T (if set) Double_t fTmin; //Lower limit in T (if set)
Double_t fTmax; //Upper limit in T (if set) Double_t fTmax; //Upper limit in T (if set)
Bool_t fScaling; //!True when TProfile3D::Scale is called Bool_t fScaling; //!True when TProfile3D::Scale is called
Double_t fTsumwt; //Total Sum of weight*T Double_t fTsumwt; //Total Sum of weight*T
Double_t fTsumwt2; //Total Sum of weight*T*T Double_t fTsumwt2; //Total Sum of weight*T*T
TArrayD fBinSumw2; //Array of sum of squares of weights per bin
static Bool_t fgApproximate; //bin error approximation option static Bool_t fgApproximate; //bin error approximation option
virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u se
virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} / /may not use virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} / /may not use
virtual Int_t BufferFill(Double_t, Double_t, Double_t, Double_t) {ret urn -2;} //may not use virtual Int_t BufferFill(Double_t, Double_t, Double_t, Double_t) {ret urn -2;} //may not use
virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t t, Double_t w); virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t t, Double_t w);
// helper methods for the Merge unification in TProfileHelper
void SetBins(const Int_t* nbins,const Double_t* range) { SetBins(nbins[0
], range[0], range[1],
nbins[1
], range[2], range[3],
nbins[2
], range[4], range[5]); };
Int_t Fill(const Double_t* v) { return Fill(v[0], v[1], v[2], v[3], v[4]
); };
private: private:
Double_t *GetB() {return &fBinEntries.fArray[0];} Double_t *GetB() {return &fBinEntries.fArray[0];}
Double_t *GetB2() {return (fBinSumw2.fN ? &fBinSumw2.fArray[0] : 0 ); }
Double_t *GetW() {return &fArray[0];} Double_t *GetW() {return &fArray[0];}
Double_t *GetW2() {return &fSumw2.fArray[0];} Double_t *GetW2() {return &fSumw2.fArray[0];}
public: public:
TProfile3D(); TProfile3D();
TProfile3D(const char *name,const char *title,Int_t nbinsx,Double_t xlow ,Double_t xup TProfile3D(const char *name,const char *title,Int_t nbinsx,Double_t xlow ,Double_t xup
,Int_t nbinsy,Double_t ylow ,Double_t yup ,Int_t nbinsy,Double_t ylow ,Double_t yup
,Int_t nbinsz,Double_t zlow ,Double_t zup, Option_t *option=""); ,Int_t nbinsz,Double_t zlow ,Double_t zup, Option_t *option="");
TProfile3D(const char *name,const char *title,Int_t nbinsx,const Double_ t *xbins TProfile3D(const char *name,const char *title,Int_t nbinsx,const Double_ t *xbins
,Int_t nbinsy,const Double_ t *ybins ,Int_t nbinsy,const Double_ t *ybins
skipping to change at line 94 skipping to change at line 105
virtual Int_t Fill(Double_t x, Double_t y, Double_t z, Double_t t, D ouble_t w); virtual Int_t Fill(Double_t x, Double_t y, Double_t z, Double_t t, D ouble_t w);
virtual Double_t GetBinContent(Int_t bin) const; virtual Double_t GetBinContent(Int_t bin) const;
virtual Double_t GetBinContent(Int_t,Int_t) const virtual Double_t GetBinContent(Int_t,Int_t) const
{ MayNotUse("GetBinContent(Int_t, Int_t"); return -1; } { MayNotUse("GetBinContent(Int_t, Int_t"); return -1; }
virtual Double_t GetBinContent(Int_t binx, Int_t biny, Int_t binz) cons t {return GetBinContent(GetBin(binx,biny,binz));} virtual Double_t GetBinContent(Int_t binx, Int_t biny, Int_t binz) cons t {return GetBinContent(GetBin(binx,biny,binz));}
virtual Double_t GetBinError(Int_t bin) const; virtual Double_t GetBinError(Int_t bin) const;
virtual Double_t GetBinError(Int_t,Int_t) const virtual Double_t GetBinError(Int_t,Int_t) const
{ MayNotUse("GetBinError(Int_t, Int_t"); return -1; } { MayNotUse("GetBinError(Int_t, Int_t"); return -1; }
virtual Double_t GetBinError(Int_t binx, Int_t biny, Int_t binz) const {return GetBinError(GetBin(binx,biny,binz));} virtual Double_t GetBinError(Int_t binx, Int_t biny, Int_t binz) const {return GetBinError(GetBin(binx,biny,binz));}
virtual Double_t GetBinEntries(Int_t bin) const; virtual Double_t GetBinEntries(Int_t bin) const;
virtual Double_t GetBinEffectiveEntries(Int_t bin);
virtual TArrayD *GetBinSumw2() {return &fBinSumw2;}
virtual const TArrayD *GetBinSumw2() const {return &fBinSumw2;}
Option_t *GetErrorOption() const; Option_t *GetErrorOption() const;
virtual void GetStats(Double_t *stats) const; virtual void GetStats(Double_t *stats) const;
virtual Double_t GetTmin() const {return fTmin;} virtual Double_t GetTmin() const {return fTmin;}
virtual Double_t GetTmax() const {return fTmax;} virtual Double_t GetTmax() const {return fTmax;}
virtual Long64_t Merge(TCollection *list); virtual Long64_t Merge(TCollection *list);
virtual void Multiply(TF1 *h1, Double_t c1=1); virtual void Multiply(TF1 *h1, Double_t c1=1);
virtual void Multiply(const TH1 *h1); virtual void Multiply(const TH1 *h1);
virtual void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option=""); // *MENU* virtual void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option=""); // *MENU*
TH3D *ProjectionXYZ(const char *name="_pxyz", Option_t *opti on="e") const; TH3D *ProjectionXYZ(const char *name="_pxyz", Option_t *opti on="e") const;
virtual void PutStats(Double_t *stats); virtual void PutStats(Double_t *stats);
virtual void Reset(Option_t *option=""); virtual void Reset(Option_t *option="");
virtual void RebinAxis(Double_t x, TAxis *axis); virtual void RebinAxis(Double_t x, TAxis *axis);
virtual void SavePrimitive(ostream &out, Option_t *option = ""); virtual void SavePrimitive(ostream &out, Option_t *option = "");
virtual void Scale(Double_t c1=1, Option_t *option=""); virtual void Scale(Double_t c1=1, Option_t *option="");
virtual void SetBinEntries(Int_t bin, Double_t w); virtual void SetBinEntries(Int_t bin, Double_t w);
void SetBins(Int_t, Double_t, Double_t) void SetBins(Int_t, Double_t, Double_t)
{ MayNotUse("SetBins(Int_t, Double_t, Double_t"); } { MayNotUse("SetBins(Int_t, Double_t, Double_t"); }
void SetBins(Int_t, const Double_t*) void SetBins(Int_t, const Double_t*)
{ MayNotUse("SetBins(Int_t, const Double_t*"); } { MayNotUse("SetBins(Int_t, const Double_t*)"); }
void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Do uble_t) void SetBins(Int_t, Double_t, Double_t, Int_t, Double_t, Do uble_t)
{ MayNotUse("SetBins(Int_t, const Double_t*"); } { MayNotUse("SetBins(Int_t, const Double_t*"); }
virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax, In virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax,
t_t nbinsy, Double_t ymin, Double_t ymax, Int_t nbinsz, Double_t zmin, Doub Int_t nbinsy, Double_t ymin, Double_t ymax,
le_t zmax); Int_t nbinsz, Double_t zmin, Double_t zmax);
void SetBins(Int_t, const Double_t*, Int_t, const Double_t* ) void SetBins(Int_t, const Double_t*, Int_t, const Double_t* )
{ MayNotUse("SetBins(Int_t, const Double_t*, Int_t, const Double_t*"); } { MayNotUse("SetBins(Int_t, const Double_t*, Int_t, const Double_t*"); }
virtual void SetBuffer(Int_t buffersize, Option_t *opt=""); virtual void SetBuffer(Int_t buffersize, Option_t *opt="");
virtual void SetErrorOption(Option_t *option=""); // *MENU* virtual void SetErrorOption(Option_t *option=""); // *MENU*
virtual void Sumw2();
ClassDef(TProfile3D,6) //Profile3D histogram class ClassDef(TProfile3D,7) //Profile3D histogram class
}; };
#endif #endif
 End of changes. 10 change blocks. 
6 lines changed or deleted 25 lines changed or added


 TProof.h   TProof.h 
// @(#)root/proof:$Id: TProof.h 27443 2009-02-12 19:18:17Z ganis $ // @(#)root/proof:$Id: TProof.h 27933 2009-03-25 15:19:55Z ganis $
// Author: Fons Rademakers 13/02/97 // Author: Fons Rademakers 13/02/97
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 581 skipping to change at line 581
static void *SlaveStartupThread(void *arg); static void *SlaveStartupThread(void *arg);
static Int_t AssertDataSet(TDSet *dset, TList *input, static Int_t AssertDataSet(TDSet *dset, TList *input,
TProofDataSetManager *mgr, TString &emsg); TProofDataSetManager *mgr, TString &emsg);
// Input data handling // Input data handling
static Int_t GetInputData(TList *input, const char *cachedir, TString &e msg); static Int_t GetInputData(TList *input, const char *cachedir, TString &e msg);
static Int_t SaveInputData(TQueryResult *qr, const char *cachedir, TStri ng &emsg); static Int_t SaveInputData(TQueryResult *qr, const char *cachedir, TStri ng &emsg);
static Int_t SendInputData(TQueryResult *qr, TProof *p, TString &emsg); static Int_t SendInputData(TQueryResult *qr, TProof *p, TString &emsg);
// Parse CINT commands
static Bool_t GetFileInCmd(const char *cmd, TString &fn);
public: public:
TProof(const char *masterurl, const char *conffile = kPROOF_ConfFile, TProof(const char *masterurl, const char *conffile = kPROOF_ConfFile,
const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0, const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0,
const char *alias = 0, TProofMgr *mgr = 0); const char *alias = 0, TProofMgr *mgr = 0);
virtual ~TProof(); virtual ~TProof();
void cd(Int_t id = -1); void cd(Int_t id = -1);
Int_t Ping(); Int_t Ping();
void Touch(); void Touch();
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 TQtBrush.h   TQtBrush.h 
// @(#)root/qt:$Id: TQtBrush.h 25206 2008-08-22 08:18:13Z brun $ // @(#)root/qt:$Id: TQtBrush.h 28205 2009-04-14 19:38:00Z brun $
// Author: Valeri Fine 21/01/2002 // Author: Valeri Fine 21/01/2002
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2002 by Valeri Fine. * * Copyright (C) 2002 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 36 skipping to change at line 36
#include "Rtypes.h" #include "Rtypes.h"
// //
// TQtBrush creates the QBrush Qt object based on the ROOT "fill" attrib utes // TQtBrush creates the QBrush Qt object based on the ROOT "fill" attrib utes
// //
class TQtBrush : public QBrush class TQtBrush : public QBrush
{ {
protected: protected:
QColor fBackground; QColor fBackground;
int fStyle; int fStyle;
int fFasi; int fFasi;
#if defined(R__WIN32) && (QT_VERSION < 0x40000)
QPixmap fCustomPixmap; // shadow transparent pixmap for WIN32
#endif
// Reset the brush color to take in account the new transperency if neede d // Reset the brush color to take in account the new transperency if neede d
void ResetColor(){ SetColor(fBackground); } void ResetColor(){ SetColor(fBackground); }
public: public:
TQtBrush(); TQtBrush();
TQtBrush(const TQtBrush &src):QBrush(src) TQtBrush(const TQtBrush &src):QBrush(src)
{ {
fBackground=src.fBackground; fBackground=src.fBackground;
fStyle=src.fStyle; fStyle=src.fStyle;
fFasi=src.fFasi; fFasi=src.fFasi;
} }
virtual ~TQtBrush(){;} virtual ~TQtBrush(){;}
Bool_t IsTransparent() const; Bool_t IsTransparent() const;
void SetStyle(int style=1000){ SetStyle(style/1000,style%1000); }; void SetStyle(int newStyle=1000){ SetStyle(newStyle/1000,newStyle%1000) ; };
void SetStyle(int style, int fasi); void SetStyle(int style, int fasi);
void SetColor(const QColor &color); void SetColor(const QColor &color);
const QColor &GetColor() const { return fBackground;} const QColor &GetColor() const { return fBackground;}
int GetStyle() const { return 1000*fStyle + fFasi; } int GetStyle() const { return 1000*fStyle + fFasi; }
ClassDef(TQtBrush,0); // create QBrush object based on the ROOT "fill" a ttributes ClassDef(TQtBrush,0); // create QBrush object based on the ROOT "fill" a ttributes
}; };
inline Bool_t TQtBrush::IsTransparent() const inline Bool_t TQtBrush::IsTransparent() const
{ return fStyle >= 4000 && fStyle <= 4100 ? kTRUE : kFALSE; } { return fStyle >= 4000 && fStyle <= 4100 ? kTRUE : kFALSE; }
 End of changes. 3 change blocks. 
5 lines changed or deleted 2 lines changed or added


 TQtClientWidget.h   TQtClientWidget.h 
// @(#)root/qt:$Id: TQtClientWidget.h 21429 2007-12-17 18:19:41Z brun $ // @(#)root/qt:$Id: TQtClientWidget.h 28205 2009-04-14 19:38:00Z brun $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2002 by Valeri Fine. * * Copyright (C) 2002 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TQtClientWidget #ifndef ROOT_TQtClientWidget
#define ROOT_TQtClientWidget #define ROOT_TQtClientWidget
#ifndef __CINT__ #ifndef __CINT__
# include "qglobal.h" # include <QKeySequence>
# if QT_VERSION < 0x40000 # include <QFrame>
# include <qframe.h> # include <QCursor>
# else /* QT_VERSION */ # include <map>
# include <QFrame>
# endif /* QT_VERSION */
# include <qcursor.h>
#else #else
class QFrame; class QFrame;
class QAccel;
class QColor; class QColor;
class QPixmap; class QPixmap;
#endif #endif
#include "GuiTypes.h" #include "GuiTypes.h"
//________________________________________________________________________ //________________________________________________________________________
// //
// TQtClientWidget is a QFrame implemantation backing ROOT TGWindow objec ts // TQtClientWidget is a QFrame implemantation backing ROOT TGWindow objec ts
// It tries to mimic the X11 Widget behaviour, that kind the ROOT Gui relie s on heavily. // It tries to mimic the X11 Widget behaviour, that kind the ROOT Gui relie s on heavily.
//________________________________________________________________________ //________________________________________________________________________
class QCursor; class QCursor;
class QCloseEvent; class QCloseEvent;
class QPaintEvent; class QPaintEvent;
class TQtClientGuard; class TQtClientGuard;
class TQtWidget; class TQtWidget;
class Q3Accel; class QShortcut;
class TGWindow; class TGWindow;
class TQtClientWidget: public QFrame { class TQtClientWidget: public QFrame {
#ifndef __CINT__ #ifndef __CINT__
Q_OBJECT Q_OBJECT
#endif #endif
private: private:
void operator=(const TQtClientWidget&); void operator=(const TQtClientWidget&);
TQtClientWidget(const TQtClientWidget&); TQtClientWidget(const TQtClientWidget&);
protected: protected:
UInt_t fGrabButtonMask; // modifier button mask for TVirtualX ::GrabButton UInt_t fGrabButtonMask; // modifier button mask for TVirtualX ::GrabButton
UInt_t fGrabEventPointerMask; // input event mask for TVirtualX::Gr abPointer UInt_t fGrabEventPointerMask; // input event mask for TVirtualX::Gr abPointer
UInt_t fGrabEventButtonMask; // input event mask for TVirtualX::Gr abButton UInt_t fGrabEventButtonMask; // input event mask for TVirtualX::Gr abButton
UInt_t fSelectEventMask; // input mask for SelectInput UInt_t fSelectEventMask; // input mask for SelectInput
UInt_t fSaveSelectInputMask; // To save dutinr the grabbing the se lectInput UInt_t fSaveSelectInputMask; // To save dutinr the grabbing the se lectInput
EMouseButton fButton; EMouseButton fButton;
#if (QT_VERSION >= 0x39999) #ifndef __CINT__
Q3Accel *fGrabbedKey; std::map<QKeySequence,QShortcut*> fGrabbedKey;
#else /* QT_VERSION */ #endif
QAccel *fGrabbedKey;
#endif /* QT_VERSION */
Bool_t fPointerOwner; Bool_t fPointerOwner;
QCursor *fNormalPointerCursor; QCursor *fNormalPointerCursor;
QCursor *fGrabPointerCursor; QCursor *fGrabPointerCursor;
QCursor *fGrabButtonCursor; QCursor *fGrabButtonCursor;
bool fIsClosing; bool fIsClosing;
bool fDeleteNotify; bool fDeleteNotify;
TQtClientGuard *fGuard; TQtClientGuard *fGuard;
TQtWidget *fCanvasWidget; TQtWidget *fCanvasWidget;
TGWindow *fMyRootWindow; // back pointer to the host window object TGWindow *fMyRootWindow; // back pointer to the host window object
QColor *fEraseColor; // Color to paint widget background with o ur PainEvent QColor *fEraseColor; // Color to paint widget background with o ur PainEvent
skipping to change at line 95 skipping to change at line 89
virtual void paintEvent ( QPaintEvent * ); virtual void paintEvent ( QPaintEvent * );
public: public:
enum {kRemove = -1, kTestKey = 0, kInsert = 1}; enum {kRemove = -1, kTestKey = 0, kInsert = 1};
virtual ~TQtClientWidget(); virtual ~TQtClientWidget();
virtual void closeEvent(QCloseEvent *ev); virtual void closeEvent(QCloseEvent *ev);
virtual void setEraseColor(const QColor &color); virtual void setEraseColor(const QColor &color);
virtual void setErasePixmap (const QPixmap &pixmap); virtual void setErasePixmap (const QPixmap &pixmap);
bool DeleteNotify(); bool DeleteNotify();
TQtWidget *GetCanvasWidget() const; TQtWidget *GetCanvasWidget() const;
void GrabEvent(Event_t &ev,bool own=TRUE); void GrabEvent(Event_t &ev,bool own=TRUE);
#if (QT_VERSION >= 0x39999) // Q3Accel *HasAccel() const ;
Q3Accel *HasAccel() const ;
#else /* QT_VERSION */
QAccel *HasAccel() const ;
#endif /* QT_VERSION */
bool IsClosing(); bool IsClosing();
bool IsGrabbed (Event_t &ev); bool IsGrabbed (Event_t &ev);
bool IsGrabPointerSelected(UInt_t evmask) const; bool IsGrabPointerSelected(UInt_t evmask) const;
bool IsGrabButtonSelected (UInt_t evmask) const; bool IsGrabButtonSelected (UInt_t evmask) const;
TQtClientWidget *IsKeyGrabbed(const Event_t &ev); TQtClientWidget *IsKeyGrabbed(const Event_t &ev);
UInt_t IsEventSelected (UInt_t evmask) const; UInt_t IsEventSelected (UInt_t evmask) const;
bool IsGrabOwner() { return fPointerOwner;} bool IsGrabOwner() { return fPointerOwner;}
void SetAttributeEventMask(UInt_t evmask); void SetAttributeEventMask(UInt_t evmask);
void SetButtonMask (UInt_t modifier=kAnyModifier,EMouseButton butto n=kAnyButton); void SetButtonMask (UInt_t modifier=kAnyModifier,EMouseButton butto n=kAnyButton);
void SetClosing(bool flag=kTRUE); void SetClosing(bool flag=kTRUE);
skipping to change at line 130 skipping to change at line 120
UInt_t ButtonMask () const; UInt_t ButtonMask () const;
UInt_t ButtonEventMask() const; UInt_t ButtonEventMask() const;
UInt_t SelectEventMask() const; UInt_t SelectEventMask() const;
EMouseButton Button() const; EMouseButton Button() const;
UInt_t PointerMask () const; UInt_t PointerMask () const;
#ifndef __CINT__ #ifndef __CINT__
protected slots: protected slots:
void Disconnect(); void Disconnect();
#endif #endif
public slots: public slots:
virtual void Accelerate(int id); virtual void Accelerate();
virtual void polish();
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN
//MOC_SKIP_BEGIN
ClassDef(TQtClientWidget,0) // QFrame implementation backing ROOT TGWi ndow objects ClassDef(TQtClientWidget,0) // QFrame implementation backing ROOT TGWi ndow objects
//MOC_SKIP_END
#endif #endif
}; };
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline bool TQtClientWidget::DeleteNotify(){return fDeleteNotify; } inline bool TQtClientWidget::DeleteNotify(){return fDeleteNotify; }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline TQtWidget *TQtClientWidget::GetCanvasWidget() const inline TQtWidget *TQtClientWidget::GetCanvasWidget() const
{ return fCanvasWidget;} { return fCanvasWidget;}
//________________________________________________________________________ //_________________________________________________________________________
______ _____
#if QT_VERSION < 0x40000 //inline Q3Accel *TQtClientWidget::HasAccel() const
inline QAccel *TQtClientWidget::HasAccel() const //{ return fGrabbedKey; }
#else /* QT_VERSION */
inline Q3Accel *TQtClientWidget::HasAccel() const
#endif /* QT_VERSION */
{ return fGrabbedKey; }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline bool TQtClientWidget::IsClosing(){ return fIsClosing; } inline bool TQtClientWidget::IsClosing(){ return fIsClosing; }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline UInt_t TQtClientWidget::IsEventSelected (UInt_t evmask) const inline UInt_t TQtClientWidget::IsEventSelected (UInt_t evmask) const
{ {
//if (evmask & (kButtonPressMask | kButtonMotionMask) ) //if (evmask & (kButtonPressMask | kButtonMotionMask) )
// fprintf(stderr,"TQtClientWidget::IsEventSelected event %x, mask %x. match %x\n" // fprintf(stderr,"TQtClientWidget::IsEventSelected event %x, mask %x. match %x\n"
// , evmask, fSelectEventtMask, evmask & (kButtonPressMask | kButtonMo tionMask)); // , evmask, fSelectEventtMask, evmask & (kButtonPressMask | kButtonMo tionMask));
return (evmask & fSelectEventMask); // || (IsGrabPointerSelected(evmas k)) ; return (evmask & fSelectEventMask); // || (IsGrabPointerSelected(evmas k)) ;
} }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TQtClientWidget::SetCursor() inline void TQtClientWidget::SetCursor()
{ // Set this widget pre-defined cursor { // Set this widget pre-defined cursor
if (fNormalPointerCursor) setCursor(*fNormalPointerCursor); if (fNormalPointerCursor) setCursor(*fNormalPointerCursor);
} }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TQtClientWidget::SetCursor(Cursor_t cursor) inline void TQtClientWidget::SetCursor(Cursor_t crsr)
{ {
// Change the pre-define curos shape and set it // Change the pre-define curos shape and set it
fNormalPointerCursor = (QCursor *)cursor; fNormalPointerCursor = (QCursor *)crsr;
SetCursor(); SetCursor();
} }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TQtClientWidget::SetClosing(bool flag) { fIsClosing = flag;} inline void TQtClientWidget::SetClosing(bool flag) { fIsClosing = flag;}
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TQtClientWidget::SetDeleteNotify(bool flag){fDeleteNotify = fl ag;} inline void TQtClientWidget::SetDeleteNotify(bool flag){fDeleteNotify = fl ag;}
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TQtClientWidget::SetAttributeEventMask(UInt_t evmask) { SelectI nput (evmask);} inline void TQtClientWidget::SetAttributeEventMask(UInt_t evmask) { SelectI nput (evmask);}
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TQtClientWidget::SetButtonEventMask(UInt_t evmask,Cursor_t curs inline void TQtClientWidget::SetButtonEventMask(UInt_t evmask,Cursor_t crsr
or) )
{ fGrabEventButtonMask = evmask; fGrabButtonCursor =(QCursor *) cursor; } { fGrabEventButtonMask = evmask; fGrabButtonCursor =(QCursor *) crsr; }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline EMouseButton TQtClientWidget::Button() const { return fButton; } inline EMouseButton TQtClientWidget::Button() const { return fButton; }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline UInt_t TQtClientWidget::ButtonEventMask() const { return fGrabEventB uttonMask;} inline UInt_t TQtClientWidget::ButtonEventMask() const { return fGrabEventB uttonMask;}
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline UInt_t TQtClientWidget::ButtonMask() const { return fGrabButtonMask ; } inline UInt_t TQtClientWidget::ButtonMask() const { return fGrabButtonMask ; }
 End of changes. 13 change blocks. 
37 lines changed or deleted 20 lines changed or added


 TQtEvent.h   TQtEvent.h 
// @(#)root/qt:$Id: TQtEvent.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/qt:$Id: TQtEvent.h 28205 2009-04-14 19:38:00Z brun $
// Author: Valeri Fine 21/01/2002 // Author: Valeri Fine 21/01/2002
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2002 by Valeri Fine. * * Copyright (C) 2002 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TQtEvent #ifndef ROOT_TQtEvent
#define ROOT_TQtEvent #define ROOT_TQtEvent
#include "qevent.h" #include <QEvent>
#if QT_VERSION >= 0x40000
//Added by qt3to4:
#include <QCustomEvent>
#endif /* QT_VERSION */
#include "TVirtualX.h"
class TQtObject; class TQtObject;
class TWaitCondition; class TWaitCondition;
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
class TQtEvent : public QCustomEvent class TQtEvent : public QEvent
{ {
private: private:
TWaitCondition *fCondition; TWaitCondition *fCondition;
ULong_t *fResult; // QApplication owns QEvent and will destroy it unsigned long *fResult; // QApplication owns QEvent and will destroy it
QObject *fReceiver; QObject *fReceiver;
QEvent *fThatEvent; QEvent *fThatEvent;
public: public:
TQtEvent(int code); TQtEvent(int code);
TQtEvent(QObject *o, QEvent *e); TQtEvent(QObject *o, QEvent *e);
virtual ~TQtEvent(){} virtual ~TQtEvent(){}
void SetWait(TWaitCondition &condition,ULong_t &result); void SetWait(TWaitCondition &condition, unsigned long &result);
void SetWait(TWaitCondition &condition); void SetWait(TWaitCondition &condition);
void SetResult(ULong_t e=0); void SetResult(unsigned long e=0);
// QEvent *WaitResult(); too dangerous // QEvent *WaitResult(); too dangerous
bool Notify(); bool Notify();
virtual void ExecuteCB(){;} virtual void ExecuteCB(){;}
}; };
#endif #endif
 End of changes. 6 change blocks. 
12 lines changed or deleted 6 lines changed or added


 TQtEventQueue.h   TQtEventQueue.h 
// Author: Valeri Fine 25/03/2004 // Author: Valeri Fine 25/03/2004
#ifndef ROOT_TQtEventQueue #ifndef ROOT_TQtEventQueue
#define ROOT_TQtEventQueue #define ROOT_TQtEventQueue
// @(#)root/qt:$Id: TQtEventQueue.h 23343 2008-04-21 04:44:58Z brun $ // @(#)root/qt:$Id: TQtEventQueue.h 28149 2009-04-08 07:25:32Z brun $
// Author: Valeri Fine 25/03/2004 // Author: Valeri Fine 25/03/2004
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2004 by Valeri Fine. * * Copyright (C) 2004 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#include "GuiTypes.h" #include "GuiTypes.h"
#include <qglobal.h> #include <QQueue>
#if QT_VERSION < 0x40000
# include <qptrlist.h>
#else /* QT_VERSION */
# include <QQueue>
#endif /* QT_VERSION */
/////////////////////////////////////////////////////////////////////////// ////// /////////////////////////////////////////////////////////////////////////// //////
// //
// TQtEventQueue is a queue container of the pointers of Event_t structure s // TQtEventQueue is a queue container of the pointers of Event_t structure s
// created by TQtClientFilter class // created by TQtClientFilter class
// If auto-deleting is turned on, all the items in a collection are delete d when // If auto-deleting is turned on, all the items in a collection are delete d when
// the collection itself is deleted. // the collection itself is deleted.
// (for the full list of the members see: // (for the full list of the members see:
// http://doc.trolltech.com/3.3/qptrlist.html) // http://doc.trolltech.com/3.3/qptrlist.html)
// //
/////////////////////////////////////////////////////////////////////////// ////// /////////////////////////////////////////////////////////////////////////// //////
#if QT_VERSION < 0x40000
class TQtEventQueue : public QPtrList<Event_t> {
#else /* QT_VERSION */
class TQtEventQueue : public QQueue<const Event_t *> { class TQtEventQueue : public QQueue<const Event_t *> {
#endif /* QT_VERSION */
public: public:
TQtEventQueue(bool autoDelete=true); TQtEventQueue();
#if QT_VERSION < 0x40000
TQtEventQueue(const TQtEventQueue &src): QPtrList<Event_t>(src) {;}
#else /* QT_VERSION */
TQtEventQueue(const TQtEventQueue &src): QQueue<const Event_t *>(src) {;} TQtEventQueue(const TQtEventQueue &src): QQueue<const Event_t *>(src) {;}
#endif /* QT_VERSION */
virtual ~TQtEventQueue(); virtual ~TQtEventQueue();
void enqueue(const Event_t *); void enqueue(const Event_t *);
const Event_t *dequeue(); const Event_t *dequeue();
int RemoveItems(const Event_t *ev); int RemoveItems(const Event_t *ev);
protected: protected:
#if 0
#if QT_VERSION < 0x40000
virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::
Item item2);
#else /* QT_VERSION */
virtual int compareItems(Q3PtrCollection::Item item1, Q3PtrCollection
::Item item2);
#endif /* QT_VERSION */
#endif
}; };
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline void TQtEventQueue::enqueue(const Event_t *ev) inline void TQtEventQueue::enqueue(const Event_t *ev)
{ {
#if QT_VERSION < 0x40000
append(ev);
#else
QQueue<const Event_t *>::enqueue(ev); QQueue<const Event_t *>::enqueue(ev);
#endif
} }
//_________________________________________________________________________ _____ //_________________________________________________________________________ _____
inline const Event_t *TQtEventQueue::dequeue() inline const Event_t *TQtEventQueue::dequeue()
{ {
return isEmpty() ? 0 : return isEmpty() ? 0 :
#if QT_VERSION < 0x40000
take(0);
#else
QQueue<const Event_t *>::dequeue(); QQueue<const Event_t *>::dequeue();
#endif
} }
#endif #endif
 End of changes. 11 change blocks. 
33 lines changed or deleted 3 lines changed or added


 TQtMarker.h   TQtMarker.h 
// @(#)root/qt:$Id: TQtMarker.h 23251 2008-04-16 10:28:21Z antcheva $ // @(#)root/qt:$Id: TQtMarker.h 28205 2009-04-14 19:38:00Z brun $
// Author: Valeri Fine 21/01/2002 // Author: Valeri Fine 21/01/2002
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2002 by Valeri Fine. * * Copyright (C) 2002 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TQtMarker #ifndef ROOT_TQtMarker
#define ROOT_TQtMarker #define ROOT_TQtMarker
#ifndef ROOT_TPoint #ifndef ROOT_TPoint
#include "TPoint.h" #include "TPoint.h"
#endif #endif
#ifndef __CINT__ #ifndef __CINT__
# include "qglobal.h" #include <QPolygon>
# if QT_VERSION < 0x40000
# include <qpointarray.h>
# else /* QT_VERSION */
# include <QPolygon>
# endif /* QT_VERSION */
#else #else
class QPointArray; class QPointArray;
class QPolygon; class QPolygon;
#endif #endif
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// //
// TQtMarker - class-utility to convert the ROOT TMarker object shape // TQtMarker - class-utility to convert the ROOT TMarker object shape
// in to the Qt QPointArray. // in to the Qt QPolygon.
// //
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
class TQtMarker { class TQtMarker {
private: private:
int fNumNode; // Number of chain in the marker shape int fNumNode; // Number of chain in the marker shape
#ifndef __CINT__ QPolygon fChain; // array of the n chains to build a shaped marke
#if (QT_VERSION < 0x40000) r
QPointArray fChain; // array of the n chains to build a shaped marke
r
#else /* QT_VERSION */
QPolygon fChain; // array of the n chains to build a shaped marker
#endif /* QT_VERSION */
#endif
Color_t fCindex; // Color index of the marker; Color_t fCindex; // Color index of the marker;
int fMarkerType; // Type of the current marker int fMarkerType; // Type of the current marker
public: public:
TQtMarker(int n=0, TPoint *xy=0,int type=0); TQtMarker(int n=0, TPoint *xy=0,int type=0);
void operator=(const TQtMarker&); void operator=(const TQtMarker&);
TQtMarker(const TQtMarker&); TQtMarker(const TQtMarker&);
virtual ~TQtMarker(); virtual ~TQtMarker();
int GetNumber() const; int GetNumber() const;
#ifndef __CINT__ const QPolygon &GetNodes() const;
#if (QT_VERSION < 0x40000) int GetType() const;
QPointArray &GetNodes();
#else /* QT_VERSION */
QPolygon &GetNodes();
#endif /* QT_VERSION */
#endif
int GetType() const;
void SetMarker(int n, TPoint *xy, int type); void SetMarker(int n, TPoint *xy, int type);
ClassDef(TQtMarker,0) // Convert ROOT TMarker objects on to QPointArra y ClassDef(TQtMarker,0) // Convert ROOT TMarker objects on to QPointArra y
}; };
//_________________________________________________________ //_________________________________________________________
inline void TQtMarker::operator=(const TQtMarker&m) inline void TQtMarker::operator=(const TQtMarker&m)
{ {
fNumNode = m.fNumNode; fNumNode = m.fNumNode;
fChain = m.fChain; fChain = m.fChain;
fCindex = m.fCindex; fCindex = m.fCindex;
 End of changes. 5 change blocks. 
25 lines changed or deleted 8 lines changed or added


 TQtPadFont.h   TQtPadFont.h 
// @(#)root/qt:$Name: $:$Id: TQtPadFont.h 24506 2008-06-24 09:16:30Z brun $ // @(#)root/qt:$Name: $:$Id: TQtPadFont.h 28205 2009-04-14 19:38:00Z brun $
// Author: Valeri Fine 21/01/2002 // Author: Valeri Fine 21/01/2002
/************************************************************************** ** /************************************************************************** **
** **
** Copyright (C) 2002 by Valeri Fine. All rights reserved. ** Copyright (C) 2002 by Valeri Fine. All rights reserved.
** **
** This file may be distributed under the terms of the Q Public License ** This file may be distributed under the terms of the Q Public License
** as defined by Trolltech AS of Norway and appearing in the file ** as defined by Trolltech AS of Norway and appearing in the file
** LICENSE.QPL included in the packaging of this file. ** LICENSE.QPL included in the packaging of this file.
*************************************************************************** **/ *************************************************************************** **/
#ifndef ROOT_TQtPadFont #ifndef ROOT_TQtPadFont
#define ROOT_TQtPadFont #define ROOT_TQtPadFont
#include "TAttText.h" #include "TAttText.h"
#include "TString.h"
#ifndef __CINT__ #ifndef __CINT__
# include <qfont.h> # include <QFont>
#else #else
class QFont; class QFont;
#endif #endif
// //
// TQtPadFont creates the QFort object to map to ROOT TAttText attribut es // TQtPadFont class is Qt QFont class with TAttText ROOT class interface
// //
class TQtPadFont : public QFont, public TAttText class TQtPadFont : public QFont, public TAttText
{ {
private: private:
static const char *fgRomanFontName; static TString fgRomanFontName;
static const char *fgArialFontName; static TString fgArialFontName;
static const char *fgCourierFontName; static TString fgCourierFontName;
static const char *fgSymbolFontFamily; static TString fgSymbolFontFamily;
public: public:
TQtPadFont(); TQtPadFont();
TQtPadFont(const TQtPadFont &src):QFont(src),TAttText(src) {} TQtPadFont(const TQtPadFont &src):QFont(src),TAttText(src) {}
virtual ~TQtPadFont(){;} virtual ~TQtPadFont(){;}
void SetTextFont(const char *fontname, int italic, int bold); void SetTextFont(const char *fontname, int italic, int bold);
void SetTextFont(Font_t fontnumber=62); void SetTextFont(Font_t fontnumber=62);
void SetTextSize(Float_t textsize=1); void SetTextSize(Float_t textsize=1);
void SetTextSizePixels(Int_t npixels); void SetTextSizePixels(Int_t npixels);
void SetTextMaginfy(Float_t mgn); void SetTextMaginfy(Float_t mgn);
 End of changes. 5 change blocks. 
7 lines changed or deleted 8 lines changed or added


 TQtRootSlot.h   TQtRootSlot.h 
// @(#)root/qt:$Id: TQtRootSlot.h 21429 2007-12-17 18:19:41Z brun $ // @(#)root/qt:$Id: TQtRootSlot.h 27630 2009-02-26 19:06:42Z brun $
// Author: Valery Fine 18/01/2007 // Author: Valery Fine 18/01/2007
/************************************************************************** ** /************************************************************************** **
** $Id: TQtRootSlot.h 21429 2007-12-17 18:19:41Z brun $ ** $Id: TQtRootSlot.h 27630 2009-02-26 19:06:42Z brun $
** **
** Copyright (C) 2007 by Valeri Fine. Brookhaven National Laboratory. ** Copyright (C) 2007 by Valeri Fine. Brookhaven National Laboratory.
** All rights reserved. ** All rights reserved.
** **
** This file may be distributed under the terms of the Q Public License ** This file may be distributed under the terms of the Q Public License
** as defined by Trolltech AS of Norway and appearing in the file ** as defined by Trolltech AS of Norway and appearing in the file
** LICENSE.QPL included in the packaging of this file. ** LICENSE.QPL included in the packaging of this file.
** **
*************************************************************************** **/ *************************************************************************** **/
//________________________________________________________________________ //________________________________________________________________________
skipping to change at line 38 skipping to change at line 38
#define ROOT_TQRootSlot #define ROOT_TQRootSlot
#ifndef __CINT__ #ifndef __CINT__
#include <qobject.h> #include <qobject.h>
#else #else
class QObject; class QObject;
#define Q_OBJECT #define Q_OBJECT
#define slots #define slots
#endif #endif
class QString;
class TQtRootSlot : public QObject { class TQtRootSlot : public QObject {
Q_OBJECT Q_OBJECT
private: private:
TQtRootSlot (const TQtRootSlot &); TQtRootSlot (const TQtRootSlot &);
void operator=(const TQtRootSlot &); void operator=(const TQtRootSlot &);
protected: protected:
static TQtRootSlot *fgTQtRootSlot; static TQtRootSlot *fgTQtRootSlot;
TQtRootSlot () {} TQtRootSlot () {}
public: public:
static TQtRootSlot *CintSlot(); static TQtRootSlot *CintSlot();
virtual ~TQtRootSlot() {} virtual ~TQtRootSlot() {}
public slots: public slots:
void ProcessLine(const char *); void ProcessLine(const char *);
void ProcessLine(const QString &);
void Terminate(int status) const; void Terminate(int status) const;
void Terminate() const; void Terminate() const;
void TerminateAndQuit() const; void TerminateAndQuit() const;
#ifndef __CINT__ #ifndef __CINT__
signals: signals:
void Error(int error); void Error(int error);
#endif #endif
}; };
 End of changes. 4 change blocks. 
2 lines changed or deleted 5 lines changed or added


 TQtTimer.h   TQtTimer.h 
// @(#)root/qt:$Id: TQtTimer.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/qt:$Id: TQtTimer.h 28205 2009-04-14 19:38:00Z brun $
// Author: Valery Fine 09/08/2004 // Author: Valery Fine 09/08/2004
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2002 by Valeri Fine. * * Copyright (C) 2002 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TQtTimer #ifndef ROOT_TQtTimer
#define ROOT_TQtTimer #define ROOT_TQtTimer
#include "Rtypes.h" #include "Rtypes.h"
#ifndef __CINT__ #ifndef __CINT__
# include <qtimer.h> # include <QTimer>
#else #else
class QTimer; class QTimer;
#endif #endif
// //
// TQtTimer is a singelton QTimer to awake the ROOT event loop from Qt even t loop // TQtTimer is a singelton QTimer to awake the ROOT event loop from Qt even t loop
// //
//___________________________________________________________________ //___________________________________________________________________
class TQtTimer : public QTimer { class TQtTimer : public QTimer {
#ifndef __CINT__ #ifndef __CINT__
Q_OBJECT Q_OBJECT
#endif #endif
private: private:
void operator=(const TQtTimer &); void operator=(const TQtTimer &);
TQtTimer(const TQtTimer &); TQtTimer(const TQtTimer &);
protected: protected:
static TQtTimer *fgQTimer; static TQtTimer *fgQTimer;
int fCounter; int fCounter;
TQtTimer (QObject *parent=0, const char *name=0): QTimer(parent,name),fCo TQtTimer (QObject *mother=0): QTimer(mother),fCounter(0)
unter(0){} {}
protected slots: protected slots:
virtual void AwakeRootEvent(); virtual void AwakeRootEvent();
public: public:
virtual ~TQtTimer(){} virtual ~TQtTimer(){}
static TQtTimer *Create(QObject *parent=0, const char *name=0); static TQtTimer *Create(QObject *parent=0);
static TQtTimer *QtTimer(); static TQtTimer *QtTimer();
ClassDef(TQtTimer,0) // QTimer to awake the ROOT event loop from Qt event loop ClassDef(TQtTimer,0) // QTimer to awake the ROOT event loop from Qt event loop
}; };
inline TQtTimer *TQtTimer::QtTimer(){ return fgQTimer; } inline TQtTimer *TQtTimer::QtTimer(){ return fgQTimer; }
#endif #endif
 End of changes. 4 change blocks. 
5 lines changed or deleted 5 lines changed or added


 TQtUtil.h   TQtUtil.h 
// @(#)root/qt:$Id: TQtUtil.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/qt:$Id: TQtUtil.h 27753 2009-03-11 09:41:27Z brun $
// Author: Valeri Fine 21/01/2002 // Author: Valeri Fine 21/01/2002
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2002 by Valeri Fine. * * Copyright (C) 2002 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 54 skipping to change at line 54
//_______________________________________ //_______________________________________
inline HDC wigdetHdc(TPad *pad) inline HDC wigdetHdc(TPad *pad)
{ return padPixmap(pad)->handle(); } { return padPixmap(pad)->handle(); }
//_______________________________________ //_______________________________________
inline HDC wigdetHdc(TCanvas *c) inline HDC wigdetHdc(TCanvas *c)
{ return canvasWidget(c)->handle(); } { return canvasWidget(c)->handle(); }
//_______________________________________ //_______________________________________
inline HDC wigdetHdc(TCanvasImp *c) inline HDC wigdetHdc(TCanvasImp *c)
{ return canvasWidget(c)->handle(); } { return canvasWidget(c)->handle(); }
ifdef WIN32 #ifdef WIN32
//_______________________________________ //_______________________________________
inline HWND hwndWin32(TCanvas *c) inline HWND hwndWin32(TCanvas *c)
{ return canvasWidget(c)->winId(); } { return canvasWidget(c)->winId(); }
//_______________________________________ //_______________________________________
inline HWND hwndWin32(TCanvasImp *c) inline HWND hwndWin32(TCanvasImp *c)
{ return canvasWidget(c)->winId(); } { return canvasWidget(c)->winId(); }
#else #else
//_______________________________________ //_______________________________________
inline Ulong_t hwndWin32(TCanvas *c) inline Ulong_t hwndWin32(TCanvas *c)
{ return canvasWidget(c)->winId(); } { return canvasWidget(c)->winId(); }
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TQtWidget.h   TQtWidget.h 
// @(#)root/qt:$Id: TQtWidget.h 25523 2008-09-25 07:28:17Z brun $ // @(#)root/qt:$Id: TQtWidget.h 28205 2009-04-14 19:38:00Z brun $
// Author: Valeri Fine 21/01/2002 // Author: Valeri Fine 21/01/2002
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2003 by Valeri Fine. * * Copyright (C) 2003 by Valeri Fine. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 83 skipping to change at line 83
//___________________________________________________________________ //___________________________________________________________________
class TQtWidgetBuffer class TQtWidgetBuffer
{ {
private: private:
const QWidget *fWidget; const QWidget *fWidget;
QPaintDevice *fBuffer; QPaintDevice *fBuffer;
bool fIsImage; bool fIsImage;
public: public:
TQtWidgetBuffer(const QWidget *w, bool clear=false); TQtWidgetBuffer(const QWidget *w, bool clear=false);
TQtWidgetBuffer(const TQtWidgetBuffer &b);
const QPaintDevice *Buffer() const { return fBuffer; } const QPaintDevice *Buffer() const { return fBuffer; }
QPaintDevice *Buffer() { return fBuffer; } QPaintDevice *Buffer() { return fBuffer; }
~TQtWidgetBuffer(){} ~TQtWidgetBuffer();
void Clear(); void Clear();
bool PaintingActive(){ return fBuffer ? fBuffer->paintingActive() : fals e; } bool PaintingActive(){ return fBuffer ? fBuffer->paintingActive() : fals e; }
QRect Rect () const { return fWidget->rect(); } QRect Rect () const { return fWidget->rect(); }
int Height () const { return fBuffer ? fBuffer->height() : 0;} int Height () const { return fBuffer ? fBuffer->height() : 0;}
int Width () const { return fBuffer ? fBuffer->width() : 0; } int Width () const { return fBuffer ? fBuffer->width() : 0; }
}; };
//___________________________________________________________________ //___________________________________________________________________
class TQtWidget : public QWidget { class TQtWidget : public QWidget {
#ifndef __CINT__ #ifndef __CINT__
skipping to change at line 152 skipping to change at line 153
TCanvas *fCanvas; TCanvas *fCanvas;
TQtWidgetBuffer *fPixmapID; // Double buffer of this widget TQtWidgetBuffer *fPixmapID; // Double buffer of this widget
TQtWidgetBuffer *fPixmapScreen; // Double buffer for no-double buffer operation TQtWidgetBuffer *fPixmapScreen; // Double buffer for no-double buffer operation
bool fPaint; bool fPaint;
bool fSizeChanged; bool fSizeChanged;
bool fDoubleBufferOn; bool fDoubleBufferOn;
bool fEmbedded; bool fEmbedded;
QSize fSizeHint; QSize fSizeHint;
QWidget *fWrapper; QWidget *fWrapper;
QString fSaveFormat; QString fSaveFormat;
bool fInsidePaintEvent;
void SetRootID(QWidget *wrapper); void SetRootID(QWidget *wrapper);
QWidget *GetRootID() const; QWidget *GetRootID() const;
virtual void EmitCanvasPainted() { emit CanvasPainted(); } virtual void EmitCanvasPainted() { emit CanvasPainted(); }
TCanvas *Canvas(); TCanvas *Canvas();
bool paintFlag(bool mode=TRUE); bool paintFlag(bool mode=TRUE);
void AdjustBufferSize(); void AdjustBufferSize();
bool PaintingActive () const; bool PaintingActive () const;
 End of changes. 4 change blocks. 
2 lines changed or deleted 4 lines changed or added


 TROOT.h   TROOT.h 
// @(#)root/base:$Id: TROOT.h 22992 2008-04-05 09:43:01Z pcanal $ // @(#)root/base:$Id: TROOT.h 27658 2009-02-28 05:34:57Z pcanal $
// Author: Rene Brun 08/12/94 // Author: Rene Brun 08/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 94 skipping to change at line 94
Bool_t fBatch; //True if session without graphic s Bool_t fBatch; //True if session without graphic s
Bool_t fEditHistograms; //True if histograms can be edite d with the mouse Bool_t fEditHistograms; //True if histograms can be edite d with the mouse
Bool_t fFromPopUp; //True if command executed from a popup menu Bool_t fFromPopUp; //True if command executed from a popup menu
Bool_t fMustClean; //True if object destructor scans canvases Bool_t fMustClean; //True if object destructor scans canvases
Bool_t fReadingObject; //True while reading an object [D eprecated (will be removed in next release) Bool_t fReadingObject; //True while reading an object [D eprecated (will be removed in next release)
Bool_t fForceStyle; //Force setting of current style when reading objects Bool_t fForceStyle; //Force setting of current style when reading objects
Bool_t fInterrupt; //True if macro should be interru pted Bool_t fInterrupt; //True if macro should be interru pted
Bool_t fEscape; //True if ESC has been pressed Bool_t fEscape; //True if ESC has been pressed
Bool_t fExecutingMacro; //True while executing a TMacro Bool_t fExecutingMacro; //True while executing a TMacro
Int_t fEditorMode; //Current Editor mode Int_t fEditorMode; //Current Editor mode
TObject *fPrimitive; //Currently selected primitive const TObject *fPrimitive; //Currently selected primitive
TVirtualPad *fSelectPad; //Currently selected pad TVirtualPad *fSelectPad; //Currently selected pad
TCollection *fClasses; //List of classes definition TCollection *fClasses; //List of classes definition
TCollection *fTypes; //List of data types definition TCollection *fTypes; //List of data types definition
TCollection *fGlobals; //List of global variables TCollection *fGlobals; //List of global variables
TCollection *fGlobalFunctions; //List of global functions TCollection *fGlobalFunctions; //List of global functions
TSeqCollection *fFiles; //List of files TSeqCollection *fFiles; //List of files
TSeqCollection *fMappedFiles; //List of memory mapped files TSeqCollection *fMappedFiles; //List of memory mapped files
TSeqCollection *fSockets; //List of network sockets TSeqCollection *fSockets; //List of network sockets
TSeqCollection *fCanvases; //List of canvases TSeqCollection *fCanvases; //List of canvases
TSeqCollection *fStyles; //List of styles TSeqCollection *fStyles; //List of styles
skipping to change at line 204 skipping to change at line 204
TDataType *GetType(const char *name, Bool_t load = kFALSE) const; TDataType *GetType(const char *name, Bool_t load = kFALSE) const;
TFile *GetFile() const { if (gDirectory != this) return gDire ctory->GetFile(); else return 0;} TFile *GetFile() const { if (gDirectory != this) return gDire ctory->GetFile(); else return 0;}
TFile *GetFile(const char *name) const; TFile *GetFile(const char *name) const;
TStyle *GetStyle(const char *name) const; TStyle *GetStyle(const char *name) const;
TObject *GetFunction(const char *name) const; TObject *GetFunction(const char *name) const;
TGlobal *GetGlobal(const char *name, Bool_t load = kFALSE) cons t; TGlobal *GetGlobal(const char *name, Bool_t load = kFALSE) cons t;
TGlobal *GetGlobal(const TObject *obj, Bool_t load = kFALSE) co nst; TGlobal *GetGlobal(const TObject *obj, Bool_t load = kFALSE) co nst;
TFunction *GetGlobalFunction(const char *name, const char *params = 0, Bool_t load = kFALSE); TFunction *GetGlobalFunction(const char *name, const char *params = 0, Bool_t load = kFALSE);
TFunction *GetGlobalFunctionWithPrototype(const char *name, const char *proto = 0, Bool_t load = kFALSE); TFunction *GetGlobalFunctionWithPrototype(const char *name, const char *proto = 0, Bool_t load = kFALSE);
TObject *GetGeometry(const char *name) const; TObject *GetGeometry(const char *name) const;
TObject *GetSelectedPrimitive() const { return fPrimitive; } const TObject *GetSelectedPrimitive() const { return fPrimitive; }
TVirtualPad *GetSelectedPad() const { return fSelectPad; } TVirtualPad *GetSelectedPad() const { return fSelectPad; }
Int_t GetNclasses() const { return fClasses->GetSize(); } Int_t GetNclasses() const { return fClasses->GetSize(); }
Int_t GetNtypes() const { return fTypes->GetSize(); } Int_t GetNtypes() const { return fTypes->GetSize(); }
TFolder *GetRootFolder() const { return fRootFolder; } TFolder *GetRootFolder() const { return fRootFolder; }
TProcessUUID *GetUUIDs() const { return fUUIDs; } TProcessUUID *GetUUIDs() const { return fUUIDs; }
void Idle(UInt_t idleTimeInSec, const char *command = 0); void Idle(UInt_t idleTimeInSec, const char *command = 0);
Int_t IgnoreInclude(const char *fname, const char *expandedf name); Int_t IgnoreInclude(const char *fname, const char *expandedf name);
Bool_t IsBatch() const { return fBatch; } Bool_t IsBatch() const { return fBatch; }
Bool_t IsExecutingMacro() const { return fExecutingMacro; } Bool_t IsExecutingMacro() const { return fExecutingMacro; }
Bool_t IsFolder() const { return kTRUE; } Bool_t IsFolder() const { return kTRUE; }
skipping to change at line 249 skipping to change at line 249
void SetEditHistograms(Bool_t flag = kTRUE) { fEditHistogra ms = flag; } void SetEditHistograms(Bool_t flag = kTRUE) { fEditHistogra ms = flag; }
void SetEditorMode(const char *mode = ""); void SetEditorMode(const char *mode = "");
void SetExecutingMacro(Bool_t flag = kTRUE) { fExecutingMac ro = flag; } void SetExecutingMacro(Bool_t flag = kTRUE) { fExecutingMac ro = flag; }
void SetFromPopUp(Bool_t flag = kTRUE) { fFromPopUp = flag; } void SetFromPopUp(Bool_t flag = kTRUE) { fFromPopUp = flag; }
void SetInterrupt(Bool_t flag = kTRUE) { fInterrupt = flag; } void SetInterrupt(Bool_t flag = kTRUE) { fInterrupt = flag; }
void SetEscape(Bool_t flag = kTRUE) { fEscape = flag; } void SetEscape(Bool_t flag = kTRUE) { fEscape = flag; }
void SetLineIsProcessing() { fLineIsProcessing++; } void SetLineIsProcessing() { fLineIsProcessing++; }
void SetLineHasBeenProcessed() { if (fLineIsProcessing) fLi neIsProcessing--; } void SetLineHasBeenProcessed() { if (fLineIsProcessing) fLi neIsProcessing--; }
void SetReadingObject(Bool_t flag = kTRUE) { fReadingObject = flag; } void SetReadingObject(Bool_t flag = kTRUE) { fReadingObject = flag; }
void SetMustClean(Bool_t flag = kTRUE) { fMustClean=flag; } void SetMustClean(Bool_t flag = kTRUE) { fMustClean=flag; }
void SetSelectedPrimitive(const TObject *obj) { fPrimitive = (TObject*)obj; } void SetSelectedPrimitive(const TObject *obj) { fPrimitive = obj; }
void SetSelectedPad(TVirtualPad *pad) { fSelectPad = pad; } void SetSelectedPad(TVirtualPad *pad) { fSelectPad = pad; }
void SetStyle(const char *stylename = "Default"); void SetStyle(const char *stylename = "Default");
void Time(Int_t casetime=1) { fTimer = casetime; } void Time(Int_t casetime=1) { fTimer = casetime; }
Int_t Timer() const { return fTimer; } Int_t Timer() const { return fTimer; }
//---- static functions //---- static functions
static Int_t DecreaseDirLevel(); static Int_t DecreaseDirLevel();
static Int_t GetDirLevel(); static Int_t GetDirLevel();
static const char *GetMacroPath(); static const char *GetMacroPath();
static void SetMacroPath(const char *newpath); static void SetMacroPath(const char *newpath);
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 TRandom.h   TRandom.h 
// @(#)root/mathcore:$Id: TRandom.h 22866 2008-03-27 15:32:50Z rdm $ // @(#)root/mathcore:$Id: TRandom.h 27771 2009-03-15 18:09:18Z brun $
// Author: Rene Brun 15/12/95 // Author: Rene Brun 15/12/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 40 skipping to change at line 40
UInt_t fSeed; //Random number generator seed UInt_t fSeed; //Random number generator seed
public: public:
TRandom(UInt_t seed=65539); TRandom(UInt_t seed=65539);
virtual ~TRandom(); virtual ~TRandom();
virtual Int_t Binomial(Int_t ntot, Double_t prob); virtual Int_t Binomial(Int_t ntot, Double_t prob);
virtual Double_t BreitWigner(Double_t mean=0, Double_t gamma=1); virtual Double_t BreitWigner(Double_t mean=0, Double_t gamma=1);
virtual void Circle(Double_t &x, Double_t &y, Double_t r); virtual void Circle(Double_t &x, Double_t &y, Double_t r);
virtual Double_t Exp(Double_t tau); virtual Double_t Exp(Double_t tau);
virtual Double_t Gaus(Double_t mean=0, Double_t sigma=1); virtual Double_t Gaus(Double_t mean=0, Double_t sigma=1);
virtual UInt_t GetSeed() {return fSeed;} virtual UInt_t GetSeed() const {return fSeed;}
virtual UInt_t Integer(UInt_t imax); virtual UInt_t Integer(UInt_t imax);
virtual Double_t Landau(Double_t mean=0, Double_t sigma=1); virtual Double_t Landau(Double_t mean=0, Double_t sigma=1);
virtual Int_t Poisson(Double_t mean); virtual Int_t Poisson(Double_t mean);
virtual Double_t PoissonD(Double_t mean); virtual Double_t PoissonD(Double_t mean);
virtual void Rannor(Float_t &a, Float_t &b); virtual void Rannor(Float_t &a, Float_t &b);
virtual void Rannor(Double_t &a, Double_t &b); virtual void Rannor(Double_t &a, Double_t &b);
virtual void ReadRandom(const char *filename); virtual void ReadRandom(const char *filename);
virtual void SetSeed(UInt_t seed=65539); virtual void SetSeed(UInt_t seed=65539);
virtual Double_t Rndm(Int_t i=0); virtual Double_t Rndm(Int_t i=0);
virtual void RndmArray(Int_t n, Float_t *array); virtual void RndmArray(Int_t n, Float_t *array);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TRecorder.h   TRecorder.h 
// @(#)root/gui:$Id: TRecorder.h 27550 2009-02-20 14:38:05Z bellenot $ // @(#)root/gui:$Id: TRecorder.h 27723 2009-03-09 13:43:34Z bellenot $
// Author: Katerina Opocenska 11/09/2008 // Author: Katerina Opocenska 11/09/2008
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TRecorder
#define ROOT_TRecorder
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// // // //
// ROOT EVENT RECORDING SYSTEM // // ROOT EVENT RECORDING SYSTEM //
// ================================================================== // // ================================================================== //
// // // //
// TRecorder class provides interface for recording and replaying // // TRecorder class provides interface for recording and replaying //
// events in ROOT. // // events in ROOT. //
// Recorded events are: // // Recorded events are: //
// - Commands typed by user in commandline ('new TCanvas') // // - Commands typed by user in commandline ('new TCanvas') //
// - GUI events (mouse movement, button clicks, ...) // // - GUI events (mouse movement, button clicks, ...) //
skipping to change at line 806 skipping to change at line 809
public: public:
TGRecorder(const TGWindow *p = 0, UInt_t w = 230, UInt_t h = 150); TGRecorder(const TGWindow *p = 0, UInt_t w = 230, UInt_t h = 150);
virtual ~TGRecorder(); virtual ~TGRecorder();
void StartStop(); void StartStop();
void Update(); void Update();
void Replay(); void Replay();
ClassDef(TGRecorder,0) // GUI class of the event recorder. ClassDef(TGRecorder,0) // GUI class of the event recorder.
}; };
#endif // ROOT_TRecorder
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 TResponseTable.h   TResponseTable.h 
// @(#)root/table:$Id: TResponseTable.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/table:$Id: TResponseTable.h 27753 2009-03-11 09:41:27Z brun $
// Author: Valery Fine(fine@bnl.gov) 30/06/2001 // Author: Valery Fine(fine@bnl.gov) 30/06/2001
#ifndef ROOT_TResponseTable
#define ROOT_TResponseTable
#include "TGenericTable.h" #include "TGenericTable.h"
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// // // //
// TResponseTable // // TResponseTable //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
class TResponseTable : public TGenericTable class TResponseTable : public TGenericTable
skipping to change at line 30 skipping to change at line 32
protected: protected:
void AddVolumePath(const char *path); void AddVolumePath(const char *path);
void AddResponse(const char *chit); void AddResponse(const char *chit);
void AddElement(const char *path,EColumnType type); void AddElement(const char *path,EColumnType type);
private: private:
Int_t fResponseLocation; Int_t fResponseLocation;
ClassDef(TResponseTable,4) // Generic Geant detector response table ClassDef(TResponseTable,4) // Generic Geant detector response table
}; };
#endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added


 TRolke.h   TRolke.h 
skipping to change at line 17 skipping to change at line 17
// in the presence of background and efficiency with a fully frequentist // in the presence of background and efficiency with a fully frequentist
// treatment of the uncertainties in the efficiency and background estimat e // treatment of the uncertainties in the efficiency and background estimat e
// using the profile likelihood method. // using the profile likelihood method.
// //
// Author: Jan Conrad (CERN) 2004 // Author: Jan Conrad (CERN) 2004
// Updated: Johan Lundberg (CERN) 2009 // Updated: Johan Lundberg (CERN) 2009
// //
// Copyright CERN 2004,2009 Jan.Conrad@cern.ch, // Copyright CERN 2004,2009 Jan.Conrad@cern.ch,
// Johan.Lundberg@cern.ch // Johan.Lundberg@cern.ch
// //
// This file lists the methods and their syntax. For information about // For information about the statistical meaning of the parameters
// the statistical meaning of the parameters, consult TRolke.cxx. // and the syntax, consult TRolke.cxx
// ------------------- // ------------------
//
// Examples are found in the file Rolke.C // Examples are found in the file Rolke.C
// -------------------------------------- // --------------------------------------
// //
/////////////////////////////////////////////////////////////////////////// /// /////////////////////////////////////////////////////////////////////////// ///
#ifndef ROOT_TRolke #ifndef ROOT_TRolke
#define ROOT_TRolke #define ROOT_TRolke
#include "TObject.h" #include "TObject.h"
#include "TMath.h" #include "TMath.h"
skipping to change at line 65 skipping to change at line 66
Double_t f_tau; Double_t f_tau;
Double_t f_b; Double_t f_b;
Int_t f_m; Int_t f_m;
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
/* Internal helper functions and methods */ /* Internal helper functions and methods */
// The Calculator // The Calculator
Double_t Interval(Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, D ouble_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Double_t b, Int_t m); Double_t Interval(Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, D ouble_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Double_t b, Int_t m);
// LIKELIHOOD ROUTINE // LIKELIHOOD ROUTINE
Double_t Likelihood(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t t au, Double_t b, Int_t m, Int_t what); Double_t Likelihood(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Double_t b, Int_t m, Int_t what);
//MODEL 1 //MODEL 1
Double_t EvalLikeMod1(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t t au, Int_t m, Int_t what); Double_t EvalLikeMod1(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t t au, Int_t m, Int_t what);
Double_t LikeMod1(Double_t mu, Double_t b, Double_t e, Int_t x, Int_t y, Int_t z, Double_t tau, Int_t m); Double_t LikeMod1(Double_t mu, Double_t b, Double_t e, Int_t x, Int_t y, Int_t z, Double_t tau, Int_t m);
void ProfLikeMod1(Double_t mu, Double_t &b, Double_t &e, Int_t x, In t_t y, Int_t z, Double_t tau, Int_t m); void ProfLikeMod1(Double_t mu, Double_t &b, Double_t &e, Int_t x, In t_t y, Int_t z, Double_t tau, Int_t m);
Double_t LikeGradMod1(Double_t e, Double_t mu, Int_t x, Int_t y, Int_t z , Double_t tau, Int_t m); Double_t LikeGradMod1(Double_t e, Double_t mu, Int_t x, Int_t y, Int_t z , Double_t tau, Int_t m);
//MODEL 2 //MODEL 2
Double_t EvalLikeMod2(Double_t mu, Int_t x, Int_t y, Double_t em, Double _t sde, Double_t tau, Int_t what); Double_t EvalLikeMod2(Double_t mu, Int_t x, Int_t y, Double_t em, Double _t sde, Double_t tau, Int_t what);
skipping to change at line 113 skipping to change at line 114
Double_t ComputeInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Double_ t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Doub le_t b, Int_t m); Double_t ComputeInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Double_ t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Doub le_t b, Int_t m);
void SetModelParameters(Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Doubl e_t b, Int_t m); void SetModelParameters(Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Doubl e_t b, Int_t m);
void SetModelParameters(); void SetModelParameters();
Double_t GetBackground(); Double_t GetBackground();
public: public:
/* Constructor with optional Confidence Level argument. /* Constructor */
'option' is not used. */
TRolke(Double_t CL = 0.9, Option_t *option = ""); TRolke(Double_t CL = 0.9, Option_t *option = "");
/* Destructor */ /* Destructor */
virtual ~TRolke(); virtual ~TRolke();
/* Get and set the Confidence Level */ /* Get and set the Confidence Level */
Double_t GetCL() const { Double_t GetCL() const {
return fCL; return fCL;
} }
void SetCL(Double_t CL) { void SetCL(Double_t CL) {
skipping to change at line 163 skipping to change at line 163
void SetKnownBkgGaussEff(Int_t x, Double_t em, Double_t sde, Double_t b) ; void SetKnownBkgGaussEff(Int_t x, Double_t em, Double_t sde, Double_t b) ;
/* Deprecated interface method (read Rolke.cxx). May be removed from fut ure releases */ /* Deprecated interface method (read Rolke.cxx). May be removed from fut ure releases */
Double_t CalculateInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Doubl e_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Do uble_t b, Int_t m); Double_t CalculateInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Doubl e_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Do uble_t b, Int_t m);
// get the upper and lower limits based on the specified model // get the upper and lower limits based on the specified model
bool GetLimits(Double_t& low, Double_t& high); bool GetLimits(Double_t& low, Double_t& high);
Double_t GetUpperLimit(); Double_t GetUpperLimit();
Double_t GetLowerLimit(); Double_t GetLowerLimit();
/* get the upper and lower average limits based on the specified model. // get the upper and lower average limits
No uncertainties are considered for the Poisson weights in the averag
ing sum */
bool GetSensitivity(Double_t& low, Double_t& high, Double_t pPrecision = 0.00001); bool GetSensitivity(Double_t& low, Double_t& high, Double_t pPrecision = 0.00001);
/* get the upper and lower limits for the outcome corresponding to // get the upper and lower limits for the outcome corresponding to
a given quantile. For integral=0.5 this gives the median limits // a given quantile.
in repeated experiments. The returned out_x is the corresponding
(e.g. median) value of x.
No uncertainties are considered for the Poisson weights when calculat
ing
the Poisson integral */
bool GetLimitsQuantile(Double_t& low, Double_t& high, Int_t& out_x, Doub le_t integral = 0.5); bool GetLimitsQuantile(Double_t& low, Double_t& high, Int_t& out_x, Doub le_t integral = 0.5);
/* get the upper and lower limits for the most likely outcome. // get the upper and lower limits for the most likely outcome.
The returned out_x is the corresponding value of x
No uncertainties are considered for the Poisson weights when finding
ML */
bool GetLimitsML(Double_t& low, Double_t& high, Int_t& out_x); bool GetLimitsML(Double_t& low, Double_t& high, Int_t& out_x);
/* get the value of x corresponding to rejection of the null hypothesis. // get the value of x corresponding to rejection of the null hypothesis.
This means a lower limit >0 with the pre-specified Confidence Level.
maxtry is the maximum value of x to try. maxtry<0 gives automatic mod
e. */
bool GetCriticalNumber(Int_t& ncrit,Int_t maxtry=-1); bool GetCriticalNumber(Int_t& ncrit,Int_t maxtry=-1);
/* Set the bounding mode flag. Read TRolke.cxx for details. */ /* Get the bounding mode flag. True activates bounded mode. Read
TRolke.cxx and the references therein for details. */
bool GetBounding() const { bool GetBounding() const {
return fBounding; return fBounding;
} }
/* Get the bounding mode flag. True activates bounded mode. Read
TRolke.cxx and the references therein for details. */
void SetBounding(const bool bnd) { void SetBounding(const bool bnd) {
fBounding = bnd; fBounding = bnd;
} }
/* Deprecated name for SetBounding. */ /* Deprecated name for SetBounding. */
void SetSwitch(bool bnd) ; void SetSwitch(bool bnd) ;
/* Dump internals. Option is not used */ /* Dump internals. Option is not used */
void Print(Option_t*) const; void Print(Option_t*) const;
 End of changes. 9 change blocks. 
25 lines changed or deleted 16 lines changed or added


 TRootContextMenu.h   TRootContextMenu.h 
// @(#)root/gui:$Id: TRootContextMenu.h 23115 2008-04-10 13:35:37Z rdm $ // @(#)root/gui:$Id: TRootContextMenu.h 28021 2009-04-01 11:10:27Z bellenot $
// Author: Fons Rademakers 12/02/98 // Author: Fons Rademakers 12/02/98
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 48 skipping to change at line 48
TList *fTrash; // list of objects to be deleted before refilli ng menu TList *fTrash; // list of objects to be deleted before refilli ng menu
TRootContextMenu(const TRootContextMenu&); TRootContextMenu(const TRootContextMenu&);
TRootContextMenu& operator=(const TRootContextMenu&); TRootContextMenu& operator=(const TRootContextMenu&);
void CreateMenu(TObject *object); void CreateMenu(TObject *object);
public: public:
TRootContextMenu(TContextMenu *c = 0, const char *name = "ROOT Context M enu"); TRootContextMenu(TContextMenu *c = 0, const char *name = "ROOT Context M enu");
virtual ~TRootContextMenu(); virtual ~TRootContextMenu();
virtual void DisplayPopup(Int_t x, Int_t y); virtual void DisplayPopup(Int_t x, Int_t y);
virtual void Dialog(TObject *object, TMethod *method); virtual void Dialog(TObject *object, TMethod *method);
virtual void Dialog(TObject *object, TFunction *function); virtual void Dialog(TObject *object, TFunction *function);
TRootDialog *GetDialog() const { return fDialog; }; virtual void DrawEntry(TGMenuEntry *entry);
TRootDialog *GetDialog() const { return fDialog; };
virtual Bool_t HandleButton(Event_t *event);
virtual Bool_t HandleCrossing(Event_t *event);
virtual Bool_t HandleMotion(Event_t *event);
virtual void OnlineHelp();
Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2); Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
protected: protected:
TGPopupMenu * FindHierarchy(const char *commentstring, TString &last_com ponent); TGPopupMenu * FindHierarchy(const char *commentstring, TString &last_com ponent);
void AddEntrySorted(TGPopupMenu *current, const char *s, Int_t id, void *ud = 0, void AddEntrySorted(TGPopupMenu *current, const char *s, Int_t id, void *ud = 0,
const TGPicture *p = 0, Bool_t sorted = kTRUE); const TGPicture *p = 0, Bool_t sorted = kTRUE);
ClassDef(TRootContextMenu,0) //ROOT native GUI context sensitive popup menu ClassDef(TRootContextMenu,0) //ROOT native GUI context sensitive popup menu
}; };
 End of changes. 2 change blocks. 
5 lines changed or deleted 10 lines changed or added


 TRootDialog.h   TRootDialog.h 
// @(#)root/gui:$Id: TRootDialog.h 23115 2008-04-10 13:35:37Z rdm $ // @(#)root/gui:$Id: TRootDialog.h 27999 2009-03-31 08:09:46Z bellenot $
// Author: Fons Rademakers 20/02/98 // Author: Fons Rademakers 20/02/98
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 41 skipping to change at line 41
class TRootDialog : public TGTransientFrame { class TRootDialog : public TGTransientFrame {
private: private:
TRootContextMenu *fMenu; // associated context menu TRootContextMenu *fMenu; // associated context menu
TGLayoutHints *fL1; // label layout TGLayoutHints *fL1; // label layout
TGLayoutHints *fL2; // text entry layout TGLayoutHints *fL2; // text entry layout
TList *fWidgets; // label and text field widgets created in d ialog TList *fWidgets; // label and text field widgets created in d ialog
Bool_t fOk; // if true show OK button Bool_t fOk; // if true show OK button
Bool_t fCancel; // if true show Cancel button Bool_t fCancel; // if true show Cancel button
Bool_t fApply; // if true show Apply button Bool_t fApply; // if true show Apply button
Bool_t fHelp; // if true show Online Help button
public: public:
TRootDialog(TRootContextMenu *cmenu = 0, const TGWindow *main = 0, TRootDialog(TRootContextMenu *cmenu = 0, const TGWindow *main = 0,
const char *title = "ROOT Dialog", Bool_t okB = kTRUE, const char *title = "ROOT Dialog", Bool_t okB = kTRUE,
Bool_t cancelB = kTRUE, Bool_t applyB = kFALSE); Bool_t cancelB = kTRUE, Bool_t applyB = kFALSE,
Bool_t helpB = kTRUE);
virtual ~TRootDialog(); virtual ~TRootDialog();
virtual void Add(const char *argname, const char *value, const char *typ e); virtual void Add(const char *argname, const char *value, const char *typ e);
//virtual void Add(TGComboBox *optionSel); //virtual void Add(TGComboBox *optionSel);
virtual const char *GetParameters(); virtual const char *GetParameters();
virtual void CloseWindow(); virtual void CloseWindow();
virtual void Popup(); virtual void Popup();
virtual Bool_t HandleKey(Event_t *event); virtual Bool_t HandleKey(Event_t *event);
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added


 TSQLStatement.h   TSQLStatement.h 
// @(#)root/net:$Id: TSQLStatement.h 23091 2008-04-09 15:04:27Z rdm $ // @(#)root/net:$Id: TSQLStatement.h 28011 2009-03-31 15:54:10Z pcanal $
// Author: Sergey Linev 6/02/2006 // Author: Sergey Linev 6/02/2006
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 24 skipping to change at line 24
#ifndef ROOT_TObject #ifndef ROOT_TObject
#include "TObject.h" #include "TObject.h"
#endif #endif
#ifndef ROOT_TString #ifndef ROOT_TString
#include "TString.h" #include "TString.h"
#endif #endif
#ifndef ROOT_TDatime #ifndef ROOT_TDatime
#include "TDatime.h" #include "TDatime.h"
#endif #endif
#include<vector>
class TSQLStatement : public TObject { class TSQLStatement : public TObject {
protected: protected:
TSQLStatement(Bool_t errout = kTRUE) : TObject(), fErrorCode(0), TSQLStatement(Bool_t errout = kTRUE) : TObject(), fErrorCode(0),
fErrorMsg(), fErrorOut(errout) { ClearError(); } fErrorMsg(), fErrorOut(errout) { ClearError(); }
Int_t fErrorCode; // error code of last operation Int_t fErrorCode; // error code of last operation
TString fErrorMsg; // error message of last operation TString fErrorMsg; // error message of last operation
Bool_t fErrorOut; // enable error output Bool_t fErrorOut; // enable error output
skipping to change at line 64 skipping to change at line 65
virtual Bool_t SetDate(Int_t, Int_t, Int_t, Int_t) { return kFALSE; } virtual Bool_t SetDate(Int_t, Int_t, Int_t, Int_t) { return kFALSE; }
Bool_t SetDate(Int_t, const TDatime&); Bool_t SetDate(Int_t, const TDatime&);
virtual Bool_t SetTime(Int_t, Int_t, Int_t, Int_t) { return kFALSE; } virtual Bool_t SetTime(Int_t, Int_t, Int_t, Int_t) { return kFALSE; }
Bool_t SetTime(Int_t, const TDatime&); Bool_t SetTime(Int_t, const TDatime&);
virtual Bool_t SetDatime(Int_t, Int_t, Int_t, Int_t, Int_t, Int_t, Int_t) { return kFALSE; } virtual Bool_t SetDatime(Int_t, Int_t, Int_t, Int_t, Int_t, Int_t, Int_t) { return kFALSE; }
Bool_t SetDatime(Int_t, const TDatime&); Bool_t SetDatime(Int_t, const TDatime&);
virtual Bool_t SetTimestamp(Int_t, Int_t, Int_t, Int_t, Int_t, Int_ t, Int_t, Int_t = 0) { return kFALSE; } virtual Bool_t SetTimestamp(Int_t, Int_t, Int_t, Int_t, Int_t, Int_ t, Int_t, Int_t = 0) { return kFALSE; }
Bool_t SetTimestamp(Int_t, const TDatime&); Bool_t SetTimestamp(Int_t, const TDatime&);
virtual void SetTimeFormating(const char*) {} virtual void SetTimeFormating(const char*) {}
virtual Bool_t SetBinary(Int_t, void*, Long_t, Long_t = 0x1000) { r eturn kFALSE; } virtual Bool_t SetBinary(Int_t, void*, Long_t, Long_t = 0x1000) { r eturn kFALSE; }
#ifndef __MAKECINT__
virtual Bool_t SetVInt(Int_t, const std::vector<Int_t>, const char*
, const char*) { return kFALSE; }
virtual Bool_t SetVUInt(Int_t, const std::vector<UInt_t>, const cha
r*, const char*) { return kFALSE; }
virtual Bool_t SetVLong(Int_t, const std::vector<Long_t>, const cha
r*, const char*) { return kFALSE; }
virtual Bool_t SetVLong64(Int_t, const std::vector<Long64_t>, const
char*, const char*) { return kFALSE; }
virtual Bool_t SetVULong64(Int_t, const std::vector<ULong64_t>, con
st char*, const char*) { return kFALSE; }
virtual Bool_t SetVDouble(Int_t, const std::vector<Double_t>, const
char*, const char*) { return kFALSE; }
#endif
virtual Bool_t Process() = 0; virtual Bool_t Process() = 0;
virtual Int_t GetNumAffectedRows() { return 0; } virtual Int_t GetNumAffectedRows() { return 0; }
virtual Bool_t StoreResult() = 0; virtual Bool_t StoreResult() = 0;
virtual Int_t GetNumFields() = 0; virtual Int_t GetNumFields() = 0;
virtual const char *GetFieldName(Int_t) = 0; virtual const char *GetFieldName(Int_t) = 0;
virtual Bool_t SetMaxFieldSize(Int_t, Long_t) { return kFALSE; } virtual Bool_t SetMaxFieldSize(Int_t, Long_t) { return kFALSE; }
virtual Bool_t NextResultRow() = 0; virtual Bool_t NextResultRow() = 0;
skipping to change at line 96 skipping to change at line 105
virtual Bool_t GetDatime(Int_t, Int_t&, Int_t&, Int_t&, Int_t&, Int _t&, Int_t&) { return kFALSE; } virtual Bool_t GetDatime(Int_t, Int_t&, Int_t&, Int_t&, Int_t&, Int _t&, Int_t&) { return kFALSE; }
TDatime GetDatime(Int_t); TDatime GetDatime(Int_t);
Int_t GetYear(Int_t); Int_t GetYear(Int_t);
Int_t GetMonth(Int_t); Int_t GetMonth(Int_t);
Int_t GetDay(Int_t); Int_t GetDay(Int_t);
Int_t GetHour(Int_t); Int_t GetHour(Int_t);
Int_t GetMinute(Int_t); Int_t GetMinute(Int_t);
Int_t GetSecond(Int_t); Int_t GetSecond(Int_t);
virtual Bool_t GetTimestamp(Int_t, Int_t&, Int_t&, Int_t&, Int_t&, Int_t&, Int_t&, Int_t&) { return kFALSE; } virtual Bool_t GetTimestamp(Int_t, Int_t&, Int_t&, Int_t&, Int_t&, Int_t&, Int_t&, Int_t&) { return kFALSE; }
TDatime GetTimestamp(Int_t); TDatime GetTimestamp(Int_t);
#ifndef __MAKECINT__
virtual Bool_t GetVInt(Int_t, std::vector<Int_t>&) { return kFALSE;
}
virtual Bool_t GetVUInt(Int_t, std::vector<UInt_t>&) { return kFALS
E; }
virtual Bool_t GetVLong(Int_t, std::vector<Long_t>&) { return kFALS
E; }
virtual Bool_t GetVLong64(Int_t, std::vector<Long64_t>&) { return k
FALSE; }
virtual Bool_t GetVULong64(Int_t, std::vector<ULong64_t>&) { return
kFALSE; }
virtual Bool_t GetVDouble(Int_t, std::vector<Double_t>&) { return k
FALSE; }
#endif
virtual Bool_t IsError() const { return GetErrorCode()!=0; } virtual Bool_t IsError() const { return GetErrorCode()!=0; }
virtual Int_t GetErrorCode() const; virtual Int_t GetErrorCode() const;
virtual const char* GetErrorMsg() const; virtual const char* GetErrorMsg() const;
virtual void EnableErrorOutput(Bool_t on = kTRUE) { fErrorOut = o n; } virtual void EnableErrorOutput(Bool_t on = kTRUE) { fErrorOut = o n; }
ClassDef(TSQLStatement, 0) //SQL statement ClassDef(TSQLStatement, 0) //SQL statement
}; };
#endif #endif
 End of changes. 4 change blocks. 
1 lines changed or deleted 30 lines changed or added


 TSchemaRule.h   TSchemaRule.h 
// @(#)root/core:$Id: TSchemaRule.h 25461 2008-09-19 08:36:32Z brun $ // @(#)root/core:$Id: TSchemaRule.h 27938 2009-03-26 09:53:23Z pcanal $
// author: Lukasz Janyst <ljanyst@cern.ch> // author: Lukasz Janyst <ljanyst@cern.ch>
#ifndef ROOT_TSchemaRule #ifndef ROOT_TSchemaRule
#define ROOT_TSchemaRule #define ROOT_TSchemaRule
class TBuffer; class TBuffer;
class TVirtualObject; class TVirtualObject;
class TObjArray; class TObjArray;
#include "TObject.h" #include "TObject.h"
skipping to change at line 69 skipping to change at line 69
void SetReadFunctionPointer( ReadFuncPtr_t ptr ); void SetReadFunctionPointer( ReadFuncPtr_t ptr );
ReadFuncPtr_t GetReadFunctionPointer() const; ReadFuncPtr_t GetReadFunctionPointer() const;
void SetReadRawFunctionPointer( ReadRawFuncPtr_t ptr ) ; void SetReadRawFunctionPointer( ReadRawFuncPtr_t ptr ) ;
ReadRawFuncPtr_t GetReadRawFunctionPointer() const; ReadRawFuncPtr_t GetReadRawFunctionPointer() const;
void SetInclude( const TString& include ); void SetInclude( const TString& include );
const TObjArray* GetInclude() const; const TObjArray* GetInclude() const;
void SetRuleType( RuleType_t type ); void SetRuleType( RuleType_t type );
RuleType_t GetRuleType() const; RuleType_t GetRuleType() const;
Bool_t Conflicts( const TSchemaRule* rule ) const; Bool_t Conflicts( const TSchemaRule* rule ) const;
void ls(Option_t *option="") const;
// Bool_t GenerateFor( const TStreamerInfo *info ); // Bool_t GenerateFor( const TStreamerInfo *info );
ClassDef( TSchemaRule, 1 ); ClassDef( TSchemaRule, 1 );
private: private:
Bool_t ProcessVersion( const TString& version ) const; Bool_t ProcessVersion( const TString& version ) const;
Bool_t ProcessChecksum( const TString& checksum ) const; Bool_t ProcessChecksum( const TString& checksum ) const;
static void ProcessList( TObjArray* array, const TString& list ); static void ProcessList( TObjArray* array, const TString& list );
static void ProcessDeclaration( TObjArray* array, const TString& l ist ); static void ProcessDeclaration( TObjArray* array, const TString& l ist );
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TSchemaRuleSet.h   TSchemaRuleSet.h 
// @(#)root/core:$Id: TSchemaRuleSet.h 25450 2008-09-18 21:13:42Z pcanal $ // @(#)root/core:$Id: TSchemaRuleSet.h 27944 2009-03-26 14:33:51Z pcanal $
// author: Lukasz Janyst <ljanyst@cern.ch> // author: Lukasz Janyst <ljanyst@cern.ch>
#ifndef ROOT_TSchemaRuleSet #ifndef ROOT_TSchemaRuleSet
#define ROOT_TSchemaRuleSet #define ROOT_TSchemaRuleSet
class TClass; class TClass;
#include "TObject.h" #include "TObject.h"
#include "TObjArray.h" #include "TObjArray.h"
#include "Rtypes.h" #include "Rtypes.h"
skipping to change at line 27 skipping to change at line 27
class TSchemaRule; class TSchemaRule;
class TSchemaMatch: public TObjArray class TSchemaMatch: public TObjArray
{ {
public: public:
virtual ~TSchemaMatch() {}; virtual ~TSchemaMatch() {};
const TSchemaRule* GetRuleWithSource( const TString& name ) const; const TSchemaRule* GetRuleWithSource( const TString& name ) const;
const TSchemaRule* GetRuleWithTarget( const TString& name ) const; const TSchemaRule* GetRuleWithTarget( const TString& name ) const;
Bool_t HasRuleWithSource( const TString& name ) const; Bool_t HasRuleWithSource( const TString& name ) const;
Bool_t HasRuleWithTarget( const TString& name ) const; Bool_t HasRuleWithTarget( const TString& name ) const;
ClassDef(TSchemaMatch,0);
}; };
class TSchemaRuleSet: public TObject class TSchemaRuleSet: public TObject
{ {
public: public:
TSchemaRuleSet(); TSchemaRuleSet();
virtual ~TSchemaRuleSet(); virtual ~TSchemaRuleSet();
Bool_t AddRule( TSchemaRule* rule, Bool_t checkConsis tency = kTRUE ); Bool_t AddRule( TSchemaRule* rule, Bool_t checkConsis tency = kTRUE );
Bool_t AddRules( TSchemaRuleSet* rules, Bool_t checkC onsistency = kTRUE );
Bool_t HasRuleWithSourceClass( const TString &source) const; Bool_t HasRuleWithSourceClass( const TString &source) const;
const TObjArray* FindRules( const TString &source ) const; const TObjArray* FindRules( const TString &source ) const;
const TSchemaMatch* FindRules( const TString &source, Int_t versio n ) const; const TSchemaMatch* FindRules( const TString &source, Int_t versio n ) const;
const TSchemaMatch* FindRules( const TString &source, UInt_t check sum ) const; const TSchemaMatch* FindRules( const TString &source, UInt_t check sum ) const;
TClass* GetClass(); TClass* GetClass();
UInt_t GetClassCheckSum() const; UInt_t GetClassCheckSum() const;
TString GetClassName() const; TString GetClassName() const;
Int_t GetClassVersion() const; Int_t GetClassVersion() const;
const TObjArray* GetRules() const; const TObjArray* GetRules() const;
const TObjArray* GetPersistentRules() const; const TObjArray* GetPersistentRules() const;
void RemoveRule( TSchemaRule* rule ); void RemoveRule( TSchemaRule* rule );
void RemoveRules( TObjArray* rules ); void RemoveRules( TObjArray* rules );
void SetClass( TClass* cls ); void SetClass( TClass* cls );
void ls(Option_t *option="") const;
ClassDef( TSchemaRuleSet, 1 ) ClassDef( TSchemaRuleSet, 1 )
private: private:
TObjArray* fPersistentRules; // Array of the rules that will be embeded in the file TObjArray* fPersistentRules; // Array of the rules that will be embeded in the file
TObjArray* fRemainingRules; //! Array of non-persisten rules - just for cleanup purposes - owns the elements TObjArray* fRemainingRules; //! Array of non-persisten rules - just for cleanup purposes - owns the elements
TObjArray* fAllRules; //! Array of all rules TObjArray* fAllRules; //! Array of all rules
TClassRef fClass; //! Targe t class pointer (for consistency checking) TClassRef fClass; //! Targe t class pointer (for consistency checking)
TString fClassName; // Targe t class name TString fClassName; // Targe t class name
Int_t fVersion; // Targe t class version Int_t fVersion; // Targe t class version
UInt_t fCheckSum; // Targe t class checksum UInt_t fCheckSum; // Targe t class checksum
 End of changes. 4 change blocks. 
1 lines changed or deleted 5 lines changed or added


 TStorage.h   TStorage.h 
// @(#)root/base:$Id: TStorage.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TStorage.h 27683 2009-03-03 20:15:49Z pcanal $
// Author: Fons Rademakers 29/07/95 // Author: Fons Rademakers 29/07/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 30 skipping to change at line 30
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifndef ROOT_Rtypes #ifndef ROOT_Rtypes
#include "Rtypes.h" #include "Rtypes.h"
#endif #endif
typedef void (*FreeHookFun_t)(void*, void *addr, size_t); typedef void (*FreeHookFun_t)(void*, void *addr, size_t);
typedef void *(*ReAllocFun_t)(void*, size_t); typedef void *(*ReAllocFun_t)(void*, size_t);
typedef void *(*ReAllocCFun_t)(void*, size_t, size_t); typedef void *(*ReAllocCFun_t)(void*, size_t, size_t);
typedef char *(*ReAllocCharFun_t)(char*, size_t, size_t);
class TStorage { class TStorage {
private: private:
static ULong_t fgHeapBegin; // begin address of heap static ULong_t fgHeapBegin; // begin address of heap
static ULong_t fgHeapEnd; // end address of heap static ULong_t fgHeapEnd; // end address of heap
static size_t fgMaxBlockSize; // largest block allocated static size_t fgMaxBlockSize; // largest block allocated
static FreeHookFun_t fgFreeHook; // function called on free static FreeHookFun_t fgFreeHook; // function called on free
static void *fgFreeHookData; // data used by this functio n static void *fgFreeHookData; // data used by this functio n
static ReAllocFun_t fgReAllocHook; // custom ReAlloc static ReAllocFun_t fgReAllocHook; // custom ReAlloc
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TStreamerElement.h   TStreamerElement.h 
// @(#)root/meta:$Id: TStreamerElement.h 26606 2008-12-02 20:36:09Z pcanal $ // @(#)root/meta:$Id: TStreamerElement.h 27938 2009-03-26 09:53:23Z pcanal $
// Author: Rene Brun 12/10/2000 // Author: Rene Brun 12/10/2000
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 66 skipping to change at line 66
enum ESTLtype { kSTL = 300 /* TVirtualStreamerInfo::kSTL */, enum ESTLtype { kSTL = 300 /* TVirtualStreamerInfo::kSTL */,
kSTLstring = 365 /* TVirtualStreamerInfo::kSTLstring */, kSTLstring = 365 /* TVirtualStreamerInfo::kSTLstring */,
kSTLvector = 1, kSTLvector = 1,
kSTLlist = 2, kSTLdeque = 3, kSTLmap = 4, kSTLlist = 2, kSTLdeque = 3, kSTLmap = 4,
kSTLset = 5, kSTLmultimap=6, kSTLmultiset=7}; kSTLset = 5, kSTLmultimap=6, kSTLmultiset=7};
// TStreamerElement status bits // TStreamerElement status bits
enum { enum {
kHasRange = BIT(6), kHasRange = BIT(6),
kCache = BIT(9), kCache = BIT(9),
kRepeat = BIT(10) kRepeat = BIT(10),
kRead = BIT(11),
kWrite = BIT(12),
kDoNotDelete = BIT(13)
}; };
TStreamerElement(); TStreamerElement();
TStreamerElement(const char *name, const char *title, Int_t offset, Int_ t dtype, const char *typeName); TStreamerElement(const char *name, const char *title, Int_t offset, Int_ t dtype, const char *typeName);
virtual ~TStreamerElement(); virtual ~TStreamerElement();
virtual Bool_t CannotSplit() const; virtual Bool_t CannotSplit() const;
Int_t GetArrayDim() const {return fArrayDim;} Int_t GetArrayDim() const {return fArrayDim;}
Int_t GetArrayLength() const {return fArrayLength;} Int_t GetArrayLength() const {return fArrayLength;}
virtual TClass *GetClassPointer() const; virtual TClass *GetClassPointer() const;
TClass *GetClass() const {return GetClassPointer();} TClass *GetClass() const {return GetClassPointer();}
 End of changes. 2 change blocks. 
2 lines changed or deleted 5 lines changed or added


 TStreamerInfo.h   TStreamerInfo.h 
// @(#)root/io:$Id: TStreamerInfo.h 27177 2009-01-18 03:38:13Z pcanal $ // @(#)root/io:$Id: TStreamerInfo.h 28024 2009-04-01 15:01:27Z pcanal $
// Author: Rene Brun 12/10/2000 // Author: Rene Brun 12/10/2000
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 272 skipping to change at line 272
virtual TVirtualCollectionProxy *GenExplicitProxy( const ::ROOT::TCollec tionProxyInfo &info, TClass *cl ); virtual TVirtualCollectionProxy *GenExplicitProxy( const ::ROOT::TCollec tionProxyInfo &info, TClass *cl );
virtual TClassStreamer *GenExplicitClassStreamer( const ::ROOT::TCollect ionProxyInfo &info, TClass *cl ); virtual TClassStreamer *GenExplicitClassStreamer( const ::ROOT::TCollect ionProxyInfo &info, TClass *cl );
static TStreamerElement *GetCurrentElement(); static TStreamerElement *GetCurrentElement();
#ifdef R__BROKEN_FUNCTION_TEMPLATES #ifdef R__BROKEN_FUNCTION_TEMPLATES
// Support for non standard compilers // Support for non standard compilers
Int_t WriteBufferAux (TBuffer &b, char ** const &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode); Int_t WriteBufferAux (TBuffer &b, char ** const &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode);
Int_t WriteBufferAux (TBuffer &b, const TVirtualColle ctionProxy &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode); Int_t WriteBufferAux (TBuffer &b, const TVirtualColle ctionProxy &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode);
Int_t WriteBufferAux (TBuffer &b, const TPointerColle ctionAdapter &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode); Int_t WriteBufferAux (TBuffer &b, const TPointerColle ctionAdapter &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode);
Int_t WriteBufferAux (TBuffer &b, const TVirtualArray &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode);
#else #else
template <class T> template <class T>
Int_t WriteBufferAux (TBuffer &b, const T &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode); Int_t WriteBufferAux (TBuffer &b, const T &arr, Int_t first,Int_t narr,Int_t eoffset,Int_t mode);
#endif #endif
//WARNING this class version must be the same as TVirtualStreamerInfo //WARNING this class version must be the same as TVirtualStreamerInfo
ClassDef(TStreamerInfo,8) //Streamer information for one class version ClassDef(TStreamerInfo,8) //Streamer information for one class version
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TTableMap.h   TTableMap.h 
// @(#)root/table:$Id: TTableMap.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/table:$Id: TTableMap.h 27657 2009-02-28 04:51:36Z pcanal $
// Author: Valery Fine(fine@bnl.gov) 01/03/2001 // Author: Valery Fine(fine@bnl.gov) 01/03/2001
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* Copyright (C) 2001 [BNL] Brookhaven National Laboratory. * * Copyright (C) 2001 [BNL] Brookhaven National Laboratory. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 36 skipping to change at line 36
// Iterator of the table with extra index array // Iterator of the table with extra index array
// //
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
class TTableMap : public TObject class TTableMap : public TObject
#ifndef __CINT__ #ifndef __CINT__
, public std::vector<Long_t> , public std::vector<Long_t>
#endif #endif
{ {
protected: protected:
TTable *fTable; // pointer to the refered TTable const TTable *fTable; // pointer to the refered TTable
public: public:
TTableMap(const TTable *table=0); TTableMap(const TTable *table=0);
TTableMap(const TTableMap &map) : TObject(map) TTableMap(const TTableMap &map) : TObject(map)
#ifndef __CINT__ #ifndef __CINT__
, std::vector<Long_t>(map) , std::vector<Long_t>(map)
#endif #endif
, fTable(map.fTable) {;} , fTable(map.fTable) {;}
virtual ~TTableMap(){;} virtual ~TTableMap(){;}
Bool_t IsValid() const; Bool_t IsValid() const;
Bool_t IsFolder() const; Bool_t IsFolder() const;
void Push_back(Long_t next); // workaround for Cint void Push_back(Long_t next); // workaround for Cint
TTable *Table(){return fTable;} const TTable *Table(){return fTable;}
TTable::iterator Begin(); TTable::iterator Begin();
TTable::iterator Begin() const; TTable::iterator Begin() const;
TTable::iterator End(); TTable::iterator End();
TTable::iterator End() const; TTable::iterator End() const;
ClassDef(TTableMap,1) // "Map" array for TTable object ClassDef(TTableMap,1) // "Map" array for TTable object
}; };
//_________________________________________________________________________ __________________________________ //_________________________________________________________________________ __________________________________
skipping to change at line 78 skipping to change at line 78
for (; i != finish; i++) { for (; i != finish; i++) {
Long_t th = *i; Long_t th = *i;
if ( th == -1 || (0 <= th && th < totalSize) ) continue; if ( th == -1 || (0 <= th && th < totalSize) ) continue;
return kFALSE; return kFALSE;
} }
return kTRUE; return kTRUE;
} }
//_________________________________________________________________________ __________________________________ //_________________________________________________________________________ __________________________________
inline TTable::iterator TTableMap::Begin() { std::vector<Long_t>:: iterator bMap = this->begin(); return TTable::iterator(*fTable, bMap);} inline TTable::iterator TTableMap::Begin() { std::vector<Long_t>:: iterator bMap = this->begin(); return TTable::iterator(*fTable, bMap);}
//_________________________________________________________________________ __________________________________ //_________________________________________________________________________ __________________________________
inline TTable::iterator TTableMap::Begin() const { std::vector<Long_t>:: const_iterator bMap = ((TTableMap*) this)->begin(); return TTable::iterator (*fTable, bMap);} inline TTable::iterator TTableMap::Begin() const { std::vector<Long_t>:: const_iterator bMap = this->begin(); return TTable::iterator(*fTable, bMap) ;}
//_________________________________________________________________________ __________________________________ //_________________________________________________________________________ __________________________________
inline TTable::iterator TTableMap::End() { std::vector<Long_t>:: iterator eMap = this->end(); return TTable::iterator(*fTable, eMap);} inline TTable::iterator TTableMap::End() { std::vector<Long_t>:: iterator eMap = this->end(); return TTable::iterator(*fTable, eMap);}
//_________________________________________________________________________ __________________________________ //_________________________________________________________________________ __________________________________
inline TTable::iterator TTableMap::End() const { std::vector<Long_t>:: const_iterator eMap = ((TTableMap*) this)->end(); return TTable::iterator( *fTable, eMap);} inline TTable::iterator TTableMap::End() const { std::vector<Long_t>:: const_iterator eMap = this->end(); return TTable::iterator(*fTable, eMap); }
//_________________________________________________________________________ __________________________________ //_________________________________________________________________________ __________________________________
inline Bool_t TTableMap::IsFolder() const { return kTRUE;} inline Bool_t TTableMap::IsFolder() const { return kTRUE;}
//_________________________________________________________________________ __________________________________ //_________________________________________________________________________ __________________________________
inline void TTableMap::Push_back(Long_t next){ push_back(next); } // workaround for Cint inline void TTableMap::Push_back(Long_t next){ push_back(next); } // workaround for Cint
#endif #endif
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 TToggle.h   TToggle.h 
// @(#)root/meta:$Id: TToggle.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/meta:$Id: TToggle.h 28005 2009-03-31 13:12:24Z brun $
// Author: Piotr Golonka 30/07/97 // Author: Piotr Golonka 30/07/97
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 88 skipping to change at line 88
virtual void Toggle(); virtual void Toggle();
virtual void SetOnValue(Long_t lon){fOnValue=lon;}; virtual void SetOnValue(Long_t lon){fOnValue=lon;};
virtual Long_t GetOnValue(){return fOnValue;}; virtual Long_t GetOnValue(){return fOnValue;};
virtual void SetOffValue(Long_t lof){fOffValue=lof;}; virtual void SetOffValue(Long_t lof){fOffValue=lof;};
virtual Long_t GetOffValue(){return fOffValue;}; virtual Long_t GetOffValue(){return fOffValue;};
virtual Int_t GetValue(){return fValue;}; virtual Int_t GetValue(){return fValue;};
virtual void SetValue(Long_t val); virtual void SetValue(Long_t val);
TMethodCall *GetGetter() const { return fGetter; }
TMethodCall *GetSetter() const { return fSetter; }
ClassDef(TToggle,0) //Facility for toggling datamembers on/off ClassDef(TToggle,0) //Facility for toggling datamembers on/off
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 TTree.h   TTree.h 
// @(#)root/tree:$Id: TTree.h 24454 2008-06-21 03:13:04Z pcanal $ // @(#)root/tree:$Id: TTree.h 27658 2009-02-28 05:34:57Z pcanal $
// Author: Rene Brun 12/01/96 // Author: Rene Brun 12/01/96
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 310 skipping to change at line 310
TObject *GetNotify() const { return fNotify; } TObject *GetNotify() const { return fNotify; }
TVirtualTreePlayer *GetPlayer(); TVirtualTreePlayer *GetPlayer();
virtual Int_t GetPacketSize() const { return fPacketSize; } virtual Int_t GetPacketSize() const { return fPacketSize; }
virtual Long64_t GetReadEntry() const { return fReadEntry; } virtual Long64_t GetReadEntry() const { return fReadEntry; }
virtual Long64_t GetReadEvent() const { return fReadEntry; } virtual Long64_t GetReadEvent() const { return fReadEntry; }
virtual Int_t GetScanField() const { return fScanField; } virtual Int_t GetScanField() const { return fScanField; }
TTreeFormula *GetSelect() { return GetPlayer()->GetSelect() ; } TTreeFormula *GetSelect() { return GetPlayer()->GetSelect() ; }
virtual Long64_t GetSelectedRows() { return GetPlayer()->GetSelec tedRows(); } virtual Long64_t GetSelectedRows() { return GetPlayer()->GetSelec tedRows(); }
virtual Int_t GetTimerInterval() const { return fTimerInterval ; } virtual Int_t GetTimerInterval() const { return fTimerInterval ; }
virtual Long64_t GetTotBytes() const { return fTotBytes; } virtual Long64_t GetTotBytes() const { return fTotBytes; }
virtual TTree *GetTree() const { return (TTree*)this; } virtual TTree *GetTree() const { return const_cast<TTree*>(this ); }
virtual TVirtualIndex *GetTreeIndex() const { return fTreeIndex; } virtual TVirtualIndex *GetTreeIndex() const { return fTreeIndex; }
virtual Int_t GetTreeNumber() const { return 0; } virtual Int_t GetTreeNumber() const { return 0; }
virtual Int_t GetUpdate() const { return fUpdate; } virtual Int_t GetUpdate() const { return fUpdate; }
virtual TList *GetUserInfo(); virtual TList *GetUserInfo();
TTreeFormula *GetVar1() { return GetPlayer()->GetVar1(); } TTreeFormula *GetVar1() { return GetPlayer()->GetVar1(); }
TTreeFormula *GetVar2() { return GetPlayer()->GetVar2(); } TTreeFormula *GetVar2() { return GetPlayer()->GetVar2(); }
TTreeFormula *GetVar3() { return GetPlayer()->GetVar3(); } TTreeFormula *GetVar3() { return GetPlayer()->GetVar3(); }
TTreeFormula *GetVar4() { return GetPlayer()->GetVar4(); } TTreeFormula *GetVar4() { return GetPlayer()->GetVar4(); }
virtual Double_t *GetV1() { return GetPlayer()->GetV1(); } virtual Double_t *GetV1() { return GetPlayer()->GetV1(); }
virtual Double_t *GetV2() { return GetPlayer()->GetV2(); } virtual Double_t *GetV2() { return GetPlayer()->GetV2(); }
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TTreeFormula.h   TTreeFormula.h 
// @(#)root/treeplayer:$Id: TTreeFormula.h 25370 2008-09-05 15:25:20Z pcana l $ // @(#)root/treeplayer:$Id: TTreeFormula.h 27765 2009-03-12 19:02:43Z pcana l $
// Author: Rene Brun 19/01/96 // Author: Rene Brun 19/01/96
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
// ---------------------------------- TreeFormula.h // ---------------------------------- TreeFormula.h
skipping to change at line 69 skipping to change at line 69
class TTreeFormulaManager; class TTreeFormulaManager;
class TTreeFormula : public TFormula { class TTreeFormula : public TFormula {
friend class TTreeFormulaManager; friend class TTreeFormulaManager;
protected: protected:
enum { enum {
kIsCharacter = BIT(12), kIsCharacter = BIT(12),
kMissingLeaf = BIT(15), // true if some of the needed leaves are miss ing in the current TTree kMissingLeaf = BIT(15), // true if some of the needed leaves are miss ing in the current TTree
kIsInteger = BIT(17) // true if the branch contains an integer var kIsInteger = BIT(17), // true if the branch contains an integer var
iable iable
kNeedEntries = BIT(18) // true if the formula uses Entries$
}; };
enum { enum {
kDirect, kDataMember, kMethod, kDirect, kDataMember, kMethod,
kIndexOfEntry, kEntries, kLength, kIteration, kLengthFunc, kSum, kEnt ryList, kIndexOfEntry, kEntries, kLength, kIteration, kLengthFunc, kSum, kEnt ryList,
kTreeMember, kTreeMember,
kIndexOfLocalEntry kIndexOfLocalEntry
}; };
enum { enum {
kAlias = 200, kAlias = 200,
kAliasString = 201, kAliasString = 201,
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 lines changed or added


 TUUID.h   TUUID.h 
// @(#)root/base:$Id: TUUID.h 20877 2007-11-19 11:17:07Z rdm $ // @(#)root/base:$Id: TUUID.h 27658 2009-02-28 05:34:57Z pcanal $
// Author: Fons Rademakers 30/9/2001 // Author: Fons Rademakers 30/9/2001
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 95 skipping to change at line 95
void FillBuffer(char *&buffer); void FillBuffer(char *&buffer);
void ReadBuffer(char *&buffer); void ReadBuffer(char *&buffer);
Int_t Sizeof() const { return 18; } Int_t Sizeof() const { return 18; }
ClassDef(TUUID,1) // Universally Unique IDentifier ClassDef(TUUID,1) // Universally Unique IDentifier
}; };
inline TBuffer &operator>>(TBuffer &buf, TUUID &uuid) inline TBuffer &operator>>(TBuffer &buf, TUUID &uuid)
{ uuid.Streamer(buf); return buf; } { uuid.Streamer(buf); return buf; }
inline TBuffer &operator<<(TBuffer &buf, const TUUID &uuid) // Not inlined in order to avoid const casted away warning in user code.
{ ((TUUID&)uuid).Streamer(buf); return buf; } TBuffer &operator<<(TBuffer &buf, const TUUID &uuid);
inline Bool_t operator==(const TUUID &u1, const TUUID &u2) inline Bool_t operator==(const TUUID &u1, const TUUID &u2)
{ return (!u1.Compare(u2)) ? kTRUE : kFALSE; } { return (!u1.Compare(u2)) ? kTRUE : kFALSE; }
inline Bool_t operator!=(const TUUID &u1, const TUUID &u2) inline Bool_t operator!=(const TUUID &u1, const TUUID &u2)
{ return !(u1 == u2); } { return !(u1 == u2); }
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 TVectorT.h   TVectorT.h 
// @(#)root/matrix:$Id: TVectorT.h 22039 2008-02-07 05:48:31Z brun $ // @(#)root/matrix:$Id: TVectorT.h 27658 2009-02-28 05:34:57Z pcanal $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TVectorT #ifndef ROOT_TVectorT
#define ROOT_TVectorT #define ROOT_TVectorT
skipping to change at line 98 skipping to change at line 98
inline Bool_t IsOwner () const { return fIsOwner; } inline Bool_t IsOwner () const { return fIsOwner; }
inline void SetElements(const Element *elements) { R__ASSERT(IsValid ()); inline void SetElements(const Element *elements) { R__ASSERT(IsValid ());
memcpy(fElements, elements,fNrows*sizeof(Element)); } memcpy(fElements, elements,fNrows*sizeof(Element)); }
inline TVectorT<Element> &Shift (Int_t row_shift) { fRowL wb += row_shift; return *this; } inline TVectorT<Element> &Shift (Int_t row_shift) { fRowL wb += row_shift; return *this; }
TVectorT<Element> &ResizeTo (Int_t lwb,Int_t upb); TVectorT<Element> &ResizeTo (Int_t lwb,Int_t upb);
inline TVectorT<Element> &ResizeTo (Int_t n) { retur n ResizeTo(0,n-1); } inline TVectorT<Element> &ResizeTo (Int_t n) { retur n ResizeTo(0,n-1); }
inline TVectorT<Element> &ResizeTo (const TVectorT<Element> &v) { retur n ResizeTo(v.GetLwb(),v.GetUpb()); } inline TVectorT<Element> &ResizeTo (const TVectorT<Element> &v) { retur n ResizeTo(v.GetLwb(),v.GetUpb()); }
TVectorT<Element> &Use (Int_t lwb,Int_t upb,Element *data); TVectorT<Element> &Use (Int_t lwb,Int_t upb,Element *data);
const TVectorT<Element> &Use (Int_t lwb,Int_t upb,const Element * data) const const TVectorT<Element> &Use (Int_t lwb,Int_t upb,const Element * data) const
{ return (const TVectorT<Element>&) (((TVectorT<Element> *)this)->Use(lwb,upb,(Element *)data)); } { return (const TVectorT<Element>&) (const_cast<TVectorT<Element> *>(this))->Use(lwb,upb,const_cast<Element *>( data)); }
TVectorT<Element> &Use (Int_t n,Element *data); TVectorT<Element> &Use (Int_t n,Element *data);
const TVectorT<Element> &Use (Int_t n,const Element *data) const ; const TVectorT<Element> &Use (Int_t n,const Element *data) const ;
TVectorT<Element> &Use (TVectorT<Element> &v); TVectorT<Element> &Use (TVectorT<Element> &v);
const TVectorT<Element> &Use (const TVectorT<Element> &v) const ; const TVectorT<Element> &Use (const TVectorT<Element> &v) const ;
TVectorT<Element> &GetSub (Int_t row_lwb,Int_t row_upb,TVector T<Element> &target,Option_t *option="S") const; TVectorT<Element> &GetSub (Int_t row_lwb,Int_t row_upb,TVector T<Element> &target,Option_t *option="S") const;
TVectorT<Element> GetSub (Int_t row_lwb,Int_t row_upb,Option_ t *option="S") const; TVectorT<Element> GetSub (Int_t row_lwb,Int_t row_upb,Option_ t *option="S") const;
TVectorT<Element> &SetSub (Int_t row_lwb,const TVectorT<Elemen t> &source); TVectorT<Element> &SetSub (Int_t row_lwb,const TVectorT<Elemen t> &source);
TVectorT<Element> &Zero(); TVectorT<Element> &Zero();
skipping to change at line 124 skipping to change at line 124
Element Norm1 () const; Element Norm1 () const;
Element Norm2Sqr() const; Element Norm2Sqr() const;
Element NormInf () const; Element NormInf () const;
Int_t NonZeros() const; Int_t NonZeros() const;
Element Sum () const; Element Sum () const;
Element Min () const; Element Min () const;
Element Max () const; Element Max () const;
inline const Element &operator()(Int_t index) const; inline const Element &operator()(Int_t index) const;
inline Element &operator()(Int_t index) { return (Element&)( inline Element &operator()(Int_t index);
(*(const TVectorT<Element> *)this)(index)); } inline const Element &operator[](Int_t index) const { return (*this)(ind
inline const Element &operator[](Int_t index) const { return (Element&)( ex); }
(*(const TVectorT<Element> *)this)(index)); } inline Element &operator[](Int_t index) { return (*this)(ind
inline Element &operator[](Int_t index) { return (Element&)( ex); }
(*(const TVectorT<Element> *)this)(index)); }
TVectorT<Element> &operator= (const TVectorT <Element> &s ource); TVectorT<Element> &operator= (const TVectorT <Element> &s ource);
TVectorT<Element> &operator= (const TMatrixTRow_const <Element> &m r); TVectorT<Element> &operator= (const TMatrixTRow_const <Element> &m r);
TVectorT<Element> &operator= (const TMatrixTColumn_const <Element> &m c); TVectorT<Element> &operator= (const TMatrixTColumn_const <Element> &m c);
TVectorT<Element> &operator= (const TMatrixTDiag_const <Element> &m d); TVectorT<Element> &operator= (const TMatrixTDiag_const <Element> &m d);
TVectorT<Element> &operator= (const TMatrixTSparseRow_const <Element> &m d); TVectorT<Element> &operator= (const TMatrixTSparseRow_const <Element> &m d);
TVectorT<Element> &operator= (const TMatrixTSparseDiag_const<Element> &m d); TVectorT<Element> &operator= (const TMatrixTSparseDiag_const<Element> &m d);
template <class Element2> TVectorT<Element> &operator= (const TVectorT<E lement2> &source) template <class Element2> TVectorT<Element> &operator= (const TVectorT<E lement2> &source)
{ {
if (!AreCompatible(*this,source)) { if (!AreCompatible(*this,source)) {
skipping to change at line 216 skipping to change at line 216
{ {
// Access a vector element. // Access a vector element.
R__ASSERT(IsValid()); R__ASSERT(IsValid());
const Int_t aind = ind-fRowLwb; const Int_t aind = ind-fRowLwb;
if (aind >= fNrows || aind < 0) { if (aind >= fNrows || aind < 0) {
Error("operator()","Request index(%d) outside vector range of %d - %d ",ind,fRowLwb,fRowLwb+fNrows); Error("operator()","Request index(%d) outside vector range of %d - %d ",ind,fRowLwb,fRowLwb+fNrows);
return fElements[0]; return fElements[0];
} }
return fElements[aind];
}
template<class Element> inline Element &TVectorT<Element>::operat
or()(Int_t ind)
{
// Access a vector element.
R__ASSERT(IsValid());
const Int_t aind = ind-fRowLwb;
if (aind >= fNrows || aind < 0) {
Error("operator()","Request index(%d) outside vector range of %d - %d
",ind,fRowLwb,fRowLwb+fNrows);
return fElements[0];
}
return fElements[aind]; return fElements[aind];
} }
template<class Element1,class Element2> template<class Element1,class Element2>
Bool_t AreCompatible(const TVectorT <Element1> &source1,const TVectorT <Element2> &source2, Int_t verbose=0); Bool_t AreCompatible(const TVectorT <Element1> &source1,const TVectorT <Element2> &source2, Int_t verbose=0);
template<class Element> Bool_t operator== (const TVectorT <Element> &source1,const TVectorT <Element> &source2); template<class Element> Bool_t operator== (const TVectorT <Element> &source1,const TVectorT <Element> &source2);
template<class Element> TVectorT<Element> operator+ (const TVectorT <Element> &source1,const TVectorT <Element> &source2); template<class Element> TVectorT<Element> operator+ (const TVectorT <Element> &source1,const TVectorT <Element> &source2);
template<class Element> TVectorT<Element> operator- (const TVectorT <Element> &source1,const TVectorT <Element> &source2); template<class Element> TVectorT<Element> operator- (const TVectorT <Element> &source1,const TVectorT <Element> &source2);
template<class Element> Element operator* (const TVectorT <Element> &source1,const TVectorT <Element> &source2); template<class Element> Element operator* (const TVectorT <Element> &source1,const TVectorT <Element> &source2);
template<class Element> TVectorT<Element> operator* (const TMatrixT <Element> &a, const TVectorT <Element> &source); template<class Element> TVectorT<Element> operator* (const TMatrixT <Element> &a, const TVectorT <Element> &source);
template<class Element> TVectorT<Element> operator* (const TMatrixTSym <Element> &a, const TVectorT <Element> &source); template<class Element> TVectorT<Element> operator* (const TMatrixTSym <Element> &a, const TVectorT <Element> &source);
 End of changes. 4 change blocks. 
8 lines changed or deleted 22 lines changed or added


 TVirtualGeoPainter.h   TVirtualGeoPainter.h 
// @(#)root/geom:$Id: TVirtualGeoPainter.h 25123 2008-08-12 09:59:46Z brun $ // @(#)root/geom:$Id: TVirtualGeoPainter.h 27749 2009-03-10 15:23:52Z brun $
// Author: Andrei Gheata 11/01/02 // Author: Andrei Gheata 11/01/02
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TVirtualGeoPainter #ifndef ROOT_TVirtualGeoPainter
skipping to change at line 71 skipping to change at line 71
public: public:
TVirtualGeoPainter(TGeoManager *manager); TVirtualGeoPainter(TGeoManager *manager);
virtual ~TVirtualGeoPainter(); virtual ~TVirtualGeoPainter();
virtual void AddSize3D(Int_t numpoints, Int_t numsegs, Int_t numpo lys) = 0; virtual void AddSize3D(Int_t numpoints, Int_t numsegs, Int_t numpo lys) = 0;
virtual TVirtualGeoTrack *AddTrack(Int_t id, Int_t pdgcode, TObject *par ticle) = 0; virtual TVirtualGeoTrack *AddTrack(Int_t id, Int_t pdgcode, TObject *par ticle) = 0;
virtual void AddTrackPoint(Double_t *point, Double_t *box, Bool_t reset=kFALSE) = 0; virtual void AddTrackPoint(Double_t *point, Double_t *box, Bool_t reset=kFALSE) = 0;
virtual void BombTranslation(const Double_t *tr, Double_t *bombtr) = 0; virtual void BombTranslation(const Double_t *tr, Double_t *bombtr) = 0;
virtual void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Option_t *option="") = 0; virtual void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Option_t *option="") = 0;
virtual void CheckBoundaryErrors(Int_t ntracks=1000000, Double_t r
adius=-1.) = 0;
virtual void CheckBoundaryReference(Int_t icheck=-1) = 0;
virtual void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t checkcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL) = 0; virtual void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t checkcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL) = 0;
virtual void CheckGeometry(Int_t nrays, Double_t startx, Double_t starty, Double_t startz) const = 0; virtual void CheckGeometry(Int_t nrays, Double_t startx, Double_t starty, Double_t startz) const = 0;
virtual void CheckOverlaps(const TGeoVolume *vol, Double_t ovlp=0. 1, Option_t *option="") const = 0; virtual void CheckOverlaps(const TGeoVolume *vol, Double_t ovlp=0. 1, Option_t *option="") const = 0;
virtual Int_t CountVisibleNodes() = 0; virtual Int_t CountVisibleNodes() = 0;
virtual void DefaultAngles() = 0; virtual void DefaultAngles() = 0;
virtual void DefaultColors() = 0; virtual void DefaultColors() = 0;
virtual Int_t DistanceToPrimitiveVol(TGeoVolume *vol, Int_t px, Int _t py) = 0; virtual Int_t DistanceToPrimitiveVol(TGeoVolume *vol, Int_t px, Int _t py) = 0;
virtual void Draw(Option_t *option="") = 0; virtual void Draw(Option_t *option="") = 0;
virtual void DrawBatemanSol(TGeoBatemanSol *sol, Option_t *option= "") = 0; virtual void DrawBatemanSol(TGeoBatemanSol *sol, Option_t *option= "") = 0;
virtual void DrawShape(TGeoShape *shape, Option_t *option="") = 0; virtual void DrawShape(TGeoShape *shape, Option_t *option="") = 0;
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 TypeBase.h   TypeBase.h 
// @(#)root/reflex:$Id: TypeBase.h 27579 2009-02-23 15:15:06Z pcanal $ // @(#)root/reflex:$Id: TypeBase.h 28064 2009-04-02 13:31:29Z axel $
// Author: Stefan Roiser 2004 // Author: Stefan Roiser 2004
// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved. // Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
// //
// Permission to use, copy, modify, and distribute this software for any // Permission to use, copy, modify, and distribute this software for any
// purpose is hereby granted without fee, provided that this copyright and // purpose is hereby granted without fee, provided that this copyright and
// permissions notice appear in all copies and derivatives. // permissions notice appear in all copies and derivatives.
// //
// This software is provided "as is" without express or implied warranty. // This software is provided "as is" without express or implied warranty.
skipping to change at line 25 skipping to change at line 25
// Include files // Include files
#include "Reflex/Kernel.h" #include "Reflex/Kernel.h"
#include "Reflex/Scope.h" #include "Reflex/Scope.h"
#include "Reflex/internal/OwnedPropertyList.h" #include "Reflex/internal/OwnedPropertyList.h"
#include <vector> #include <vector>
#include <typeinfo> #include <typeinfo>
namespace Reflex { namespace Reflex {
// forward declarations // forward declarations
class Member;
class Base;
class Type; class Type;
class Object; class Object;
class MemberTemplate;
class TypeTemplate; class TypeTemplate;
class Fundamental;
class Function;
class Array;
class Class;
class Enum;
class Typedef;
class Pointer;
class ClassTemplateInstance;
class FunctionMemberTemplateInstance;
class TypeName; class TypeName;
class DictionaryGenerator; class DictionaryGenerator;
/** /**
* @class TypeBase TypeBase.h Reflex/TypeBase.h * @class TypeBase TypeBase.h Reflex/TypeBase.h
* @author Stefan Roiser * @author Stefan Roiser
* @date 24/11/2003 * @date 24/11/2003
* @ingroup Ref * @ingroup Ref
*/ */
class RFLX_API TypeBase { class RFLX_API TypeBase {
skipping to change at line 83 skipping to change at line 71
*/ */
operator Type () const; operator Type () const;
/** /**
* Allocate will reserve memory for the size of the object * Allocate will reserve memory for the size of the object
* @return pointer to allocated memory * @return pointer to allocated memory
*/ */
void * Allocate() const; void * Allocate() const;
/** /**
* nthBase will return the nth BaseAt class information
* @param nth nth BaseAt class
* @return pointer to BaseAt class information
*/
virtual Base BaseAt( size_t nth ) const;
/**
* BaseSize will return the number of base classes
* @return number of base classes
*/
virtual size_t BaseSize() const;
virtual Base_Iterator Base_Begin() const;
virtual Base_Iterator Base_End() const;
virtual Reverse_Base_Iterator Base_RBegin() const;
virtual Reverse_Base_Iterator Base_REnd() const;
/**
* CastObject an object from this class At to another one * CastObject an object from this class At to another one
* @param to is the class At to cast into * @param to is the class At to cast into
* @param obj the memory AddressGet of the object to be casted * @param obj the memory AddressGet of the object to be casted
*/ */
virtual Object CastObject( const Type & to, virtual Object CastObject( const Type & to,
const Object & obj ) const; const Object & obj ) const;
/** /**
* Construct will call the constructor of a given At and Allocate the * Construct will call the constructor of a given At and Allocate the
* memory for it * memory for it
skipping to change at line 125 skipping to change at line 95
*/ */
/* /*
virtual Object Construct( const Type & signature, virtual Object Construct( const Type & signature,
const std::vector < Object > & values, const std::vector < Object > & values,
void * mem ) const;*/ void * mem ) const;*/
virtual Object Construct( const Type & signature, virtual Object Construct( const Type & signature,
const std::vector < void * > & values, const std::vector < void * > & values,
void * mem) const; void * mem) const;
/** /**
* DataMemberAt will return the nth data MemberAt of the At
* @param nth data MemberAt
* @return pointer to data MemberAt
*/
virtual Member DataMemberAt( size_t nth ) const;
/**
* DataMemberByName will return the MemberAt with Name
* @param Name of data MemberAt
* @return data MemberAt
*/
virtual Member DataMemberByName( const std::string & nam ) const;
/**
* DataMemberSize will return the number of data members of this At
* @return number of data members
*/
virtual size_t DataMemberSize() const;
virtual Member_Iterator DataMember_Begin() const;
virtual Member_Iterator DataMember_End() const;
virtual Reverse_Member_Iterator DataMember_RBegin() const;
virtual Reverse_Member_Iterator DataMember_REnd() const;
/**
* Deallocate will Deallocate the memory for a given object * Deallocate will Deallocate the memory for a given object
* @param instance of the At in memory * @param instance of the At in memory
*/ */
void Deallocate( void * instance ) const; void Deallocate( void * instance ) const;
/** /**
* Destruct will call the destructor of a At and remove its memory * Destruct will call the destructor of a At and remove its memory
* allocation if desired * allocation if desired
* @param instance of the At in memory * @param instance of the At in memory
* @param dealloc for also deallacoting the memory * @param dealloc for also deallacoting the memory
*/ */
virtual void Destruct( void * instance, virtual void Destruct( void * instance,
bool dealloc = true ) const; bool dealloc = true ) const;
/** /**
* DeclaringScope will return a pointer to the At of this one * DeclaringScope will return a pointer to the At of this one
* @return pointer to declaring At * @return pointer to declaring At
*/ */
virtual Scope DeclaringScope() const; Scope DeclaringScope() const;
/** /**
* DynamicType is used to discover whether an object represents the * DynamicType is used to discover whether an object represents the
* current class At or not * current class At or not
* @param mem is the memory AddressGet of the object to checked * @param mem is the memory AddressGet of the object to checked
* @return the actual class of the object * @return the actual class of the object
*/ */
virtual Type DynamicType( const Object & obj ) const; virtual Type DynamicType( const Object & obj ) const;
/** /**
* FinalType will return the type without typedefs * FinalType will return the type without typedefs
* @return type with all typedef info removed * @return type with all typedef info removed
*/ */
Type FinalType() const; Type FinalType() const;
/** /**
* FunctionMemberAt will return the nth function MemberAt of the At
* @param nth function MemberAt
* @return pointer to function MemberAt
*/
virtual Member FunctionMemberAt( size_t nth ) const;
/**
* FunctionMemberByName will return the MemberAt with the Name,
* optionally the signature of the function may be given
* @param Name of function MemberAt
* @param signature of the MemberAt function
* @return function MemberAt
*/
virtual Member FunctionMemberByName( const std::string & nam,
const Type & signature,
unsigned int modifiers_mask = 0) const;
/**
* FunctionMemberSize will return the number of function members of
* this At
* @return number of function members
*/
virtual size_t FunctionMemberSize() const;
virtual Member_Iterator FunctionMember_Begin() const;
virtual Member_Iterator FunctionMember_End() const;
virtual Reverse_Member_Iterator FunctionMember_RBegin() const;
virtual Reverse_Member_Iterator FunctionMember_REnd() const;
/**
* GenerateDict will produce the dictionary information of this type * GenerateDict will produce the dictionary information of this type
* @param generator a reference to the dictionary generator instance * @param generator a reference to the dictionary generator instance
*/ */
virtual void GenerateDict(DictionaryGenerator &generator) const; virtual void GenerateDict(DictionaryGenerator &generator) const;
/** /**
* HasBase will check whether this class has a BaseAt class given
* as argument
* @param cl the BaseAt-class to check for
* @return the Base info if it is found, an empty base otherwise (can
be tested for bool)
*/
virtual bool HasBase( const Type & cl ) const;
/**
* IsAbstract will return true if the the class is abstract * IsAbstract will return true if the the class is abstract
* @return true if the class is abstract * @return true if the class is abstract
*/ */
virtual bool IsAbstract() const; virtual bool IsAbstract() const;
/** /**
* IsArray returns true if the At represents a Array * IsArray returns true if the At represents a Array
* @return true if At represents a Array * @return true if At represents a Array
*/ */
bool IsArray() const; bool IsArray() const;
skipping to change at line 337 skipping to change at line 244
*/ */
virtual bool IsVirtual() const; virtual bool IsVirtual() const;
/** Array /** Array
* size returns the size of the array * size returns the size of the array
* @return size of array * @return size of array
*/ */
virtual size_t ArrayLength() const; virtual size_t ArrayLength() const;
/** /**
* MemberByName will return the first MemberAt with a given Name
* @param MemberAt Name
* @return pointer to MemberAt
*/
virtual Member MemberByName( const std::string & nam,
const Type & signature ) const;
/**
* MemberAt will return the nth MemberAt of the At
* @param nth MemberAt
* @return pointer to nth MemberAt
*/
virtual Member MemberAt( size_t nth ) const;
/**
* MemberSize will return the number of members
* @return number of members
*/
virtual size_t MemberSize() const;
virtual Member_Iterator Member_Begin() const;
virtual Member_Iterator Member_End() const;
virtual Reverse_Member_Iterator Member_RBegin() const;
virtual Reverse_Member_Iterator Member_REnd() const;
/**
* MemberTemplateAt will return the nth MemberAt template of this At
* @param nth MemberAt template
* @return nth MemberAt template
*/
virtual MemberTemplate MemberTemplateAt( size_t nth ) const;
/**
* MemberTemplateSize will return the number of MemberAt templates in
this socpe
* @return number of defined MemberAt templates
*/
virtual size_t MemberTemplateSize() const;
virtual MemberTemplate_Iterator MemberTemplate_Begin() const;
virtual MemberTemplate_Iterator MemberTemplate_End() const;
virtual Reverse_MemberTemplate_Iterator MemberTemplate_RBegin() const
;
virtual Reverse_MemberTemplate_Iterator MemberTemplate_REnd() const;
/**
* Name returns the name of the type * Name returns the name of the type
* @return name of type * @return name of type
*/ */
virtual std::string Name( unsigned int mod = 0 ) const; virtual std::string Name( unsigned int mod = 0 ) const;
/** /**
* SimpleName returns the name of the type as a reference. It provides a * SimpleName returns the name of the type as a reference. It provides a
* simplified but faster generation of a type name. Attention currentl y it * simplified but faster generation of a type name. Attention currentl y it
* is not guaranteed that Name() and SimpleName() return the same char acter * is not guaranteed that Name() and SimpleName() return the same char acter
* layout of a name (ie. spacing, commas, etc. ) * layout of a name (ie. spacing, commas, etc. )
skipping to change at line 449 skipping to change at line 312
*/ */
virtual Type ReturnType() const; virtual Type ReturnType() const;
/** /**
* sizeof will return the size of the At * sizeof will return the size of the At
* @return size of the At as int * @return size of the At as int
*/ */
size_t SizeOf() const; size_t SizeOf() const;
/** /**
* SubScopeAt will return a pointer to a sub-scopes
* @param nth sub-At
* @return pointer to nth sub-At
*/
virtual Scope SubScopeAt( size_t nth ) const;
/**
* ScopeSize will return the number of sub-scopes
* @return number of sub-scopes
*/
virtual size_t SubScopeSize() const;
virtual Scope_Iterator SubScope_Begin() const;
virtual Scope_Iterator SubScope_End() const;
virtual Reverse_Scope_Iterator SubScope_RBegin() const;
virtual Reverse_Scope_Iterator SubScope_REnd() const;
/**
* nthType will return a pointer to the nth sub-At
* @param nth sub-At
* @return pointer to nth sub-At
*/
virtual Type SubTypeAt( size_t nth ) const;
/**
* TypeSize will returnt he number of sub-types
* @return number of sub-types
*/
virtual size_t SubTypeSize() const;
virtual Type_Iterator SubType_Begin() const;
virtual Type_Iterator SubType_End() const;
virtual Reverse_Type_Iterator SubType_RBegin() const;
virtual Reverse_Type_Iterator SubType_REnd() const;
/**
* TemplateArgumentAt will return a pointer to the nth template argume nt * TemplateArgumentAt will return a pointer to the nth template argume nt
* @param nth nth template argument * @param nth nth template argument
* @return pointer to nth template argument * @return pointer to nth template argument
*/ */
virtual Type TemplateArgumentAt( size_t nth ) const; virtual Type TemplateArgumentAt( size_t nth ) const;
/** /**
* templateArgSize will return the number of template arguments * templateArgSize will return the number of template arguments
* @return number of template arguments * @return number of template arguments
*/ */
skipping to change at line 521 skipping to change at line 348
*/ */
virtual Type ToType() const; virtual Type ToType() const;
/** /**
* At returns the corresponding unqualified Type object * At returns the corresponding unqualified Type object
* @return corresponding At object * @return corresponding At object
*/ */
Type ThisType() const; Type ThisType() const;
/** /**
* SubTypeTemplateAt will return the nth At template of this At
* @param nth At template
* @return nth At template
*/
virtual TypeTemplate SubTypeTemplateAt( size_t nth ) const;
/**
* SubTypeTemplateSize will return the number of At templates in this
socpe
* @return number of defined At templates
*/
virtual size_t SubTypeTemplateSize() const;
virtual TypeTemplate_Iterator SubTypeTemplate_Begin() const;
virtual TypeTemplate_Iterator SubTypeTemplate_End() const;
virtual Reverse_TypeTemplate_Iterator SubTypeTemplate_RBegin() const;
virtual Reverse_TypeTemplate_Iterator SubTypeTemplate_REnd() const;
/**
* TypeInfo will return the c++ type_info object of the At * TypeInfo will return the c++ type_info object of the At
* @return type_info object of At * @return type_info object of At
*/ */
virtual const std::type_info & TypeInfo() const; virtual const std::type_info & TypeInfo() const;
/** /**
* TypeType will return the real At * TypeType will return the real At
* @return real At * @return real At
*/ */
TYPE TypeType() const; TYPE TypeType() const;
/** /**
* TypeTypeAsString will return the string representation of the TYPE At * TypeTypeAsString will return the string representation of the TYPE At
* @return string representation of TYPE At * @return string representation of TYPE At
*/ */
std::string TypeTypeAsString() const; std::string TypeTypeAsString() const;
/**
* UpdateMembers2 will update the list of Function/Data/Members with a
ll
* MemberAt of BaseAt classes currently availabe in the system
*/
virtual void UpdateMembers() const;
public: public:
/** /**
* AddDataMember will add the information about a data MemberAt
* @param dm pointer to data MemberAt
*/
virtual void AddDataMember(const Member& dm) const;
virtual void AddDataMember(const char* nam, const Type& typ, size_t o
ffs, unsigned int modifiers = 0) const;
virtual void AddDataMember(Member& output, const char* nam, const Typ
e& typ, size_t offs, unsigned int modifiers = 0, char* interpreterOffset =
0) const;
/**
* AddFunctionMember will add the information about a function MemberA
t
* @param fm pointer to function MemberAt
*/
virtual void AddFunctionMember( const Member & fm ) const;
virtual void AddFunctionMember( const char * nam,
const Type & typ,
StubFunction stubFP,
void * stubCtx = 0,
const char * params = 0,
unsigned int modifiers = 0 ) const;
/**
* AddSubScope will add a sub-At to this one
* @param sc pointer to Scope
*/
virtual void AddSubScope( const Scope & sc ) const;
virtual void AddSubScope( const char * scop,
TYPE scopeTyp ) const;
/**
* AddSubType will add a sub-At to this At
* @param sc pointer to Type
*/
virtual void AddSubType( const Type & ty ) const;
virtual void AddSubType( const char * typ,
size_t size,
TYPE typeTyp,
const std::type_info & ti,
unsigned int modifiers ) const;
/**
* RemoveDataMember will remove the information about a data MemberAt
* @param dm pointer to data MemberAt
*/
virtual void RemoveDataMember( const Member & dm ) const;
/**
* RemoveFunctionMember will remove the information about a function M
emberAt
* @param fm pointer to function MemberAt
*/
virtual void RemoveFunctionMember( const Member & fm ) const;
/**
* RemoveSubScope will remove a sub-At to this one
* @param sc pointer to Scope
*/
virtual void RemoveSubScope( const Scope & sc ) const;
/**
* RemoveSubType will remove a sub-At to this At
* @param sc pointer to Type
*/
virtual void RemoveSubType( const Type & ty ) const;
/**
* SetSize will set the size of the type. This function shall * SetSize will set the size of the type. This function shall
* be used with care. It will change the reflection information * be used with care. It will change the reflection information
* of this type. * of this type.
*/ */
void SetSize( size_t s ) const; void SetSize( size_t s ) const;
/** /**
* SetTypeInfo will set the type_info object of this type. * SetTypeInfo will set the type_info object of this type.
* Attention: This will change the reflection information * Attention: This will change the reflection information
* of this type. * of this type.
skipping to change at line 749 skipping to change at line 489
*/ */
mutable mutable
Type * fRawType; Type * fRawType;
}; // class TypeBase }; // class TypeBase
} //namespace Reflex } //namespace Reflex
#include "Reflex/TypeTemplate.h" #include "Reflex/TypeTemplate.h"
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Base_Iterator Reflex::TypeBase::Base_Begin() const {
//-------------------------------------------------------------------------
------
return Dummy::BaseCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Base_Iterator Reflex::TypeBase::Base_End() const {
//-------------------------------------------------------------------------
------
return Dummy::BaseCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Base_Iterator Reflex::TypeBase::Base_RBegin() const
{
//-------------------------------------------------------------------------
------
return Dummy::BaseCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Base_Iterator Reflex::TypeBase::Base_REnd() const {
//-------------------------------------------------------------------------
------
return Dummy::BaseCont().rend();
}
//-------------------------------------------------------------------------
------
inline size_t Reflex::TypeBase::CalculateSize() const { inline size_t Reflex::TypeBase::CalculateSize() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return fSize; return fSize;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::TypeBase::DataMemberSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::Member_Iterator Reflex::TypeBase::DataMember_Begin() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Member_Iterator Reflex::TypeBase::DataMember_End() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Member_Iterator Reflex::TypeBase::DataMember_RBegin(
) const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Member_Iterator Reflex::TypeBase::DataMember_REnd()
const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().rend();
}
//-------------------------------------------------------------------------
------
inline size_t Reflex::TypeBase::FunctionMemberSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::Member_Iterator Reflex::TypeBase::FunctionMember_Begin() con
st {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Member_Iterator Reflex::TypeBase::FunctionMember_End() const
{
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Member_Iterator Reflex::TypeBase::FunctionMember_RBe
gin() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Member_Iterator Reflex::TypeBase::FunctionMember_REn
d() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().rend();
}
//-------------------------------------------------------------------------
------
inline bool Reflex::TypeBase::IsAbstract() const { inline bool Reflex::TypeBase::IsAbstract() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return false; return false;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::TypeBase::IsArray() const { inline bool Reflex::TypeBase::IsArray() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return ( fTypeType == ARRAY ); return ( fTypeType == ARRAY );
} }
skipping to change at line 944 skipping to change at line 600
return false; return false;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline bool Reflex::TypeBase::IsVirtual() const { inline bool Reflex::TypeBase::IsVirtual() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return false; return false;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::TypeBase::MemberSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::Member_Iterator Reflex::TypeBase::Member_Begin() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Member_Iterator Reflex::TypeBase::Member_End() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Member_Iterator Reflex::TypeBase::Member_RBegin() co
nst {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Member_Iterator Reflex::TypeBase::Member_REnd() cons
t {
//-------------------------------------------------------------------------
------
return Dummy::MemberCont().rend();
}
//-------------------------------------------------------------------------
------
inline size_t Reflex::TypeBase::MemberTemplateSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::MemberTemplate_Iterator Reflex::TypeBase::MemberTemplate_Beg
in() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberTemplateCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::MemberTemplate_Iterator Reflex::TypeBase::MemberTemplate_End
() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberTemplateCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_MemberTemplate_Iterator Reflex::TypeBase::MemberTemp
late_RBegin() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberTemplateCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_MemberTemplate_Iterator Reflex::TypeBase::MemberTemp
late_REnd() const {
//-------------------------------------------------------------------------
------
return Dummy::MemberTemplateCont().rend();
}
//-------------------------------------------------------------------------
------
inline Reflex::Type_Iterator Reflex::TypeBase::FunctionParameter_Begin() co nst { inline Reflex::Type_Iterator Reflex::TypeBase::FunctionParameter_Begin() co nst {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return Dummy::TypeCont().begin(); return Dummy::TypeCont().begin();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Type_Iterator Reflex::TypeBase::FunctionParameter_End() cons t { inline Reflex::Type_Iterator Reflex::TypeBase::FunctionParameter_End() cons t {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return Dummy::TypeCont().end(); return Dummy::TypeCont().end();
} }
skipping to change at line 1035 skipping to change at line 631
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::TypeBase::SizeOf() const { inline size_t Reflex::TypeBase::SizeOf() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
if (!fSize) fSize = CalculateSize(); if (!fSize) fSize = CalculateSize();
return fSize; return fSize;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::TypeBase::SubScopeSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::Scope_Iterator Reflex::TypeBase::SubScope_Begin() const {
//-------------------------------------------------------------------------
------
return Dummy::ScopeCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Scope_Iterator Reflex::TypeBase::SubScope_End() const {
//-------------------------------------------------------------------------
------
return Dummy::ScopeCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Scope_Iterator Reflex::TypeBase::SubScope_RBegin() c
onst {
//-------------------------------------------------------------------------
------
return Dummy::ScopeCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Scope_Iterator Reflex::TypeBase::SubScope_REnd() con
st {
//-------------------------------------------------------------------------
------
return Dummy::ScopeCont().rend();
}
//-------------------------------------------------------------------------
------
inline size_t Reflex::TypeBase::SubTypeSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::Type_Iterator Reflex::TypeBase::SubType_Begin() const {
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Type_Iterator Reflex::TypeBase::SubType_End() const {
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Type_Iterator Reflex::TypeBase::SubType_RBegin() con
st {
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_Type_Iterator Reflex::TypeBase::SubType_REnd() const
{
//-------------------------------------------------------------------------
------
return Dummy::TypeCont().rend();
}
//-------------------------------------------------------------------------
------
inline size_t Reflex::TypeBase::TemplateArgumentSize() const { inline size_t Reflex::TypeBase::TemplateArgumentSize() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return 0; return 0;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline Reflex::Type_Iterator Reflex::TypeBase::TemplateArgument_Begin() con st { inline Reflex::Type_Iterator Reflex::TypeBase::TemplateArgument_Begin() con st {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return Dummy::TypeCont().begin(); return Dummy::TypeCont().begin();
} }
skipping to change at line 1137 skipping to change at line 673
return Dummy::TypeTemplate(); return Dummy::TypeTemplate();
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline const std::type_info & Reflex::TypeBase::TypeInfo() const { inline const std::type_info & Reflex::TypeBase::TypeInfo() const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
return *fTypeInfo; return *fTypeInfo;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline size_t Reflex::TypeBase::SubTypeTemplateSize() const {
//-------------------------------------------------------------------------
------
return 0;
}
//-------------------------------------------------------------------------
------
inline Reflex::TypeTemplate_Iterator Reflex::TypeBase::SubTypeTemplate_Begi
n() const {
//-------------------------------------------------------------------------
------
return Dummy::TypeTemplateCont().begin();
}
//-------------------------------------------------------------------------
------
inline Reflex::TypeTemplate_Iterator Reflex::TypeBase::SubTypeTemplate_End(
) const {
//-------------------------------------------------------------------------
------
return Dummy::TypeTemplateCont().end();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_TypeTemplate_Iterator Reflex::TypeBase::SubTypeTempl
ate_RBegin() const {
//-------------------------------------------------------------------------
------
return Dummy::TypeTemplateCont().rbegin();
}
//-------------------------------------------------------------------------
------
inline Reflex::Reverse_TypeTemplate_Iterator Reflex::TypeBase::SubTypeTempl
ate_REnd() const {
//-------------------------------------------------------------------------
------
return Dummy::TypeTemplateCont().rend();
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::UpdateMembers() const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function UpdateMembers can only be called on Class/S
truct");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddDataMember( const Member & /* dm */ ) cons
t {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddDataMember not callable on this object"
);
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddDataMember( const char * /* nam */,
const Type & /* typ */,
size_t /* offs */,
unsigned int /* modifier
s */ ) const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddDataMember not callable on this object"
);
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddDataMember(Member& /*output*/, const char*
/*nam*/, const Type& /*typ*/, size_t /*offs*/, unsigned int /*modifiers*/,
char* /*interpreterOffset*/) const {
//----------------------------------------------------------------------
---------
throw RuntimeError("Function AddDataMember not callable on this object"
);
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddFunctionMember( const Member & /* fm */ )
const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddFunctionMember not callable on this obje
ct");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddFunctionMember( const char * /* nam */,
const Type & /* typ
*/,
StubFunction /* stub
FP */,
void * /* stubCtx */
,
const char * /* para
ms */,
unsigned int /* modi
fiers */ ) const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddFunctionMember not callable on this obje
ct");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddSubScope( const Scope & /* sc */ ) const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddSubScope not callable on this object");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddSubScope( const char * /* scop */,
TYPE /* scopeTyp */ ) cons
t {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddSubScope not callable on this object");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddSubType( const Type & /* ty */ ) const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddSubType not callable on this object");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::AddSubType( const char * /* typ */,
size_t /* size */,
TYPE /* typeTyp */,
const std::type_info & /* t
i */,
unsigned int /* modifiers *
/ ) const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function AddSubType not callable on this object");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::RemoveDataMember( const Member & /* dm */ ) c
onst {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function RemoveDataMember not callable on this objec
t");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::RemoveFunctionMember( const Member & /* fm */
) const {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function RemoveFunctionMember not callable on this o
bject");
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::RemoveSubScope( const Scope & /* sc */ ) cons
t {
//-------------------------------------------------------------------------
------
throw RuntimeError("Function RemoveSubScope not callable on this object"
);
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::RemoveSubType( const Type & /* ty */ ) const
{
//-------------------------------------------------------------------------
------
throw RuntimeError("Function RemoveSubType not callable on this object")
;
}
//-------------------------------------------------------------------------
------
inline void Reflex::TypeBase::SetSize( size_t s ) const { inline void Reflex::TypeBase::SetSize( size_t s ) const {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
fSize = s; fSize = s;
} }
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
inline void Reflex::TypeBase::SetTypeInfo( const std::type_info & ti ) cons t { inline void Reflex::TypeBase::SetTypeInfo( const std::type_info & ti ) cons t {
//------------------------------------------------------------------------- ------ //------------------------------------------------------------------------- ------
fTypeInfo = &ti; fTypeInfo = &ti;
} }
 End of changes. 19 change blocks. 
757 lines changed or deleted 2 lines changed or added


 cintdictversion.h   cintdictversion.h 
skipping to change at line 18 skipping to change at line 18
************************************************************************ ************************************************************************
* Copyright(c) 1995~2008 Masaharu Goto (cint@pcroot.cern.ch) * Copyright(c) 1995~2008 Masaharu Goto (cint@pcroot.cern.ch)
* *
* For the licensing terms see the file COPYING * For the licensing terms see the file COPYING
* *
************************************************************************/ ************************************************************************/
#ifndef INCLUDE_CINTDICTVERSION #ifndef INCLUDE_CINTDICTVERSION
#define INCLUDE_CINTDICTVERSION #define INCLUDE_CINTDICTVERSION
#define G__CINTDICTVERSION 20090127 #define G__CINTDICTVERSION 20090417
#endif /* INCLUDE_CINTDICTVERSION */ #endif /* INCLUDE_CINTDICTVERSION */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 compiledata.h   compiledata.h 
/* This is file is automatically generated */ /* This is file is automatically generated */
#define BUILD_ARCH "linux" #define BUILD_ARCH "linux"
#define BUILD_NODE "Linux lxbuild116-vm3.cern.ch 2.6.18-92.1.18.el5PAE #1 S MP Wed Nov 12 07:09:13 EST 2008 i686 i686 i386 GNU/Linux" #define BUILD_NODE "Linux lxbuild147.cern.ch 2.6.18-92.1.18.el5 #1 SMP Wed Nov 12 06:49:06 EST 2008 i686 i686 i386 GNU/Linux"
#define COMPILER "/afs/cern.ch/sw/lcg/contrib/gcc/4.3/slc4_ia32_gcc34/bin/g ++" #define COMPILER "/afs/cern.ch/sw/lcg/contrib/gcc/4.3/slc4_ia32_gcc34/bin/g ++"
#define COMPILERVERS "gcc432" #define COMPILERVERS "gcc432"
#define MAKESHAREDLIB "cd $BuildDir ; g++ -c $Opt -pipe -m32 -Wall -W -Wov erloaded-virtual -fPIC -pthread $IncludePath $SourceFiles ; g++ $ObjectFil es -shared -Wl,-soname,$LibName.so -m32 -O2 $LinkedLibs -o $SharedLib" #define MAKESHAREDLIB "cd $BuildDir ; g++ -c $Opt -pipe -m32 -Wall -W -Wov erloaded-virtual -fPIC -pthread $IncludePath $SourceFiles ; g++ $ObjectFil es -shared -Wl,-soname,$LibName.so -m32 -O2 $LinkedLibs -o $SharedLib"
#define MAKEEXE "cd $BuildDir ; g++ -c -pipe -m32 -Wall -W -Woverloaded-vi rtual -fPIC -pthread $IncludePath $SourceFiles; g++ $ObjectFiles -m32 -O2 -o $ExeName $LinkedLibs -lm -ldl -pthread -rdynamic" #define MAKEEXE "cd $BuildDir ; g++ -c -pipe -m32 -Wall -W -Woverloaded-vi rtual -fPIC -pthread $IncludePath $SourceFiles; g++ $ObjectFiles -m32 -O2 -o $ExeName $LinkedLibs -lm -ldl -pthread -rdynamic"
#define CXXOPT "-O2" #define CXXOPT "-O2"
#define CXXDEBUG "-g" #define CXXDEBUG "-g"
#define ROOTBUILD "" #define ROOTBUILD ""
#define LINKEDLIBS "-L$ROOTSYS/lib -lCore -lCint -lMathCore -lRint " #define LINKEDLIBS "-L$ROOTSYS/lib -lCore -lCint -lMathCore -lRint "
#define INCLUDEPATH "-I$ROOTSYS/include" #define INCLUDEPATH "-I$ROOTSYS/include"
#define OBJEXT "o" #define OBJEXT "o"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 rootcint.pri   rootcint.pri 
# #
# author Valeri Fine (fine@bnl.gov) # author Valeri Fine (fine@bnl.gov)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# Qmake include file to add the rules to create RootCint Dictionary # Qmake include file to add the rules to create RootCint Dictionary
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# $Id: rootcint.pri,v 1.7 2008/09/25 22:19:24 fine Exp $ # $Id: rootcint.pri,v 1.8 2009/03/22 04:58:00 fine Exp $
# #
# Copyright (C) 2002 by Valeri Fine. All rights reserved. # Copyright (C) 2002 by Valeri Fine. All rights reserved.
# #
# This file may be distributed under the terms of the Q Public License # This file may be distributed under the terms of the Q Public License
# as defined by Trolltech AS of Norway and appearing in the file # as defined by Trolltech AS of Norway and appearing in the file
# LICENSE.QPL included in the packaging of this file. # LICENSE.QPL included in the packaging of this file.
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Usage: # Usage:
# ----- # -----
skipping to change at line 60 skipping to change at line 60
# ----------------------------------------------- # -----------------------------------------------
#-- permanent components to be included into any ".pro" file to build the R ootCint dictionary #-- permanent components to be included into any ".pro" file to build the R ootCint dictionary
# #
# -- define the LIBS and INCLUDEPATH variable # -- define the LIBS and INCLUDEPATH variable
# #
# ------- define rootlibs.pri ----------------- # ------- define rootlibs.pri -----------------
ROOTLIBSPRI = ROOTLIBSPRI =
ROOTLIBSPRIFILE = rootlibs.pri ROOTLIBSPRIFILE = rootlibs.pri
win32: DEFINES += _CRT_SECURE_NO_WARNINGS
# Wow !!! Qt exists function for the nested include file applies the relati ve path # Wow !!! Qt exists function for the nested include file applies the relati ve path
exists ($$ROOTLIBSPRIFILE){ exists ($$ROOTLIBSPRIFILE){
# ROOTLIBSPRI = inc/$$ROOTLIBSPRIFILE # ROOTLIBSPRI = inc/$$ROOTLIBSPRIFILE
ROOTLIBSPRI = $$ROOTLIBSPRIFILE ROOTLIBSPRI = $$ROOTLIBSPRIFILE
} }
isEmpty(ROOTLIBSPRI) { isEmpty(ROOTLIBSPRI) {
exists ($$(QTROOTSYSDIR)/include/$$ROOTLIBSPRIFILE){ exists ($$(QTROOTSYSDIR)/include/$$ROOTLIBSPRIFILE){
ROOTLIBSPRI = $$(QTROOTSYSDIR)/include/$$ROOTLIBSPRIFILE ROOTLIBSPRI = $$(QTROOTSYSDIR)/include/$$ROOTLIBSPRIFILE
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 rootlibs.pri   rootlibs.pri 
skipping to change at line 60 skipping to change at line 60
CONFIG += no_smart_library_merge CONFIG += no_smart_library_merge
} }
win32 { win32 {
QMAKE_EXTENSION_SHLIB = dll QMAKE_EXTENSION_SHLIB = dll
} }
#-- permanent components to be included into any ".pro" file to build the R ootCint dictionary #-- permanent components to be included into any ".pro" file to build the R ootCint dictionary
win32 { win32 {
LIBS += LIBS +=
\ \
-include:_G__cpp_setupG__Hist -include:_G__cpp_setupG__Graf1 - -include:_G__cpp_setupG__Hist -include:_G__cpp_setupG__G3D
include:_G__cpp_setupG__G3D \ \
-include:_G__cpp_setupG__GPad -include:_G__cpp_setupG__Tree - include:_G__cpp_setupG__Rint \ -include:_G__cpp_setupG__GPad -include:_G__cpp_setupG__Tree - include:_G__cpp_setupG__Rint \
-include:_G__cpp_setupG__PostScript -include:_G__cpp_setupG__Matrix - include:_G__cpp_setupG__Physics \ -include:_G__cpp_setupG__PostScript -include:_G__cpp_setupG__Matrix - include:_G__cpp_setupG__Physics \
-include:_G__cpp_setupG__Gui1 -include:_G__cpp_setupG__Geom1 -include:_G__cpp_setupG__Gui1 -include:_G__cpp_setupG__Geom1
exists( $$(ROOTSYS)/lib/libRIO.lib ) { exists( $$(ROOTSYS)/lib/libRIO.lib ) {
LIBS += -include:_G__cpp_setupG__IO LIBS += -include:_G__cpp_setupG__IO
} }
exists( $$(ROOTSYS)/lib/libTable.lib ) { exists( $$(ROOTSYS)/lib/libTable.lib ) {
LIBS += -include:_G__cpp_setupG__Table LIBS += -include:_G__cpp_setupG__Table
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/