ROOT: headers diff between 5.34.08 and 5.34.09 versions

	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.34/08"	#define ROOT_RELEASE "5.34/09"
	#define ROOT_RELEASE_DATE "May 31 2013"	#define ROOT_RELEASE_DATE "Jun 26 2013"
	#define ROOT_RELEASE_TIME "17:37:51"	#define ROOT_RELEASE_TIME "16:38:19"
	#define ROOT_SVN_REVISION 49361	#define ROOT_SVN_REVISION 49361

	#define ROOT_GIT_COMMIT "e0a8419"	#define ROOT_GIT_COMMIT "v5-34-08-80-g1323c6f"
	#define ROOT_GIT_BRANCH "heads/v5-34-00-patches"	#define ROOT_GIT_BRANCH "heads/v5-34-00-patches"

	#define ROOT_VERSION_CODE 336392	#define ROOT_VERSION_CODE 336393
	#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. 3 change blocks.
	5 lines changed or deleted	5 lines changed or added

	RooAbsCategoryLValue.h	RooAbsCategoryLValue.h

	skipping to change at line 55	skipping to change at line 55
	// Return volume of i-th bin (according to binning named rangeName if r angeName!=0)	// Return volume of i-th bin (according to binning named rangeName if r angeName!=0)
	return 1.0 ;	return 1.0 ;
	}	}
	virtual Double_t volume(const char* rangeName) const {	virtual Double_t volume(const char* rangeName) const {
	// Return span of range with given name (=number of states included in this range)	// Return span of range with given name (=number of states included in this range)
	return numTypes(rangeName) ;	return numTypes(rangeName) ;
	}	}
	virtual void randomize(const char* rangeName=0);	virtual void randomize(const char* rangeName=0);

	virtual const RooAbsBinning* getBinningPtr(const char* /rangeName/) con st { return 0 ; }	virtual const RooAbsBinning* getBinningPtr(const char* /rangeName/) con st { return 0 ; }

		virtual std::list<std::string> getBinningNames() const { return std::list <std::string>(1, "") ; }
	virtual Int_t getBin(const RooAbsBinning* /ptr/) const { return getBin( (const char*)0) ; }	virtual Int_t getBin(const RooAbsBinning* /ptr/) const { return getBin( (const char*)0) ; }

	inline void setConstant(Bool_t value= kTRUE) {	inline void setConstant(Bool_t value= kTRUE) {
	// Declare category constant	// Declare category constant
	setAttribute("Constant",value);	setAttribute("Constant",value);
	}	}

	inline virtual Bool_t isLValue() const {	inline virtual Bool_t isLValue() const {
	// Object is an l-value	// Object is an l-value
	return kTRUE;	return kTRUE;

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	RooAbsLValue.h	RooAbsLValue.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_ABS_LVALUE	#ifndef ROO_ABS_LVALUE
	#define ROO_ABS_LVALUE	#define ROO_ABS_LVALUE


		#include <list>
		#include <string>

	#include "Riosfwd.h"	#include "Riosfwd.h"
	#include "Rtypes.h"	#include "Rtypes.h"

	class RooAbsBinning ;	class RooAbsBinning ;

	class RooAbsLValue {	class RooAbsLValue {
	public:	public:

	// Constructors, cloning and assignment	// Constructors, cloning and assignment
	RooAbsLValue() ;	RooAbsLValue() ;
	virtual ~RooAbsLValue();	virtual ~RooAbsLValue();

	virtual void setBin(Int_t ibin, const char* rangeName=0) = 0 ;	virtual void setBin(Int_t ibin, const char* rangeName=0) = 0 ;
	virtual Int_t getBin(const char* rangeName=0) const = 0 ;	virtual Int_t getBin(const char* rangeName=0) const = 0 ;
	virtual Int_t numBins(const char* rangeName=0) const = 0 ;	virtual Int_t numBins(const char* rangeName=0) const = 0 ;
	virtual Double_t getBinWidth(Int_t i, const char* rangeName=0) const = 0 ;	virtual Double_t getBinWidth(Int_t i, const char* rangeName=0) const = 0 ;
	virtual Double_t volume(const char* rangeName) const = 0 ;	virtual Double_t volume(const char* rangeName) const = 0 ;
	virtual void randomize(const char* rangeName=0) = 0 ;	virtual void randomize(const char* rangeName=0) = 0 ;

	virtual const RooAbsBinning* getBinningPtr(const char* rangeName) const = 0 ;	virtual const RooAbsBinning* getBinningPtr(const char* rangeName) const = 0 ;

		virtual std::list<std::string> getBinningNames() const = 0;
	virtual Int_t getBin(const RooAbsBinning*) const = 0 ;	virtual Int_t getBin(const RooAbsBinning*) const = 0 ;

	protected:	protected:

	ClassDef(RooAbsLValue,1) // Abstract variable	ClassDef(RooAbsLValue,1) // Abstract variable
	};	};

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	RooCFunction1Binding.h	RooCFunction1Binding.h

	skipping to change at line 30	skipping to change at line 30
	#include "RooMsgService.h"	#include "RooMsgService.h"
	#include <string>	#include <string>
	#include <map>	#include <map>
	#include <vector>	#include <vector>

	namespace RooFit {	namespace RooFit {

	typedef Double_t (*CFUNCD1D)(Double_t) ;	typedef Double_t (*CFUNCD1D)(Double_t) ;
	typedef Double_t (*CFUNCD1I)(Int_t) ;	typedef Double_t (*CFUNCD1I)(Int_t) ;


	RooAbsReal* bindFunction(const char* name,void* func,RooAbsReal& x) ;
	RooAbsPdf* bindPdf(const char* name,void* func,RooAbsReal& x) ;
	#ifndef __CINT__
	RooAbsReal* bindFunction(const char* name,CFUNCD1D func,RooAbsReal& x) ;	RooAbsReal* bindFunction(const char* name,CFUNCD1D func,RooAbsReal& x) ;
	RooAbsReal* bindFunction(const char* name,CFUNCD1I func,RooAbsReal& x) ;	RooAbsReal* bindFunction(const char* name,CFUNCD1I func,RooAbsReal& x) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD1D func,RooAbsReal& x) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD1D func,RooAbsReal& x) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD1I func,RooAbsReal& x) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD1I func,RooAbsReal& x) ;

	#endif

	}	}

	template<class VO, class VI>	template<class VO, class VI>
	class RooCFunction1Map {	class RooCFunction1Map {
	public:	public:
	RooCFunction1Map() {} ;	RooCFunction1Map() {} ;

	void add(const char* name, VO (ptr)(VI), const char arg1name="x") {	void add(const char* name, VO (ptr)(VI), const char arg1name="x") {
	// Register function with given name and argument name	// Register function with given name and argument name

End of changes. 2 change blocks.
	4 lines changed or deleted	0 lines changed or added

	RooCFunction2Binding.h	RooCFunction2Binding.h

	skipping to change at line 33	skipping to change at line 33
	#include <vector>	#include <vector>

	namespace RooFit {	namespace RooFit {

	typedef Double_t (*CFUNCD2DD)(Double_t,Double_t) ;	typedef Double_t (*CFUNCD2DD)(Double_t,Double_t) ;
	typedef Double_t (*CFUNCD2ID)(Int_t,Double_t) ;	typedef Double_t (*CFUNCD2ID)(Int_t,Double_t) ;
	typedef Double_t (*CFUNCD2UD)(UInt_t,Double_t) ;	typedef Double_t (*CFUNCD2UD)(UInt_t,Double_t) ;
	typedef Double_t (*CFUNCD2DI)(Double_t,Int_t) ;	typedef Double_t (*CFUNCD2DI)(Double_t,Int_t) ;
	typedef Double_t (*CFUNCD2II)(Int_t,Int_t) ;	typedef Double_t (*CFUNCD2II)(Int_t,Int_t) ;


	RooAbsReal* bindFunction(const char* name,void* func,RooAbsReal& x, RooAbsR
	eal& y) ;
	RooAbsPdf* bindPdf(const char* name,void* func,RooAbsReal& x, RooAbsReal& y
	) ;
	#ifndef __CINT__
	RooAbsReal* bindFunction(const char* name,CFUNCD2DD func,RooAbsReal& x, Roo AbsReal& y) ;	RooAbsReal* bindFunction(const char* name,CFUNCD2DD func,RooAbsReal& x, Roo AbsReal& y) ;
	RooAbsReal* bindFunction(const char* name,CFUNCD2ID func,RooAbsReal& x, Roo AbsReal& y) ;	RooAbsReal* bindFunction(const char* name,CFUNCD2ID func,RooAbsReal& x, Roo AbsReal& y) ;
	RooAbsReal* bindFunction(const char* name,CFUNCD2UD func,RooAbsReal& x, Roo AbsReal& y) ;	RooAbsReal* bindFunction(const char* name,CFUNCD2UD func,RooAbsReal& x, Roo AbsReal& y) ;
	RooAbsReal* bindFunction(const char* name,CFUNCD2DI func,RooAbsReal& x, Roo AbsReal& y) ;	RooAbsReal* bindFunction(const char* name,CFUNCD2DI func,RooAbsReal& x, Roo AbsReal& y) ;
	RooAbsReal* bindFunction(const char* name,CFUNCD2II func,RooAbsReal& x, Roo AbsReal& y) ;	RooAbsReal* bindFunction(const char* name,CFUNCD2II func,RooAbsReal& x, Roo AbsReal& y) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD2DD func,RooAbsReal& x, RooAbsRea l& y) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD2DD func,RooAbsReal& x, RooAbsRea l& y) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD2ID func,RooAbsReal& x, RooAbsRea l& y) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD2ID func,RooAbsReal& x, RooAbsRea l& y) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD2UD func,RooAbsReal& x, RooAbsRea l& y) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD2UD func,RooAbsReal& x, RooAbsRea l& y) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD2DI func,RooAbsReal& x, RooAbsRea l& y) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD2DI func,RooAbsReal& x, RooAbsRea l& y) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD2II func,RooAbsReal& x, RooAbsRea l& y) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD2II func,RooAbsReal& x, RooAbsRea l& y) ;

	#endif

	}	}

	template<class VO, class VI1, class VI2>	template<class VO, class VI1, class VI2>
	class RooCFunction2Map {	class RooCFunction2Map {
	public:	public:
	RooCFunction2Map() {} ;	RooCFunction2Map() {} ;

	void add(const char* name, VO (ptr)(VI1,VI2), const char arg1name="x", const char* arg2name="y") {	void add(const char* name, VO (ptr)(VI1,VI2), const char arg1name="x", const char* arg2name="y") {
	// Register function with given name and argument name	// Register function with given name and argument name

End of changes. 2 change blocks.
	6 lines changed or deleted	0 lines changed or added

	RooCFunction4Binding.h	RooCFunction4Binding.h

	skipping to change at line 31	skipping to change at line 31
	#include <string>	#include <string>
	#include <map>	#include <map>
	#include <vector>	#include <vector>

	namespace RooFit {	namespace RooFit {

	typedef Double_t (*CFUNCD4DDDD)(Double_t,Double_t,Double_t,Double_t) ;	typedef Double_t (*CFUNCD4DDDD)(Double_t,Double_t,Double_t,Double_t) ;
	typedef Double_t (*CFUNCD4DDDI)(Double_t,Double_t,Double_t,Int_t) ;	typedef Double_t (*CFUNCD4DDDI)(Double_t,Double_t,Double_t,Int_t) ;
	typedef Double_t (*CFUNCD4DDDB)(Double_t,Double_t,Double_t,Bool_t) ;	typedef Double_t (*CFUNCD4DDDB)(Double_t,Double_t,Double_t,Bool_t) ;


	RooAbsReal* bindFunction(const char* name,void* func,RooAbsReal& x, RooAbsR
	eal& y, RooAbsReal& z, RooAbsReal& w) ;
	RooAbsPdf* bindPdf(const char* name,void* func,RooAbsReal& x, RooAbsReal& y
	, RooAbsReal& z, RooAbsReal& w) ;
	#ifndef __CINT__
	RooAbsReal* bindFunction(const char* name,CFUNCD4DDDD func,RooAbsReal& x, R ooAbsReal& y, RooAbsReal& z, RooAbsReal& w) ;	RooAbsReal* bindFunction(const char* name,CFUNCD4DDDD func,RooAbsReal& x, R ooAbsReal& y, RooAbsReal& z, RooAbsReal& w) ;
	RooAbsReal* bindFunction(const char* name,CFUNCD4DDDI func,RooAbsReal& x, R ooAbsReal& y, RooAbsReal& z, RooAbsReal& w) ;	RooAbsReal* bindFunction(const char* name,CFUNCD4DDDI func,RooAbsReal& x, R ooAbsReal& y, RooAbsReal& z, RooAbsReal& w) ;
	RooAbsReal* bindFunction(const char* name,CFUNCD4DDDB func,RooAbsReal& x, R ooAbsReal& y, RooAbsReal& z, RooAbsReal& w) ;	RooAbsReal* bindFunction(const char* name,CFUNCD4DDDB func,RooAbsReal& x, R ooAbsReal& y, RooAbsReal& z, RooAbsReal& w) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD4DDDD func,RooAbsReal& x, RooAbsR eal& y, RooAbsReal& z, RooAbsReal& w) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD4DDDD func,RooAbsReal& x, RooAbsR eal& y, RooAbsReal& z, RooAbsReal& w) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD4DDDI func,RooAbsReal& x, RooAbsR eal& y, RooAbsReal& z, RooAbsReal& w) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD4DDDI func,RooAbsReal& x, RooAbsR eal& y, RooAbsReal& z, RooAbsReal& w) ;
	RooAbsPdf* bindPdf(const char* name,CFUNCD4DDDB func,RooAbsReal& x, RooAbsR eal& y, RooAbsReal& z, RooAbsReal& w) ;	RooAbsPdf* bindPdf(const char* name,CFUNCD4DDDB func,RooAbsReal& x, RooAbsR eal& y, RooAbsReal& z, RooAbsReal& w) ;

	#endif

	}	}

	template<class VO, class VI1, class VI2, class VI3, class VI4>	template<class VO, class VI1, class VI2, class VI3, class VI4>
	class RooCFunction4Map {	class RooCFunction4Map {
	public:	public:
	RooCFunction4Map() {} ;	RooCFunction4Map() {} ;

	void add(const char* name, VO (ptr)(VI1,VI2,VI3,VI4), const char arg1na me="x", const char* arg2name="y",	void add(const char* name, VO (ptr)(VI1,VI2,VI3,VI4), const char arg1na me="x", const char* arg2name="y",
	const char* arg3nam e="z", const char* arg4name="w") {	const char* arg3nam e="z", const char* arg4name="w") {

End of changes. 2 change blocks.
	6 lines changed or deleted	0 lines changed or added

	RooCintUtils.h	RooCintUtils.h

	skipping to change at line 27	skipping to change at line 27
	#define ROO_CINT_UTILS	#define ROO_CINT_UTILS

	#include "Rtypes.h"	#include "Rtypes.h"
	#include <list>	#include <list>
	#include <string>	#include <string>
	namespace RooCintUtils {	namespace RooCintUtils {

	std::pair<std::list<std::string>,unsigned int> ctorArgs(const char* class name, UInt_t nMinArgs=0) ;	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 isEnum(const char* typeName) ;
	Bool_t isValidEnumValue(const char* typeName, const char* value) ;	Bool_t isValidEnumValue(const char* typeName, const char* value) ;

	const char* functionName(void* func) ;
	Bool_t matchFuncPtrArgs(void* func, const char* args) ;
	Bool_t isTypeDef(const char* trueName, const char* aliasName) ;	Bool_t isTypeDef(const char* trueName, const char* aliasName) ;
	std::string trueName(const char* typeDefName) ;	std::string trueName(const char* typeDefName) ;

	}	}

	#endif	#endif

End of changes. 1 change blocks.
	2 lines changed or deleted	0 lines changed or added

	RooLinkedList.h	RooLinkedList.h

	skipping to change at line 30	skipping to change at line 30
	#include <list>	#include <list>

	#include "TNamed.h"	#include "TNamed.h"
	#include "RooLinkedListElem.h"	#include "RooLinkedListElem.h"
	#include "RooHashTable.h"	#include "RooHashTable.h"
	class RooLinkedListIter ;	class RooLinkedListIter ;
	class RooFIter ;	class RooFIter ;
	class TIterator ;	class TIterator ;
	class RooAbsArg ;	class RooAbsArg ;


		namespace RooLinkedListImplDetails {
		class Chunk;
		class Pool;
		}

	class RooLinkedList : public TObject {	class RooLinkedList : public TObject {
	public:	public:
	// Constructor	// Constructor
	RooLinkedList(Int_t htsize=0) ;	RooLinkedList(Int_t htsize=0) ;

	// Copy constructor	// Copy constructor
	RooLinkedList(const RooLinkedList& other) ;	RooLinkedList(const RooLinkedList& other) ;

	virtual TObject* Clone(const char* =0) const {	virtual TObject* Clone(const char* =0) const {
	return new RooLinkedList(*this) ;	return new RooLinkedList(*this) ;

	skipping to change at line 109	skipping to change at line 114
	RooHashTable* _htableName ; //! Hash table by name	RooHashTable* _htableName ; //! Hash table by name
	RooHashTable* _htableLink ; //! Hash table by link pointer	RooHashTable* _htableLink ; //! Hash table by link pointer

	TString _name ;	TString _name ;

	private:	private:
	template <bool ascending>	template <bool ascending>
	static RooLinkedListElem* mergesort_impl(RooLinkedListElem* l1,	static RooLinkedListElem* mergesort_impl(RooLinkedListElem* l1,
	const unsigned sz, RooLinkedListElem** tail = 0);	const unsigned sz, RooLinkedListElem** tail = 0);
	/// memory pool for quick allocation of RooLinkedListElems	/// memory pool for quick allocation of RooLinkedListElems

	class Pool {	typedef RooLinkedListImplDetails::Pool Pool;
	private:
	enum {
	minsz = 7, ///< minimum chunk size (just below 1 << minsz bytes)
	maxsz = 20, ///< maximum chunk size (just below 1 << maxsz bytes)
	szincr = 1 ///< size class increment (sz = 1 << (minsz + k * szincr)
	)
	};
	/// a chunk of memory in the pool
	class Chunk;
	typedef std::list<Chunk*> ChunkList;
	typedef std::map<const void, Chunk> AddrMap;
	public:
	/// constructor
	Pool();
	/// destructor
	~Pool();
	/// acquire the pool
	inline void acquire() { ++_refCount; }
	/// release the pool, return true if the pool is unused
	inline bool release() { return 0 == --_refCount; }
	/// pop a free element out of the pool
	RooLinkedListElem* pop_free_elem();
	/// push a free element back into the pool
	void push_free_elem(RooLinkedListElem* el);
	private:
	AddrMap _addrmap;
	ChunkList _freelist;
	UInt_t _szmap[(maxsz - minsz) / szincr];
	Int_t _cursz;
	UInt_t _refCount;

	/// adjust _cursz to current largest block
	void updateCurSz(Int_t sz, Int_t incr);
	/// find size of next chunk to allocate (in a hopefully smart way)
	Int_t nextChunkSz() const;
	};
	/// shared memory pool for allocation of RooLinkedListElems	/// shared memory pool for allocation of RooLinkedListElems
	static Pool* _pool; //!	static Pool* _pool; //!

	ClassDef(RooLinkedList,3) // Doubly linked list for storage of RooAbsArg objects	ClassDef(RooLinkedList,3) // Doubly linked list for storage of RooAbsArg objects
	};	};

	#endif	#endif

End of changes. 2 change blocks.
	37 lines changed or deleted	6 lines changed or added

	RooLinkedListElem.h	RooLinkedListElem.h

	skipping to change at line 25	skipping to change at line 25
	************************************************************************ */	************************************************************************ */
	#ifndef ROO_LINKED_LIST_ELEM	#ifndef ROO_LINKED_LIST_ELEM
	#define ROO_LINKED_LIST_ELEM	#define ROO_LINKED_LIST_ELEM

	#include "Rtypes.h"	#include "Rtypes.h"

	class TObject ;	class TObject ;
	class RooLinkedListElem ;	class RooLinkedListElem ;
	class TBuffer ;	class TBuffer ;


		namespace RooLinkedListImplDetails {
		class Chunk;
		class Pool;
		}

	class RooLinkedListElem {	class RooLinkedListElem {
	public:	public:
	// Initial element ctor	// Initial element ctor
	RooLinkedListElem() :	RooLinkedListElem() :
	_prev(0), _next(0), _arg(0), _refCount(0) {	_prev(0), _next(0), _arg(0), _refCount(0) {
	}	}

	void init(TObject* arg, RooLinkedListElem* after=0) {	void init(TObject* arg, RooLinkedListElem* after=0) {
	_arg = arg ;	_arg = arg ;
	_refCount = 1 ;	_refCount = 1 ;

	skipping to change at line 81	skipping to change at line 86
	if (_next) _next->_prev = _prev ;	if (_next) _next->_prev = _prev ;
	}	}

	Int_t refCount() const { return _refCount ; }	Int_t refCount() const { return _refCount ; }
	Int_t incRefCount() { return ++_refCount ; }	Int_t incRefCount() { return ++_refCount ; }
	Int_t decRefCount() { return --_refCount ; }	Int_t decRefCount() { return --_refCount ; }

	protected:	protected:
	friend class RooHashTable ;	friend class RooHashTable ;
	friend class RooLinkedList ;	friend class RooLinkedList ;

		friend class RooLinkedListImplDetails::Pool;
		friend class RooLinkedListImplDetails::Chunk;
	friend class RooLinkedListIter ;	friend class RooLinkedListIter ;
	friend class RooFIter ;	friend class RooFIter ;
	RooLinkedListElem* _prev ; // Link to previous element in list	RooLinkedListElem* _prev ; // Link to previous element in list
	RooLinkedListElem* _next ; // Link to next element in list	RooLinkedListElem* _next ; // Link to next element in list
	TObject* _arg ; // Link to contents	TObject* _arg ; // Link to contents
	Int_t _refCount ; //! Reference count	Int_t _refCount ; //! Reference count

	protected:	protected:

	// Forbidden	// Forbidden

End of changes. 2 change blocks.
	0 lines changed or deleted	7 lines changed or added

	RooMinimizer.h	RooMinimizer.h

	skipping to change at line 82	skipping to change at line 82
	void setProfile(Bool_t flag=kTRUE) { _profile = flag ; }	void setProfile(Bool_t flag=kTRUE) { _profile = flag ; }
	Bool_t setLogFile(const char* logf=0) { return _fcn->SetLogFile(logf); }	Bool_t setLogFile(const char* logf=0) { return _fcn->SetLogFile(logf); }

	void setMinimizerType(const char* type) ;	void setMinimizerType(const char* type) ;

	static void cleanup() ;	static void cleanup() ;
	static RooFitResult* lastMinuitFit(const RooArgList& varList=RooArgList() ) ;	static RooFitResult* lastMinuitFit(const RooArgList& varList=RooArgList() ) ;

	void saveStatus(const char* label, Int_t status) { _statusHistory.push_ba ck(std::pair<std::string,int>(label,status)) ; }	void saveStatus(const char* label, Int_t status) { _statusHistory.push_ba ck(std::pair<std::string,int>(label,status)) ; }


		Int_t evalCounter() const { return _fcn->evalCounter() ; }
		void zeroEvalCount() { _fcn->zeroEvalCount() ; }

	protected:	protected:

	friend class RooAbsPdf ;	friend class RooAbsPdf ;
	void applyCovarianceMatrix(TMatrixDSym& V) ;	void applyCovarianceMatrix(TMatrixDSym& V) ;

	void profileStart() ;	void profileStart() ;
	void profileStop() ;	void profileStop() ;

	inline Int_t getNPar() const { return _fcn->NDim() ; }	inline Int_t getNPar() const { return _fcn->NDim() ; }
	inline std::ofstream* logfile() const { return _fcn->GetLogFile(); }	inline std::ofstream* logfile() const { return _fcn->GetLogFile(); }

End of changes. 1 change blocks.
	0 lines changed or deleted	3 lines changed or added

	RooMinimizerFcn.h	RooMinimizerFcn.h

	skipping to change at line 39	skipping to change at line 39
	#include <fstream>	#include <fstream>

	class RooMinimizer;	class RooMinimizer;

	class RooMinimizerFcn : public ROOT::Math::IBaseFunctionMultiDim {	class RooMinimizerFcn : public ROOT::Math::IBaseFunctionMultiDim {

	public:	public:

	RooMinimizerFcn(RooAbsReal funct, RooMinimizer context,	RooMinimizerFcn(RooAbsReal funct, RooMinimizer context,
	bool verbose = false);	bool verbose = false);

		RooMinimizerFcn(const RooMinimizerFcn& other);
	virtual ~RooMinimizerFcn();	virtual ~RooMinimizerFcn();

	virtual ROOT::Math::IBaseFunctionMultiDim* Clone() const;	virtual ROOT::Math::IBaseFunctionMultiDim* Clone() const;
	virtual unsigned int NDim() const { return _nDim; }	virtual unsigned int NDim() const { return _nDim; }

	RooArgList* GetFloatParamList() { return _floatParamList; }	RooArgList* GetFloatParamList() { return _floatParamList; }
	RooArgList* GetConstParamList() { return _constParamList; }	RooArgList* GetConstParamList() { return _constParamList; }
	RooArgList* GetInitFloatParamList() { return _initFloatParamList; }	RooArgList* GetInitFloatParamList() { return _initFloatParamList; }
	RooArgList* GetInitConstParamList() { return _initConstParamList; }	RooArgList* GetInitConstParamList() { return _initConstParamList; }


	skipping to change at line 63	skipping to change at line 64
	void SetVerbose(Bool_t flag=kTRUE) { _verbose = flag ; }	void SetVerbose(Bool_t flag=kTRUE) { _verbose = flag ; }

	Double_t& GetMaxFCN() { return _maxFCN; }	Double_t& GetMaxFCN() { return _maxFCN; }
	Int_t GetNumInvalidNLL() { return _numBadNLL; }	Int_t GetNumInvalidNLL() { return _numBadNLL; }

	Bool_t Synchronize(std::vector<ROOT::Fit::ParameterSettings>& parameters,	Bool_t Synchronize(std::vector<ROOT::Fit::ParameterSettings>& parameters,
	Bool_t optConst, Bool_t verbose);	Bool_t optConst, Bool_t verbose);
	void BackProp(const ROOT::Fit::FitResult &results);	void BackProp(const ROOT::Fit::FitResult &results);
	void ApplyCovarianceMatrix(TMatrixDSym& V);	void ApplyCovarianceMatrix(TMatrixDSym& V);


		Int_t evalCounter() const { return _evalCounter ; }
		void zeroEvalCount() { _evalCounter = 0 ; }

	private:	private:

	Double_t GetPdfParamVal(Int_t index);	Double_t GetPdfParamVal(Int_t index);
	Double_t GetPdfParamErr(Int_t index);	Double_t GetPdfParamErr(Int_t index);
	void SetPdfParamErr(Int_t index, Double_t value);	void SetPdfParamErr(Int_t index, Double_t value);
	void ClearPdfParamAsymErr(Int_t index);	void ClearPdfParamAsymErr(Int_t index);
	void SetPdfParamErr(Int_t index, Double_t loVal, Double_t hiVal);	void SetPdfParamErr(Int_t index, Double_t loVal, Double_t hiVal);

	inline Bool_t SetPdfParamVal(const Int_t &index, const Double_t &value) c onst;	inline Bool_t SetPdfParamVal(const Int_t &index, const Double_t &value) c onst;

	virtual double DoEval(const double * x) const;	virtual double DoEval(const double * x) const;
	void updateFloatVec() ;	void updateFloatVec() ;

	private:	private:


		mutable Int_t _evalCounter ;

	RooAbsReal *_funct;	RooAbsReal *_funct;
	RooMinimizer *_context;	RooMinimizer *_context;

	mutable double _maxFCN;	mutable double _maxFCN;
	mutable int _numBadNLL;	mutable int _numBadNLL;
	mutable int _printEvalErrors;	mutable int _printEvalErrors;
	Bool_t _doEvalErrorWall;	Bool_t _doEvalErrorWall;

	int _nDim;	int _nDim;
	std::ofstream *_logfile;	std::ofstream *_logfile;

End of changes. 3 change blocks.
	0 lines changed or deleted	6 lines changed or added

	RooNDKeysPdf.h	RooNDKeysPdf.h
	/************************************************************************ *	/************************************************************************ *
	* Project: RooFit *	* Project: RooFit *
	* Package: RooFitModels *	* Package: RooFitModels *

	* File: $Id$	* File: $Id: RooNDKeysPdf.h 44368 2012-05-30 15:38:44Z axel $
	* Authors: *	* Authors: *
	* Max Baak, CERN, mbaak@cern.ch *	* Max Baak, CERN, mbaak@cern.ch *
	* *	* *
	* 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_KEYS_PDF	#ifndef ROO_NDKEYS_PDF
	#define ROO_KEYS_PDF	#define ROO_NDKEYS_PDF

	#include "RooAbsPdf.h"	#include "RooAbsPdf.h"
	#include "RooRealProxy.h"	#include "RooRealProxy.h"
	#include "RooSetProxy.h"	#include "RooSetProxy.h"
	#include "RooRealConstant.h"	#include "RooRealConstant.h"
	#include "TVectorD.h"	#include "TVectorD.h"
	#include "TMatrixD.h"	#include "TMatrixD.h"
	#include "TMatrixDSym.h"	#include "TMatrixDSym.h"
	#include <map>	#include <map>
	#include <vector>	#include <vector>

	skipping to change at line 58	skipping to change at line 58
	enum Mirror {NoMirror, MirrorLeft, MirrorRight, MirrorBoth,	enum Mirror {NoMirror, MirrorLeft, MirrorRight, MirrorBoth,
	MirrorAsymLeft, MirrorAsymLeftRight,	MirrorAsymLeft, MirrorAsymLeftRight,
	MirrorAsymRight, MirrorLeftAsymRight,	MirrorAsymRight, MirrorLeftAsymRight,
	MirrorAsymBoth };	MirrorAsymBoth };

	RooNDKeysPdf(const char name, const char title,	RooNDKeysPdf(const char name, const char title,
	const RooArgList& varList, RooDataSet& data,	const RooArgList& varList, RooDataSet& data,
	TString options="a", Double_t rho=1, Double_t nSigma=3, Bool_ t rotate=kTRUE) ;	TString options="a", Double_t rho=1, Double_t nSigma=3, Bool_ t rotate=kTRUE) ;

	RooNDKeysPdf(const char name, const char title,	RooNDKeysPdf(const char name, const char title,

		const RooArgList& varList, RooDataSet& data, const TVectorD&
		rho,
		TString options="a", Double_t nSigma=3, Bool_t rotate=kTRUE)
		;

		RooNDKeysPdf(const char name, const char title,
	RooAbsReal& x, RooDataSet& data,	RooAbsReal& x, RooDataSet& data,
	Mirror mirror= NoMirror, Double_t rho=1, Double_t nSigma=3, Bool_t rotate=kTRUE) ;	Mirror mirror= NoMirror, Double_t rho=1, Double_t nSigma=3, Bool_t rotate=kTRUE) ;

	RooNDKeysPdf(const char name, const char title,	RooNDKeysPdf(const char name, const char title,
	RooAbsReal& x, RooAbsReal &y, RooDataSet& data,	RooAbsReal& x, RooAbsReal &y, RooDataSet& data,
	TString options="a", Double_t rho = 1.0, Double_t nSigma=3, Bool_t rotate=kTRUE);	TString options="a", Double_t rho = 1.0, Double_t nSigma=3, Bool_t rotate=kTRUE);

	RooNDKeysPdf(const RooNDKeysPdf& other, const char* name=0);	RooNDKeysPdf(const RooNDKeysPdf& other, const char* name=0);
	virtual ~RooNDKeysPdf();	virtual ~RooNDKeysPdf();


	skipping to change at line 191	skipping to change at line 195
	Int_t idx;	Int_t idx;

	SorterTV_L2H (Int_t index) : idx(index) {}	SorterTV_L2H (Int_t index) : idx(index) {}
	bool operator() (const itPair& a, const itPair& b) {	bool operator() (const itPair& a, const itPair& b) {
	const TVectorD& aVec = *(a.second);	const TVectorD& aVec = *(a.second);
	const TVectorD& bVec = *(b.second);	const TVectorD& bVec = *(b.second);
	return (aVec[idx]<bVec[idx]);	return (aVec[idx]<bVec[idx]);
	}	}
	};	};


	ClassDef(RooNDKeysPdf,0) // General N-dimensional non-parametric kernel e stimation p.d.f	ClassDef(RooNDKeysPdf,1) // General N-dimensional non-parametric kernel e stimation p.d.f
	};	};

	#endif	#endif

End of changes. 4 change blocks.
	4 lines changed or deleted	10 lines changed or added

	RooProfileLL.h	RooProfileLL.h

	skipping to change at line 21	skipping to change at line 21

	#ifndef ROOPROFILELL	#ifndef ROOPROFILELL
	#define ROOPROFILELL	#define ROOPROFILELL

	#include "RooAbsReal.h"	#include "RooAbsReal.h"
	#include "RooRealProxy.h"	#include "RooRealProxy.h"
	#include "RooSetProxy.h"	#include "RooSetProxy.h"
	#include <map>	#include <map>
	#include <string>	#include <string>


		class RooMinimizer ;
	class RooMinuit ;	class RooMinuit ;


		#define MINIMIZER RooMinimizer

	class RooProfileLL : public RooAbsReal {	class RooProfileLL : public RooAbsReal {
	public:	public:

	RooProfileLL() ;	RooProfileLL() ;
	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 ; }


	RooMinuit* minuit() { return _minuit ; }	MINIMIZER* minimizer() { return _minimizer ; }
	RooAbsReal& nll() { return const_cast<RooAbsReal&>(_nll.arg()) ; }	RooAbsReal& nll() { return const_cast<RooAbsReal&>(_nll.arg()) ; }
	const RooArgSet& bestFitParams() const ;	const RooArgSet& bestFitParams() const ;
	const RooArgSet& bestFitObs() const ;	const RooArgSet& bestFitObs() const ;

	virtual RooAbsReal* createProfile(const RooArgSet& paramsOfInterest) ;	virtual RooAbsReal* createProfile(const RooArgSet& paramsOfInterest) ;

	virtual Bool_t redirectServersHook(const RooAbsCollection& /newServerLis t/, Bool_t /mustReplaceAll/, Bool_t /nameChange/, Bool_t /isRecursive /) ;	virtual Bool_t redirectServersHook(const RooAbsCollection& /newServerLis t/, Bool_t /mustReplaceAll/, Bool_t /nameChange/, Bool_t /isRecursive /) ;

	void clearAbsMin() { _absMinValid = kFALSE ; }	void clearAbsMin() { _absMinValid = kFALSE ; }

	Int_t numEval() const { return _neval ; }	Int_t numEval() const { return _neval ; }

	protected:	protected:

	void validateAbsMin() const ;	void validateAbsMin() const ;

	void initializeMinuit() const ;	void initializeMinimizer() 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
	RooSetProxy _par ; // Marginialized parameters of likelihood	RooSetProxy _par ; // Marginialized parameters of likelihood
	Bool_t _startFromMin ; // Always start minimization for global minimum?	Bool_t _startFromMin ; // Always start minimization for global minimum?

	TIterator* _piter ; //! Iterator over profile likelihood parameters to be minimized	TIterator* _piter ; //! Iterator over profile likelihood parameters to be minimized
	TIterator* _oiter ; //! Iterator of profile likelihood output parameter(s )	TIterator* _oiter ; //! Iterator of profile likelihood output parameter(s )


	mutable RooMinuit* _minuit ; //! Internal minuit instance	mutable MINIMIZER* _minimizer ; //! Internal minuit instance

	mutable Bool_t _absMinValid ; // flag if absmin is up-to-date	mutable Bool_t _absMinValid ; // flag if absmin is up-to-date
	mutable Double_t _absMin ; // absolute minimum of -log(L)	mutable Double_t _absMin ; // absolute minimum of -log(L)
	mutable RooArgSet _paramAbsMin ; // Parameter values at absolute minimum	mutable RooArgSet _paramAbsMin ; // Parameter values at absolute minimum
	mutable RooArgSet _obsAbsMin ; // Observable values at absolute minimum	mutable RooArgSet _obsAbsMin ; // Observable values at absolute minimum
	mutable std::map<std::string,bool> _paramFixed ; // Parameter constant st atus at last time of use	mutable std::map<std::string,bool> _paramFixed ; // Parameter constant st atus at last time of use
	mutable Int_t _neval ; // Number evaluations used in last minimization	mutable Int_t _neval ; // Number evaluations used in last minimization
	Double_t evaluate() const ;	Double_t evaluate() const ;

	private:	private:

End of changes. 5 change blocks.
	3 lines changed or deleted	6 lines changed or added

	RooWorkspace.h	RooWorkspace.h

	skipping to change at line 156	skipping to change at line 156
	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 ; }	const TUUID& uuid() const { return _uuid ; }

	RooExpensiveObjectCache& expensiveObjectCache() { return _eocache ; }	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) {} ;


		CodeRepo(const CodeRepo& other, RooWorkspace* wspace=0) : TObject(other
		) ,
		_wspace(wspace?wspace:other._wspace),
		_c2fmap(other._c2fmap),
		_fmap(other._fmap),
		_ehmap(other._ehmap),
		_compiledOK(other._compiledOK) {} ;

	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 ; }

	std::string listOfClassNames() const ;	std::string listOfClassNames() const ;

	class ClassRelInfo {	class ClassRelInfo {

End of changes. 1 change blocks.
	0 lines changed or deleted	9 lines changed or added

	TGFileBrowser.h	TGFileBrowser.h

	skipping to change at line 37	skipping to change at line 37
	class TGListTree;	class TGListTree;
	class TGListTreeItem;	class TGListTreeItem;
	class TGPicture;	class TGPicture;
	class TGComboBox;	class TGComboBox;
	class TContextMenu;	class TContextMenu;
	class TRegexp;	class TRegexp;
	class TString;	class TString;
	class TRootBrowser;	class TRootBrowser;
	class TSystemDirectory;	class TSystemDirectory;
	class TSystemFile;	class TSystemFile;

		class TGPictureButton;

	class TGFileBrowser : public TGMainFrame, public TBrowserImp {	class TGFileBrowser : public TGMainFrame, public TBrowserImp {

	public:	public:
	typedef std::list<TGListTreeItem*> sLTI_t;	typedef std::list<TGListTreeItem*> sLTI_t;
	typedef sLTI_t::iterator sLTI_i;	typedef sLTI_t::iterator sLTI_i;
	typedef sLTI_t::reverse_iterator sLTI_ri;	typedef sLTI_t::reverse_iterator sLTI_ri;
	typedef std::map<TGListTreeItem, const char > mFiltered_t;	typedef std::map<TGListTreeItem, const char > mFiltered_t;
	typedef mFiltered_t::iterator mFiltered_i;	typedef mFiltered_t::iterator mFiltered_i;


End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	TGeoBranchArray.h	TGeoBranchArray.h

	skipping to change at line 27	skipping to change at line 27
	#endif	#endif

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoBranchArray - An array of daughter indices making a geometry path. / /	// TGeoBranchArray - An array of daughter indices making a geometry path. / /
	// Can be used to backup/restore a state / /	// Can be used to backup/restore a state / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	class TGeoHMatrix;	class TGeoHMatrix;

		class TGeoMatrix;
	class TGeoNavigator;	class TGeoNavigator;
	class TGeoNode;	class TGeoNode;

	class TGeoBranchArray : public TObject	class TGeoBranchArray : public TObject
	{	{
	protected:	protected:
	Int_t fLevel; // Branch depth	Int_t fLevel; // Branch depth
	Int_t fMaxLevel; // Array length	Int_t fMaxLevel; // Array length
	TGeoNode **fArray; //![fMaxLevel] Array of nodes	TGeoNode **fArray; //![fMaxLevel] Array of nodes
	TGeoHMatrix *fMatrix; // Global matrix (owned)	TGeoHMatrix *fMatrix; // Global matrix (owned)

	skipping to change at line 63	skipping to change at line 64
	void AddLevel(Int_t dindex);	void AddLevel(Int_t dindex);
	virtual Int_t Compare(const TObject *obj) const;	virtual Int_t Compare(const TObject *obj) const;
	void CleanMatrix();	void CleanMatrix();
	TGeoNode **GetArray() const {return fArray;}	TGeoNode **GetArray() const {return fArray;}
	TObject *GetClient() const {return fClient;}	TObject *GetClient() const {return fClient;}
	Int_t GetLevel() const {return fLevel;}	Int_t GetLevel() const {return fLevel;}
	TGeoHMatrix *GetMatrix() const {return fMatrix;}	TGeoHMatrix *GetMatrix() const {return fMatrix;}
	TGeoNode *GetNode(Int_t level) const {return fArray[level];}	TGeoNode *GetNode(Int_t level) const {return fArray[level];}
	TGeoNode *GetCurrentNode() const {return fArray[fLevel];}	TGeoNode *GetCurrentNode() const {return fArray[fLevel];}
	void GetPath(TString &path) const;	void GetPath(TString &path) const;

		void Init(TGeoNode *branch, TGeoMatrix global, Int_t leve l);
	void InitFromNavigator(TGeoNavigator *nav);	void InitFromNavigator(TGeoNavigator *nav);
	virtual Bool_t IsSortable() const {return kTRUE;}	virtual Bool_t IsSortable() const {return kTRUE;}
	virtual Bool_t Notify() {return (fClient)?fClient->Notify():kFALSE;}	virtual Bool_t Notify() {return (fClient)?fClient->Notify():kFALSE;}
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	void SetClient(TObject *client) {fClient = client;}	void SetClient(TObject *client) {fClient = client;}
	static void Sort(Int_t n, TGeoBranchArray *array, Int_t index, B ool_t down=kTRUE);	static void Sort(Int_t n, TGeoBranchArray *array, Int_t index, B ool_t down=kTRUE);
	static Long64_t BinarySearch(Long64_t n, const TGeoBranchArray *array , TGeoBranchArray value);	static Long64_t BinarySearch(Long64_t n, const TGeoBranchArray *array , TGeoBranchArray value);
	void UpdateNavigator(TGeoNavigator *nav) const;	void UpdateNavigator(TGeoNavigator *nav) const;

	ClassDef(TGeoBranchArray, 3)	ClassDef(TGeoBranchArray, 3)

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added

	TGeoMedium.h	TGeoMedium.h

	skipping to change at line 55	skipping to change at line 55
	TGeoMedium(const char *name, Int_t numed, Int_t imat, Int_t isvol, Int_t ifield,	TGeoMedium(const char *name, Int_t numed, Int_t imat, Int_t isvol, Int_t ifield,
	Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t d eemax, Double_t epsil, Double_t stmin);	Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t d eemax, Double_t epsil, Double_t stmin);
	virtual ~TGeoMedium();	virtual ~TGeoMedium();
	// methods	// methods
	virtual Int_t GetByteCount() const {return sizeof(*this);}	virtual Int_t GetByteCount() const {return sizeof(*this);}
	Int_t GetId() const {return fId;}	Int_t GetId() const {return fId;}
	Double_t GetParam(Int_t i) const {return fParams[i];}	Double_t GetParam(Int_t i) const {return fParams[i];}
	void SetParam(Int_t i, Double_t val) {fParams[i] = val;}	void SetParam(Int_t i, Double_t val) {fParams[i] = val;}
	char *GetPointerName() const;	char *GetPointerName() const;
	TGeoMaterial *GetMaterial() const {return fMaterial;}	TGeoMaterial *GetMaterial() const {return fMaterial;}

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *opti on = "");
	void SetId(Int_t id) {fId = id;}	void SetId(Int_t id) {fId = id;}
	void SetMaterial(TGeoMaterial *mat) {fMaterial = mat ;}	void SetMaterial(TGeoMaterial *mat) {fMaterial = mat ;}
	virtual void SetCerenkovProperties(TObject* cerenkov) {fMate rial->SetCerenkovProperties(cerenkov);}	virtual void SetCerenkovProperties(TObject* cerenkov) {fMate rial->SetCerenkovProperties(cerenkov);}
	ClassDef(TGeoMedium, 1) // tracking medium	ClassDef(TGeoMedium, 1) // tracking medium

	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TIndArray.h	TIndArray.h

	skipping to change at line 26	skipping to change at line 26
	{	{
	public:	public:
	TIndArray():	TIndArray():
	fElems( 0 ), fCapacity( 0 ), fArr( 0 ) {};	fElems( 0 ), fCapacity( 0 ), fArr( 0 ) {};

	virtual ~TIndArray()	virtual ~TIndArray()
	{	{
	delete [] fArr;	delete [] fArr;
	}	}


	void Reserve( UInt_t size )	void ClearAndResize( UInt_t size )
	{	{

	delete fArr;	delete [] fArr;
	fElems = 0;	fElems = 0;
	fArr = new UChar_t[size];	fArr = new UChar_t[size];
	fCapacity = size;	fCapacity = size;
	}	}

	UInt_t GetCapacity() { return fCapacity; }	UInt_t GetCapacity() { return fCapacity; }
	UInt_t GetNumItems() { return fElems; }	UInt_t GetNumItems() { return fElems; }
	void SetNumItems( UInt_t items ) { fElems = items;}	void SetNumItems( UInt_t items ) { fElems = items;}
	UChar_t &At( Int_t ind ) { return fArr[ind]; }	UChar_t &At( Int_t ind ) { return fArr[ind]; }
	void Clear() { fElems = 0; }	void Clear() { fElems = 0; }

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	TRootBrowser.h	TRootBrowser.h

	// @(#)root/gui:$Id$	// @(#)root/gui:$Id: 7cf312b9bc9940a03d7c0cee95eea0085dc9898c $
	// 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 99	skipping to change at line 99
	TGCompositeFrame *fActMenuBar; // Actual (active) menu bar	TGCompositeFrame *fActMenuBar; // Actual (active) menu bar
	TBrowserImp *fActBrowser; // Actual (active) brows er imp	TBrowserImp *fActBrowser; // Actual (active) brows er imp
	TList fBrowsers; // List of (sub)browsers	TList fBrowsers; // List of (sub)browsers
	TList fPlugins; // List of plugins	TList fPlugins; // List of plugins
	TGStatusBar *fStatusBar; // Status bar	TGStatusBar *fStatusBar; // Status bar
	Int_t fNbInitPlugins; // Number of initial plu gins (from .rootrc)	Int_t fNbInitPlugins; // Number of initial plu gins (from .rootrc)
	Int_t fNbTab[3]; // Number of tab element s (for each Tab)	Int_t fNbTab[3]; // Number of tab element s (for each Tab)
	Int_t fCrTab[3]; // Actual (active) tab e lements (for each Tab)	Int_t fCrTab[3]; // Actual (active) tab e lements (for each Tab)
	Int_t fPid; // Current process id	Int_t fPid; // Current process id
	Bool_t fShowCloseTab; // kTRUE to show close i con on tab elements	Bool_t fShowCloseTab; // kTRUE to show close i con on tab elements

		const TGPicture *fIconPic; // icon picture

	public:	public:
	enum ENewBrowserMessages {	enum ENewBrowserMessages {
	kBrowse = 11011,	kBrowse = 11011,
	kOpenFile,	kOpenFile,
	kClone,	kClone,
	kHelpAbout,	kHelpAbout,
	kHelpOnBrowser,	kHelpOnBrowser,
	kHelpOnCanvas,	kHelpOnCanvas,
	kHelpOnMenus,	kHelpOnMenus,

End of changes. 2 change blocks.
	1 lines changed or deleted	2 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/

	Roo1DTable.h	Roo1DTable.h

	skipping to change at line 40	skipping to change at line 40
	// Default constructor	// Default constructor
	// coverity[UNINIT_CTOR]	// coverity[UNINIT_CTOR]
	} ;	} ;
	virtual ~Roo1DTable();	virtual ~Roo1DTable();
	Roo1DTable(const char name, const char title, const RooAbsCategory &cat );	Roo1DTable(const char name, const char title, const RooAbsCategory &cat );
	Roo1DTable(const Roo1DTable& other) ;	Roo1DTable(const Roo1DTable& other) ;

	virtual void fill(RooAbsCategory& cat, Double_t weight=1.0) ;	virtual void fill(RooAbsCategory& cat, Double_t weight=1.0) ;
	Double_t get(const char* label, Bool_t silent=kFALSE) const ;	Double_t get(const char* label, Bool_t silent=kFALSE) const ;
	Double_t getFrac(const char* label, Bool_t silent=kFALSE) const ;	Double_t getFrac(const char* label, Bool_t silent=kFALSE) const ;

		Double_t get(const int index, Bool_t silent=kFALSE) const ;
		Double_t getFrac(const int index, Bool_t silent=kFALSE) const ;
	Double_t getOverflow() const ;	Double_t getOverflow() const ;

	// Printing interface (human readable)	// Printing interface (human readable)
	virtual void printName(std::ostream& os) const ;	virtual void printName(std::ostream& os) const ;
	virtual void printTitle(std::ostream& os) const ;	virtual void printTitle(std::ostream& os) const ;
	virtual void printClassName(std::ostream& os) const ;	virtual void printClassName(std::ostream& os) const ;
	virtual void printValue(std::ostream& os) const ;	virtual void printValue(std::ostream& os) const ;
	virtual void printMultiline(std::ostream& os, Int_t contents, Bool_t verb ose=kFALSE, TString indent="") const ;	virtual void printMultiline(std::ostream& os, Int_t contents, Bool_t verb ose=kFALSE, TString indent="") const ;
	virtual Int_t defaultPrintContents(Option_t* opt) const ;	virtual Int_t defaultPrintContents(Option_t* opt) const ;


End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	RooErrorVar.h	RooErrorVar.h

	skipping to change at line 86	skipping to change at line 86
	void setRange(const char* name, Double_t min, Double_t max) ;	void setRange(const char* name, Double_t min, Double_t max) ;

	void setBins(Int_t nBins) {	void setBins(Int_t nBins) {
	// Set default binning to nBins uniform bins	// Set default binning to nBins uniform bins
	setBinning(RooUniformBinning(getMin(),getMax(),nBins)) ;	setBinning(RooUniformBinning(getMin(),getMax(),nBins)) ;
	}	}
	void setBinning(const RooAbsBinning& binning, const char* name=0) ;	void setBinning(const RooAbsBinning& binning, const char* name=0) ;
	const RooAbsBinning& getBinning(const char* name=0, Bool_t verbose=kTRUE, Bool_t createOnTheFly=kFALSE) const ;	const RooAbsBinning& getBinning(const char* name=0, Bool_t verbose=kTRUE, Bool_t createOnTheFly=kFALSE) const ;
	RooAbsBinning& getBinning(const char* name=0, Bool_t verbose=kTRUE, Bool_ t createOnTheFly=kFALSE) ;	RooAbsBinning& getBinning(const char* name=0, Bool_t verbose=kTRUE, Bool_ t createOnTheFly=kFALSE) ;
	Bool_t hasBinning(const char* name) const ;	Bool_t hasBinning(const char* name) const ;

		std::list<std::string> getBinningNames() const ;

	// Set infinite fit range limits	// Set infinite fit range limits
	inline void removeMin(const char* name=0) {	inline void removeMin(const char* name=0) {
	// Remove lower bound from named binning, or default binning if name is null	// Remove lower bound from named binning, or default binning if name is null
	getBinning(name).setMin(-RooNumber::infinity()) ;	getBinning(name).setMin(-RooNumber::infinity()) ;
	}	}
	inline void removeMax(const char* name=0) {	inline void removeMax(const char* name=0) {
	// Remove upper bound from named binning, or default binning if name is null	// Remove upper bound from named binning, or default binning if name is null
	getBinning(name).setMax(RooNumber::infinity()) ;	getBinning(name).setMax(RooNumber::infinity()) ;
	}	}

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	RooHistPdf.h	RooHistPdf.h

	skipping to change at line 87	skipping to change at line 87

	virtual Int_t getMaxVal(const RooArgSet& vars) const ;	virtual Int_t getMaxVal(const RooArgSet& vars) const ;
	virtual Double_t maxVal(Int_t code) const ;	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 ;
	virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou ble_t /xlo/, Double_t /xhi/) const ;	virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou ble_t /xlo/, Double_t /xhi/) const ;
	virtual Bool_t isBinnedDistribution(const RooArgSet&) const { return _int Order==0 ; }	virtual Bool_t isBinnedDistribution(const RooArgSet&) const { return _int Order==0 ; }

	protected:	protected:


		Bool_t areIdentical(const RooDataHist& dh1, const RooDataHist& dh2) ;

	Bool_t importWorkspaceHook(RooWorkspace& ws) ;	Bool_t importWorkspaceHook(RooWorkspace& ws) ;

	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 ;

	RooArgSet _histObsList ; // List of observables defining dimensio ns of histogram	RooArgSet _histObsList ; // List of observables defining dimensio ns of histogram
	RooSetProxy _pdfObsList ; // List of observables mapped onto histo gram observables	RooSetProxy _pdfObsList ; // List of observables mapped onto histo gram observables
	RooDataHist* _dataHist ; // Unowned pointer to underlying histogram	RooDataHist* _dataHist ; // Unowned pointer to underlying histogram

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	RooLinearVar.h	RooLinearVar.h

	skipping to change at line 46	skipping to change at line 46
	virtual TObject* clone(const char* newname) const { return new RooLinearV ar(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooLinearV ar(*this,newname); }
	virtual ~RooLinearVar() ;	virtual ~RooLinearVar() ;

	// Parameter value and error accessors	// Parameter value and error accessors
	virtual void setVal(Double_t value) ;	virtual void setVal(Double_t value) ;

	// Jacobian and limits	// Jacobian and limits
	virtual Bool_t hasBinning(const char* name) const ;	virtual Bool_t hasBinning(const char* name) const ;
	virtual const RooAbsBinning& getBinning(const char* name=0, Bool_t verbos e=kTRUE, Bool_t createOnTheFly=kFALSE) const ;	virtual const RooAbsBinning& getBinning(const char* name=0, Bool_t verbos e=kTRUE, Bool_t createOnTheFly=kFALSE) const ;
	virtual RooAbsBinning& getBinning(const char* name=0, Bool_t verbose=kTRU E, Bool_t createOnTheFly=kFALSE) ;	virtual RooAbsBinning& getBinning(const char* name=0, Bool_t verbose=kTRU E, Bool_t createOnTheFly=kFALSE) ;

		virtual std::list<std::string> getBinningNames() const;

	virtual Double_t jacobian() const ;	virtual Double_t jacobian() const ;
	virtual Bool_t isJacobianOK(const RooArgSet& depList) const ;	virtual Bool_t isJacobianOK(const RooArgSet& depList) const ;

	// I/O streaming interface (machine readable)	// I/O streaming interface (machine readable)
	virtual Bool_t readFromStream(std::istream& is, Bool_t compact, Bool_t ve rbose=kFALSE) ;	virtual Bool_t readFromStream(std::istream& is, Bool_t compact, Bool_t ve rbose=kFALSE) ;
	virtual void writeToStream(std::ostream& os, Bool_t compact) const ;	virtual void writeToStream(std::ostream& os, Bool_t compact) const ;

	// Printing interface (human readable)	// Printing interface (human readable)


End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	TCint.h	TCint.h

	skipping to change at line 110	skipping to change at line 110
	void LoadMacro(const char filename, EErrorCode error = 0);	void LoadMacro(const char filename, EErrorCode error = 0);
	Int_t LoadLibraryMap(const char *rootmapfile = 0);	Int_t LoadLibraryMap(const char *rootmapfile = 0);
	Int_t RescanLibraryMap();	Int_t RescanLibraryMap();
	Int_t ReloadAllSharedLibraryMaps();	Int_t ReloadAllSharedLibraryMaps();
	Int_t UnloadAllSharedLibraryMaps();	Int_t UnloadAllSharedLibraryMaps();
	Int_t UnloadLibraryMap(const char *library);	Int_t UnloadLibraryMap(const char *library);
	Long_t ProcessLine(const char line, EErrorCode error = 0);	Long_t ProcessLine(const char line, EErrorCode error = 0);
	Long_t ProcessLineAsynch(const char line, EErrorCode error = 0);	Long_t ProcessLineAsynch(const char line, EErrorCode error = 0);
	Long_t ProcessLineSynch(const char line, EErrorCode error = 0);	Long_t ProcessLineSynch(const char line, EErrorCode error = 0);
	void PrintIntro();	void PrintIntro();

		Int_t SetClassSharedLibs(const char cls, const char libs);
	void SetGetline(const char(getlineFunc)(const char* prompt),	void SetGetline(const char(getlineFunc)(const char* prompt),
	void (histaddFunc)(const char line));	void (histaddFunc)(const char line));
	void Reset();	void Reset();
	void ResetAll();	void ResetAll();
	void ResetGlobals();	void ResetGlobals();
	void ResetGlobalVar(void *obj);	void ResetGlobalVar(void *obj);
	void RewindDictionary();	void RewindDictionary();
	Int_t DeleteGlobal(void *obj);	Int_t DeleteGlobal(void *obj);
	void SaveContext();	void SaveContext();
	void SaveGlobalsContext();	void SaveGlobalsContext();

	skipping to change at line 269	skipping to change at line 270
	virtual const char DataMemberInfo_TypeName(DataMemberInfo_t dminfo) co nst;	virtual const char DataMemberInfo_TypeName(DataMemberInfo_t dminfo) co nst;
	virtual const char DataMemberInfo_TypeTrueName(DataMemberInfo_t dminfo ) const;	virtual const char DataMemberInfo_TypeTrueName(DataMemberInfo_t dminfo ) const;
	virtual const char DataMemberInfo_Name(DataMemberInfo_t dminfo) const;	virtual const char DataMemberInfo_Name(DataMemberInfo_t dminfo) const;
	virtual const char DataMemberInfo_Title(DataMemberInfo_t dminfo) const ;	virtual const char DataMemberInfo_Title(DataMemberInfo_t dminfo) const ;
	virtual const char DataMemberInfo_ValidArrayIndex(DataMemberInfo_t dmi nfo) const;	virtual const char DataMemberInfo_ValidArrayIndex(DataMemberInfo_t dmi nfo) const;

	// G__MethodInfo interface	// G__MethodInfo interface
	virtual void MethodInfo_CreateSignature(MethodInfo_t *minfo, TString & signature) const;	virtual void MethodInfo_CreateSignature(MethodInfo_t *minfo, TString & signature) const;
	virtual void MethodInfo_Delete(MethodInfo_t *minfo) const;	virtual void MethodInfo_Delete(MethodInfo_t *minfo) const;
	virtual MethodInfo_t *MethodInfo_Factory() const;	virtual MethodInfo_t *MethodInfo_Factory() const;

		virtual MethodInfo_t MethodInfo_Factory(ClassInfo_t /clinfo/) cons t;
	virtual MethodInfo_t MethodInfo_FactoryCopy(MethodInfo_t minfo) const ;	virtual MethodInfo_t MethodInfo_FactoryCopy(MethodInfo_t minfo) const ;
	virtual MethodInfo_t MethodInfo_InterfaceMethod(MethodInfo_t minfo) c onst;	virtual MethodInfo_t MethodInfo_InterfaceMethod(MethodInfo_t minfo) c onst;
	virtual Bool_t MethodInfo_IsValid(MethodInfo_t *minfo) const;	virtual Bool_t MethodInfo_IsValid(MethodInfo_t *minfo) const;
	virtual int MethodInfo_NArg(MethodInfo_t *minfo) const;	virtual int MethodInfo_NArg(MethodInfo_t *minfo) const;
	virtual int MethodInfo_NDefaultArg(MethodInfo_t *minfo) const;	virtual int MethodInfo_NDefaultArg(MethodInfo_t *minfo) const;
	virtual int MethodInfo_Next(MethodInfo_t *minfo) const;	virtual int MethodInfo_Next(MethodInfo_t *minfo) const;
	virtual Long_t MethodInfo_Property(MethodInfo_t *minfo) const;	virtual Long_t MethodInfo_Property(MethodInfo_t *minfo) const;
	virtual TypeInfo_t MethodInfo_Type(MethodInfo_t minfo) const;	virtual TypeInfo_t MethodInfo_Type(MethodInfo_t minfo) const;
	virtual const char MethodInfo_GetMangledName(MethodInfo_t minfo) const ;	virtual const char MethodInfo_GetMangledName(MethodInfo_t minfo) const ;
	virtual const char MethodInfo_GetPrototype(MethodInfo_t minfo) const;	virtual const char MethodInfo_GetPrototype(MethodInfo_t minfo) const;
	virtual const char MethodInfo_Name(MethodInfo_t minfo) const;	virtual const char MethodInfo_Name(MethodInfo_t minfo) const;
	virtual const char MethodInfo_TypeName(MethodInfo_t minfo) const;	virtual const char MethodInfo_TypeName(MethodInfo_t minfo) const;
	virtual std::string MethodInfo_TypeNormalizedName(MethodInfo_t *minfo) c onst;	virtual std::string MethodInfo_TypeNormalizedName(MethodInfo_t *minfo) c onst;
	virtual const char MethodInfo_Title(MethodInfo_t minfo) const;	virtual const char MethodInfo_Title(MethodInfo_t minfo) const;

	// G__MethodArgInfo interface	// G__MethodArgInfo interface
	virtual void MethodArgInfo_Delete(MethodArgInfo_t *marginfo) const;	virtual void MethodArgInfo_Delete(MethodArgInfo_t *marginfo) const;
	virtual MethodArgInfo_t *MethodArgInfo_Factory() const;	virtual MethodArgInfo_t *MethodArgInfo_Factory() const;

		virtual MethodArgInfo_t MethodArgInfo_Factory(MethodInfo_t minfo) con st;
	virtual MethodArgInfo_t MethodArgInfo_FactoryCopy(MethodArgInfo_t mar ginfo) const;	virtual MethodArgInfo_t MethodArgInfo_FactoryCopy(MethodArgInfo_t mar ginfo) const;
	virtual Bool_t MethodArgInfo_IsValid(MethodArgInfo_t *marginfo) const;	virtual Bool_t MethodArgInfo_IsValid(MethodArgInfo_t *marginfo) const;
	virtual int MethodArgInfo_Next(MethodArgInfo_t *marginfo) const;	virtual int MethodArgInfo_Next(MethodArgInfo_t *marginfo) const;
	virtual Long_t MethodArgInfo_Property(MethodArgInfo_t *marginfo) const;	virtual Long_t MethodArgInfo_Property(MethodArgInfo_t *marginfo) const;
	virtual const char MethodArgInfo_DefaultValue(MethodArgInfo_t marginfo ) const;	virtual const char MethodArgInfo_DefaultValue(MethodArgInfo_t marginfo ) const;
	virtual const char MethodArgInfo_Name(MethodArgInfo_t marginfo) const;	virtual const char MethodArgInfo_Name(MethodArgInfo_t marginfo) const;
	virtual const char MethodArgInfo_TypeName(MethodArgInfo_t marginfo) co nst;	virtual const char MethodArgInfo_TypeName(MethodArgInfo_t marginfo) co nst;
	virtual std::string MethodArgInfo_TypeNormalizedName(MethodArgInfo_t *ma rginfo) const;	virtual std::string MethodArgInfo_TypeNormalizedName(MethodArgInfo_t *ma rginfo) const;

	// G__TypeInfo interface	// G__TypeInfo interface

	skipping to change at line 315	skipping to change at line 318
	virtual int TypeInfo_RefType(TypeInfo_t * /* tinfo */) const;	virtual int TypeInfo_RefType(TypeInfo_t * /* tinfo */) const;
	virtual int TypeInfo_Size(TypeInfo_t *tinfo) const;	virtual int TypeInfo_Size(TypeInfo_t *tinfo) const;
	virtual const char TypeInfo_TrueName(TypeInfo_t tinfo) const;	virtual const char TypeInfo_TrueName(TypeInfo_t tinfo) const;

	// G__TypedefInfo interface	// G__TypedefInfo interface
	virtual void TypedefInfo_Delete(TypedefInfo_t *tinfo) const;	virtual void TypedefInfo_Delete(TypedefInfo_t *tinfo) const;
	virtual TypedefInfo_t *TypedefInfo_Factory() const;	virtual TypedefInfo_t *TypedefInfo_Factory() const;
	virtual TypedefInfo_t TypedefInfo_FactoryCopy(TypedefInfo_t tinfo) co nst;	virtual TypedefInfo_t TypedefInfo_FactoryCopy(TypedefInfo_t tinfo) co nst;
	virtual void TypedefInfo_Init(TypedefInfo_t tinfo, const char funcna me) const;	virtual void TypedefInfo_Init(TypedefInfo_t tinfo, const char funcna me) const;
	virtual Bool_t TypedefInfo_IsValid(TypedefInfo_t *tinfo) const;	virtual Bool_t TypedefInfo_IsValid(TypedefInfo_t *tinfo) const;

		virtual int TypedefInfo_Next(TypedefInfo_t *tinfo) const;
	virtual Long_t TypedefInfo_Property(TypedefInfo_t *tinfo) const;	virtual Long_t TypedefInfo_Property(TypedefInfo_t *tinfo) const;
	virtual int TypedefInfo_Size(TypedefInfo_t *tinfo) const;	virtual int TypedefInfo_Size(TypedefInfo_t *tinfo) const;
	virtual const char TypedefInfo_TrueName(TypedefInfo_t tinfo) const;	virtual const char TypedefInfo_TrueName(TypedefInfo_t tinfo) const;
	virtual const char TypedefInfo_Name(TypedefInfo_t tinfo) const;	virtual const char TypedefInfo_Name(TypedefInfo_t tinfo) const;
	virtual const char TypedefInfo_Title(TypedefInfo_t tinfo) const;	virtual const char TypedefInfo_Title(TypedefInfo_t tinfo) const;

	ClassDef(TCint,0) //Interface to CINT C/C++ interpreter	ClassDef(TCint,0) //Interface to CINT C/C++ interpreter
	};	};

	#endif	#endif

End of changes. 4 change blocks.
	0 lines changed or deleted	4 lines changed or added

	TGeoArb8.h	TGeoArb8.h

	skipping to change at line 98	skipping to change at line 98
	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 (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 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(std::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;}
	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 Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoArb8, 1) // arbitrary trapezoid with 8 vertices	ClassDef(TGeoArb8, 1) // arbitrary trapezoid with 8 vertices
	};	};

	skipping to change at line 171	skipping to change at line 171
	Double_t GetBl1() const {return fBl1;}	Double_t GetBl1() const {return fBl1;}
	Double_t GetTl1() const {return fTl1;}	Double_t GetTl1() const {return fTl1;}
	Double_t GetAlpha1() const {return fAlpha1;}	Double_t GetAlpha1() const {return fAlpha1;}
	Double_t GetH2() const {return fH2;}	Double_t GetH2() const {return fH2;}
	Double_t GetBl2() const {return fBl2;}	Double_t GetBl2() const {return fBl2;}
	Double_t GetTl2() const {return fTl2;}	Double_t GetTl2() const {return fTl2;}
	Double_t GetAlpha2() const {return fAlpha2;}	Double_t GetAlpha2() const {return fAlpha2;}
	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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(std::ostream &out, Option_t *option = "");

	ClassDef(TGeoTrap, 1) // G3 TRAP shape	ClassDef(TGeoTrap, 1) // G3 TRAP shape
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoGtra / /	// TGeoGtra / /
	// / /	// / /
	// Gtra is a twisted general trapezoid, i.e. one for which the faces perpen dicular//	// Gtra is a twisted general trapezoid, i.e. one for which the faces perpen dicular//
	// to z are trapezia and their centres are not the same x, y. It has 12 / /	// to z are trapezia and their centres are not the same x, y. It has 12 / /

	skipping to change at line 215	skipping to change at line 215
	// destructor	// destructor
	virtual ~TGeoGtra();	virtual ~TGeoGtra();
	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int _t iact=1,	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int _t iact=1,
	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;
	virtual Double_t DistFromOutside(Double_t point, Double_t dir, In t_t iact=1,	virtual Double_t DistFromOutside(Double_t point, Double_t dir, In t_t iact=1,
	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;
	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;
	Double_t GetTwistAngle() const {return fTwistAngle;}	Double_t GetTwistAngle() const {return fTwistAngle;}
	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 SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);

	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");

	ClassDef(TGeoGtra, 1) // G3 GTRA shape	ClassDef(TGeoGtra, 1) // G3 GTRA shape
	};	};

	#endif	#endif

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	TGeoBBox.h	TGeoBBox.h

	skipping to change at line 88	skipping to change at line 88
	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<1.E-16)&&(fDY<1.E- 16)&&(fDZ<1.E-16))?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(std::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;

	ClassDef(TGeoBBox, 1) // box primitive	ClassDef(TGeoBBox, 1) // box primitive
	};	};

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoBoolNode.h	TGeoBoolNode.h

	skipping to change at line 95	skipping to change at line 95
	virtual Int_t GetNpoints() = 0;	virtual Int_t GetNpoints() = 0;
	TGeoMatrix *GetLeftMatrix() const {return fLeftMat;}	TGeoMatrix *GetLeftMatrix() const {return fLeftMat;}
	TGeoMatrix *GetRightMatrix() const {return fRightMat;}	TGeoMatrix *GetRightMatrix() const {return fRightMat;}
	TGeoShape *GetLeftShape() const {return fLeft;}	TGeoShape *GetLeftShape() const {return fLeft;}
	TGeoShape *GetRightShape() const {return fRight;}	TGeoShape *GetRightShape() const {return fRight;}
	virtual TGeoBoolNode *MakeClone() const = 0;	virtual TGeoBoolNode *MakeClone() const = 0;
	virtual void Paint(Option_t *option);	virtual void Paint(Option_t *option);
	void RegisterMatrices();	void RegisterMatrices();
	Bool_t ReplaceMatrix(TGeoMatrix mat, TGeoMatrix newmat);	Bool_t ReplaceMatrix(TGeoMatrix mat, TGeoMatrix newmat);
	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const = 0;	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const = 0;

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "" );
	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;
	void SetSelected(Int_t sel);	void SetSelected(Int_t sel);
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoBoolNode, 1) // a boolean node	ClassDef(TGeoBoolNode, 1) // a boolean node
	};	};

	/////////////////////////////////////////////////////////////////////////// ///	/////////////////////////////////////////////////////////////////////////// ///
	// //	// //

	skipping to change at line 132	skipping to change at line 132
	virtual void ComputeNormal(Double_t point, Double_t dir, Double_t *norm);	virtual void ComputeNormal(Double_t point, Double_t dir, Double_t *norm);
	virtual Bool_t Contains(Double_t *point) const;	virtual Bool_t Contains(Double_t *point) const;
	virtual Int_t DistanceToPrimitive(Int_t px, Int_t py);	virtual Int_t DistanceToPrimitive(Int_t px, Int_t py);
	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int_t i act=1,	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int_t i act=1,
	Double_t step=0, Double_t *safe=0) const;	Double_t step=0, Double_t *safe=0) const;
	virtual Double_t DistFromOutside(Double_t point, Double_t dir, Int_t iact=1,	virtual Double_t DistFromOutside(Double_t point, Double_t dir, Int_t iact=1,
	Double_t step=0, Double_t *safe=0) const;	Double_t step=0, Double_t *safe=0) const;
	virtual EGeoBoolType GetBooleanOperator() const {return kGeoUnion;}	virtual EGeoBoolType GetBooleanOperator() const {return kGeoUnion;}
	virtual Int_t GetNpoints();	virtual Int_t GetNpoints();
	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(std::ostream &out, Option_t *option = "" );
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	//CS specific	//CS specific
	virtual TGeoBoolNode *MakeClone() const;	virtual TGeoBoolNode *MakeClone() const;
	virtual void Paint(Option_t *option);	virtual void Paint(Option_t *option);

	ClassDef(TGeoUnion, 1) // union node	ClassDef(TGeoUnion, 1) // union node
	};	};

	/////////////////////////////////////////////////////////////////////////// ///	/////////////////////////////////////////////////////////////////////////// ///

	skipping to change at line 171	skipping to change at line 171
	virtual void ComputeNormal(Double_t point, Double_t dir, Double_t *norm);	virtual void ComputeNormal(Double_t point, Double_t dir, Double_t *norm);
	virtual Bool_t Contains(Double_t *point) const;	virtual Bool_t Contains(Double_t *point) const;
	virtual Int_t DistanceToPrimitive(Int_t px, Int_t py);	virtual Int_t DistanceToPrimitive(Int_t px, Int_t py);
	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int_t i act=1,	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int_t i act=1,
	Double_t step=0, Double_t *safe=0) const;	Double_t step=0, Double_t *safe=0) const;
	virtual Double_t DistFromOutside(Double_t point, Double_t dir, Int_t iact=1,	virtual Double_t DistFromOutside(Double_t point, Double_t dir, Int_t iact=1,
	Double_t step=0, Double_t *safe=0) const;	Double_t step=0, Double_t *safe=0) const;
	virtual EGeoBoolType GetBooleanOperator() const {return kGeoIntersection ;}	virtual EGeoBoolType GetBooleanOperator() const {return kGeoIntersection ;}
	virtual Int_t GetNpoints();	virtual Int_t GetNpoints();
	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(std::ostream &out, Option_t *option = "" );
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	//CS specific	//CS specific
	virtual TGeoBoolNode *MakeClone() const;	virtual TGeoBoolNode *MakeClone() const;
	virtual void Paint(Option_t *option);	virtual void Paint(Option_t *option);

	ClassDef(TGeoIntersection, 1) // intersection node	ClassDef(TGeoIntersection, 1) // intersection node
	};	};

	/////////////////////////////////////////////////////////////////////////// ///	/////////////////////////////////////////////////////////////////////////// ///

	skipping to change at line 209	skipping to change at line 209
	virtual void ComputeNormal(Double_t point, Double_t dir, Double_t *norm);	virtual void ComputeNormal(Double_t point, Double_t dir, Double_t *norm);
	virtual Bool_t Contains(Double_t *point) const;	virtual Bool_t Contains(Double_t *point) const;
	virtual Int_t DistanceToPrimitive(Int_t px, Int_t py);	virtual Int_t DistanceToPrimitive(Int_t px, Int_t py);
	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int_t i act=1,	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int_t i act=1,
	Double_t step=0, Double_t *safe=0) const;	Double_t step=0, Double_t *safe=0) const;
	virtual Double_t DistFromOutside(Double_t point, Double_t dir, Int_t iact=1,	virtual Double_t DistFromOutside(Double_t point, Double_t dir, Int_t iact=1,
	Double_t step=0, Double_t *safe=0) const;	Double_t step=0, Double_t *safe=0) const;
	virtual EGeoBoolType GetBooleanOperator() const {return kGeoSubtraction; }	virtual EGeoBoolType GetBooleanOperator() const {return kGeoSubtraction; }
	virtual Int_t GetNpoints();	virtual Int_t GetNpoints();
	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(std::ostream &out, Option_t *option = "" );
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	//CS specific	//CS specific
	virtual TGeoBoolNode *MakeClone() const;	virtual TGeoBoolNode *MakeClone() const;
	virtual void Paint(Option_t *option);	virtual void Paint(Option_t *option);

	ClassDef(TGeoSubtraction, 1) // subtraction node	ClassDef(TGeoSubtraction, 1) // subtraction node
	};	};
	#endif	#endif

End of changes. 4 change blocks.
	4 lines changed or deleted	4 lines changed or added

	TGeoCompositeShape.h	TGeoCompositeShape.h

	skipping to change at line 76	skipping to change at line 76
	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;	virtual Int_t GetNmeshVertices() const;
	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsComposite() const {return kTRUE;}	virtual Bool_t IsComposite() const {return kTRUE;}
	virtual Bool_t IsCylType() const {return kFALSE;}	virtual Bool_t IsCylType() const {return kFALSE;}
	void MakeNode(const char *expression);	void MakeNode(const char *expression);
	virtual Bool_t PaintComposite(Option_t *option = "") const;	virtual Bool_t PaintComposite(Option_t *option = "") const;
	void RegisterYourself();	void RegisterYourself();
	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(std::ostream &out, Option_t *option = "");
	virtual void SetDimensions(Double_t * /param/) {;}	virtual void SetDimensions(Double_t * /param/) {;}
	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 Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoCompositeShape, 1) // boolean composite shape	ClassDef(TGeoCompositeShape, 1) // boolean composite shape
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoCone.h	TGeoCone.h

	skipping to change at line 91	skipping to change at line 91
	virtual Double_t GetRmax1() const {return fRmax1;}	virtual Double_t GetRmax1() const {return fRmax1;}
	virtual Double_t GetRmin2() const {return fRmin2;}	virtual Double_t GetRmin2() const {return fRmin2;}
	virtual Double_t GetRmax2() const {return fRmax2;}	virtual Double_t GetRmax2() const {return fRmax2;}

	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kTRUE;}	virtual Bool_t IsCylType() const {return kTRUE;}
	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;
	static Double_t SafetyS(Double_t *point, Bool_t in, Double_t dz, D ouble_t rmin1, Double_t rmax1,	static Double_t SafetyS(Double_t *point, Bool_t in, Double_t dz, D ouble_t rmin1, Double_t rmax1,
	Double_t rmin2, Double_t rmax2, Int_t skip z=0);	Double_t rmin2, Double_t rmax2, Int_t skip z=0);

	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	void SetConeDimensions(Double_t dz, Double_t rmin1, Dou ble_t rmax1,	void SetConeDimensions(Double_t dz, Double_t rmin1, Dou ble_t rmax1,
	Double_t rmin2, Double_t rmax2);	Double_t rmin2, Double_t rmax2);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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;

	ClassDef(TGeoCone, 1) // conical tube class	ClassDef(TGeoCone, 1) // conical tube class


	skipping to change at line 167	skipping to change at line 167
	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;	virtual Int_t GetNmeshVertices() const;
	virtual Bool_t GetPointsOnSegments(Int_t npoints, Double_t *array ) const;	virtual Bool_t GetPointsOnSegments(Int_t npoints, Double_t *array ) const;
	Double_t GetPhi1() const {return fPhi1;}	Double_t GetPhi1() const {return fPhi1;}
	Double_t GetPhi2() const {return fPhi2;}	Double_t GetPhi2() const {return fPhi2;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	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;
	static Double_t SafetyS(Double_t *point, Bool_t in, Double_t dz, D ouble_t rmin1, Double_t rmax1,	static Double_t SafetyS(Double_t *point, Bool_t in, Double_t dz, D ouble_t rmin1, Double_t rmax1,
	Double_t rmin2, Double_t rmax2, Double_t p hi1, Double_t phi2, Int_t skipz=0);	Double_t rmin2, Double_t rmax2, Double_t p hi1, Double_t phi2, Int_t skipz=0);

	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	void SetConsDimensions(Double_t dz, Double_t rmin1, Dou ble_t rmax1,	void SetConsDimensions(Double_t dz, Double_t rmin1, Dou ble_t rmax1,
	Double_t rmin2, Double_t rmax2, Doub le_t phi1, Double_t phi2);	Double_t rmin2, Double_t rmax2, Doub le_t phi1, Double_t phi2);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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;

	ClassDef(TGeoConeSeg, 1) // conical tube segment class	ClassDef(TGeoConeSeg, 1) // conical tube segment class
	};	};

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	TGeoMaterial.h		TGeoMaterial.h

	skipping to change at line 35		skipping to change at line 35

	#ifndef ROOT_TAttFill		#ifndef ROOT_TAttFill
	#include "TAttFill.h"		#include "TAttFill.h"
	#endif		#endif

	#ifndef ROOT_TGeoElement		#ifndef ROOT_TGeoElement
	#include "TGeoElement.h"		#include "TGeoElement.h"
	#endif		#endif

	// forward declarations		// forward declarations

			class TGeoExtension;

	/////////////////////////////////////////////////////////////////////////// /		/////////////////////////////////////////////////////////////////////////// /
	// / /		// / /
	// TGeoMaterial - base class describing materials / /		// TGeoMaterial - base class describing materials / /
	// / /		// / /
	/////////////////////////////////////////////////////////////////////////// /		/////////////////////////////////////////////////////////////////////////// /

	// Some units used in G4		// Some units used in G4
	static const Double_t STP_temperature = 273.15; // [K]		static const Double_t STP_temperature = 273.15; // [K]
	static const Double_t STP_pressure = 6.32420e+8; // [MeV/mm3]		static const Double_t STP_pressure = 6.32420e+8; // [MeV/mm3]

	skipping to change at line 74		skipping to change at line 75
	Double_t fZ; // Z of material		Double_t fZ; // Z of material
	Double_t fDensity; // density of material		Double_t fDensity; // density of material
	Double_t fRadLen; // radiation length		Double_t fRadLen; // radiation length
	Double_t fIntLen; // interaction length		Double_t fIntLen; // interaction length
	Double_t fTemperature; // temperature		Double_t fTemperature; // temperature
	Double_t fPressure; // pressure		Double_t fPressure; // pressure
	EGeoMaterialState fState; // material state		EGeoMaterialState fState; // material state
	TObject *fShader; // shader with optical properties		TObject *fShader; // shader with optical properties
	TObject *fCerenkov; // pointer to class with Cerenkov properties		TObject *fCerenkov; // pointer to class with Cerenkov properties
	TGeoElement *fElement; // pointer to element composing th e material		TGeoElement *fElement; // pointer to element composing th e material

			TGeoExtension *fUserExtension; //! Transient user-defined ext
			ension to materials
			TGeoExtension *fFWExtension; //! Transient framework-define

	TGeoNode.h		TGeoNode.h

	skipping to change at line 120		skipping to change at line 120
	Bool_t IsOffset() const {return TObject::TestBit(kGeoNodeOffs et);}		Bool_t IsOffset() const {return TObject::TestBit(kGeoNodeOffs et);}
	Bool_t IsOnScreen() const; // MENU		Bool_t IsOnScreen() const; // MENU
	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(std::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(TGeoVolume *volume) {fVolume = 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(TGeoVolume *mother) {fMother = mother; }		void SetMotherVolume(TGeoVolume *mother) {fMother = mother; }
	void SetOverlaps(Int_t *ovlp, Int_t novlp);		void SetOverlaps(Int_t *ovlp, Int_t novlp);
	void SetUserExtension(TGeoExtension *ext);		void SetUserExtension(TGeoExtension *ext);
	void SetFWExtension(TGeoExtension *ext);		void SetFWExtension(TGeoExtension *ext);

			TGeoExtension *GetUserExtension() const {return fUserExtension;}
			TGeoExtension *GetFWExtension() const {return fFWExtension;}
	TGeoExtension *GrabUserExtension() const;		TGeoExtension *GrabUserExtension() const;
	TGeoExtension *GrabFWExtension() const;		TGeoExtension *GrabFWExtension() const;

	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 = "");

	TGeoElement.h	TGeoElement.h

	skipping to change at line 202	skipping to change at line 202
	TObjArray *Decays() const {return fDecays;}	TObjArray *Decays() const {return fDecays;}
	Int_t GetNdecays() const;	Int_t GetNdecays() const;
	TGeoBatemanSol *Ratio() const {return fRatio;}	TGeoBatemanSol *Ratio() const {return fRatio;}

	// Utilities	// Utilities
	Bool_t CheckDecays() const;	Bool_t CheckDecays() const;
	Int_t DecayResult(TGeoDecayChannel *dc) const;	Int_t DecayResult(TGeoDecayChannel *dc) const;
	void FillPopulation(TObjArray *population, Double_t precision=0.001, Double_t factor=1.);	void FillPopulation(TObjArray *population, Double_t precision=0.001, Double_t factor=1.);
	virtual void Print(Option_t *option = "") const;	virtual void Print(Option_t *option = "") const;
	static TGeoElementRN ReadElementRN(const char record, Int_t &ndecay s);	static TGeoElementRN ReadElementRN(const char record, Int_t &ndecay s);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *opti on = "");

	ClassDef(TGeoElementRN, 2) // radionuclides class	ClassDef(TGeoElementRN, 2) // radionuclides class
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoDecayChannel - decay channel utility class. / /	// TGeoDecayChannel - decay channel utility class. / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /


	skipping to change at line 266	skipping to change at line 266
	Int_t DeltaIso() const {return fDiso;}	Int_t DeltaIso() const {return fDiso;}
	TGeoElementRN *Daughter() const {return fDaughter;}	TGeoElementRN *Daughter() const {return fDaughter;}
	TGeoElementRN *Parent() const {return fParent;}	TGeoElementRN *Parent() const {return fParent;}
	static void DecayName(UInt_t decay, TString &name);	static void DecayName(UInt_t decay, TString &name);
	// Setters	// Setters
	void SetParent(TGeoElementRN *parent) {fParent = par ent;}	void SetParent(TGeoElementRN *parent) {fParent = par ent;}
	void SetDaughter(TGeoElementRN *daughter) {fDaughter = daughter;}	void SetDaughter(TGeoElementRN *daughter) {fDaughter = daughter;}
	// Services	// Services
	virtual void Print(Option_t *opt = " ") const;	virtual void Print(Option_t *opt = " ") const;
	static TGeoDecayChannel ReadDecay(const char record);	static TGeoDecayChannel ReadDecay(const char record);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *opti on = "");
	virtual void DecayShift(Int_t &dA, Int_t &dZ, Int_t &dI) con st ;	virtual void DecayShift(Int_t &dA, Int_t &dZ, Int_t &dI) con st ;

	ClassDef(TGeoDecayChannel,1) // Decay channel for Elements	ClassDef(TGeoDecayChannel,1) // Decay channel for Elements
	};	};

	/////////////////////////////////////////////////////////////////////////// /////	/////////////////////////////////////////////////////////////////////////// /////
	// //	// //
	// TGeoBatemanSol -Class representing the Bateman solution for a decay bran ch //	// TGeoBatemanSol -Class representing the Bateman solution for a decay bran ch //
	// //	// //
	/////////////////////////////////////////////////////////////////////////// /////	/////////////////////////////////////////////////////////////////////////// /////

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	TGeoEltu.h	TGeoEltu.h

	skipping to change at line 61	skipping to change at line 61
	virtual Double_t GetB() const {return fRmax;}	virtual Double_t GetB() const {return fRmax;}
	virtual void GetBoundingCylinder(Double_t *param) const;	virtual void GetBoundingCylinder(Double_t *param) const;
	virtual const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFram e) const;	virtual const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFram e) const;
	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;	virtual Int_t GetNmeshVertices() const;
	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kTRUE;}	virtual Bool_t IsCylType() const {return kTRUE;}
	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(std::ostream &out, Option_t *option = "");
	void SetEltuDimensions(Double_t a, Double_t b, Double_t dz);	void SetEltuDimensions(Double_t a, Double_t b, Double_t dz);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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;

	ClassDef(TGeoEltu, 1) // elliptical tube class	ClassDef(TGeoEltu, 1) // elliptical tube class

	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoHalfSpace.h	TGeoHalfSpace.h

	skipping to change at line 62	skipping to change at line 62
	Double_t start, Double_t step);	Double_t start, Double_t step);
	virtual Double_t *GetPoint() {return fP;}	virtual Double_t *GetPoint() {return fP;}
	virtual Double_t *GetNorm() {return fN;}	virtual Double_t *GetNorm() {return fN;}
	virtual void GetBoundingCylinder(Double_t * /param/) const {; }	virtual void GetBoundingCylinder(Double_t * /param/) const {; }
	virtual TGeoShape GetMakeRuntimeShape(TGeoShape /mother/, TGeoMa trix * /mat/) const {return 0;}	virtual TGeoShape GetMakeRuntimeShape(TGeoShape /mother/, TGeoMa trix * /mat/) const {return 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 Int_t GetNmeshVertices() const {return 0;}	virtual Int_t GetNmeshVertices() const {return 0;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kFALSE;}	virtual Bool_t IsCylType() const {return kFALSE;}
	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(std::ostream &out, Option_t *option = "");
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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 Sizeof3D() const {;}	virtual void Sizeof3D() const {;}

	ClassDef(TGeoHalfSpace, 1) // half-space class	ClassDef(TGeoHalfSpace, 1) // half-space class
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoHype.h	TGeoHype.h

	skipping to change at line 104	skipping to change at line 104
	Double_t GetStOut() const {return fStOut;}	Double_t GetStOut() const {return fStOut;}
	Bool_t HasInner() const {return !TestShapeBit(kGeoRSeg);}	Bool_t HasInner() const {return !TestShapeBit(kGeoRSeg);}
	Double_t RadiusHypeSq(Double_t z, Bool_t inner) const;	Double_t RadiusHypeSq(Double_t z, Bool_t inner) const;
	Double_t ZHypeSq(Double_t r, Bool_t inner) const;	Double_t ZHypeSq(Double_t r, Bool_t inner) const;
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kTRUE;}	virtual Bool_t IsCylType() const {return kTRUE;}
	virtual TBuffer3D *MakeBuffer3D() const;	virtual TBuffer3D *MakeBuffer3D() const;
	//virtual void Paint(Option_t *option);	//virtual void Paint(Option_t *option);
	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;
	Double_t SafetyToHype(Double_t *point, Bool_t inner, Bool_t in) const;	Double_t SafetyToHype(Double_t *point, Bool_t inner, Bool_t in) const;

	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	void SetHypeDimensions(Double_t rin, Double_t stin, Dou ble_t rout, Double_t stout, Double_t dz);	void SetHypeDimensions(Double_t rin, Double_t stin, Dou ble_t rout, Double_t stout, Double_t dz);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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 &buff) const;	virtual void SetSegsAndPols(TBuffer3D &buff) const;
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoHype, 1) // hyperboloid class	ClassDef(TGeoHype, 1) // hyperboloid class

	};	};

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoMatrix.h	TGeoMatrix.h

	skipping to change at line 158	skipping to change at line 158
	virtual void LocalToMaster(const Double_t local, Double_t mast er) const;	virtual void LocalToMaster(const Double_t local, Double_t mast er) const;
	virtual void LocalToMasterVect(const Double_t local, Double_t master) const;	virtual void LocalToMasterVect(const Double_t local, Double_t master) const;
	virtual void LocalToMasterBomb(const Double_t local, Double_t master) const;	virtual void LocalToMasterBomb(const Double_t local, Double_t master) const;
	virtual TGeoMatrix *MakeClone() const;	virtual TGeoMatrix *MakeClone() const;
	virtual void MasterToLocal(const Double_t master, Double_t loc al) const;	virtual void MasterToLocal(const Double_t master, Double_t loc al) const;
	virtual void MasterToLocalVect(const Double_t master, Double_t local) const;	virtual void MasterToLocalVect(const Double_t master, Double_t local) const;
	virtual void MasterToLocalBomb(const Double_t master, Double_t local) const;	virtual void MasterToLocalBomb(const Double_t master, Double_t local) const;
	virtual void RotateX(Double_t angle);	virtual void RotateX(Double_t angle);
	virtual void RotateY(Double_t angle);	virtual void RotateY(Double_t angle);
	virtual void RotateZ(Double_t angle);	virtual void RotateZ(Double_t angle);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	void Subtract(const TGeoTranslation *other);	void Subtract(const TGeoTranslation *other);
	void SetTranslation(Double_t dx, Double_t dy, Double_t d z);	void SetTranslation(Double_t dx, Double_t dy, Double_t d z);
	void SetTranslation(const TGeoMatrix &other);	void SetTranslation(const TGeoMatrix &other);
	virtual void SetDx(Double_t dx) {SetTranslation(dx, fTranslation [1], fTranslation[2]);}	virtual void SetDx(Double_t dx) {SetTranslation(dx, fTranslation [1], fTranslation[2]);}
	virtual void SetDy(Double_t dy) {SetTranslation(fTranslation[0], dy, fTranslation[2]);}	virtual void SetDy(Double_t dy) {SetTranslation(fTranslation[0], dy, fTranslation[2]);}
	virtual void SetDz(Double_t dz) {SetTranslation(fTranslation[0], fTranslation[1], dz);}	virtual void SetDz(Double_t dz) {SetTranslation(fTranslation[0], fTranslation[1], dz);}

	virtual const Double_t *GetTranslation() const {return &fTranslation[ 0];}	virtual const Double_t *GetTranslation() const {return &fTranslation[ 0];}
	virtual const Double_t *GetRotationMatrix() const {return &kIdentityM atrix[0];}	virtual const Double_t *GetRotationMatrix() const {return &kIdentityM atrix[0];}
	virtual const Double_t *GetScale() const {return &kUnitScale[0] ;}	virtual const Double_t *GetScale() const {return &kUnitScale[0] ;}

	skipping to change at line 220	skipping to change at line 220
	virtual void LocalToMasterVect(const Double_t local, Double_t master) const {TGeoRotation::LocalToMaster(local, master);}	virtual void LocalToMasterVect(const Double_t local, Double_t master) const {TGeoRotation::LocalToMaster(local, master);}
	virtual void LocalToMasterBomb(const Double_t local, Double_t master) const {TGeoRotation::LocalToMaster(local, master);}	virtual void LocalToMasterBomb(const Double_t local, Double_t master) const {TGeoRotation::LocalToMaster(local, master);}
	virtual TGeoMatrix *MakeClone() const;	virtual TGeoMatrix *MakeClone() const;
	virtual void MasterToLocal(const Double_t master, Double_t loc al) const;	virtual void MasterToLocal(const Double_t master, Double_t loc al) const;
	virtual void MasterToLocalVect(const Double_t master, Double_t local) const {TGeoRotation::MasterToLocal(master, local);}	virtual void MasterToLocalVect(const Double_t master, Double_t local) const {TGeoRotation::MasterToLocal(master, local);}
	virtual void MasterToLocalBomb(const Double_t master, Double_t local) const {TGeoRotation::MasterToLocal(master, local);}	virtual void MasterToLocalBomb(const Double_t master, Double_t local) const {TGeoRotation::MasterToLocal(master, local);}
	void MultiplyBy(TGeoRotation *rot, Bool_t after=kTRUE);	void MultiplyBy(TGeoRotation *rot, Bool_t after=kTRUE);
	virtual void RotateX(Double_t angle);	virtual void RotateX(Double_t angle);
	virtual void RotateY(Double_t angle);	virtual void RotateY(Double_t angle);
	virtual void RotateZ(Double_t angle);	virtual void RotateZ(Double_t angle);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void ReflectX(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectX(Bool_t leftside, Bool_t rotonly=kFALSE);
	virtual void ReflectY(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectY(Bool_t leftside, Bool_t rotonly=kFALSE);
	virtual void ReflectZ(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectZ(Bool_t leftside, Bool_t rotonly=kFALSE);
	void SetAngles(Double_t phi, Double_t theta, Double_t ps i);	void SetAngles(Double_t phi, Double_t theta, Double_t ps i);
	void SetAngles(Double_t theta1, Double_t phi1, Double_t theta2, Double_t phi2,	void SetAngles(Double_t theta1, Double_t phi1, Double_t theta2, Double_t phi2,
	Double_t theta3, Double_t phi3);	Double_t theta3, Double_t phi3);
	void SetMatrix(const Double_t rot) {memcpy(&fRotationMa trix[0], rot, 9sizeof(Double_t));CheckMatrix();}	void SetMatrix(const Double_t rot) {memcpy(&fRotationMa trix[0], rot, 9sizeof(Double_t));CheckMatrix();}
	void SetRotation(const TGeoMatrix &other);	void SetRotation(const TGeoMatrix &other);
	void GetInverse(Double_t *invmat) const;	void GetInverse(Double_t *invmat) const;


	skipping to change at line 313	skipping to change at line 313
	void Clear(Option_t *option ="");	void Clear(Option_t *option ="");
	virtual TGeoMatrix& Inverse() const;	virtual TGeoMatrix& Inverse() const;
	virtual TGeoMatrix *MakeClone() const;	virtual TGeoMatrix *MakeClone() const;
	virtual void RegisterYourself();	virtual void RegisterYourself();
	virtual void RotateX(Double_t angle);	virtual void RotateX(Double_t angle);
	virtual void RotateY(Double_t angle);	virtual void RotateY(Double_t angle);
	virtual void RotateZ(Double_t angle);	virtual void RotateZ(Double_t angle);
	virtual void ReflectX(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectX(Bool_t leftside, Bool_t rotonly=kFALSE);
	virtual void ReflectY(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectY(Bool_t leftside, Bool_t rotonly=kFALSE);
	virtual void ReflectZ(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectZ(Bool_t leftside, Bool_t rotonly=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void SetDx(Double_t dx) {SetTranslation(dx, fTranslation [1], fTranslation[2]);}	virtual void SetDx(Double_t dx) {SetTranslation(dx, fTranslation [1], fTranslation[2]);}
	virtual void SetDy(Double_t dy) {SetTranslation(fTranslation[0], dy, fTranslation[2]);}	virtual void SetDy(Double_t dy) {SetTranslation(fTranslation[0], dy, fTranslation[2]);}
	virtual void SetDz(Double_t dz) {SetTranslation(fTranslation[0], fTranslation[1], dz);}	virtual void SetDz(Double_t dz) {SetTranslation(fTranslation[0], fTranslation[1], dz);}
	void SetTranslation(const TGeoTranslation &tr);	void SetTranslation(const TGeoTranslation &tr);
	void SetTranslation(Double_t dx, Double_t dy, Double_t d z);	void SetTranslation(Double_t dx, Double_t dy, Double_t d z);
	void SetTranslation(Double_t *vect);	void SetTranslation(Double_t *vect);
	void SetRotation(const TGeoRotation &other);	void SetRotation(const TGeoRotation &other);
	void SetRotation(const TGeoRotation *rot);	void SetRotation(const TGeoRotation *rot);

	TGeoRotation *GetRotation() const {return fRotation;}	TGeoRotation *GetRotation() const {return fRotation;}

	skipping to change at line 393	skipping to change at line 393
	virtual void LocalToMasterVect(const Double_t local, Double_t master) const {memcpy(master, local, 3*sizeof(Double_t));}	virtual void LocalToMasterVect(const Double_t local, Double_t master) const {memcpy(master, local, 3*sizeof(Double_t));}
	virtual void LocalToMasterBomb(const Double_t local, Double_t master) const {TGeoIdentity::LocalToMaster(local, master);}	virtual void LocalToMasterBomb(const Double_t local, Double_t master) const {TGeoIdentity::LocalToMaster(local, master);}
	virtual TGeoMatrix *MakeClone() const {return NULL;}	virtual TGeoMatrix *MakeClone() const {return NULL;}
	virtual void MasterToLocal(const Double_t master, Double_t loc al) const {memcpy(local, master, 3*sizeof(Double_t));}	virtual void MasterToLocal(const Double_t master, Double_t loc al) const {memcpy(local, master, 3*sizeof(Double_t));}
	virtual void MasterToLocalVect(const Double_t master, Double_t local) const {memcpy(local, master, 3*sizeof(Double_t));}	virtual void MasterToLocalVect(const Double_t master, Double_t local) const {memcpy(local, master, 3*sizeof(Double_t));}
	virtual void MasterToLocalBomb(const Double_t master, Double_t local) const {TGeoIdentity::MasterToLocal(master, local);}	virtual void MasterToLocalBomb(const Double_t master, Double_t local) const {TGeoIdentity::MasterToLocal(master, local);}

	virtual const Double_t *GetTranslation() const {return &kNullVector[0 ];}	virtual const Double_t *GetTranslation() const {return &kNullVector[0 ];}
	virtual const Double_t *GetRotationMatrix() const {return &kIdentityM atrix[0];}	virtual const Double_t *GetRotationMatrix() const {return &kIdentityM atrix[0];}
	virtual const Double_t *GetScale() const {return &kUnitScale[0] ;}	virtual const Double_t *GetScale() const {return &kUnitScale[0] ;}

	virtual void SavePrimitive(ostream &, Option_t * = "") {;}	virtual void SavePrimitive(std::ostream &, Option_t * = "") {;}

	ClassDef(TGeoIdentity, 1) // identity transformation cla ss	ClassDef(TGeoIdentity, 1) // identity transformation cla ss
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoHMatrix - Matrix class used for computing global transformations / /	// TGeoHMatrix - Matrix class used for computing global transformations / /
	// Should NOT be used for node definition. An instance of this class / /	// Should NOT be used for node definition. An instance of this class / /
	// is generally used to pile-up local transformations starting from / /	// is generally used to pile-up local transformations starting from / /
	// the top level physical node, down to the current node. / /	// the top level physical node, down to the current node. / /

	skipping to change at line 441	skipping to change at line 441
	virtual TGeoMatrix *MakeClone() const;	virtual TGeoMatrix *MakeClone() const;
	void Multiply(const TGeoMatrix *right);	void Multiply(const TGeoMatrix *right);
	void MultiplyLeft(const TGeoMatrix *left);	void MultiplyLeft(const TGeoMatrix *left);

	virtual void RotateX(Double_t angle);	virtual void RotateX(Double_t angle);
	virtual void RotateY(Double_t angle);	virtual void RotateY(Double_t angle);
	virtual void RotateZ(Double_t angle);	virtual void RotateZ(Double_t angle);
	virtual void ReflectX(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectX(Bool_t leftside, Bool_t rotonly=kFALSE);
	virtual void ReflectY(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectY(Bool_t leftside, Bool_t rotonly=kFALSE);
	virtual void ReflectZ(Bool_t leftside, Bool_t rotonly=kFALSE);	virtual void ReflectZ(Bool_t leftside, Bool_t rotonly=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void SetDx(Double_t dx) {fTranslation[0] = dx; SetBit(kG eoTranslation);}	virtual void SetDx(Double_t dx) {fTranslation[0] = dx; SetBit(kG eoTranslation);}
	virtual void SetDy(Double_t dy) {fTranslation[1] = dy; SetBit(kG eoTranslation);}	virtual void SetDy(Double_t dy) {fTranslation[1] = dy; SetBit(kG eoTranslation);}
	virtual void SetDz(Double_t dz) {fTranslation[2] = dz; SetBit(kG eoTranslation);}	virtual void SetDz(Double_t dz) {fTranslation[2] = dz; SetBit(kG eoTranslation);}
	void SetTranslation(const Double_t vect) {SetBit(kGeoTr anslation); memcpy(&fTranslation[0], vect, 3sizeof(Double_t));}	void SetTranslation(const Double_t vect) {SetBit(kGeoTr anslation); memcpy(&fTranslation[0], vect, 3sizeof(Double_t));}
	void SetRotation(const Double_t matrix) {SetBit(kGeoRot ation); memcpy(&fRotationMatrix[0], matrix, 9sizeof(Double_t));}	void SetRotation(const Double_t matrix) {SetBit(kGeoRot ation); memcpy(&fRotationMatrix[0], matrix, 9sizeof(Double_t));}
	void SetScale(const Double_t scale) {SetBit(kGeoScale); memcpy(&fScale[0], scale, 3sizeof(Double_t));}	void SetScale(const Double_t scale) {SetBit(kGeoScale); memcpy(&fScale[0], scale, 3sizeof(Double_t));}

	virtual const Double_t *GetTranslation() const {return &fTranslation[ 0];}	virtual const Double_t *GetTranslation() const {return &fTranslation[ 0];}
	virtual const Double_t *GetRotationMatrix() const {return &fRotationM atrix[0];}	virtual const Double_t *GetRotationMatrix() const {return &fRotationM atrix[0];}
	virtual const Double_t *GetScale() const {return &fScale[0];}	virtual const Double_t *GetScale() const {return &fScale[0];}

End of changes. 5 change blocks.
	5 lines changed or deleted	5 lines changed or added

	TGeoPara.h	TGeoPara.h

	skipping to change at line 82	skipping to change at line 82
	Double_t GetZ() const {return fZ;}	Double_t GetZ() const {return fZ;}
	Double_t GetAlpha() const {return fAlpha;}	Double_t GetAlpha() const {return fAlpha;}
	Double_t GetTheta() const {return fTheta;}	Double_t GetTheta() const {return fTheta;}
	Double_t GetPhi() const {return fPhi;}	Double_t GetPhi() const {return fPhi;}
	Double_t GetTxy() const {return fTxy;}	Double_t GetTxy() const {return fTxy;}
	Double_t GetTxz() const {return fTxz;}	Double_t GetTxz() const {return fTxz;}
	Double_t GetTyz() const {return fTyz;}	Double_t GetTyz() const {return fTyz;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kFALSE;}	virtual Bool_t IsCylType() const {return kFALSE;}
	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(std::ostream &out, Option_t *option = "");
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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 Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoPara, 1) // box primitive	ClassDef(TGeoPara, 1) // box primitive
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoParaboloid.h	TGeoParaboloid.h

	skipping to change at line 79	skipping to change at line 79

	virtual void GetBoundingCylinder(Double_t *param) const;	virtual void GetBoundingCylinder(Double_t *param) const;
	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;	virtual Int_t GetNmeshVertices() const;
	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kTRUE;}	virtual Bool_t IsCylType() const {return kTRUE;}
	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(std::ostream &out, Option_t *option = "");
	void SetParaboloidDimensions(Double_t rlo, Double_t rhi , Double_t dz);	void SetParaboloidDimensions(Double_t rlo, Double_t rhi , Double_t dz);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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 &buff) const;	virtual void SetSegsAndPols(TBuffer3D &buff) const;
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoParaboloid, 1) // paraboloid class	ClassDef(TGeoParaboloid, 1) // paraboloid class

	};	};

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoPatternFinder.h	TGeoPatternFinder.h

	skipping to change at line 136	skipping to change at line 136
	virtual ~TGeoPatternX();	virtual ~TGeoPatternX();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternX, 1) // X division pattern	ClassDef(TGeoPatternX, 1) // X division pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternY - a Y axis divison pattern / /	// TGeoPatternY - a Y axis divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 169	skipping to change at line 169
	virtual ~TGeoPatternY();	virtual ~TGeoPatternY();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternY, 1) // Y division pattern	ClassDef(TGeoPatternY, 1) // Y division pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternZ - a Z axis divison pattern / /	// TGeoPatternZ - a Z axis divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 202	skipping to change at line 202
	virtual ~TGeoPatternZ();	virtual ~TGeoPatternZ();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternZ, 1) // Z division pattern	ClassDef(TGeoPatternZ, 1) // Z division pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternParaX - a X axis divison pattern for PARA shapes / /	// TGeoPatternParaX - a X axis divison pattern for PARA shapes / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 235	skipping to change at line 235
	// destructor	// destructor
	virtual ~TGeoPatternParaX();	virtual ~TGeoPatternParaX();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternParaX, 1) // Para X division pattern	ClassDef(TGeoPatternParaX, 1) // Para X division pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternParaY - a Y axis divison pattern for PARA shapes / /	// TGeoPatternParaY - a Y axis divison pattern for PARA shapes / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 271	skipping to change at line 271
	// destructor	// destructor
	virtual ~TGeoPatternParaY();	virtual ~TGeoPatternParaY();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternParaY, 1) // Para Y division pattern	ClassDef(TGeoPatternParaY, 1) // Para Y division pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternParaZ - a Z axis divison pattern for PARA shapes / /	// TGeoPatternParaZ - a Z axis divison pattern for PARA shapes / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 308	skipping to change at line 308
	// destructor	// destructor
	virtual ~TGeoPatternParaZ();	virtual ~TGeoPatternParaZ();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternParaZ, 1) // Para Z division pattern	ClassDef(TGeoPatternParaZ, 1) // Para Z division pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternTrapZ - a Z axis divison pattern for TRAP or GTRA shapes / /	// TGeoPatternTrapZ - a Z axis divison pattern for TRAP or GTRA shapes / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 347	skipping to change at line 347
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	Double_t GetTxz() const {return fTxz;}	Double_t GetTxz() const {return fTxz;}
	Double_t GetTyz() const {return fTyz;}	Double_t GetTyz() const {return fTyz;}
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternTrapZ, 1) // Trap od Gtra Z division pa ttern	ClassDef(TGeoPatternTrapZ, 1) // Trap od Gtra Z division pa ttern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternCylR - a cylindrical R divison pattern / /	// TGeoPatternCylR - a cylindrical R divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 379	skipping to change at line 379
	// destructor	// destructor
	virtual ~TGeoPatternCylR();	virtual ~TGeoPatternCylR();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternCylR, 1) // Cylindrical R division patt ern	ClassDef(TGeoPatternCylR, 1) // Cylindrical R division patt ern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternCylPhi - a cylindrical phi divison pattern / /	// TGeoPatternCylPhi - a cylindrical phi divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 420	skipping to change at line 420
	// destructor	// destructor
	virtual ~TGeoPatternCylPhi();	virtual ~TGeoPatternCylPhi();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternCylPhi, 1) // Cylindrical phi division pattern	ClassDef(TGeoPatternCylPhi, 1) // Cylindrical phi division pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternSphR - a spherical R divison pattern / /	// TGeoPatternSphR - a spherical R divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 451	skipping to change at line 451
	TGeoPatternSphR& operator=(const TGeoPatternSphR&);	TGeoPatternSphR& operator=(const TGeoPatternSphR&);
	// destructor	// destructor
	virtual ~TGeoPatternSphR();	virtual ~TGeoPatternSphR();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternSphR, 1) // spherical R division patter n	ClassDef(TGeoPatternSphR, 1) // spherical R division patter n
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternSphTheta - a spherical theta divison pattern / /	// TGeoPatternSphTheta - a spherical theta divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 482	skipping to change at line 482
	TGeoPatternSphTheta& operator=(const TGeoPatternSphTheta&);	TGeoPatternSphTheta& operator=(const TGeoPatternSphTheta&);
	// destructor	// destructor
	virtual ~TGeoPatternSphTheta();	virtual ~TGeoPatternSphTheta();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternSphTheta, 1) // spherical theta divisio n pattern	ClassDef(TGeoPatternSphTheta, 1) // spherical theta divisio n pattern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternSphPhi - a spherical phi divison pattern / /	// TGeoPatternSphPhi - a spherical phi divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	skipping to change at line 513	skipping to change at line 513
	TGeoPatternSphPhi& operator=(const TGeoPatternSphPhi&);	TGeoPatternSphPhi& operator=(const TGeoPatternSphPhi&);
	// destructor	// destructor
	virtual ~TGeoPatternSphPhi();	virtual ~TGeoPatternSphPhi();
	// methods	// methods
	virtual TGeoMatrix* CreateMatrix() const;	virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;	virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternSphPhi, 1) // Spherical phi division pa ttern	ClassDef(TGeoPatternSphPhi, 1) // Spherical phi division pa ttern
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternHoneycomb - a divison pattern specialized for honeycombs / /	// TGeoPatternHoneycomb - a divison pattern specialized for honeycombs / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

End of changes. 12 change blocks.
	12 lines changed or deleted	12 lines changed or added

	TGeoScaledShape.h	TGeoScaledShape.h

	skipping to change at line 68	skipping to change at line 68
	virtual Int_t GetNmeshVertices() const {return fShape->GetNmeshV ertices();}	virtual Int_t GetNmeshVertices() const {return fShape->GetNmeshV ertices();}
	TGeoShape *GetShape() const {return fShape;}	TGeoShape *GetShape() const {return fShape;}
	TGeoScale *GetScale() const {return fScale;}	TGeoScale *GetScale() const {return fScale;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsAssembly() const;	virtual Bool_t IsAssembly() const;
	virtual Bool_t IsCylType() const {return fShape->IsCylType();}	virtual Bool_t IsCylType() const {return fShape->IsCylType();}
	virtual Bool_t IsReflected() const;	virtual Bool_t IsReflected() const;
	virtual TBuffer3D *MakeBuffer3D() const;	virtual TBuffer3D *MakeBuffer3D() const;
	static TGeoShape MakeScaledShape(const char name, TGeoShape shape , TGeoScale scale);	static TGeoShape MakeScaledShape(const char name, TGeoShape shape , TGeoScale scale);
	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(std::ostream &out, Option_t *option = "");
	void SetScale(TGeoScale *scale) {fScale = scale;}	void SetScale(TGeoScale *scale) {fScale = scale;}
	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;

	ClassDef(TGeoScaledShape, 1) // a scaled shape	ClassDef(TGeoScaledShape, 1) // a scaled shape
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoSphere.h	TGeoSphere.h

	skipping to change at line 89	skipping to change at line 89
	Double_t GetTheta1() const {return fTheta1;}	Double_t GetTheta1() const {return fTheta1;}
	Double_t GetTheta2() const {return fTheta2;}	Double_t GetTheta2() const {return fTheta2;}
	Double_t GetPhi1() const {return fPhi1;}	Double_t GetPhi1() const {return fPhi1;}
	Double_t GetPhi2() const {return fPhi2;}	Double_t GetPhi2() const {return fPhi2;}
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kFALSE;}	virtual Bool_t IsCylType() const {return kFALSE;}
	Int_t IsOnBoundary(Double_t *point) const;	Int_t IsOnBoundary(Double_t *point) const;
	Bool_t IsPointInside(Double_t *point, Bool_t checkR=kTRUE , Bool_t checkTh=kTRUE, Bool_t checkPh=kTRUE) const;	Bool_t IsPointInside(Double_t *point, Bool_t checkR=kTRUE , Bool_t checkTh=kTRUE, Bool_t checkPh=kTRUE) const;
	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(std::ostream &out, Option_t *option = "");
	void SetSphDimensions(Double_t rmin, Double_t rmax, Dou ble_t theta1,	void SetSphDimensions(Double_t rmin, Double_t rmax, Dou ble_t theta1,
	Double_t theta2, Double_t phi1, Doub le_t phi2);	Double_t theta2, Double_t phi1, Doub le_t phi2);
	virtual void SetNumberOfDivisions(Int_t p);	virtual void SetNumberOfDivisions(Int_t p);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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 &buff) const;	virtual void SetSegsAndPols(TBuffer3D &buff) const;
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoSphere, 1) // sphere class	ClassDef(TGeoSphere, 1) // sphere class

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoTrd1.h	TGeoTrd1.h

	skipping to change at line 72	skipping to change at line 72
	Double_t GetDx2() const {return fDx2;}	Double_t GetDx2() const {return fDx2;}
	Double_t GetDy() const {return fDy;}	Double_t GetDy() const {return fDy;}
	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, TGeoMatrix *mat) const;	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;
	void GetVisibleCorner(Double_t point, Double_t vertex , Double_t *normals) const;	void GetVisibleCorner(Double_t point, Double_t vertex , Double_t *normals) const;
	void GetOppositeCorner(Double_t point, Int_t inorm, Do uble_t vertex, Double_t *normals) const;	void GetOppositeCorner(Double_t point, Int_t inorm, Do uble_t vertex, Double_t *normals) const;
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kFALSE;}	virtual Bool_t IsCylType() const {return kFALSE;}
	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(std::ostream &out, Option_t *option = "");
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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;
	void SetVertex(Double_t *vertex) const;	void SetVertex(Double_t *vertex) const;
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoTrd1, 1) // TRD1 shape class	ClassDef(TGeoTrd1, 1) // TRD1 shape class
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoTrd2.h	TGeoTrd2.h

	skipping to change at line 74	skipping to change at line 74
	Double_t GetDy1() const {return fDy1;}	Double_t GetDy1() const {return fDy1;}
	Double_t GetDy2() const {return fDy2;}	Double_t GetDy2() const {return fDy2;}
	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, TGeoMatrix *mat) const;	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;
	void GetVisibleCorner(Double_t point, Double_t vertex , Double_t *normals) const;	void GetVisibleCorner(Double_t point, Double_t vertex , Double_t *normals) const;
	void GetOppositeCorner(Double_t point, Int_t inorm, Do uble_t vertex, Double_t *normals) const;	void GetOppositeCorner(Double_t point, Int_t inorm, Do uble_t vertex, Double_t *normals) const;
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual Bool_t IsCylType() const {return kFALSE;}	virtual Bool_t IsCylType() const {return kFALSE;}
	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(std::ostream &out, Option_t *option = "");
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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;
	void SetVertex(Double_t *vertex) const;	void SetVertex(Double_t *vertex) const;
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoTrd2, 1) // TRD2 shape class	ClassDef(TGeoTrd2, 1) // TRD2 shape class
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TGeoVolume.h	TGeoVolume.h

	skipping to change at line 143	skipping to change at line 143
	virtual void DrawOnly(Option_t option=""); // MENU*	virtual void DrawOnly(Option_t option=""); // MENU*
	TH2F *LegoPlot(Int_t ntheta=20, Double_t themin=0., Double_t t hemax=180.,	TH2F *LegoPlot(Int_t ntheta=20, Double_t themin=0., Double_t t hemax=180.,
	Int_t nphi=60, Double_t phimin=0., Double_t phi max=360.,	Int_t nphi=60, Double_t phimin=0., Double_t phi max=360.,
	Double_t rmin=0., Double_t rmax=9999999, Option _t option=""); // MENU*	Double_t rmin=0., Double_t rmax=9999999, Option _t option=""); // MENU*
	virtual void Paint(Option_t *option="");	virtual void Paint(Option_t *option="");
	void PrintNodes() const;	void PrintNodes() const;
	void PrintVoxels() const; // MENU	void PrintVoxels() const; // MENU
	void ReplayCreation(const TGeoVolume *other);	void ReplayCreation(const TGeoVolume *other);
	void SetUserExtension(TGeoExtension *ext);	void SetUserExtension(TGeoExtension *ext);
	void SetFWExtension(TGeoExtension *ext);	void SetFWExtension(TGeoExtension *ext);

		TGeoExtension *GetUserExtension() const {return fUserExtension;}
		TGeoExtension *GetFWExtension() const {return fFWExtension;}
	TGeoExtension *GrabUserExtension() const;	TGeoExtension *GrabUserExtension() const;
	TGeoExtension *GrabFWExtension() const;	TGeoExtension *GrabFWExtension() const;
	virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);	virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);

	Bool_t IsActive() const {return TGeoAtt::IsActive();}	Bool_t IsActive() const {return TGeoAtt::IsActive();}
	Bool_t IsActiveDaughters() const {return TGeoAtt::IsActiveDaugh ters();}	Bool_t IsActiveDaughters() const {return TGeoAtt::IsActiveDaugh ters();}
	Bool_t IsAdded() const {return TObject::TestBit(kVolumeAdde d);}	Bool_t IsAdded() const {return TObject::TestBit(kVolumeAdde d);}
	Bool_t IsReplicated() const {return TObject::TestBit(kVolumeRep licated);}	Bool_t IsReplicated() const {return TObject::TestBit(kVolumeRep licated);}
	Bool_t IsSelected() const {return TObject::TestBit(kVolumeSele cted);}	Bool_t IsSelected() const {return TObject::TestBit(kVolumeSele cted);}
	Bool_t IsCylVoxels() const {return TObject::TestBit(kVoxelsCyl) ;}	Bool_t IsCylVoxels() const {return TObject::TestBit(kVoxelsCyl) ;}

	skipping to change at line 208	skipping to change at line 210
	void MakeCopyNodes(const TGeoVolume *other);	void MakeCopyNodes(const TGeoVolume *other);
	TGeoVolume MakeReflectedVolume(const char newname="") const;	TGeoVolume MakeReflectedVolume(const char newname="") const;
	Bool_t OptimizeVoxels(); // MENU	Bool_t OptimizeVoxels(); // MENU
	void RandomPoints(Int_t npoints=1000000, Option_t option="") ; // MENU*	void RandomPoints(Int_t npoints=1000000, Option_t option="") ; // MENU*
	void RandomRays(Int_t nrays=10000, Double_t startx=0, Double_ t starty=0, Double_t startz=0, const char target_vol=0, Bool_t check_norm= kFALSE); // MENU*	void RandomRays(Int_t nrays=10000, Double_t startx=0, Double_ t starty=0, Double_t startz=0, const char target_vol=0, Bool_t check_norm= kFALSE); // MENU*
	void Raytrace(Bool_t flag=kTRUE); // TOGGLE *GETTER=IsRaytr acing	void Raytrace(Bool_t flag=kTRUE); // TOGGLE *GETTER=IsRaytr acing
	void RegisterYourself(Option_t *option="");	void RegisterYourself(Option_t *option="");
	void RemoveNode(TGeoNode *node);	void RemoveNode(TGeoNode *node);
	TGeoNode ReplaceNode(TGeoNode nodeorig, TGeoShape newshape=0, T GeoMatrix newpos=0, TGeoMedium *newmed=0);	TGeoNode ReplaceNode(TGeoNode nodeorig, TGeoShape newshape=0, T GeoMatrix newpos=0, TGeoMedium *newmed=0);
	void SaveAs(const char filename,Option_t option="") const; // MENU	void SaveAs(const char filename,Option_t option="") const; // MENU

	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
	void SelectVolume(Bool_t clear = kFALSE);	void SelectVolume(Bool_t clear = kFALSE);
	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);

End of changes. 2 change blocks.
	1 lines changed or deleted	3 lines changed or added

	TGeoXtru.h	TGeoXtru.h

	skipping to change at line 113	skipping to change at line 113
	Double_t GetScale(Int_t i) const {return (i<fNz&&i>-1 && fS cale!=0) ? fScale[i] : 1.0;}	Double_t GetScale(Int_t i) const {return (i<fNz&&i>-1 && fS cale!=0) ? fScale[i] : 1.0;}
	Double_t *GetZ() const {return fZ;}	Double_t *GetZ() const {return fZ;}
	Double_t GetZ(Int_t ipl) const;	Double_t GetZ(Int_t ipl) const;
	virtual TGeoShape GetMakeRuntimeShape(TGeoShape /mother/, TGeoMa trix * /mat/) const {return 0;}	virtual TGeoShape GetMakeRuntimeShape(TGeoShape /mother/, TGeoMa trix * /mat/) const {return 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 Int_t GetNmeshVertices() const;	virtual Int_t GetNmeshVertices() const;
	virtual void InspectShape() const;	virtual void InspectShape() const;
	virtual TBuffer3D *MakeBuffer3D() const;	virtual TBuffer3D *MakeBuffer3D() const;
	Double_t &Z(Int_t ipl) {return fZ[ipl];}	Double_t &Z(Int_t ipl) {return fZ[ipl];}
	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(std::ostream &out, Option_t *option = "");
	void SetCurrentZ(Double_t z, Int_t iz);	void SetCurrentZ(Double_t z, Int_t iz);
	void SetCurrentVertices(Double_t x0, Double_t y0, Doubl e_t scale);	void SetCurrentVertices(Double_t x0, Double_t y0, Doubl e_t scale);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	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 &buff) const;	virtual void SetSegsAndPols(TBuffer3D &buff) const;
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

	ClassDef(TGeoXtru, 3) // extruded polygon class	ClassDef(TGeoXtru, 3) // extruded polygon class
	};	};

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TInterpreter.h	TInterpreter.h

	skipping to change at line 85	skipping to change at line 85
	virtual Int_t Load(const char *filenam, Bool_t system = kFALSE) = 0;	virtual Int_t Load(const char *filenam, Bool_t system = kFALSE) = 0;
	virtual void LoadMacro(const char filename, EErrorCode error = 0) = 0;	virtual void LoadMacro(const char filename, EErrorCode error = 0) = 0;
	virtual Int_t LoadLibraryMap(const char *rootmapfile = 0) = 0;	virtual Int_t LoadLibraryMap(const char *rootmapfile = 0) = 0;
	virtual Int_t RescanLibraryMap() = 0;	virtual Int_t RescanLibraryMap() = 0;
	virtual Int_t ReloadAllSharedLibraryMaps() = 0;	virtual Int_t ReloadAllSharedLibraryMaps() = 0;
	virtual Int_t UnloadAllSharedLibraryMaps() = 0;	virtual Int_t UnloadAllSharedLibraryMaps() = 0;
	virtual Int_t UnloadLibraryMap(const char *library) = 0;	virtual Int_t UnloadLibraryMap(const char *library) = 0;
	virtual Long_t ProcessLine(const char line, EErrorCode error = 0) = 0;	virtual Long_t ProcessLine(const char line, EErrorCode error = 0) = 0;
	virtual Long_t ProcessLineSynch(const char line, EErrorCode error = 0) = 0;	virtual Long_t ProcessLineSynch(const char line, EErrorCode error = 0) = 0;
	virtual void PrintIntro() = 0;	virtual void PrintIntro() = 0;

		virtual Int_t SetClassSharedLibs(const char cls, const char libs) = 0;
	virtual void SetGetline(const char(getlineFunc)(const char* prompt ),	virtual void SetGetline(const char(getlineFunc)(const char* prompt ),
	void (histaddFunc)(const char line)) = 0;	void (histaddFunc)(const char line)) = 0;
	virtual void Reset() = 0;	virtual void Reset() = 0;
	virtual void ResetAll() = 0;	virtual void ResetAll() = 0;
	virtual void ResetGlobals() = 0;	virtual void ResetGlobals() = 0;
	virtual void ResetGlobalVar(void *obj) = 0;	virtual void ResetGlobalVar(void *obj) = 0;
	virtual void RewindDictionary() = 0;	virtual void RewindDictionary() = 0;
	virtual Int_t DeleteGlobal(void *obj) = 0;	virtual Int_t DeleteGlobal(void *obj) = 0;
	virtual void SaveContext() = 0;	virtual void SaveContext() = 0;
	virtual void SaveGlobalsContext() = 0;	virtual void SaveGlobalsContext() = 0;

	skipping to change at line 240	skipping to change at line 241
	virtual const char DataMemberInfo_TypeName(DataMemberInfo_t /* dminfo */) const {return 0;}	virtual const char DataMemberInfo_TypeName(DataMemberInfo_t /* dminfo */) const {return 0;}
	virtual const char DataMemberInfo_TypeTrueName(DataMemberInfo_t /* dm info */) const {return 0;}	virtual const char DataMemberInfo_TypeTrueName(DataMemberInfo_t /* dm info */) const {return 0;}
	virtual const char DataMemberInfo_Name(DataMemberInfo_t /* dminfo */) const {return 0;}	virtual const char DataMemberInfo_Name(DataMemberInfo_t /* dminfo */) const {return 0;}
	virtual const char DataMemberInfo_Title(DataMemberInfo_t /* dminfo */ ) const {return 0;}	virtual const char DataMemberInfo_Title(DataMemberInfo_t /* dminfo */ ) const {return 0;}
	virtual const char DataMemberInfo_ValidArrayIndex(DataMemberInfo_t /* dminfo */) const {return 0;}	virtual const char DataMemberInfo_ValidArrayIndex(DataMemberInfo_t /* dminfo */) const {return 0;}

	// G__MethodInfo interface	// G__MethodInfo interface
	virtual void MethodInfo_CreateSignature(MethodInfo_t * /* minfo /, TS tring & / signature */) const {;}	virtual void MethodInfo_CreateSignature(MethodInfo_t * /* minfo /, TS tring & / signature */) const {;}
	virtual void MethodInfo_Delete(MethodInfo_t * /* minfo */) const {;}	virtual void MethodInfo_Delete(MethodInfo_t * /* minfo */) const {;}
	virtual MethodInfo_t *MethodInfo_Factory() const {return 0;}	virtual MethodInfo_t *MethodInfo_Factory() const {return 0;}

		virtual MethodInfo_t MethodInfo_Factory(ClassInfo_t /clinfo/) cons t {return 0;}
	virtual MethodInfo_t MethodInfo_FactoryCopy(MethodInfo_t /* minfo */ ) const {return 0;}	virtual MethodInfo_t MethodInfo_FactoryCopy(MethodInfo_t /* minfo */ ) const {return 0;}
	virtual MethodInfo_t MethodInfo_InterfaceMethod(MethodInfo_t /* minf o */) const {return 0;}	virtual MethodInfo_t MethodInfo_InterfaceMethod(MethodInfo_t /* minf o */) const {return 0;}
	virtual Bool_t MethodInfo_IsValid(MethodInfo_t * /* minfo */) const {ret urn 0;}	virtual Bool_t MethodInfo_IsValid(MethodInfo_t * /* minfo */) const {ret urn 0;}
	virtual int MethodInfo_NArg(MethodInfo_t * /* minfo */) const {return 0;}	virtual int MethodInfo_NArg(MethodInfo_t * /* minfo */) const {return 0;}
	virtual int MethodInfo_NDefaultArg(MethodInfo_t * /* minfo */) const {return 0;}	virtual int MethodInfo_NDefaultArg(MethodInfo_t * /* minfo */) const {return 0;}
	virtual int MethodInfo_Next(MethodInfo_t * /* minfo */) const {return 0;}	virtual int MethodInfo_Next(MethodInfo_t * /* minfo */) const {return 0;}
	virtual Long_t MethodInfo_Property(MethodInfo_t * /* minfo */) const {re turn 0;}	virtual Long_t MethodInfo_Property(MethodInfo_t * /* minfo */) const {re turn 0;}
	virtual TypeInfo_t MethodInfo_Type(MethodInfo_t /* minfo */) const { return 0;}	virtual TypeInfo_t MethodInfo_Type(MethodInfo_t /* minfo */) const { return 0;}
	virtual const char MethodInfo_GetMangledName(MethodInfo_t /* minfo */ ) const {return 0;}	virtual const char MethodInfo_GetMangledName(MethodInfo_t /* minfo */ ) const {return 0;}
	virtual const char MethodInfo_GetPrototype(MethodInfo_t /* minfo */) const {return 0;}	virtual const char MethodInfo_GetPrototype(MethodInfo_t /* minfo */) const {return 0;}
	virtual const char MethodInfo_Name(MethodInfo_t /* minfo */) const {r eturn 0;}	virtual const char MethodInfo_Name(MethodInfo_t /* minfo */) const {r eturn 0;}
	virtual const char MethodInfo_TypeName(MethodInfo_t /* minfo */) cons t {return 0;}	virtual const char MethodInfo_TypeName(MethodInfo_t /* minfo */) cons t {return 0;}
	virtual std::string MethodInfo_TypeNormalizedName(MethodInfo_t * /* minf o */) const {return "";}	virtual std::string MethodInfo_TypeNormalizedName(MethodInfo_t * /* minf o */) const {return "";}
	virtual const char MethodInfo_Title(MethodInfo_t /* minfo */) const { return 0;}	virtual const char MethodInfo_Title(MethodInfo_t /* minfo */) const { return 0;}

	// G__MethodArgInfo interface	// G__MethodArgInfo interface
	virtual void MethodArgInfo_Delete(MethodArgInfo_t * /* marginfo */) co nst {;}	virtual void MethodArgInfo_Delete(MethodArgInfo_t * /* marginfo */) co nst {;}
	virtual MethodArgInfo_t *MethodArgInfo_Factory() const {return 0;}	virtual MethodArgInfo_t *MethodArgInfo_Factory() const {return 0;}

		virtual MethodArgInfo_t MethodArgInfo_Factory(MethodInfo_t /minfo/ ) const {return 0;}
	virtual MethodArgInfo_t MethodArgInfo_FactoryCopy(MethodArgInfo_t /* marginfo */) const {return 0;}	virtual MethodArgInfo_t MethodArgInfo_FactoryCopy(MethodArgInfo_t /* marginfo */) const {return 0;}
	virtual Bool_t MethodArgInfo_IsValid(MethodArgInfo_t * /* marginfo */) c onst {return 0;}	virtual Bool_t MethodArgInfo_IsValid(MethodArgInfo_t * /* marginfo */) c onst {return 0;}
	virtual int MethodArgInfo_Next(MethodArgInfo_t * /* marginfo */) cons t {return 0;}	virtual int MethodArgInfo_Next(MethodArgInfo_t * /* marginfo */) cons t {return 0;}
	virtual Long_t MethodArgInfo_Property(MethodArgInfo_t * /* marginfo */) const {return 0;}	virtual Long_t MethodArgInfo_Property(MethodArgInfo_t * /* marginfo */) const {return 0;}
	virtual const char MethodArgInfo_DefaultValue(MethodArgInfo_t /* marg info */) const {return 0;}	virtual const char MethodArgInfo_DefaultValue(MethodArgInfo_t /* marg info */) const {return 0;}
	virtual const char MethodArgInfo_Name(MethodArgInfo_t /* marginfo */) const {return 0;}	virtual const char MethodArgInfo_Name(MethodArgInfo_t /* marginfo */) const {return 0;}
	virtual const char MethodArgInfo_TypeName(MethodArgInfo_t /* marginfo */) const {return 0;}	virtual const char MethodArgInfo_TypeName(MethodArgInfo_t /* marginfo */) const {return 0;}
	virtual std::string MethodArgInfo_TypeNormalizedName(MethodArgInfo_t * / * marginfo */) const {return 0;}	virtual std::string MethodArgInfo_TypeNormalizedName(MethodArgInfo_t * / * marginfo */) const {return 0;}

	// G__TypeInfo interface	// G__TypeInfo interface

	skipping to change at line 286	skipping to change at line 289
	virtual int TypeInfo_RefType(TypeInfo_t * /* tinfo */) const {return 0;}	virtual int TypeInfo_RefType(TypeInfo_t * /* tinfo */) const {return 0;}
	virtual int TypeInfo_Size(TypeInfo_t * /* tinfo */) const {return 0;}	virtual int TypeInfo_Size(TypeInfo_t * /* tinfo */) const {return 0;}
	virtual const char TypeInfo_TrueName(TypeInfo_t /* tinfo */) const {r eturn 0;}	virtual const char TypeInfo_TrueName(TypeInfo_t /* tinfo */) const {r eturn 0;}

	// G__TypedefInfo interface	// G__TypedefInfo interface
	virtual void TypedefInfo_Delete(TypedefInfo_t * /* tinfo */) const {;}	virtual void TypedefInfo_Delete(TypedefInfo_t * /* tinfo */) const {;}
	virtual TypedefInfo_t *TypedefInfo_Factory() const {return 0;}	virtual TypedefInfo_t *TypedefInfo_Factory() const {return 0;}
	virtual TypedefInfo_t TypedefInfo_FactoryCopy(TypedefInfo_t /* tinfo */) const {return 0;}	virtual TypedefInfo_t TypedefInfo_FactoryCopy(TypedefInfo_t /* tinfo */) const {return 0;}
	virtual void TypedefInfo_Init(TypedefInfo_t * /* tinfo /, const char /* funcname */) const {;}	virtual void TypedefInfo_Init(TypedefInfo_t * /* tinfo /, const char /* funcname */) const {;}
	virtual Bool_t TypedefInfo_IsValid(TypedefInfo_t * /* tinfo */) const {r eturn 0;}	virtual Bool_t TypedefInfo_IsValid(TypedefInfo_t * /* tinfo */) const {r eturn 0;}

		virtual int TypedefInfo_Next(TypedefInfo_t * /* tinfo */) const {retu rn 0;}
	virtual Long_t TypedefInfo_Property(TypedefInfo_t * /* tinfo */) const { return 0;}	virtual Long_t TypedefInfo_Property(TypedefInfo_t * /* tinfo */) const { return 0;}
	virtual int TypedefInfo_Size(TypedefInfo_t * /* tinfo */) const {retu rn 0;}	virtual int TypedefInfo_Size(TypedefInfo_t * /* tinfo */) const {retu rn 0;}
	virtual const char TypedefInfo_TrueName(TypedefInfo_t /* tinfo */) co nst {return 0;}	virtual const char TypedefInfo_TrueName(TypedefInfo_t /* tinfo */) co nst {return 0;}
	virtual const char TypedefInfo_Name(TypedefInfo_t /* tinfo */) const {return 0;}	virtual const char TypedefInfo_Name(TypedefInfo_t /* tinfo */) const {return 0;}
	virtual const char TypedefInfo_Title(TypedefInfo_t /* tinfo */) const {return 0;}	virtual const char TypedefInfo_Title(TypedefInfo_t /* tinfo */) const {return 0;}

	static TInterpreter *&Instance();	static TInterpreter *&Instance();

	ClassDef(TInterpreter,0) //ABC defining interface to generic interprete r	ClassDef(TInterpreter,0) //ABC defining interface to generic interprete r
	};	};

End of changes. 4 change blocks.
	0 lines changed or deleted	4 lines changed or added

	TProof.h	TProof.h

	skipping to change at line 864	skipping to change at line 864
	Int_t Remove(Int_t query, Bool_t all = kFALSE);	Int_t Remove(Int_t query, Bool_t all = kFALSE);
	Int_t Remove(const char *queryref, Bool_t all = kFALSE);	Int_t Remove(const char *queryref, Bool_t all = kFALSE);
	Int_t Retrieve(Int_t query, const char *path = 0);	Int_t Retrieve(Int_t query, const char *path = 0);
	Int_t Retrieve(const char queryref, const char path = 0);	Int_t Retrieve(const char queryref, const char path = 0);

	void DisableGoAsyn();	void DisableGoAsyn();
	void GoAsynchronous();	void GoAsynchronous();
	void StopProcess(Bool_t abort, Int_t timeout = -1);	void StopProcess(Bool_t abort, Int_t timeout = -1);
	void Browse(TBrowser *b);	void Browse(TBrowser *b);


	Int_t SetParallel(Int_t nodes = 9999, Bool_t random = kFALSE);	Int_t SetParallel(Int_t nodes = -1, Bool_t random = kFALSE);
	void SetLogLevel(Int_t level, UInt_t mask = TProofDebug::kAll);	void SetLogLevel(Int_t level, UInt_t mask = TProofDebug::kAll);

	void Close(Option_t *option="");	void Close(Option_t *option="");
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;

	//-- cache and package management	//-- cache and package management
	virtual void ShowCache(Bool_t all = kFALSE);	virtual void ShowCache(Bool_t all = kFALSE);
	virtual void ClearCache(const char *file = 0);	virtual void ClearCache(const char *file = 0);
	TList *GetListOfPackages();	TList *GetListOfPackages();
	TList *GetListOfEnabledPackages();	TList *GetListOfEnabledPackages();

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TProofBench.h	TProofBench.h

	skipping to change at line 55	skipping to change at line 55
	TProof* fProof; // Proof	TProof* fProof; // Proof
	TProof* fProofDS; // Proof to be used for dataset actions	TProof* fProofDS; // Proof to be used for dataset actions
	TFile *fOutFile; // Output file	TFile *fOutFile; // Output file
	TString fOutFileName; // Name of the output file	TString fOutFileName; // Name of the output file
	Int_t fNtries; // Number of times a measurement is repeat ed	Int_t fNtries; // Number of times a measurement is repeat ed
	TPBHistType *fHistType; // Type of histograms for CPU runs	TPBHistType *fHistType; // Type of histograms for CPU runs
	Int_t fNHist; // Number of histograms to be created in d efault CPU runs	Int_t fNHist; // Number of histograms to be created in d efault CPU runs
	TPBReadType *fReadType; // Type of read (partial, full)	TPBReadType *fReadType; // Type of read (partial, full)
	TString fDataSet; // Name of the dataset	TString fDataSet; // Name of the dataset
	Int_t fNFilesWrk; // Number of files generated files per wor ker	Int_t fNFilesWrk; // Number of files generated files per wor ker

		Int_t fNumWrkMax; // Max number of workers (required for dyn amic setups)

	TString fCPUSel; // Selector to be used for CPU benchmarks	TString fCPUSel; // Selector to be used for CPU benchmarks
	TString fCPUPar; // List of par files to be loaded for CPU benchmarks	TString fCPUPar; // List of par files to be loaded for CPU benchmarks
	TString fDataSel; // Selector to be used for data benchmarks	TString fDataSel; // Selector to be used for data benchmarks
	TString fDataPar; // List of par files to be loaded for data benchmarks	TString fDataPar; // List of par files to be loaded for data benchmarks
	TString fDataGenSel; // Selector to be used for generate data f or benchmarks	TString fDataGenSel; // Selector to be used for generate data f or benchmarks
	TString fDataGenPar; // List of par files to be loaded to gener ate data for benchmarks	TString fDataGenPar; // List of par files to be loaded to gener ate data for benchmarks

	TProofBenchRunCPU *fRunCPU; // Instance to run CPU scans	TProofBenchRunCPU *fRunCPU; // Instance to run CPU scans
	TProofBenchRunDataRead *fRunDS; // Instance to run data-read scans	TProofBenchRunDataRead *fRunDS; // Instance to run data-read scans

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	TSQLStatement.h	TSQLStatement.h

	skipping to change at line 65	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; }

		virtual Bool_t SetLargeObject(Int_t col, void* mem, Long_t size, Lo ng_t maxsize = 0x1000) { return SetBinary(col, mem, size, maxsize); }
	#ifndef __MAKECINT__	#ifndef __MAKECINT__
	virtual Bool_t SetVInt(Int_t, const std::vector<Int_t>, const char* , const char*) { return kFALSE; }	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 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 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 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 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; }	virtual Bool_t SetVDouble(Int_t, const std::vector<Double_t>, const char, const char) { return kFALSE; }
	#endif	#endif

	virtual Bool_t Process() = 0;	virtual Bool_t Process() = 0;

	skipping to change at line 92	skipping to change at line 93

	virtual Bool_t IsNull(Int_t) { return kTRUE; }	virtual Bool_t IsNull(Int_t) { return kTRUE; }
	virtual Int_t GetInt(Int_t) { return 0; }	virtual Int_t GetInt(Int_t) { return 0; }
	virtual UInt_t GetUInt(Int_t) { return 0; }	virtual UInt_t GetUInt(Int_t) { return 0; }
	virtual Long_t GetLong(Int_t) { return 0; }	virtual Long_t GetLong(Int_t) { return 0; }
	virtual Long64_t GetLong64(Int_t) { return 0; }	virtual Long64_t GetLong64(Int_t) { return 0; }
	virtual ULong64_t GetULong64(Int_t) { return 0; }	virtual ULong64_t GetULong64(Int_t) { return 0; }
	virtual Double_t GetDouble(Int_t) { return 0.; }	virtual Double_t GetDouble(Int_t) { return 0.; }
	virtual const char *GetString(Int_t) { return 0; }	virtual const char *GetString(Int_t) { return 0; }
	virtual Bool_t GetBinary(Int_t, void* &, Long_t&) { return kFALSE; }	virtual Bool_t GetBinary(Int_t, void* &, Long_t&) { return kFALSE; }

		virtual Bool_t GetLargeObject(Int_t col, void* &mem, Long_t& size) { return GetBinary(col, mem, size); }

	virtual Bool_t GetDate(Int_t, Int_t&, Int_t&, Int_t&) { return kFAL SE; }	virtual Bool_t GetDate(Int_t, Int_t&, Int_t&, Int_t&) { return kFAL SE; }
	virtual Bool_t GetTime(Int_t, Int_t&, Int_t&, Int_t&) { return kFAL SE; }	virtual Bool_t GetTime(Int_t, Int_t&, Int_t&, Int_t&) { return kFAL SE; }
	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);

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added

	TTreeViewer.h	TTreeViewer.h

	skipping to change at line 224	skipping to change at line 224
	void SetCutMode(Bool_t enabled = kTRUE) {fEnableCut = enabled;}	void SetCutMode(Bool_t enabled = kTRUE) {fEnableCut = enabled;}
	void SetCurrentRecord(Long64_t entry);	void SetCurrentRecord(Long64_t entry);
	void SetGrOpt(const char *option);	void SetGrOpt(const char *option);
	void SetNexpressions(Int_t expr);	void SetNexpressions(Int_t expr);
	void SetRecordName(const char name); // MENU*	void SetRecordName(const char name); // MENU*
	void SetScanFileName(const char name=""); // MENU*	void SetScanFileName(const char name=""); // MENU*
	void SetScanMode(Bool_t mode=kTRUE) {fScanMode = mode;}	void SetScanMode(Bool_t mode=kTRUE) {fScanMode = mode;}
	void SetScanRedirect(Bool_t mode);	void SetScanRedirect(Bool_t mode);
	void SetSession(TTVSession *session);	void SetSession(TTVSession *session);
	void SetUserCode(const char code, Bool_t autoexec=kTRUE); // MENU*	void SetUserCode(const char code, Bool_t autoexec=kTRUE); // MENU*

		void SetTree(TTree* tree);
	void SetTreeName(const char* treeName); // MENU	void SetTreeName(const char* treeName); // MENU
	Bool_t SwitchTree(Int_t index);	Bool_t SwitchTree(Int_t index);
	void UpdateCombo();	void UpdateCombo();
	void UpdateRecord(const char name="new name"); // MENU*	void UpdateRecord(const char name="new name"); // MENU*

	ClassDef(TTreeViewer,0) // A GUI oriented tree viewer	ClassDef(TTreeViewer,0) // A GUI oriented tree viewer
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added